You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by jp...@apache.org on 2019/04/10 15:36:22 UTC
[lucene-solr] branch jira/LUCENE-8738 updated (d13874a -> 65ddd31)
This is an automated email from the ASF dual-hosted git repository.
jpountz pushed a change to branch jira/LUCENE-8738
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git.
from d13874a Merge branch 'master' of https://gitbox.apache.org/repos/asf/lucene-solr into jira/LUCENE-8738
new cfe959b LUCENE-8738: Update Eclipse config.
new a11c397 LUCENE-8738: Update Idea configuration (untested).
new 65ddd31 LUCENE-8738: Use getConstructor instead of getDeclaredConstructor.
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
dev-tools/eclipse/dot.classpath.xsl | 2 +-
dev-tools/eclipse/dot.settings/org.eclipse.jdt.core.prefs | 6 +++---
dev-tools/idea/.idea/misc.xml | 2 +-
.../java/org/apache/lucene/analysis/snowball/SnowballFilter.java | 2 +-
.../lucene/analysis/snowball/SnowballPorterFilterFactory.java | 2 +-
.../org/apache/lucene/analysis/util/ClasspathResourceLoader.java | 2 +-
.../test/org/apache/lucene/analysis/core/TestRandomChains.java | 2 +-
.../org/apache/lucene/analysis/util/StringMockResourceLoader.java | 2 +-
.../org/apache/lucene/analysis/ja/StringMockResourceLoader.java | 2 +-
.../org/apache/lucene/analysis/ko/StringMockResourceLoader.java | 2 +-
.../apache/lucene/analysis/phonetic/PhoneticFilterFactory.java | 2 +-
.../src/java/org/apache/lucene/benchmark/byTask/PerfRunData.java | 8 ++++----
.../apache/lucene/benchmark/byTask/feeds/TrecContentSource.java | 4 ++--
.../org/apache/lucene/benchmark/byTask/tasks/CreateIndexTask.java | 8 ++++----
.../org/apache/lucene/benchmark/byTask/tasks/NewAnalyzerTask.java | 2 +-
.../lucene/benchmark/byTask/tasks/SearchWithCollectorTask.java | 2 +-
lucene/core/src/java/org/apache/lucene/store/LockStressTest.java | 2 +-
lucene/core/src/java/org/apache/lucene/util/NamedSPILoader.java | 2 +-
.../lucene/analysis/tokenattributes/TestBytesRefAttImpl.java | 2 +-
.../analysis/tokenattributes/TestCharTermAttributeImpl.java | 2 +-
.../lucene/spatial/prefix/tree/SpatialPrefixTreeFactory.java | 2 +-
.../org/apache/lucene/search/suggest/LookupBenchmarkTest.java | 2 +-
.../test/org/apache/lucene/search/suggest/PersistenceTest.java | 4 ++--
.../src/java/org/apache/lucene/util/LuceneTestCase.java | 2 +-
.../handler/clustering/carrot2/LuceneCarrot2StemmerFactory.java | 2 +-
.../org/apache/solr/handler/dataimport/MailEntityProcessor.java | 2 +-
.../src/java/org/apache/solr/handler/dataimport/DataImporter.java | 6 +++---
.../src/java/org/apache/solr/handler/dataimport/DocBuilder.java | 4 ++--
.../apache/solr/handler/dataimport/EntityProcessorWrapper.java | 4 ++--
.../java/org/apache/solr/handler/dataimport/JdbcDataSource.java | 2 +-
.../apache/solr/handler/dataimport/AbstractDIHJdbcTestCase.java | 4 ++--
.../apache/solr/handler/dataimport/TestEntityProcessorBase.java | 6 +++---
.../core/src/java/org/apache/solr/cloud/rule/ReplicaAssigner.java | 4 ++--
solr/core/src/java/org/apache/solr/core/MemClassLoader.java | 2 +-
solr/core/src/java/org/apache/solr/core/SolrCore.java | 2 +-
.../java/org/apache/solr/core/TransientSolrCoreCacheFactory.java | 2 +-
.../org/apache/solr/handler/component/ShardHandlerFactory.java | 2 +-
solr/core/src/java/org/apache/solr/schema/CurrencyFieldType.java | 2 +-
.../src/java/org/apache/solr/schema/FieldTypePluginLoader.java | 2 +-
.../src/java/org/apache/solr/schema/FileExchangeRateProvider.java | 2 +-
solr/core/src/java/org/apache/solr/search/CacheConfig.java | 2 +-
solr/core/src/java/org/apache/solr/util/SolrCLI.java | 4 ++--
solr/core/src/test/org/apache/solr/SolrInfoBeanTest.java | 2 +-
.../org/apache/solr/analysis/ThrowingMockTokenFilterFactory.java | 2 +-
solr/core/src/test/org/apache/solr/core/DirectoryFactoryTest.java | 6 +++---
solr/core/src/test/org/apache/solr/core/TestDirectoryFactory.java | 2 +-
.../src/test/org/apache/solr/legacy/TestNumericTokenStream.java | 2 +-
.../src/test/org/apache/solr/schema/PrimitiveFieldTypeTest.java | 4 ++--
.../org/apache/solr/spelling/ConjunctionSolrSpellCheckerTest.java | 4 ++--
.../org/apache/solr/client/solrj/beans/DocumentObjectBinder.java | 2 +-
.../java/org/apache/solr/client/solrj/impl/HttpClientUtil.java | 2 +-
.../org/apache/solr/client/solrj/io/stream/JDBCStreamTest.java | 2 +-
.../org/apache/solr/analysis/StringMockSolrResourceLoader.java | 2 +-
53 files changed, 76 insertions(+), 76 deletions(-)
[lucene-solr] 03/03: LUCENE-8738: Use getConstructor instead of
getDeclaredConstructor.
Posted by jp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jpountz pushed a commit to branch jira/LUCENE-8738
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 65ddd311288411e9dd56fd05e69a1a68c64a84ea
Author: Adrien Grand <jp...@gmail.com>
AuthorDate: Wed Apr 10 17:34:48 2019 +0200
LUCENE-8738: Use getConstructor instead of getDeclaredConstructor.
I had to make FileExchangeRateProvider public.
---
.../java/org/apache/lucene/analysis/snowball/SnowballFilter.java | 2 +-
.../lucene/analysis/snowball/SnowballPorterFilterFactory.java | 2 +-
.../org/apache/lucene/analysis/util/ClasspathResourceLoader.java | 2 +-
.../test/org/apache/lucene/analysis/core/TestRandomChains.java | 2 +-
.../org/apache/lucene/analysis/util/StringMockResourceLoader.java | 2 +-
.../org/apache/lucene/analysis/ja/StringMockResourceLoader.java | 2 +-
.../org/apache/lucene/analysis/ko/StringMockResourceLoader.java | 2 +-
.../apache/lucene/analysis/phonetic/PhoneticFilterFactory.java | 2 +-
.../src/java/org/apache/lucene/benchmark/byTask/PerfRunData.java | 8 ++++----
.../apache/lucene/benchmark/byTask/feeds/TrecContentSource.java | 4 ++--
.../org/apache/lucene/benchmark/byTask/tasks/CreateIndexTask.java | 8 ++++----
.../org/apache/lucene/benchmark/byTask/tasks/NewAnalyzerTask.java | 2 +-
.../lucene/benchmark/byTask/tasks/SearchWithCollectorTask.java | 2 +-
lucene/core/src/java/org/apache/lucene/store/LockStressTest.java | 2 +-
lucene/core/src/java/org/apache/lucene/util/NamedSPILoader.java | 2 +-
.../lucene/analysis/tokenattributes/TestBytesRefAttImpl.java | 2 +-
.../analysis/tokenattributes/TestCharTermAttributeImpl.java | 2 +-
.../lucene/spatial/prefix/tree/SpatialPrefixTreeFactory.java | 2 +-
.../org/apache/lucene/search/suggest/LookupBenchmarkTest.java | 2 +-
.../test/org/apache/lucene/search/suggest/PersistenceTest.java | 4 ++--
.../src/java/org/apache/lucene/util/LuceneTestCase.java | 2 +-
.../handler/clustering/carrot2/LuceneCarrot2StemmerFactory.java | 2 +-
.../org/apache/solr/handler/dataimport/MailEntityProcessor.java | 2 +-
.../src/java/org/apache/solr/handler/dataimport/DataImporter.java | 6 +++---
.../src/java/org/apache/solr/handler/dataimport/DocBuilder.java | 4 ++--
.../apache/solr/handler/dataimport/EntityProcessorWrapper.java | 4 ++--
.../java/org/apache/solr/handler/dataimport/JdbcDataSource.java | 2 +-
.../apache/solr/handler/dataimport/AbstractDIHJdbcTestCase.java | 4 ++--
.../apache/solr/handler/dataimport/TestEntityProcessorBase.java | 6 +++---
.../core/src/java/org/apache/solr/cloud/rule/ReplicaAssigner.java | 4 ++--
solr/core/src/java/org/apache/solr/core/MemClassLoader.java | 2 +-
solr/core/src/java/org/apache/solr/core/SolrCore.java | 2 +-
.../java/org/apache/solr/core/TransientSolrCoreCacheFactory.java | 2 +-
.../org/apache/solr/handler/component/ShardHandlerFactory.java | 2 +-
solr/core/src/java/org/apache/solr/schema/CurrencyFieldType.java | 2 +-
.../src/java/org/apache/solr/schema/FieldTypePluginLoader.java | 2 +-
.../src/java/org/apache/solr/schema/FileExchangeRateProvider.java | 2 +-
solr/core/src/java/org/apache/solr/search/CacheConfig.java | 2 +-
solr/core/src/java/org/apache/solr/util/SolrCLI.java | 4 ++--
solr/core/src/test/org/apache/solr/SolrInfoBeanTest.java | 2 +-
.../org/apache/solr/analysis/ThrowingMockTokenFilterFactory.java | 2 +-
solr/core/src/test/org/apache/solr/core/DirectoryFactoryTest.java | 6 +++---
solr/core/src/test/org/apache/solr/core/TestDirectoryFactory.java | 2 +-
.../src/test/org/apache/solr/legacy/TestNumericTokenStream.java | 2 +-
.../src/test/org/apache/solr/schema/PrimitiveFieldTypeTest.java | 4 ++--
.../org/apache/solr/spelling/ConjunctionSolrSpellCheckerTest.java | 4 ++--
.../org/apache/solr/client/solrj/beans/DocumentObjectBinder.java | 2 +-
.../java/org/apache/solr/client/solrj/impl/HttpClientUtil.java | 2 +-
.../org/apache/solr/client/solrj/io/stream/JDBCStreamTest.java | 2 +-
.../org/apache/solr/analysis/StringMockSolrResourceLoader.java | 2 +-
50 files changed, 71 insertions(+), 71 deletions(-)
diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/snowball/SnowballFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/snowball/SnowballFilter.java
index d0b35df..ceec615 100644
--- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/snowball/SnowballFilter.java
+++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/snowball/SnowballFilter.java
@@ -78,7 +78,7 @@ public final class SnowballFilter extends TokenFilter {
try {
Class<? extends SnowballProgram> stemClass =
Class.forName("org.tartarus.snowball.ext." + name + "Stemmer").asSubclass(SnowballProgram.class);
- stemmer = stemClass.getDeclaredConstructor().newInstance();
+ stemmer = stemClass.getConstructor().newInstance();
} catch (Exception e) {
throw new IllegalArgumentException("Invalid stemmer class specified: " + name, e);
}
diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/snowball/SnowballPorterFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/snowball/SnowballPorterFilterFactory.java
index b46d0e1..181f7ad 100644
--- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/snowball/SnowballPorterFilterFactory.java
+++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/snowball/SnowballPorterFilterFactory.java
@@ -76,7 +76,7 @@ public class SnowballPorterFilterFactory extends TokenFilterFactory implements R
public TokenFilter create(TokenStream input) {
SnowballProgram program;
try {
- program = stemClass.getDeclaredConstructor().newInstance();
+ program = stemClass.getConstructor().newInstance();
} catch (Exception e) {
throw new RuntimeException("Error instantiating stemmer for language " + language + "from class " + stemClass, e);
}
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 794a1ff..e746347 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
@@ -91,7 +91,7 @@ public final class ClasspathResourceLoader implements ResourceLoader {
public <T> T newInstance(String cname, Class<T> expectedType) {
Class<? extends T> clazz = findClass(cname, expectedType);
try {
- return clazz.getDeclaredConstructor().newInstance();
+ return clazz.getConstructor().newInstance();
} catch (Exception e) {
throw new RuntimeException("Cannot create instance: " + cname, e);
}
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java
index 003f087..10358c7 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java
@@ -408,7 +408,7 @@ public class TestRandomChains extends BaseTokenStreamTestCase {
try {
String lang = TestSnowball.SNOWBALL_LANGS[random.nextInt(TestSnowball.SNOWBALL_LANGS.length)];
Class<? extends SnowballProgram> clazz = Class.forName("org.tartarus.snowball.ext." + lang + "Stemmer").asSubclass(SnowballProgram.class);
- return clazz.getDeclaredConstructor().newInstance();
+ return clazz.getConstructor().newInstance();
} catch (Exception ex) {
Rethrow.rethrow(ex);
return null; // unreachable code
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/StringMockResourceLoader.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/StringMockResourceLoader.java
index d771651..f5384f4 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/StringMockResourceLoader.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/StringMockResourceLoader.java
@@ -43,7 +43,7 @@ public class StringMockResourceLoader implements ResourceLoader {
public <T> T newInstance(String cname, Class<T> expectedType) {
Class<? extends T> clazz = findClass(cname, expectedType);
try {
- return clazz.getDeclaredConstructor().newInstance();
+ return clazz.getConstructor().newInstance();
} catch (Exception e) {
throw new RuntimeException("Cannot create instance: " + cname, e);
}
diff --git a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/StringMockResourceLoader.java b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/StringMockResourceLoader.java
index 18a518e..887098f 100644
--- a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/StringMockResourceLoader.java
+++ b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/StringMockResourceLoader.java
@@ -45,7 +45,7 @@ class StringMockResourceLoader implements ResourceLoader {
public <T> T newInstance(String cname, Class<T> expectedType) {
Class<? extends T> clazz = findClass(cname, expectedType);
try {
- return clazz.getDeclaredConstructor().newInstance();
+ return clazz.getConstructor().newInstance();
} catch (Exception e) {
throw new RuntimeException("Cannot create instance: " + cname, e);
}
diff --git a/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/StringMockResourceLoader.java b/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/StringMockResourceLoader.java
index 93077ca..db9ff89 100644
--- a/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/StringMockResourceLoader.java
+++ b/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/StringMockResourceLoader.java
@@ -45,7 +45,7 @@ class StringMockResourceLoader implements ResourceLoader {
public <T> T newInstance(String cname, Class<T> expectedType) {
Class<? extends T> clazz = findClass(cname, expectedType);
try {
- return clazz.getDeclaredConstructor().newInstance();
+ return clazz.getConstructor().newInstance();
} catch (Exception e) {
throw new RuntimeException("Cannot create instance: " + cname, e);
}
diff --git a/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/PhoneticFilterFactory.java b/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/PhoneticFilterFactory.java
index c709fc3..e580d6e 100644
--- a/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/PhoneticFilterFactory.java
+++ b/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/PhoneticFilterFactory.java
@@ -144,7 +144,7 @@ public class PhoneticFilterFactory extends TokenFilterFactory implements Resourc
// Unfortunately, Commons-Codec doesn't offer any thread-safe guarantees so we must play it safe and instantiate
// every time. A simple benchmark showed this as negligible.
try {
- Encoder encoder = clazz.getDeclaredConstructor().newInstance();
+ Encoder encoder = clazz.getConstructor().newInstance();
// Try to set the maxCodeLength
if(maxCodeLength != null && setMaxCodeLenMethod != null) {
setMaxCodeLenMethod.invoke(encoder, maxCodeLength);
diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/PerfRunData.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/PerfRunData.java
index a38e0ee..8ad4755 100644
--- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/PerfRunData.java
+++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/PerfRunData.java
@@ -115,16 +115,16 @@ public class PerfRunData implements Closeable {
// content source
String sourceClass = config.get("content.source", "org.apache.lucene.benchmark.byTask.feeds.SingleDocSource");
- contentSource = Class.forName(sourceClass).asSubclass(ContentSource.class).getDeclaredConstructor().newInstance();
+ contentSource = Class.forName(sourceClass).asSubclass(ContentSource.class).getConstructor().newInstance();
contentSource.setConfig(config);
// doc maker
docMaker = Class.forName(config.get("doc.maker",
- "org.apache.lucene.benchmark.byTask.feeds.DocMaker")).asSubclass(DocMaker.class).getDeclaredConstructor().newInstance();
+ "org.apache.lucene.benchmark.byTask.feeds.DocMaker")).asSubclass(DocMaker.class).getConstructor().newInstance();
docMaker.setConfig(config, contentSource);
// facet source
facetSource = Class.forName(config.get("facet.source",
- "org.apache.lucene.benchmark.byTask.feeds.RandomFacetSource")).asSubclass(FacetSource.class).getDeclaredConstructor().newInstance();
+ "org.apache.lucene.benchmark.byTask.feeds.RandomFacetSource")).asSubclass(FacetSource.class).getConstructor().newInstance();
facetSource.setConfig(config);
// query makers
readTaskQueryMaker = new HashMap<>();
@@ -453,7 +453,7 @@ public class PerfRunData implements Closeable {
QueryMaker qm = readTaskQueryMaker.get(readTaskClass);
if (qm == null) {
try {
- qm = qmkrClass.getDeclaredConstructor().newInstance();
+ qm = qmkrClass.getConstructor().newInstance();
qm.setConfig(config);
} catch (Exception e) {
throw new RuntimeException(e);
diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecContentSource.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecContentSource.java
index 3002178..55c6b63 100644
--- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecContentSource.java
+++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecContentSource.java
@@ -309,7 +309,7 @@ public class TrecContentSource extends ContentSource {
// trec doc parser
try {
String trecDocParserClassName = config.get("trec.doc.parser", "org.apache.lucene.benchmark.byTask.feeds.TrecGov2Parser");
- trecDocParser = Class.forName(trecDocParserClassName).asSubclass(TrecDocParser.class).getDeclaredConstructor().newInstance();
+ trecDocParser = Class.forName(trecDocParserClassName).asSubclass(TrecDocParser.class).getConstructor().newInstance();
} catch (Exception e) {
// Should not get here. Throw runtime exception.
throw new RuntimeException(e);
@@ -318,7 +318,7 @@ public class TrecContentSource extends ContentSource {
try {
String htmlParserClassName = config.get("html.parser",
"org.apache.lucene.benchmark.byTask.feeds.DemoHTMLParser");
- htmlParser = Class.forName(htmlParserClassName).asSubclass(HTMLParser.class).getDeclaredConstructor().newInstance();
+ htmlParser = Class.forName(htmlParserClassName).asSubclass(HTMLParser.class).getConstructor().newInstance();
} catch (Exception e) {
// Should not get here. Throw runtime exception.
throw new RuntimeException(e);
diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTask.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTask.java
index 831f67d..30076e9 100644
--- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTask.java
+++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTask.java
@@ -80,7 +80,7 @@ public class CreateIndexTask extends PerfTask {
return NoDeletionPolicy.INSTANCE;
} else {
try {
- return Class.forName(deletionPolicyName).asSubclass(IndexDeletionPolicy.class).getDeclaredConstructor().newInstance();
+ return Class.forName(deletionPolicyName).asSubclass(IndexDeletionPolicy.class).getConstructor().newInstance();
} catch (Exception e) {
throw new RuntimeException("unable to instantiate class '" + deletionPolicyName + "' as IndexDeletionPolicy", e);
}
@@ -111,7 +111,7 @@ public class CreateIndexTask extends PerfTask {
iwConf.setMergeScheduler(NoMergeScheduler.INSTANCE);
} else {
try {
- iwConf.setMergeScheduler(Class.forName(mergeScheduler).asSubclass(MergeScheduler.class).getDeclaredConstructor().newInstance());
+ iwConf.setMergeScheduler(Class.forName(mergeScheduler).asSubclass(MergeScheduler.class).getConstructor().newInstance());
} catch (Exception e) {
throw new RuntimeException("unable to instantiate class '" + mergeScheduler + "' as merge scheduler", e);
}
@@ -128,7 +128,7 @@ public class CreateIndexTask extends PerfTask {
if (defaultCodec != null) {
try {
Class<? extends Codec> clazz = Class.forName(defaultCodec).asSubclass(Codec.class);
- iwConf.setCodec(clazz.getDeclaredConstructor().newInstance());
+ iwConf.setCodec(clazz.getConstructor().newInstance());
} catch (Exception e) {
throw new RuntimeException("Couldn't instantiate Codec: " + defaultCodec, e);
}
@@ -157,7 +157,7 @@ public class CreateIndexTask extends PerfTask {
iwConf.setMergePolicy(NoMergePolicy.INSTANCE);
} else {
try {
- iwConf.setMergePolicy(Class.forName(mergePolicy).asSubclass(MergePolicy.class).getDeclaredConstructor().newInstance());
+ iwConf.setMergePolicy(Class.forName(mergePolicy).asSubclass(MergePolicy.class).getConstructor().newInstance());
} catch (Exception e) {
throw new RuntimeException("unable to instantiate class '" + mergePolicy + "' as merge policy", e);
}
diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewAnalyzerTask.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewAnalyzerTask.java
index 05845ff..53f5b10 100644
--- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewAnalyzerTask.java
+++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewAnalyzerTask.java
@@ -48,7 +48,7 @@ public class NewAnalyzerTask extends PerfTask {
return cnstr.newInstance(Version.LATEST);
} catch (NoSuchMethodException nsme) {
// otherwise use default ctor
- return clazz.getDeclaredConstructor().newInstance();
+ return clazz.getConstructor().newInstance();
}
}
diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchWithCollectorTask.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchWithCollectorTask.java
index 1f36871..e3343fe 100644
--- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchWithCollectorTask.java
+++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchWithCollectorTask.java
@@ -55,7 +55,7 @@ public class SearchWithCollectorTask extends SearchTask {
if (clnName.equalsIgnoreCase("topScoreDoc") == true) {
collector = TopScoreDocCollector.create(numHits(), Integer.MAX_VALUE);
} else if (clnName.length() > 0){
- collector = Class.forName(clnName).asSubclass(Collector.class).getDeclaredConstructor().newInstance();
+ collector = Class.forName(clnName).asSubclass(Collector.class).getConstructor().newInstance();
} else {
collector = super.createCollector();
diff --git a/lucene/core/src/java/org/apache/lucene/store/LockStressTest.java b/lucene/core/src/java/org/apache/lucene/store/LockStressTest.java
index 01c43ef..8d8c042 100644
--- a/lucene/core/src/java/org/apache/lucene/store/LockStressTest.java
+++ b/lucene/core/src/java/org/apache/lucene/store/LockStressTest.java
@@ -139,7 +139,7 @@ public class LockStressTest {
// try to create a new instance
try {
- return Class.forName(lockFactoryClassName).asSubclass(FSLockFactory.class).getDeclaredConstructor().newInstance();
+ return Class.forName(lockFactoryClassName).asSubclass(FSLockFactory.class).getConstructor().newInstance();
} catch (ReflectiveOperationException | ClassCastException e) {
// fall-through
}
diff --git a/lucene/core/src/java/org/apache/lucene/util/NamedSPILoader.java b/lucene/core/src/java/org/apache/lucene/util/NamedSPILoader.java
index 30173c5..c8d4002 100644
--- a/lucene/core/src/java/org/apache/lucene/util/NamedSPILoader.java
+++ b/lucene/core/src/java/org/apache/lucene/util/NamedSPILoader.java
@@ -69,7 +69,7 @@ public final class NamedSPILoader<S extends NamedSPILoader.NamedSPI> implements
while (loader.hasNext()) {
final Class<? extends S> c = loader.next();
try {
- final S service = c.getDeclaredConstructor().newInstance();
+ final S service = c.getConstructor().newInstance();
final String name = service.getName();
// only add the first one for each name, later services will be ignored
// this allows to place services before others in classpath to make
diff --git a/lucene/core/src/test/org/apache/lucene/analysis/tokenattributes/TestBytesRefAttImpl.java b/lucene/core/src/test/org/apache/lucene/analysis/tokenattributes/TestBytesRefAttImpl.java
index 75379ed..6c01d5c 100644
--- a/lucene/core/src/test/org/apache/lucene/analysis/tokenattributes/TestBytesRefAttImpl.java
+++ b/lucene/core/src/test/org/apache/lucene/analysis/tokenattributes/TestBytesRefAttImpl.java
@@ -39,7 +39,7 @@ public class TestBytesRefAttImpl extends LuceneTestCase {
public static <T extends AttributeImpl> T assertCopyIsEqual(T att) throws Exception {
@SuppressWarnings("unchecked")
- T copy = (T) att.getClass().getDeclaredConstructor().newInstance();
+ T copy = (T) att.getClass().getConstructor().newInstance();
att.copyTo(copy);
assertEquals("Copied instance must be equal", att, copy);
assertEquals("Copied instance's hashcode must be equal", att.hashCode(), copy.hashCode());
diff --git a/lucene/core/src/test/org/apache/lucene/analysis/tokenattributes/TestCharTermAttributeImpl.java b/lucene/core/src/test/org/apache/lucene/analysis/tokenattributes/TestCharTermAttributeImpl.java
index f207064..a889e4d 100644
--- a/lucene/core/src/test/org/apache/lucene/analysis/tokenattributes/TestCharTermAttributeImpl.java
+++ b/lucene/core/src/test/org/apache/lucene/analysis/tokenattributes/TestCharTermAttributeImpl.java
@@ -291,7 +291,7 @@ public class TestCharTermAttributeImpl extends LuceneTestCase {
public static <T extends AttributeImpl> T assertCopyIsEqual(T att) throws Exception {
@SuppressWarnings("unchecked")
- T copy = (T) att.getClass().getDeclaredConstructor().newInstance();
+ T copy = (T) att.getClass().getConstructor().newInstance();
att.copyTo(copy);
assertEquals("Copied instance must be equal", att, copy);
assertEquals("Copied instance's hashcode must be equal", att.hashCode(), copy.hashCode());
diff --git a/lucene/spatial-extras/src/java/org/apache/lucene/spatial/prefix/tree/SpatialPrefixTreeFactory.java b/lucene/spatial-extras/src/java/org/apache/lucene/spatial/prefix/tree/SpatialPrefixTreeFactory.java
index 922ccb4..424e482 100644
--- a/lucene/spatial-extras/src/java/org/apache/lucene/spatial/prefix/tree/SpatialPrefixTreeFactory.java
+++ b/lucene/spatial-extras/src/java/org/apache/lucene/spatial/prefix/tree/SpatialPrefixTreeFactory.java
@@ -59,7 +59,7 @@ public abstract class SpatialPrefixTreeFactory {
else {
try {
Class<?> c = classLoader.loadClass(cname);
- instance = (SpatialPrefixTreeFactory) c.getDeclaredConstructor().newInstance();
+ instance = (SpatialPrefixTreeFactory) c.getConstructor().newInstance();
} catch (Exception e) {
throw new RuntimeException(e);
}
diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/LookupBenchmarkTest.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/LookupBenchmarkTest.java
index 1798659..7e01256 100644
--- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/LookupBenchmarkTest.java
+++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/LookupBenchmarkTest.java
@@ -163,7 +163,7 @@ public class LookupBenchmarkTest extends LuceneTestCase {
private Lookup buildLookup(Class<? extends Lookup> cls, Input[] input) throws Exception {
Lookup lookup = null;
try {
- lookup = cls.getDeclaredConstructor().newInstance();
+ lookup = cls.getConstructor().newInstance();
} catch (InstantiationException e) {
Analyzer a = new MockAnalyzer(random, MockTokenizer.KEYWORD, false);
if (cls == AnalyzingInfixSuggester.class || cls == BlendedInfixSuggester.class) {
diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/PersistenceTest.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/PersistenceTest.java
index c9dd121..fd5b558 100644
--- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/PersistenceTest.java
+++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/PersistenceTest.java
@@ -73,7 +73,7 @@ public class PersistenceTest extends LuceneTestCase {
} else if (lookupClass == FSTCompletionLookup.class) {
lookup = new FSTCompletionLookup(tempDir, "suggest");
} else {
- lookup = lookupClass.getDeclaredConstructor().newInstance();
+ lookup = lookupClass.getConstructor().newInstance();
}
Input[] keys = new Input[this.keys.length];
for (int i = 0; i < keys.length; i++)
@@ -85,7 +85,7 @@ public class PersistenceTest extends LuceneTestCase {
lookup.store(Files.newOutputStream(storeDir.resolve("lookup.dat")));
// Re-read it from disk.
- lookup = lookupClass.getDeclaredConstructor().newInstance();
+ lookup = lookupClass.getConstructor().newInstance();
lookup.load(Files.newInputStream(storeDir.resolve("lookup.dat")));
// Assert validity.
diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java
index c8a0192..6aa6f03 100644
--- a/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java
+++ b/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java
@@ -1658,7 +1658,7 @@ public abstract class LuceneTestCase extends Assert {
}
// try empty ctor
- return clazz.getDeclaredConstructor().newInstance();
+ return clazz.getConstructor().newInstance();
} catch (Exception e) {
Rethrow.rethrow(e);
throw null; // dummy to prevent compiler failure
diff --git a/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/LuceneCarrot2StemmerFactory.java b/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/LuceneCarrot2StemmerFactory.java
index 3fb96a5..1ebd1fc 100644
--- a/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/LuceneCarrot2StemmerFactory.java
+++ b/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/LuceneCarrot2StemmerFactory.java
@@ -143,7 +143,7 @@ public class LuceneCarrot2StemmerFactory implements IStemmerFactory {
}
try {
- return new SnowballStemmerAdapter(stemmerClazz.getDeclaredConstructor().newInstance());
+ return new SnowballStemmerAdapter(stemmerClazz.getConstructor().newInstance());
} catch (Exception e) {
log.warn("Could not instantiate snowball stemmer"
+ " for language: " + language.name()
diff --git a/solr/contrib/dataimporthandler-extras/src/java/org/apache/solr/handler/dataimport/MailEntityProcessor.java b/solr/contrib/dataimporthandler-extras/src/java/org/apache/solr/handler/dataimport/MailEntityProcessor.java
index 99b74c1..f19a4ca 100644
--- a/solr/contrib/dataimporthandler-extras/src/java/org/apache/solr/handler/dataimport/MailEntityProcessor.java
+++ b/solr/contrib/dataimporthandler-extras/src/java/org/apache/solr/handler/dataimport/MailEntityProcessor.java
@@ -419,7 +419,7 @@ public class MailEntityProcessor extends EntityProcessorBase {
if (customFilter != null && !customFilter.equals("")) {
try {
Class<?> cf = Class.forName(customFilter);
- Object obj = cf.getDeclaredConstructor().newInstance();
+ Object obj = cf.getConstructor().newInstance();
if (obj instanceof CustomFilter) {
filters.add((CustomFilter) obj);
}
diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImporter.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImporter.java
index 11f0eb1..932849b 100644
--- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImporter.java
+++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImporter.java
@@ -333,7 +333,7 @@ public class DataImporter {
PropertyWriter configPw = config.getPropertyWriter();
try {
Class<DIHProperties> writerClass = DocBuilder.loadClass(configPw.getType(), this.core);
- propWriter = writerClass.getDeclaredConstructor().newInstance();
+ propWriter = writerClass.getConstructor().newInstance();
propWriter.init(this, configPw.getParameters());
} catch (Exception e) {
throw new DataImportHandlerException(DataImportHandlerException.SEVERE, "Unable to PropertyWriter implementation:" + configPw.getType(), e);
@@ -378,7 +378,7 @@ public class DataImporter {
dataSrc = new JdbcDataSource();
} else {
try {
- dataSrc = (DataSource) DocBuilder.loadClass(type, getCore()).getDeclaredConstructor().newInstance();
+ dataSrc = (DataSource) DocBuilder.loadClass(type, getCore()).getConstructor().newInstance();
} catch (Exception e) {
wrapAndThrow(SEVERE, e, "Invalid type for data source: " + type);
}
@@ -533,7 +533,7 @@ public class DataImporter {
SolrCore core = docBuilder == null ? null : docBuilder.dataImporter.getCore();
for (Map<String, String> map : fn) {
try {
- evaluators.put(map.get(NAME), (Evaluator) loadClass(map.get(CLASS), core).getDeclaredConstructor().newInstance());
+ evaluators.put(map.get(NAME), (Evaluator) loadClass(map.get(CLASS), core).getConstructor().newInstance());
} catch (Exception e) {
wrapAndThrow(SEVERE, e, "Unable to instantiate evaluator: " + map.get(CLASS));
}
diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DocBuilder.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DocBuilder.java
index 2c8d0af..285b135 100644
--- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DocBuilder.java
+++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DocBuilder.java
@@ -157,7 +157,7 @@ public class DocBuilder {
private void invokeEventListener(String className, Exception lastException) {
try {
- EventListener listener = (EventListener) loadClass(className, dataImporter.getCore()).getDeclaredConstructor().newInstance();
+ EventListener listener = (EventListener) loadClass(className, dataImporter.getCore()).getConstructor().newInstance();
notifyListener(listener, lastException);
} catch (Exception e) {
wrapAndThrow(SEVERE, e, "Unable to load class : " + className);
@@ -721,7 +721,7 @@ public class DocBuilder {
} else {
try {
entityProcessor = (EntityProcessor) loadClass(entity.getProcessorName(), dataImporter.getCore())
- .getDeclaredConstructor().newInstance();
+ .getConstructor().newInstance();
} catch (Exception e) {
wrapAndThrow (SEVERE,e,
"Unable to load EntityProcessor implementation for entity:" + entity.getName());
diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/EntityProcessorWrapper.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/EntityProcessorWrapper.java
index 28c2a3c..984f030 100644
--- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/EntityProcessorWrapper.java
+++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/EntityProcessorWrapper.java
@@ -112,7 +112,7 @@ public class EntityProcessorWrapper extends EntityProcessor {
try {
Class clazz = DocBuilder.loadClass(trans, context.getSolrCore());
if (Transformer.class.isAssignableFrom(clazz)) {
- transformers.add((Transformer) clazz.getDeclaredConstructor().newInstance());
+ transformers.add((Transformer) clazz.getConstructor().newInstance());
} else {
Method meth = clazz.getMethod(TRANSFORM_ROW, Map.class);
transformers.add(new ReflectionTransformer(meth, clazz, trans));
@@ -164,7 +164,7 @@ public class EntityProcessorWrapper extends EntityProcessor {
this.meth = meth;
this.clazz = clazz;
this.trans = trans;
- o = clazz.getDeclaredConstructor().newInstance();
+ o = clazz.getConstructor().newInstance();
}
@Override
diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/JdbcDataSource.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/JdbcDataSource.java
index 49d6824..5eb3517 100644
--- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/JdbcDataSource.java
+++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/JdbcDataSource.java
@@ -188,7 +188,7 @@ public class JdbcDataSource extends
// the class loader of the class which is trying to make the connection.
// This is a workaround for cases where the user puts the driver jar in the
// solr.home/lib or solr.home/core/lib directories.
- Driver d = (Driver) DocBuilder.loadClass(driver, context.getSolrCore()).getDeclaredConstructor().newInstance();
+ Driver d = (Driver) DocBuilder.loadClass(driver, context.getSolrCore()).getConstructor().newInstance();
c = d.connect(url, initProps);
}
}
diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractDIHJdbcTestCase.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractDIHJdbcTestCase.java
index 5e80a5c..5428e18 100644
--- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractDIHJdbcTestCase.java
+++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractDIHJdbcTestCase.java
@@ -52,12 +52,12 @@ public abstract class AbstractDIHJdbcTestCase extends
@BeforeClass
public static void beforeClassDihJdbcTest() throws Exception {
try {
- Class.forName("org.hsqldb.jdbcDriver").getDeclaredConstructor().newInstance();
+ Class.forName("org.hsqldb.jdbcDriver").getConstructor().newInstance();
String oldProp = System.getProperty("derby.stream.error.field");
System
.setProperty("derby.stream.error.field",
"org.apache.solr.handler.dataimport.AbstractDIHJdbcTestCase$DerbyUtil.DEV_NULL");
- Class.forName("org.apache.derby.jdbc.EmbeddedDriver").getDeclaredConstructor().newInstance();
+ Class.forName("org.apache.derby.jdbc.EmbeddedDriver").getConstructor().newInstance();
if (oldProp != null) {
System.setProperty("derby.stream.error.field", oldProp);
}
diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestEntityProcessorBase.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestEntityProcessorBase.java
index 623e49e..75ec2f5 100644
--- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestEntityProcessorBase.java
+++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestEntityProcessorBase.java
@@ -55,7 +55,7 @@ public class TestEntityProcessorBase extends AbstractDataImportHandlerTestCase {
assertNotNull(res.get("T3"));
}
- static class T1 extends Transformer {
+ public static class T1 extends Transformer {
@Override
public Object transformRow(Map<String, Object> aRow, Context context) {
@@ -65,7 +65,7 @@ public class TestEntityProcessorBase extends AbstractDataImportHandlerTestCase {
}
}
- static class T2 extends Transformer {
+ public static class T2 extends Transformer {
@Override
public Object transformRow(Map<String, Object> aRow, Context context) {
@@ -74,7 +74,7 @@ public class TestEntityProcessorBase extends AbstractDataImportHandlerTestCase {
}
}
- static class T3 {
+ public static class T3 {
public Object transformRow(Map<String, Object> aRow) {
aRow.put("T3", "T3 called");
diff --git a/solr/core/src/java/org/apache/solr/cloud/rule/ReplicaAssigner.java b/solr/core/src/java/org/apache/solr/cloud/rule/ReplicaAssigner.java
index b79ad72..3d04fff 100644
--- a/solr/core/src/java/org/apache/solr/cloud/rule/ReplicaAssigner.java
+++ b/solr/core/src/java/org/apache/solr/cloud/rule/ReplicaAssigner.java
@@ -338,7 +338,7 @@ public class ReplicaAssigner {
for (Class c : Snitch.WELL_KNOWN_SNITCHES) {
if (snitches.containsKey(c)) continue;// it is already specified explicitly , ignore
try {
- snitches.put(c, new SnitchInfoImpl(Collections.EMPTY_MAP, (Snitch) c.getDeclaredConstructor().newInstance(), cloudManager));
+ snitches.put(c, new SnitchInfoImpl(Collections.EMPTY_MAP, (Snitch) c.getConstructor().newInstance(), cloudManager));
} catch (Exception e) {
throw new SolrException(SolrException.ErrorCode.BAD_REQUEST, "Error instantiating Snitch " + c.getName());
}
@@ -433,7 +433,7 @@ public class ReplicaAssigner {
try {
if (klas.indexOf('.') == -1) klas = Snitch.class.getPackage().getName() + "." + klas;
Snitch inst =
- (Snitch) Snitch.class.getClassLoader().loadClass(klas).getDeclaredConstructor().newInstance() ;
+ (Snitch) Snitch.class.getClassLoader().loadClass(klas).getConstructor().newInstance() ;
snitches.put(inst.getClass(), new SnitchInfoImpl(map, inst, cloudManager));
} catch (Exception e) {
throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, e);
diff --git a/solr/core/src/java/org/apache/solr/core/MemClassLoader.java b/solr/core/src/java/org/apache/solr/core/MemClassLoader.java
index 4722bbb..a249dc8 100644
--- a/solr/core/src/java/org/apache/solr/core/MemClassLoader.java
+++ b/solr/core/src/java/org/apache/solr/core/MemClassLoader.java
@@ -169,7 +169,7 @@ public class MemClassLoader extends ClassLoader implements AutoCloseable, Resour
@Override
public <T> T newInstance(String cname, Class<T> expectedType) {
try {
- return findClass(cname, expectedType).getDeclaredConstructor().newInstance();
+ return findClass(cname, expectedType).getConstructor().newInstance();
} catch (SolrException e) {
throw e;
} catch (Exception e) {
diff --git a/solr/core/src/java/org/apache/solr/core/SolrCore.java b/solr/core/src/java/org/apache/solr/core/SolrCore.java
index 4fc7091..d850aa1 100644
--- a/solr/core/src/java/org/apache/solr/core/SolrCore.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrCore.java
@@ -2687,7 +2687,7 @@ public final class SolrCore implements SolrInfoBean, SolrMetricProducer, Closeab
DEFAULT_RESPONSE_WRITERS = Collections.unmodifiableMap(m);
try {
m.put("xlsx",
- (QueryResponseWriter) Class.forName("org.apache.solr.handler.extraction.XLSXResponseWriter").getDeclaredConstructor().newInstance());
+ (QueryResponseWriter) Class.forName("org.apache.solr.handler.extraction.XLSXResponseWriter").getConstructor().newInstance());
} catch (Exception e) {
//don't worry; solrcell contrib not in class path
}
diff --git a/solr/core/src/java/org/apache/solr/core/TransientSolrCoreCacheFactory.java b/solr/core/src/java/org/apache/solr/core/TransientSolrCoreCacheFactory.java
index 3eadc1c..6d0646e 100644
--- a/solr/core/src/java/org/apache/solr/core/TransientSolrCoreCacheFactory.java
+++ b/solr/core/src/java/org/apache/solr/core/TransientSolrCoreCacheFactory.java
@@ -50,7 +50,7 @@ public abstract class TransientSolrCoreCacheFactory {
try {
// According to the docs, this returns a TransientSolrCoreCacheFactory with the default c'tor
- TransientSolrCoreCacheFactory tccf = loader.findClass(info.className, TransientSolrCoreCacheFactory.class).getDeclaredConstructor().newInstance();
+ TransientSolrCoreCacheFactory tccf = loader.findClass(info.className, TransientSolrCoreCacheFactory.class).getConstructor().newInstance();
// OK, now we call it's init method.
if (PluginInfoInitialized.class.isAssignableFrom(tccf.getClass()))
diff --git a/solr/core/src/java/org/apache/solr/handler/component/ShardHandlerFactory.java b/solr/core/src/java/org/apache/solr/handler/component/ShardHandlerFactory.java
index 196c3d4..a7712c3 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/ShardHandlerFactory.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/ShardHandlerFactory.java
@@ -46,7 +46,7 @@ public abstract class ShardHandlerFactory {
info = DEFAULT_SHARDHANDLER_INFO;
try {
- ShardHandlerFactory shf = loader.findClass(info.className, ShardHandlerFactory.class).getDeclaredConstructor().newInstance();
+ ShardHandlerFactory shf = loader.findClass(info.className, ShardHandlerFactory.class).getConstructor().newInstance();
if (PluginInfoInitialized.class.isAssignableFrom(shf.getClass()))
PluginInfoInitialized.class.cast(shf).init(info);
return shf;
diff --git a/solr/core/src/java/org/apache/solr/schema/CurrencyFieldType.java b/solr/core/src/java/org/apache/solr/schema/CurrencyFieldType.java
index 6e0006e..4e59212 100644
--- a/solr/core/src/java/org/apache/solr/schema/CurrencyFieldType.java
+++ b/solr/core/src/java/org/apache/solr/schema/CurrencyFieldType.java
@@ -122,7 +122,7 @@ public class CurrencyFieldType extends FieldType implements SchemaAware, Resourc
try {
Class<? extends ExchangeRateProvider> c
= schema.getResourceLoader().findClass(exchangeRateProviderClass, ExchangeRateProvider.class);
- provider = c.getDeclaredConstructor().newInstance();
+ provider = c.getConstructor().newInstance();
provider.init(args);
} catch (Exception e) {
throw new SolrException(ErrorCode.SERVER_ERROR,
diff --git a/solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java b/solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java
index 42b478f..36be446 100644
--- a/solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java
+++ b/solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java
@@ -226,7 +226,7 @@ public final class FieldTypePluginLoader
try {
// No need to be core-aware as Analyzers are not in the core-aware list
final Class<? extends Analyzer> clazz = loader.findClass(analyzerName, Analyzer.class);
- Analyzer analyzer = clazz.getDeclaredConstructor().newInstance();
+ Analyzer analyzer = clazz.getConstructor().newInstance();
final String matchVersionStr = DOMUtil.getAttr(attrs, LUCENE_MATCH_VERSION_PARAM);
final Version luceneMatchVersion = (matchVersionStr == null) ?
diff --git a/solr/core/src/java/org/apache/solr/schema/FileExchangeRateProvider.java b/solr/core/src/java/org/apache/solr/schema/FileExchangeRateProvider.java
index 4836764..fe3f2fd 100644
--- a/solr/core/src/java/org/apache/solr/schema/FileExchangeRateProvider.java
+++ b/solr/core/src/java/org/apache/solr/schema/FileExchangeRateProvider.java
@@ -43,7 +43,7 @@ import org.xml.sax.SAXException;
/**
* Configuration for currency. Provides currency exchange rates.
*/
-class FileExchangeRateProvider implements ExchangeRateProvider {
+public class FileExchangeRateProvider implements ExchangeRateProvider {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
protected static final String PARAM_CURRENCY_CONFIG = "currencyConfig";
diff --git a/solr/core/src/java/org/apache/solr/search/CacheConfig.java b/solr/core/src/java/org/apache/solr/search/CacheConfig.java
index 3e5b474..16a9d57 100644
--- a/solr/core/src/java/org/apache/solr/search/CacheConfig.java
+++ b/solr/core/src/java/org/apache/solr/search/CacheConfig.java
@@ -136,7 +136,7 @@ public class CacheConfig implements MapSerializable{
public SolrCache newInstance() {
try {
- SolrCache cache = clazz.getDeclaredConstructor().newInstance();
+ SolrCache cache = clazz.getConstructor().newInstance();
persistence[0] = cache.init(args, persistence[0], regenerator);
return cache;
} catch (Exception e) {
diff --git a/solr/core/src/java/org/apache/solr/util/SolrCLI.java b/solr/core/src/java/org/apache/solr/util/SolrCLI.java
index 34f7ba3..791a9d5 100755
--- a/solr/core/src/java/org/apache/solr/util/SolrCLI.java
+++ b/solr/core/src/java/org/apache/solr/util/SolrCLI.java
@@ -416,7 +416,7 @@ public class SolrCLI implements CLIO {
// classpath scanning
for (Class<Tool> next : findToolClassesInPackage("org.apache.solr.util")) {
- Tool tool = next.getDeclaredConstructor().newInstance();
+ Tool tool = next.getConstructor().newInstance();
if (toolType.equals(tool.getName()))
return tool;
}
@@ -445,7 +445,7 @@ public class SolrCLI implements CLIO {
List<Class<Tool>> toolClasses = findToolClassesInPackage("org.apache.solr.util");
for (Class<Tool> next : toolClasses) {
- Tool tool = next.getDeclaredConstructor().newInstance();
+ Tool tool = next.getConstructor().newInstance();
formatter.printHelp(tool.getName(), getToolOptions(tool));
}
}
diff --git a/solr/core/src/test/org/apache/solr/SolrInfoBeanTest.java b/solr/core/src/test/org/apache/solr/SolrInfoBeanTest.java
index fc8238f..0289668 100644
--- a/solr/core/src/test/org/apache/solr/SolrInfoBeanTest.java
+++ b/solr/core/src/test/org/apache/solr/SolrInfoBeanTest.java
@@ -63,7 +63,7 @@ public class SolrInfoBeanTest extends SolrTestCaseJ4
for( Class clazz : classes ) {
if( SolrInfoBean.class.isAssignableFrom( clazz ) ) {
try {
- SolrInfoBean info = (SolrInfoBean)clazz.getDeclaredConstructor().newInstance();
+ SolrInfoBean info = (SolrInfoBean)clazz.getConstructor().newInstance();
if (info instanceof SolrMetricProducer) {
((SolrMetricProducer)info).initializeMetrics(metricManager, registry, "foo", scope);
}
diff --git a/solr/core/src/test/org/apache/solr/analysis/ThrowingMockTokenFilterFactory.java b/solr/core/src/test/org/apache/solr/analysis/ThrowingMockTokenFilterFactory.java
index 71efc26..19b52c2 100644
--- a/solr/core/src/test/org/apache/solr/analysis/ThrowingMockTokenFilterFactory.java
+++ b/solr/core/src/test/org/apache/solr/analysis/ThrowingMockTokenFilterFactory.java
@@ -58,7 +58,7 @@ public class ThrowingMockTokenFilterFactory extends TokenFilterFactory {
public boolean incrementToken() throws IOException {
if (input.incrementToken()) {
try {
- throw exceptionClass.getDeclaredConstructor().newInstance();
+ throw exceptionClass.getConstructor().newInstance();
} catch (IllegalAccessException | InstantiationException | InvocationTargetException | NoSuchMethodException iae) {
throw new RuntimeException(iae);
}
diff --git a/solr/core/src/test/org/apache/solr/core/DirectoryFactoryTest.java b/solr/core/src/test/org/apache/solr/core/DirectoryFactoryTest.java
index 0f0b1cd..7936ef1 100755
--- a/solr/core/src/test/org/apache/solr/core/DirectoryFactoryTest.java
+++ b/solr/core/src/test/org/apache/solr/core/DirectoryFactoryTest.java
@@ -80,7 +80,7 @@ public class DirectoryFactoryTest extends SolrTestCase {
NodeConfig config = loadNodeConfig("/solr/solr-solrDataHome.xml");
CoreContainer cc = new CoreContainer(config);
Properties cp = cc.getContainerProperties();
- DirectoryFactory df = directoryFactoryClass.getDeclaredConstructor().newInstance();
+ DirectoryFactory df = directoryFactoryClass.getConstructor().newInstance();
df.initCoreContainer(cc);
df.init(new NamedList());
@@ -97,7 +97,7 @@ public class DirectoryFactoryTest extends SolrTestCase {
System.setProperty("solr.data.home", "solrdata");
config = loadNodeConfig("/solr/solr-solrDataHome.xml");
cc = new CoreContainer(config);
- df = directoryFactoryClass.getDeclaredConstructor().newInstance();
+ df = directoryFactoryClass.getConstructor().newInstance();
df.initCoreContainer(cc);
df.init(new NamedList());
assertDataHome(solrHome.resolve("solrdata/inst_dir/data").toAbsolutePath().toString(), "inst_dir", df, cc);
@@ -107,7 +107,7 @@ public class DirectoryFactoryTest extends SolrTestCase {
System.setProperty("test.solr.data.home", "/foo");
config = loadNodeConfig("/solr/solr-solrDataHome.xml");
cc = new CoreContainer(config);
- df = directoryFactoryClass.getDeclaredConstructor().newInstance();
+ df = directoryFactoryClass.getConstructor().newInstance();
df.initCoreContainer(cc);
df.init(new NamedList());
assertDataHome("/foo/inst_dir/data", "inst_dir", df, cc);
diff --git a/solr/core/src/test/org/apache/solr/core/TestDirectoryFactory.java b/solr/core/src/test/org/apache/solr/core/TestDirectoryFactory.java
index 39d7d0f..72b02b3 100644
--- a/solr/core/src/test/org/apache/solr/core/TestDirectoryFactory.java
+++ b/solr/core/src/test/org/apache/solr/core/TestDirectoryFactory.java
@@ -62,7 +62,7 @@ public class TestDirectoryFactory extends SolrTestCaseJ4 {
final String path = createTempDir().toString() + "/" + clazz + "_somedir";
DirectoryFactory dirFac = null;
try {
- dirFac = clazz.getDeclaredConstructor().newInstance();
+ dirFac = clazz.getConstructor().newInstance();
dirFac.initCoreContainer(null); // greybox testing directly against path
dirFac.init(new NamedList());
diff --git a/solr/core/src/test/org/apache/solr/legacy/TestNumericTokenStream.java b/solr/core/src/test/org/apache/solr/legacy/TestNumericTokenStream.java
index 5ddc507..4cdabba 100644
--- a/solr/core/src/test/org/apache/solr/legacy/TestNumericTokenStream.java
+++ b/solr/core/src/test/org/apache/solr/legacy/TestNumericTokenStream.java
@@ -176,7 +176,7 @@ public class TestNumericTokenStream extends BaseTokenStreamTestCase {
public static <T extends AttributeImpl> T assertCopyIsEqual(T att) throws Exception {
@SuppressWarnings("unchecked")
- T copy = (T) att.getClass().getDeclaredConstructor().newInstance();
+ T copy = (T) att.getClass().getConstructor().newInstance();
att.copyTo(copy);
assertEquals("Copied instance must be equal", att, copy);
assertEquals("Copied instance's hashcode must be equal", att.hashCode(), copy.hashCode());
diff --git a/solr/core/src/test/org/apache/solr/schema/PrimitiveFieldTypeTest.java b/solr/core/src/test/org/apache/solr/schema/PrimitiveFieldTypeTest.java
index 1673454..544b2d4 100644
--- a/solr/core/src/test/org/apache/solr/schema/PrimitiveFieldTypeTest.java
+++ b/solr/core/src/test/org/apache/solr/schema/PrimitiveFieldTypeTest.java
@@ -76,7 +76,7 @@ public class PrimitiveFieldTypeTest extends SolrTestCaseJ4 {
for (Class<? extends FieldType> clazz : types) {
- FieldType ft = clazz.getDeclaredConstructor().newInstance();
+ FieldType ft = clazz.getConstructor().newInstance();
ft.init(schema, initMap);
assertFalse(ft.getClass().getName(), ft.hasProperty(FieldType.OMIT_NORMS));
}
@@ -87,7 +87,7 @@ public class PrimitiveFieldTypeTest extends SolrTestCaseJ4 {
schema = IndexSchemaFactory.buildIndexSchema(testConfHome + "schema15.xml", config);
for (Class<? extends FieldType> clazz : types) {
- FieldType ft = clazz.getDeclaredConstructor().newInstance();
+ FieldType ft = clazz.getConstructor().newInstance();
ft.init(schema, initMap);
assertEquals(ft.getClass().getName(),
ft instanceof PrimitiveFieldType,
diff --git a/solr/core/src/test/org/apache/solr/spelling/ConjunctionSolrSpellCheckerTest.java b/solr/core/src/test/org/apache/solr/spelling/ConjunctionSolrSpellCheckerTest.java
index f805c76..c531d49 100644
--- a/solr/core/src/test/org/apache/solr/spelling/ConjunctionSolrSpellCheckerTest.java
+++ b/solr/core/src/test/org/apache/solr/spelling/ConjunctionSolrSpellCheckerTest.java
@@ -40,8 +40,8 @@ public class ConjunctionSolrSpellCheckerTest extends SolrTestCase {
@SuppressWarnings("unchecked")
Class<StringDistance> sameDistance = (Class<StringDistance>) AVAILABLE_DISTANCES[random().nextInt(AVAILABLE_DISTANCES.length)];
- StringDistance sameDistance1 = sameDistance.getDeclaredConstructor().newInstance();
- StringDistance sameDistance2 = sameDistance.getDeclaredConstructor().newInstance();
+ StringDistance sameDistance1 = sameDistance.getConstructor().newInstance();
+ StringDistance sameDistance2 = sameDistance.getConstructor().newInstance();
//NGramDistance defaults to 2, so we'll try 3 or 4 to ensure we have one that is not-equal.
StringDistance differentDistance = new NGramDistance(3);
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/beans/DocumentObjectBinder.java b/solr/solrj/src/java/org/apache/solr/client/solrj/beans/DocumentObjectBinder.java
index 7d61ece..0e06615 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/beans/DocumentObjectBinder.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/beans/DocumentObjectBinder.java
@@ -62,7 +62,7 @@ public class DocumentObjectBinder {
}
try {
- T obj = clazz.getDeclaredConstructor().newInstance();
+ T obj = clazz.getConstructor().newInstance();
for (DocField docField : fields) {
docField.inject(obj, solrDoc);
}
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpClientUtil.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpClientUtil.java
index e940354..21177af 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpClientUtil.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpClientUtil.java
@@ -152,7 +152,7 @@ public class HttpClientUtil {
if (factoryClassName != null) {
log.debug ("Using " + factoryClassName);
try {
- HttpClientBuilderFactory factory = (HttpClientBuilderFactory)Class.forName(factoryClassName).getDeclaredConstructor().newInstance();
+ HttpClientBuilderFactory factory = (HttpClientBuilderFactory)Class.forName(factoryClassName).getConstructor().newInstance();
httpClientBuilder = factory.getHttpClientBuilder(Optional.of(SolrHttpClientBuilder.create()));
} catch (InstantiationException | IllegalAccessException | ClassNotFoundException | InvocationTargetException | NoSuchMethodException e) {
throw new RuntimeException("Unable to instantiate Solr HttpClientBuilderFactory", e);
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/JDBCStreamTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/JDBCStreamTest.java
index 8c47667..2fbe101 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/JDBCStreamTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/JDBCStreamTest.java
@@ -93,7 +93,7 @@ public class JDBCStreamTest extends SolrCloudTestCase {
// So, for this reason and to simplify writing these tests I've decided that in all statements all table and column names
// will be in UPPERCASE. This is to ensure things look and behave consistently. Note that this is not a requirement of the
// JDBCStream and is only a carryover from the driver we are testing with.
- Class.forName("org.hsqldb.jdbcDriver").getDeclaredConstructor().newInstance();
+ Class.forName("org.hsqldb.jdbcDriver").getConstructor().newInstance();
Connection connection = DriverManager.getConnection("jdbc:hsqldb:mem:.");
Statement statement = connection.createStatement();
statement.executeUpdate("create table COUNTRIES(CODE varchar(3) not null primary key, COUNTRY_NAME varchar(50), DELETED char(1) default 'N')");
diff --git a/solr/test-framework/src/java/org/apache/solr/analysis/StringMockSolrResourceLoader.java b/solr/test-framework/src/java/org/apache/solr/analysis/StringMockSolrResourceLoader.java
index bebabcc..4b79cf0 100644
--- a/solr/test-framework/src/java/org/apache/solr/analysis/StringMockSolrResourceLoader.java
+++ b/solr/test-framework/src/java/org/apache/solr/analysis/StringMockSolrResourceLoader.java
@@ -43,7 +43,7 @@ class StringMockSolrResourceLoader implements ResourceLoader {
public <T> T newInstance(String cname, Class<T> expectedType) {
Class<? extends T> clazz = findClass(cname, expectedType);
try {
- return clazz.getDeclaredConstructor().newInstance();
+ return clazz.getConstructor().newInstance();
} catch (Exception e) {
throw new RuntimeException("Cannot create instance: " + cname, e);
}
[lucene-solr] 02/03: LUCENE-8738: Update Idea configuration
(untested).
Posted by jp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jpountz pushed a commit to branch jira/LUCENE-8738
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit a11c3974b9e6b80b7b566bc1cd8b08c5d1db8a6b
Author: Adrien Grand <jp...@gmail.com>
AuthorDate: Wed Apr 10 17:32:48 2019 +0200
LUCENE-8738: Update Idea configuration (untested).
---
dev-tools/idea/.idea/misc.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-tools/idea/.idea/misc.xml b/dev-tools/idea/.idea/misc.xml
index 0fe2e6d..8414ae3 100755
--- a/dev-tools/idea/.idea/misc.xml
+++ b/dev-tools/idea/.idea/misc.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" subst.="idea.jdk" />
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_11" subst.="idea.jdk" />
</project>
[lucene-solr] 01/03: LUCENE-8738: Update Eclipse config.
Posted by jp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jpountz pushed a commit to branch jira/LUCENE-8738
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit cfe959b81458bac06f1ad5d8161e59adb85b87b2
Author: Adrien Grand <jp...@gmail.com>
AuthorDate: Wed Apr 10 17:32:04 2019 +0200
LUCENE-8738: Update Eclipse config.
---
dev-tools/eclipse/dot.classpath.xsl | 2 +-
dev-tools/eclipse/dot.settings/org.eclipse.jdt.core.prefs | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dev-tools/eclipse/dot.classpath.xsl b/dev-tools/eclipse/dot.classpath.xsl
index 40bca21..8d48c5d 100644
--- a/dev-tools/eclipse/dot.classpath.xsl
+++ b/dev-tools/eclipse/dot.classpath.xsl
@@ -74,7 +74,7 @@
<!-- the main resources folder is here (see above), so it's listed after the test-framework resources, making preflex-override work: -->
<classpathentry kind="output" path="eclipse-build/main"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<xsl:for-each select="str:split($eclipse.fileset.libs,'|')">
<!-- sort the jars by path name: -->
diff --git a/dev-tools/eclipse/dot.settings/org.eclipse.jdt.core.prefs b/dev-tools/eclipse/dot.settings/org.eclipse.jdt.core.prefs
index 6014c22..8dba526 100644
--- a/dev-tools/eclipse/dot.settings/org.eclipse.jdt.core.prefs
+++ b/dev-tools/eclipse/dot.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
#Sun Sep 23 13:02:27 EDT 2012
eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.doc.comment.support=enabled
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=error
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
@@ -34,7 +34,7 @@ org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
org.eclipse.jdt.core.compiler.problem.unusedImport=error
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=11
org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
org.eclipse.jdt.core.compiler.taskPriorities=HIGH
org.eclipse.jdt.core.compiler.taskTags=nocommit