You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ro...@apache.org on 2019/01/24 10:39:19 UTC
[lucene-solr] 01/02: Remove deprecated ResourceLoader constructors
This is an automated email from the ASF dual-hosted git repository.
romseygeek pushed a commit to branch master-deprecations
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 856c9830f8b4e4fcc95a583942b944c7a5827631
Author: Alan Woodward <ro...@apache.org>
AuthorDate: Thu Jan 24 10:35:22 2019 +0000
Remove deprecated ResourceLoader constructors
---
.../analysis/util/ClasspathResourceLoader.java | 18 ------------------
.../analysis/util/FilesystemResourceLoader.java | 16 ----------------
.../util/TestFilesystemResourceLoader.java | 2 +-
.../byTask/tasks/AnalyzerFactoryTask.java | 22 +++++++++++-----------
.../apache/solr/schema/TestICUCollationField.java | 2 +-
5 files changed, 13 insertions(+), 47 deletions(-)
diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ClasspathResourceLoader.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ClasspathResourceLoader.java
index 4ee9212..014f329 100644
--- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ClasspathResourceLoader.java
+++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ClasspathResourceLoader.java
@@ -20,8 +20,6 @@ package org.apache.lucene.analysis.util;
import java.io.IOException;
import java.io.InputStream;
-import org.apache.lucene.util.SuppressForbidden;
-
/**
* Simple {@link ResourceLoader} that uses {@link ClassLoader#getResourceAsStream(String)}
* and {@link Class#forName(String,boolean,ClassLoader)} to open resources and
@@ -30,22 +28,6 @@ import org.apache.lucene.util.SuppressForbidden;
public final class ClasspathResourceLoader implements ResourceLoader {
private final Class<?> clazz;
private final ClassLoader loader;
-
- /**
- * Creates an instance using the context classloader to load resources and classes.
- * Resource paths must be absolute.
- *
- * @deprecated You should not use this ctor, because it uses the thread's context
- * class loader, which is bad programming style. Please specify a reference class or
- * a {@link ClassLoader} instead.
- * @see #ClasspathResourceLoader(ClassLoader)
- * @see #ClasspathResourceLoader(Class)
- */
- @Deprecated
- @SuppressForbidden(reason = "Deprecated method uses thread's context classloader, but there for backwards compatibility")
- public ClasspathResourceLoader() {
- this(Thread.currentThread().getContextClassLoader());
- }
/**
* Creates an instance using the given classloader to load Resources and classes.
diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/FilesystemResourceLoader.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/FilesystemResourceLoader.java
index 4fbaa6d..6d0e608 100644
--- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/FilesystemResourceLoader.java
+++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/FilesystemResourceLoader.java
@@ -40,22 +40,6 @@ import java.nio.file.Path;
public final class FilesystemResourceLoader implements ResourceLoader {
private final Path baseDirectory;
private final ResourceLoader delegate;
-
- /**
- * Creates a resource loader that resolves resources against the given
- * base directory (may be {@code null} to refer to CWD).
- * Files not found in file system and class lookups are delegated to context
- * classloader.
- *
- * @deprecated You should not use this ctor, because it uses the thread's context
- * class loader as fallback for resource lookups, which is bad programming style.
- * Please specify a {@link ClassLoader} instead.
- * @see #FilesystemResourceLoader(Path, ClassLoader)
- */
- @Deprecated
- public FilesystemResourceLoader(Path baseDirectory) {
- this(baseDirectory, new ClasspathResourceLoader());
- }
/**
* Creates a resource loader that resolves resources against the given
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestFilesystemResourceLoader.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestFilesystemResourceLoader.java
index eaa6174..8858302 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestFilesystemResourceLoader.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestFilesystemResourceLoader.java
@@ -63,7 +63,7 @@ public class TestFilesystemResourceLoader extends LuceneTestCase {
IOUtils.closeWhileHandlingException(os);
}
- ResourceLoader rl = new FilesystemResourceLoader(base);
+ ResourceLoader rl = new FilesystemResourceLoader(base, TestFilesystemResourceLoader.class.getClassLoader());
assertEquals("foobar", WordlistLoader.getLines(rl.openResource("template.txt"), StandardCharsets.UTF_8).get(0));
// Same with full path name:
String fullPath = base.resolve("template.txt").toAbsolutePath().toString();
diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AnalyzerFactoryTask.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AnalyzerFactoryTask.java
index 051a8fc..9f6cabf 100644
--- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AnalyzerFactoryTask.java
+++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AnalyzerFactoryTask.java
@@ -17,16 +17,6 @@
package org.apache.lucene.benchmark.byTask.tasks;
-import org.apache.lucene.analysis.util.AbstractAnalysisFactory;
-import org.apache.lucene.analysis.util.CharFilterFactory;
-import org.apache.lucene.analysis.util.FilesystemResourceLoader;
-import org.apache.lucene.analysis.util.ResourceLoaderAware;
-import org.apache.lucene.analysis.util.TokenFilterFactory;
-import org.apache.lucene.analysis.util.TokenizerFactory;
-import org.apache.lucene.benchmark.byTask.PerfRunData;
-import org.apache.lucene.benchmark.byTask.utils.AnalyzerFactory;
-import org.apache.lucene.util.Version;
-
import java.io.StreamTokenizer;
import java.io.StringReader;
import java.nio.file.Files;
@@ -38,6 +28,16 @@ import java.util.List;
import java.util.Map;
import java.util.regex.Pattern;
+import org.apache.lucene.analysis.util.AbstractAnalysisFactory;
+import org.apache.lucene.analysis.util.CharFilterFactory;
+import org.apache.lucene.analysis.util.FilesystemResourceLoader;
+import org.apache.lucene.analysis.util.ResourceLoaderAware;
+import org.apache.lucene.analysis.util.TokenFilterFactory;
+import org.apache.lucene.analysis.util.TokenizerFactory;
+import org.apache.lucene.benchmark.byTask.PerfRunData;
+import org.apache.lucene.benchmark.byTask.utils.AnalyzerFactory;
+import org.apache.lucene.util.Version;
+
/**
* Analyzer factory construction task. The name given to the constructed factory may
* be given to NewAnalyzerTask, which will call AnalyzerFactory.create().
@@ -372,7 +372,7 @@ public class AnalyzerFactoryTask extends PerfTask {
if (!Files.isDirectory(baseDir)) {
baseDir = Paths.get(".");
}
- ((ResourceLoaderAware)instance).inform(new FilesystemResourceLoader(baseDir));
+ ((ResourceLoaderAware)instance).inform(new FilesystemResourceLoader(baseDir, AnalyzerFactoryTask.class.getClassLoader()));
}
if (CharFilterFactory.class.isAssignableFrom(clazz)) {
charFilterFactories.add((CharFilterFactory)instance);
diff --git a/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationField.java b/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationField.java
index f164080..9d04c1a 100644
--- a/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationField.java
+++ b/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationField.java
@@ -92,7 +92,7 @@ public class TestICUCollationField extends SolrTestCaseJ4 {
if (random().nextBoolean()) {
loader = new StringMockResourceLoader(tailoredRules);
} else {
- loader = new FilesystemResourceLoader(confDir.toPath());
+ loader = new FilesystemResourceLoader(confDir.toPath(), TestICUCollationField.class.getClassLoader());
}
final Collator readCollator = ICUCollationField.createFromRules(osFileName, loader);
assertEquals(tailoredCollator, readCollator);