|
@@ -25,6 +25,7 @@ import java.util.stream.Collectors;
|
|
|
import java.util.stream.Stream;
|
|
import java.util.stream.Stream;
|
|
|
import java.util.stream.StreamSupport;
|
|
import java.util.stream.StreamSupport;
|
|
|
import net.ranides.assira.collection.iterators.ForwardSpliterator;
|
|
import net.ranides.assira.collection.iterators.ForwardSpliterator;
|
|
|
|
|
+import net.ranides.assira.io.ZipReader;
|
|
|
import net.ranides.assira.text.StringUtils;
|
|
import net.ranides.assira.text.StringUtils;
|
|
|
import net.ranides.assira.io.uri.URIUtils;
|
|
import net.ranides.assira.io.uri.URIUtils;
|
|
|
import net.ranides.assira.trace.ExceptionUtils;
|
|
import net.ranides.assira.trace.ExceptionUtils;
|
|
@@ -102,7 +103,7 @@ public final class PackageScanner {
|
|
|
private Spliterator<String> forJAR(String uri) {
|
|
private Spliterator<String> forJAR(String uri) {
|
|
|
try {
|
|
try {
|
|
|
String jar = StringUtils.between(uri, ":", "!");
|
|
String jar = StringUtils.between(uri, ":", "!");
|
|
|
- return new JARSpliterator(new JarInputStream(new FileInputStream(jar)));
|
|
|
|
|
|
|
+ return new JARSpliterator(ZipReader.openJAR(new FileInputStream(jar)));
|
|
|
} catch (IOException cause) {
|
|
} catch (IOException cause) {
|
|
|
throw ExceptionUtils.rethrow(cause);
|
|
throw ExceptionUtils.rethrow(cause);
|
|
|
}
|
|
}
|