honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-18 19:05:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

SQL: Fix classpath discovery on Java 10+ (#40420)

Browse Source 
(cherry picked from commit 2cef233cb34ee80d8ed9cd014cea76ea5096d206)
This commit is contained in:
Costin Leau 2019-03-26 08:17:08 +02:00 committed by Costin Leau
parent c20ea9a2dd
commit 7234d78747
1 changed files with 5 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
x-pack/plugin/sql/qa/src/main/java/org/elasticsearch/xpack/sql/qa/jdbc/JdbcTestUtils.java
View File

@ -15,9 +15,7 @@ import org.elasticsearch.xpack.sql.proto.ColumnInfo;
import org.elasticsearch.xpack.sql.proto.StringUtils; import org.elasticsearch.xpack.sql.proto.StringUtils;
import java.io.IOException; import java.io.IOException;
import java.net.URI;
import java.net.URL; import java.net.URL;
import java.net.URLClassLoader;
import java.net.URLConnection; import java.net.URLConnection;
import java.nio.file.FileVisitOption; import java.nio.file.FileVisitOption;
import java.nio.file.FileVisitResult; import java.nio.file.FileVisitResult;
@ -37,8 +35,6 @@ import java.util.List;
import java.util.jar.JarInputStream; import java.util.jar.JarInputStream;
import java.util.zip.ZipEntry; import java.util.zip.ZipEntry;
import static java.util.Arrays.asList;
import static java.util.Collections.list;
import static org.elasticsearch.xpack.sql.action.BasicFormatter.FormatOption.CLI; import static org.elasticsearch.xpack.sql.action.BasicFormatter.FormatOption.CLI;
public abstract class JdbcTestUtils { public abstract class JdbcTestUtils {
@ -170,8 +166,6 @@ public abstract class JdbcTestUtils {
* inside jars (gradle). * inside jars (gradle).
*/ */
public static List<URL> classpathResources(String pattern) throws Exception { public static List<URL> classpathResources(String pattern) throws Exception {
ClassLoader cl = JdbcTestUtils.class.getClassLoader();
while (pattern.startsWith("/")) { while (pattern.startsWith("/")) {
pattern = pattern.substring(1); pattern = pattern.substring(1);
} }
@ -183,37 +177,24 @@ public abstract class JdbcTestUtils {
final String root = split.v1(); final String root = split.v1();
final String filePattern = split.v2(); final String filePattern = split.v2();
List<URL> resources = null; String[] resources = System.getProperty("java.class.path").split(System.getProperty("path.separator"));
if (cl instanceof URLClassLoader) {
resources = asList(((URLClassLoader) cl).getURLs());
} else {
// fallback in case of non-standard CL
resources = list(cl.getResources(root));
}
List<URL> matches = new ArrayList<>(); List<URL> matches = new ArrayList<>();
for (URL resource : resources) { for (String resource : resources) {
String protocol = resource.getProtocol(); Path path = PathUtils.get(resource);
URI uri = resource.toURI();
Path path = PathUtils.get(uri);
if ("file".equals(protocol) == false) {
throw new IllegalArgumentException("Unsupported protocol " + protocol);
}
// check whether we're dealing with a jar // check whether we're dealing with a jar
// Java 7 java.nio.fileFileSystem can be used on top of ZIPs/JARs but consumes more memory // Java 7 java.nio.fileFileSystem can be used on top of ZIPs/JARs but consumes more memory
// hence the use of the JAR API // hence the use of the JAR API
if (path.toString().endsWith(".jar")) { if (path.toString().endsWith(".jar")) {
try (JarInputStream jar = getJarStream(resource)) { try (JarInputStream jar = getJarStream(path.toUri().toURL())) {
ZipEntry entry = null; ZipEntry entry = null;
while ((entry = jar.getNextEntry()) != null) { while ((entry = jar.getNextEntry()) != null) {
String name = entry.getName(); String name = entry.getName();
Tuple<String, String> entrySplit = pathAndName(name); Tuple<String, String> entrySplit = pathAndName(name);
if (root.equals(entrySplit.v1()) && Regex.simpleMatch(filePattern, entrySplit.v2())) { if (root.equals(entrySplit.v1()) && Regex.simpleMatch(filePattern, entrySplit.v2())) {
matches.add(new URL("jar:" + resource.toString() + "!/" + name)); matches.add(new URL("jar:" + path.toUri() + "!/" + name));
} }
} }
} }