From 975dbe134e93cc95bebdb40c00a3b3ec8617dce4 Mon Sep 17 00:00:00 2001 From: Steven Rowe Date: Wed, 24 Dec 2014 14:33:59 +0000 Subject: [PATCH] LUCENE-6134: fix typos: wether->whether, neccessary->necessary, initalize->initialize, specifed->specified, etc. (thanks Ahmet Arslan\!) git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1647795 13f79535-47bb-0310-9956-ffa450edef68 --- dev-tools/scripts/archive-solr-ref-guide.sh | 6 +++--- lucene/CHANGES.txt | 2 +- .../directory/TaxonomyIndexArrays.java | 2 +- .../facet/taxonomy/TestTaxonomyCombined.java | 2 +- .../queries/function/TestValueSources.java | 6 +++--- solr/CHANGES.txt | 6 +++--- .../conf/dataimport-solrconfig.xml | 2 +- .../solr/handler/dataimport/DocBuilder.java | 6 +++--- .../dataimport/EntityProcessorWrapper.java | 20 +++++++++++++++---- .../handler/dataimport/XPathRecordReader.java | 2 +- .../conf/contentstream-solrconfig.xml | 2 +- .../dataimport-nodatasource-solrconfig.xml | 2 +- .../conf/dataimport-solrconfig.xml | 2 +- .../solr/collection1/conf/solrconfig.xml | 4 ++-- .../collection1/conf/solrconfig.xml | 4 ++-- .../solr/handler/admin/LoggingHandler.java | 2 +- .../handler/component/StatsComponent.java | 2 +- .../solr/handler/component/StatsField.java | 2 +- .../handler/component/StatsValuesFactory.java | 2 +- .../internal/csv/ExtendedBufferedReader.java | 2 +- .../org/apache/solr/schema/SchemaField.java | 2 +- .../apache/solr/search/SolrIndexSearcher.java | 2 +- .../SweetSpotSimilarityFactory.java | 10 +++++----- .../spelling/ConjunctionSolrSpellChecker.java | 6 +++--- .../org/apache/solr/SolrInfoMBeanTest.java | 2 +- .../org/apache/solr/core/SOLR749Test.java | 2 +- .../DistributedFacetPivotLargeTest.java | 8 ++++---- ...istributedFacetPivotSmallAdvancedTest.java | 2 +- .../handler/component/SearchHandlerTest.java | 2 +- .../solr/client/solrj/SolrExampleTests.java | 2 +- 30 files changed, 64 insertions(+), 52 deletions(-) diff --git a/dev-tools/scripts/archive-solr-ref-guide.sh b/dev-tools/scripts/archive-solr-ref-guide.sh index 9e06ead520f..02dc7a5a4f9 100755 --- a/dev-tools/scripts/archive-solr-ref-guide.sh +++ b/dev-tools/scripts/archive-solr-ref-guide.sh @@ -17,9 +17,9 @@ #### -# Convinience script to generates the SVN command line for you to run in order to -# remove old (arvhived) versions of the solr ref guide from the dist repo, and -# (if neccessary) clean up any old RC files. +# Convenience script to generates the SVN command line for you to run in order to +# remove old (archived) versions of the solr ref guide from the dist repo, and +# (if necessary) clean up any old RC files. # # See: https://cwiki.apache.org/confluence/display/solr/Internal+-+How+To+Publish+This+Documentation diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt index a85a553b5bf..f12d0aabbbe 100644 --- a/lucene/CHANGES.txt +++ b/lucene/CHANGES.txt @@ -662,7 +662,7 @@ Bug Fixes * LUCENE-5818, LUCENE-5823: Fix hunspell overgeneration for short strings that also match affixes, words are only stripped to a zero-length string if FULLSTRIP option - is specifed in the dictionary. (Robert Muir) + is specified in the dictionary. (Robert Muir) * LUCENE-5824: Fix hunspell 'long' flag handling. (Robert Muir) diff --git a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/TaxonomyIndexArrays.java b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/TaxonomyIndexArrays.java index 36adfa85186..6a59db87793 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/TaxonomyIndexArrays.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/TaxonomyIndexArrays.java @@ -38,7 +38,7 @@ class TaxonomyIndexArrays extends ParallelTaxonomyArrays { private final int[] parents; - // the following two arrays are lazily intialized. note that we only keep a + // the following two arrays are lazily initialized. note that we only keep a // single boolean member as volatile, instead of declaring the arrays // volatile. the code guarantees that only after the boolean is set to true, // the arrays are returned. diff --git a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyCombined.java b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyCombined.java index 42fe16e2857..b896e7fe602 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyCombined.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyCombined.java @@ -743,7 +743,7 @@ public class TestTaxonomyCombined extends FacetTestCase { private void assertConsistentYoungestChild(final FacetLabel abPath, final int abOrd, final int abYoungChildBase1, final int abYoungChildBase2, final int retry, int numCategories) throws Exception { - SlowRAMDirectory indexDir = new SlowRAMDirectory(-1, null); // no slowness for intialization + SlowRAMDirectory indexDir = new SlowRAMDirectory(-1, null); // no slowness for initialization TaxonomyWriter tw = new DirectoryTaxonomyWriter(indexDir); tw.addCategory(new FacetLabel("a", "0")); tw.addCategory(abPath); diff --git a/lucene/queries/src/test/org/apache/lucene/queries/function/TestValueSources.java b/lucene/queries/src/test/org/apache/lucene/queries/function/TestValueSources.java index da8f50aa990..b66c1e22705 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/function/TestValueSources.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/function/TestValueSources.java @@ -341,7 +341,7 @@ public class TestValueSources extends LuceneTestCase { ValueSource vs = new NormValueSource("byte"); assertHits(new FunctionQuery(vs), new float[] { 0f, 0f }); - // regardless of wether norms exist, value source exists == 0 + // regardless of whether norms exist, value source exists == 0 assertAllExist(vs); vs = new NormValueSource("text"); @@ -486,7 +486,7 @@ public class TestValueSources extends LuceneTestCase { assertHits(new FunctionQuery(vs), new float[] { 0f, 1f }); assertAllExist(vs); - // regardless of wether norms exist, value source exists == 0 + // regardless of whether norms exist, value source exists == 0 vs = new TermFreqValueSource("bogus", "bogus", "bogus", new BytesRef("bogus")); assertHits(new FunctionQuery(vs), new float[] { 0F, 0F }); assertAllExist(vs); @@ -507,7 +507,7 @@ public class TestValueSources extends LuceneTestCase { assertHits(new FunctionQuery(vs), new float[] { 0f, 1f }); assertAllExist(vs); - // regardless of wether norms exist, value source exists == 0 + // regardless of whether norms exist, value source exists == 0 vs = new TFValueSource("bogus", "bogus", "bogus", new BytesRef("bogus")); assertHits(new FunctionQuery(vs), new float[] { 0F, 0F }); assertAllExist(vs); diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index 92fa9245600..57022d59e7b 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -2545,7 +2545,7 @@ Bug Fixes * SOLR-4909: Use DirectoryReader.openIfChanged in non-NRT mode. (Michael Garski via Robert Muir) -* SOLR-5227: Correctly fail schema initalization if a dynamicField is configured to +* SOLR-5227: Correctly fail schema initialization if a dynamicField is configured to be required, or have a default value. (hossman) * SOLR-5231: Fixed a bug with the behavior of BoolField that caused documents w/o @@ -5900,7 +5900,7 @@ Bug Fixes (James Dyer, others) * SOLR-3260: DataImportHandler: ScriptTransformer gives better error messages when - problems arise on initalization (no Script Engine, invalid script, etc). (James Dyer) + problems arise on initialization (no Script Engine, invalid script, etc). (James Dyer) * SOLR-2959: edismax now respects the magic fields '_val_' and '_query_' (Michael Watts, hossman) @@ -9461,7 +9461,7 @@ Changes in runtime behavior to facilitate checking for parameters that must be present. (Ryan McKinley, J.J. Larrea via yonik) - 8. SOLR-179: By default, solr will abort after any severe initalization + 8. SOLR-179: By default, solr will abort after any severe initialization errors. This behavior can be disabled by setting: false in solrconfig.xml (ryan) diff --git a/solr/contrib/dataimporthandler-extras/src/test-files/dihextras/solr/collection1/conf/dataimport-solrconfig.xml b/solr/contrib/dataimporthandler-extras/src/test-files/dihextras/solr/collection1/conf/dataimport-solrconfig.xml index 38f03cfaa92..bfaccd359bc 100644 --- a/solr/contrib/dataimporthandler-extras/src/test-files/dihextras/solr/collection1/conf/dataimport-solrconfig.xml +++ b/solr/contrib/dataimporthandler-extras/src/test-files/dihextras/solr/collection1/conf/dataimport-solrconfig.xml @@ -294,7 +294,7 @@ To enable solr1.1 behavior, remove the /update handler or change its path - "update.processor.class" is the class name for the UpdateRequestProcessor. It is initalized + "update.processor.class" is the class name for the UpdateRequestProcessor. It is initialized only once. This can not be changed for each request. --> 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 ff9cf3058d8..dfb77360106 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 @@ -400,7 +400,7 @@ public class DocBuilder { } private void resetEntity(EntityProcessorWrapper epw) { - epw.setInitalized(false); + epw.setInitialized(false); for (EntityProcessorWrapper child : epw.getChildren()) { resetEntity(child); } @@ -432,9 +432,9 @@ public class DocBuilder { pk == null ? Context.FULL_DUMP : Context.DELTA_DUMP, session, parentCtx, this); epw.init(ctx); - if (!epw.isInitalized()) { + if (!epw.isInitialized()) { entitiesToDestroy.add(epw); - epw.setInitalized(true); + epw.setInitialized(true); } if (reqParams.getStart() > 0) { 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 a09efb1b0f8..2d47396f5ba 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 @@ -45,7 +45,7 @@ public class EntityProcessorWrapper extends EntityProcessor { private DataSource datasource; private List children = new ArrayList<>(); private DocBuilder docBuilder; - private boolean initalized; + private boolean initialized; private String onError; private Context context; private VariableResolver resolver; @@ -317,11 +317,23 @@ public class EntityProcessorWrapper extends EntityProcessor { this.datasource = datasource; } + /** @deprecated will be removed in Solr 6; use {@link #isInitialized()} */ + @Deprecated public boolean isInitalized() { - return initalized; + return initialized; } - public void setInitalized(boolean initalized) { - this.initalized = initalized; + public boolean isInitialized() { + return initialized; + } + + /** @deprecated will be removed in Solr 6; use {@link #setInitialized(boolean)} */ + @Deprecated + public void setInitalized(boolean initialized) { + this.initialized = initialized; + } + + public void setInitialized(boolean initialized) { + this.initialized = initialized; } } diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/XPathRecordReader.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/XPathRecordReader.java index 8d2af7ed763..68cb859ad31 100644 --- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/XPathRecordReader.java +++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/XPathRecordReader.java @@ -566,7 +566,7 @@ public class XPathRecordReader { for (Node n : searchList) if (n.xpathName.equals(xpathName)) return n; // new territory! add a new node for this Xpath bitty - Node n = new Node(xpathName, this); // a minimal Node initalization + Node n = new Node(xpathName, this); // a minimal Node initialization Matcher m = ATTRIB_PRESENT_WITHVAL.matcher(xpathName); if (m.find()) { n.name = m.group(1); diff --git a/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/contentstream-solrconfig.xml b/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/contentstream-solrconfig.xml index af93b7ce8c1..64cec1c4207 100644 --- a/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/contentstream-solrconfig.xml +++ b/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/contentstream-solrconfig.xml @@ -298,7 +298,7 @@ To enable solr1.1 behavior, remove the /update handler or change its path - "update.processor.class" is the class name for the UpdateRequestProcessor. It is initalized + "update.processor.class" is the class name for the UpdateRequestProcessor. It is initialized only once. This can not be changed for each request. --> diff --git a/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-nodatasource-solrconfig.xml b/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-nodatasource-solrconfig.xml index c359b41e1ec..644a24bd459 100644 --- a/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-nodatasource-solrconfig.xml +++ b/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-nodatasource-solrconfig.xml @@ -296,7 +296,7 @@ To enable solr1.1 behavior, remove the /update handler or change its path - "update.processor.class" is the class name for the UpdateRequestProcessor. It is initalized + "update.processor.class" is the class name for the UpdateRequestProcessor. It is initialized only once. This can not be changed for each request. --> diff --git a/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-solrconfig.xml b/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-solrconfig.xml index 270cbbc1bf6..0cee8f5baaa 100644 --- a/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-solrconfig.xml +++ b/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-solrconfig.xml @@ -297,7 +297,7 @@ To enable solr1.1 behavior, remove the /update handler or change its path - "update.processor.class" is the class name for the UpdateRequestProcessor. It is initalized + "update.processor.class" is the class name for the UpdateRequestProcessor. It is initialized only once. This can not be changed for each request. --> diff --git a/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig.xml index f8dec564e26..97933f4db3d 100644 --- a/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig.xml +++ b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig.xml @@ -1088,7 +1088,7 @@ http://wiki.apache.org/solr/SolrReplication - It is also neccessary for SolrCloud to function (in Cloud mode, the + It is also necessary for SolrCloud to function (in Cloud mode, the replication handler is used to bulk transfer segments when nodes are added or need to recover). @@ -1097,7 +1097,7 @@ diff --git a/solr/contrib/morphlines-core/src/test-files/solr/solrcelltest/collection1/conf/solrconfig.xml b/solr/contrib/morphlines-core/src/test-files/solr/solrcelltest/collection1/conf/solrconfig.xml index d93ae8cc866..41a55aa3844 100644 --- a/solr/contrib/morphlines-core/src/test-files/solr/solrcelltest/collection1/conf/solrconfig.xml +++ b/solr/contrib/morphlines-core/src/test-files/solr/solrcelltest/collection1/conf/solrconfig.xml @@ -1101,7 +1101,7 @@ http://wiki.apache.org/solr/SolrReplication - It is also neccessary for SolrCloud to function (in Cloud mode, the + It is also necessary for SolrCloud to function (in Cloud mode, the replication handler is used to bulk transfer segments when nodes are added or need to recover). @@ -1110,7 +1110,7 @@ diff --git a/solr/core/src/java/org/apache/solr/handler/admin/LoggingHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/LoggingHandler.java index 6d97852235c..daf12386364 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/LoggingHandler.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/LoggingHandler.java @@ -67,7 +67,7 @@ public class LoggingHandler extends RequestHandlerBase implements SolrCoreAware public void handleRequestBody(SolrQueryRequest req, SolrQueryResponse rsp) throws Exception { // Don't do anything if the framework is unknown if(watcher==null) { - rsp.add("error", "Logging Not Initalized"); + rsp.add("error", "Logging Not Initialized"); return; } rsp.add("watcher", watcher.getName()); diff --git a/solr/core/src/java/org/apache/solr/handler/component/StatsComponent.java b/solr/core/src/java/org/apache/solr/handler/component/StatsComponent.java index 2d07ea7a74d..340839c9222 100644 --- a/solr/core/src/java/org/apache/solr/handler/component/StatsComponent.java +++ b/solr/core/src/java/org/apache/solr/handler/component/StatsComponent.java @@ -138,7 +138,7 @@ public class StatsComponent extends SearchComponent { /** * Given a map of {@link StatsValues} using the appropriate response key, - * builds up the neccessary "stats" data structure for including in the response -- + * builds up the necessary "stats" data structure for including in the response -- * including the esoteric "stats_fields" wrapper. */ public static NamedList>> convertToResponse diff --git a/solr/core/src/java/org/apache/solr/handler/component/StatsField.java b/solr/core/src/java/org/apache/solr/handler/component/StatsField.java index 9d6042b2415..cb0aa228f28 100644 --- a/solr/core/src/java/org/apache/solr/handler/component/StatsField.java +++ b/solr/core/src/java/org/apache/solr/handler/component/StatsField.java @@ -361,7 +361,7 @@ public class StatsField { } /** - * Wether or not the effective value of the {@link StatsParams#STATS_CALC_DISTINCT} param + * Whether or not the effective value of the {@link StatsParams#STATS_CALC_DISTINCT} param * is true or false for this StatsField */ public boolean getCalcDistinct() { diff --git a/solr/core/src/java/org/apache/solr/handler/component/StatsValuesFactory.java b/solr/core/src/java/org/apache/solr/handler/component/StatsValuesFactory.java index 445b57443dc..693da285a4b 100644 --- a/solr/core/src/java/org/apache/solr/handler/component/StatsValuesFactory.java +++ b/solr/core/src/java/org/apache/solr/handler/component/StatsValuesFactory.java @@ -359,7 +359,7 @@ class NumericStatsValues extends AbstractStatsValues { assert null != max : "max is null but min isn't ? ==> " + min; // we always use the double value, because that way the response Object class is - // consistent regardless of wether we only have 1 value or many that we min/max + // consistent regardless of whether we only have 1 value or many that we min/max // // TODO: would be nice to have subclasses for each type of Number ... breaks backcompat double minD = min.doubleValue(); diff --git a/solr/core/src/java/org/apache/solr/internal/csv/ExtendedBufferedReader.java b/solr/core/src/java/org/apache/solr/internal/csv/ExtendedBufferedReader.java index 0201a8c4624..8470906d05d 100644 --- a/solr/core/src/java/org/apache/solr/internal/csv/ExtendedBufferedReader.java +++ b/solr/core/src/java/org/apache/solr/internal/csv/ExtendedBufferedReader.java @@ -77,7 +77,7 @@ class ExtendedBufferedReader extends BufferedReader { */ @Override public int read() throws IOException { - // initalize the lookahead + // initialize the lookahead if (lookaheadChar == UNDEFINED) { lookaheadChar = super.read(); } diff --git a/solr/core/src/java/org/apache/solr/schema/SchemaField.java b/solr/core/src/java/org/apache/solr/schema/SchemaField.java index 47a8f30c810..cca6e51d0a8 100644 --- a/solr/core/src/java/org/apache/solr/schema/SchemaField.java +++ b/solr/core/src/java/org/apache/solr/schema/SchemaField.java @@ -78,7 +78,7 @@ public final class SchemaField extends FieldProperties { this.properties = properties; this.defaultValue = defaultValue; - // initalize with the required property flag + // initialize with the required property flag required = (properties & REQUIRED) !=0; type.checkSchemaField(this); diff --git a/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java b/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java index 7007fbef1d4..1efa33b5332 100644 --- a/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java +++ b/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java @@ -205,7 +205,7 @@ public class SolrIndexSearcher extends IndexSearcher implements Closeable,SolrIn } /** - * Builds the neccessary collector chain (via delegate wrapping) and executes the query + * Builds the necessary collector chain (via delegate wrapping) and executes the query * against it. This method takes into consideration both the explicitly provided collector * and postFilter as well as any needed collector wrappers for dealing with options * specified in the QueryCOmmand. diff --git a/solr/core/src/java/org/apache/solr/search/similarities/SweetSpotSimilarityFactory.java b/solr/core/src/java/org/apache/solr/search/similarities/SweetSpotSimilarityFactory.java index 7094e6ad8d8..398eea11d8d 100644 --- a/solr/core/src/java/org/apache/solr/search/similarities/SweetSpotSimilarityFactory.java +++ b/solr/core/src/java/org/apache/solr/search/similarities/SweetSpotSimilarityFactory.java @@ -61,9 +61,9 @@ import static org.apache.solr.common.SolrException.ErrorCode.*; *
  • If any individual settings from one of the above mentioned sets * are specified, then all settings from that set must be specified. *
    • - *
  • If Baseline TF settings are spcified, then Hyperbolic TF settings + *
  • If Baseline TF settings are specified, then Hyperbolic TF settings * are not permitted, and vice versa. (The settings specified will - * determine wether {@link SweetSpotSimilarity#baselineTf} or + * determine whether {@link SweetSpotSimilarity#baselineTf} or * {@link SweetSpotSimilarity#hyperbolicTf} will be used. *
    • * @@ -139,7 +139,7 @@ public class SweetSpotSimilarityFactory extends DefaultSimilarityFactory { throw new SolrException(SERVER_ERROR, "Can not mix hyperbolicTf settings with baselineTf settings"); } - // pick Similarity impl based on wether hyper tf settings are set + // pick Similarity impl based on whether hyper tf settings are set sim = (null != hyper_min) ? new HyperbolicSweetSpotSimilarity() : new SweetSpotSimilarity(); @@ -159,7 +159,7 @@ public class SweetSpotSimilarityFactory extends DefaultSimilarityFactory { @Override public Similarity getSimilarity() { - assert sim != null : "SweetSpotSimilarityFactory was not initalized"; + assert sim != null : "SweetSpotSimilarityFactory was not initialized"; return sim; } @@ -183,5 +183,5 @@ public class SweetSpotSimilarityFactory extends DefaultSimilarityFactory { public float tf(float freq) { return hyperbolicTf(freq); } - }; + } } diff --git a/solr/core/src/java/org/apache/solr/spelling/ConjunctionSolrSpellChecker.java b/solr/core/src/java/org/apache/solr/spelling/ConjunctionSolrSpellChecker.java index c85764c0aab..a35dfbb13bc 100644 --- a/solr/core/src/java/org/apache/solr/spelling/ConjunctionSolrSpellChecker.java +++ b/solr/core/src/java/org/apache/solr/spelling/ConjunctionSolrSpellChecker.java @@ -47,10 +47,10 @@ public class ConjunctionSolrSpellChecker extends SolrSpellChecker { private String dictionaryName = null; private Analyzer queryAnalyzer = null; private List checkers = new ArrayList<>(); - private boolean initalized = false; + private boolean initialized = false; public void addChecker(SolrSpellChecker checker) { - if (initalized) { + if (initialized) { throw new IllegalStateException( "Need to add checkers before calling init()"); } @@ -102,7 +102,7 @@ public class ConjunctionSolrSpellChecker extends SolrSpellChecker { if (dictionaryName == null) { dictionaryName = DEFAULT_DICTIONARY_NAME; } - initalized = true; + initialized = true; return dictionaryName; } diff --git a/solr/core/src/test/org/apache/solr/SolrInfoMBeanTest.java b/solr/core/src/test/org/apache/solr/SolrInfoMBeanTest.java index 8a5453bd8ae..f077f02e7fa 100644 --- a/solr/core/src/test/org/apache/solr/SolrInfoMBeanTest.java +++ b/solr/core/src/test/org/apache/solr/SolrInfoMBeanTest.java @@ -78,7 +78,7 @@ public class SolrInfoMBeanTest extends SolrTestCaseJ4 } catch( InstantiationException ex ) { // expected... - //System.out.println( "unable to initalize: "+clazz ); + //System.out.println( "unable to initialize: "+clazz ); } } } diff --git a/solr/core/src/test/org/apache/solr/core/SOLR749Test.java b/solr/core/src/test/org/apache/solr/core/SOLR749Test.java index d1d0b315636..d3d0dcbb573 100644 --- a/solr/core/src/test/org/apache/solr/core/SOLR749Test.java +++ b/solr/core/src/test/org/apache/solr/core/SOLR749Test.java @@ -79,7 +79,7 @@ public class SOLR749Test extends SolrTestCaseJ4 { "//result[@numFound=19]"); // don't assume specific clause evaluation ordering. - // ideally this is 19, but could be as high as 20 depending on wether frange's + // ideally this is 19, but could be as high as 20 depending on whether frange's // scorer has next() called on it before other clauses skipTo int count = CountUsageValueSourceParser.getAndClearCount("frange_in_bq"); assertTrue("frange_in_bq: " + count, (19 <= count && count <= 20)); diff --git a/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotLargeTest.java b/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotLargeTest.java index 6584300d3b4..eea99e2a3b1 100644 --- a/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotLargeTest.java +++ b/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotLargeTest.java @@ -207,7 +207,7 @@ public class DistributedFacetPivotLargeTest extends BaseDistributedSearchTestCas // basic check w/ limit & index sort for (SolrParams facetParams : - // results should be the same regardless of wether local params are used + // results should be the same regardless of whether local params are used new SolrParams[] { // Broken: SOLR-6193 // params("facet.pivot","{!facet.limit=4 facet.sort=index}place_s,company_t"), @@ -476,7 +476,7 @@ public class DistributedFacetPivotLargeTest extends BaseDistributedSearchTestCas // Negative facet limit for (SolrParams facetParams : - // results should be the same regardless of wether facet.limit is global, + // results should be the same regardless of whether facet.limit is global, // a local param, or specified as a per-field override for both fields new SolrParams[] { params(FacetParams.FACET_LIMIT, "-1", @@ -508,7 +508,7 @@ public class DistributedFacetPivotLargeTest extends BaseDistributedSearchTestCas // Negative per-field facet limit (outer) for (SolrParams facetParams : - // results should be the same regardless of wether per-field facet.limit is + // results should be the same regardless of whether per-field facet.limit is // a global or a local param new SolrParams[] { // Broken: SOLR-6193 @@ -535,7 +535,7 @@ public class DistributedFacetPivotLargeTest extends BaseDistributedSearchTestCas // Negative per-field facet limit (inner) for (SolrParams facetParams : - // results should be the same regardless of wether per-field facet.limit is + // results should be the same regardless of whether per-field facet.limit is // a global or a local param new SolrParams[] { // Broken: SOLR-6193 diff --git a/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotSmallAdvancedTest.java b/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotSmallAdvancedTest.java index d428f068c2d..6ee1e4e4beb 100644 --- a/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotSmallAdvancedTest.java +++ b/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotSmallAdvancedTest.java @@ -142,7 +142,7 @@ public class DistributedFacetPivotSmallAdvancedTest extends BaseDistributedSearc if (params.getBool("facet", false)) { // if this was a facet request, then the top pivot constraint and pivot - // stats should match what we expect - regardless of wether refine + // stats should match what we expect - regardless of whether refine // was used, or if the query was initially satisfied by the default overrequest List placePivots = rsp.getFacetPivot().get("place_t,company_t"); diff --git a/solr/core/src/test/org/apache/solr/handler/component/SearchHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/component/SearchHandlerTest.java index 5106bdf5298..0e49f11f8dc 100644 --- a/solr/core/src/test/org/apache/solr/handler/component/SearchHandlerTest.java +++ b/solr/core/src/test/org/apache/solr/handler/component/SearchHandlerTest.java @@ -37,7 +37,7 @@ public class SearchHandlerTest extends SolrTestCaseJ4 @SuppressWarnings("unchecked") @Test - public void testInitalization() + public void testInitialization() { SolrCore core = h.getCore(); diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java index 25c05da6fa0..a6438a4d03f 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java @@ -949,7 +949,7 @@ abstract public class SolrExampleTests extends SolrExampleTestsBase server.commit(); assertNumFound("*:*", 0); // make sure it got in - // results of this test should be the same regardless of wether any docs in index + // results of this test should be the same regardless of whether any docs in index if (random().nextBoolean()) { server.add(makeTestDoc("id", 1, "features", "aaa", "cat", "a", "inStock", true, "popularity", 12, "price", .017)); server.commit();