SOLR-14151: Reverting recent changes
This commit takes us back to this commit point:
commit f5219061252912c000f5d119d49bb315e5e6f1ae (jira/solr-14151-new-revert-8x)
Author: noble <noble@apache.org>
Date: Tue Sep 29 15:27:50 2020 +1000
SOLR-14901: TestPackages uses binary precompiled classes to refer to analysis factory FQCNs
diff --git a/solr/core/src/java/org/apache/solr/schema/IndexSchema.java b/solr/core/src/java/org/apache/solr/schema/IndexSchema.java
index 26286c2..bd4ae7e 100644
--- a/solr/core/src/java/org/apache/solr/schema/IndexSchema.java
+++ b/solr/core/src/java/org/apache/solr/schema/IndexSchema.java
@@ -20,7 +20,6 @@
import javax.xml.xpath.XPathConstants;
import javax.xml.xpath.XPathExpressionException;
import java.io.IOException;
-import java.io.InputStream;
import java.io.Writer;
import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
@@ -47,7 +46,6 @@
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.DelegatingAnalyzerWrapper;
-import org.apache.lucene.analysis.util.ResourceLoader;
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.queries.payloads.PayloadDecoder;
import org.apache.lucene.search.similarities.Similarity;
@@ -138,7 +136,6 @@
protected final Version luceneVersion;
protected float version;
protected final SolrResourceLoader loader;
- protected ResourceLoader resourceLoader;
protected final SolrClassLoader solrClassLoader;
protected final Properties substitutableProperties;
@@ -184,7 +181,7 @@
this.resourceName = Objects.requireNonNull(name);
try {
readSchema(is);
- loader.inform(this.resourceLoader);
+ loader.inform(loader);
} catch (IOException e) {
throw new RuntimeException(e);
}
@@ -193,36 +190,8 @@
protected IndexSchema(Version luceneVersion, SolrResourceLoader loader, Properties substitutableProperties) {
this.luceneVersion = Objects.requireNonNull(luceneVersion);
this.loader = loader;
- this.solrClassLoader = loader.getSchemaLoader() == null ?
- loader :
- loader.getSchemaLoader();
- resourceLoader = this.solrClassLoader instanceof SolrResourceLoader ?
- (ResourceLoader) this.solrClassLoader :
- wrappedResourceLoader(this.solrClassLoader);
- this.substitutableProperties = substitutableProper`ties;
- }
-
- /**We want resources to be loaded using {@link SolrResourceLoader}
- * and classes to be loaded using {@link org.apache.solr.pkg.PackageListeningClassLoader}
- *
- */
- private ResourceLoader wrappedResourceLoader(SolrClassLoader solrClassLoader) {
- return new ResourceLoader() {
- @Override
- public InputStream openResource(String resource) throws IOException {
- return loader.openResource(resource);
- }
-
- @Override
- public <T> Class<? extends T> findClass(String cname, Class<T> expectedType) {
- return solrClassLoader.findClass(cname, expectedType);
- }
-
- @Override
- public <T> T newInstance(String cname, Class<T> expectedType) {
- return solrClassLoader.newInstance(cname, expectedType);
- }
- };
+ this.solrClassLoader = loader.getSchemaLoader() == null ? loader : loader.getSchemaLoader();
+ this.substitutableProperties = substitutableProperties;
}
/**
diff --git a/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchema.java b/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchema.java
index b22ba69..f4ae860 100644
--- a/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchema.java
+++ b/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchema.java
@@ -1319,7 +1319,7 @@
for (CharFilterFactory next : charFilters) {
if (next instanceof ResourceLoaderAware) {
try {
- ((ResourceLoaderAware) next).inform(resourceLoader);
+ ((ResourceLoaderAware) next).inform(loader);
} catch (IOException e) {
throw new SolrException(ErrorCode.SERVER_ERROR, e);
}
@@ -1329,7 +1329,7 @@
TokenizerFactory tokenizerFactory = chain.getTokenizerFactory();
if (tokenizerFactory instanceof ResourceLoaderAware) {
try {
- ((ResourceLoaderAware) tokenizerFactory).inform(resourceLoader);
+ ((ResourceLoaderAware) tokenizerFactory).inform(loader);
} catch (IOException e) {
throw new SolrException(ErrorCode.SERVER_ERROR, e);
}
@@ -1340,7 +1340,7 @@
if (next instanceof ResourceLoaderAware) {
SolrResourceLoader.CURRENT_AWARE.set((ResourceLoaderAware) next);
try {
- ((ResourceLoaderAware) next).inform(resourceLoader);
+ ((ResourceLoaderAware) next).inform(loader);
} catch (IOException e) {
throw new SolrException(ErrorCode.SERVER_ERROR, e);
} finally {
