Skip to content

fix jar scanner for java 17 #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alex-karpovich merged 2 commits into from
Mar 10, 2025
Merged

fix jar scanner for java 17 #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c7bea1e
fix jar scanner for java 17
IvanNoyvik Mar 7, 2025
8790095
update ci script
IvanNoyvik Mar 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ jobs:
- name: Checkout code
uses: actions/checkout@v2
- name: Cache gradle dependencies
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/.gradle/caches
key: ${{ runner.os }}-gradle-caches-${{ hashFiles('**/*.gradle') }}
restore-keys: |
${{ runner.os }}-gradle-caches-
- name: Cache gradle wrapper
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/.gradle/wrapper
key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
Expand All @@ -43,7 +43,7 @@ jobs:
run: ./gradlew build
- name: Upload test results
if: ${{ failure() }}
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
path: build/reports/tests/test
name: Test Report
6 changes: 4 additions & 2 deletions util/src/main/java/com/epam/deltix/util/lang/JarScanner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
package com.epam.deltix.util.lang;

import javax.tools.JavaFileObject;
import java.io.File;
import java.io.IOException;
import java.net.JarURLConnection;
import java.net.URI;
Expand Down Expand Up @@ -59,7 +58,7 @@ private static Collection<JavaFileObject> listUnder(String packageName, URL pack
}

private static List<JavaFileObject> processJar(String packageName, URL packageFolderURL) {
List<JavaFileObject> result = new ArrayList<JavaFileObject>();
List<JavaFileObject> result = new ArrayList<>();
try {
String[] uris = packageFolderURL.toExternalForm().split("!");
String jarUri = uris[0];
Expand Down Expand Up @@ -87,6 +86,9 @@ private static List<JavaFileObject> processJar(String packageName, URL packageFo
} else if (secondUri.endsWith(".jar")) {
JarURLConnection jarConn = (JarURLConnection) packageFolderURL.openConnection();
String rootEntryName = jarConn.getEntryName();
if (rootEntryName == null) {
rootEntryName = "";
}
int rootEnd = rootEntryName.length() + 1;
if (!secondUri.endsWith("jar"))
return result;
Expand Down