This is an automated email from the ASF dual-hosted git repository.
epugh pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/branch_9x by this push:
new 7eceacf fix typo for word overridden (#632)
7eceacf is described below
commit 7eceacf0b268aabd557716a8833f44a67ab1bf35
Author: Eric Pugh <[email protected]>
AuthorDate: Mon Feb 14 12:27:00 2022 +0100
fix typo for word overridden (#632)
---
.../apache/solr/search/DisMaxQParserPlugin.java | 2 +-
.../org/apache/solr/response/JSONWriterTest.java | 52 +++++++++++-----------
.../test/org/apache/solr/s3/S3ReadWriteTest.java | 2 +-
.../query-guide/pages/result-clustering.adoc | 2 +-
.../org/apache/solr/common/params/FacetParams.java | 26 +++++------
.../apache/solr/cloud/MiniSolrCloudCluster.java | 2 +-
6 files changed, 43 insertions(+), 43 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/search/DisMaxQParserPlugin.java
b/solr/core/src/java/org/apache/solr/search/DisMaxQParserPlugin.java
index 3945445..7ca1b02 100644
--- a/solr/core/src/java/org/apache/solr/search/DisMaxQParserPlugin.java
+++ b/solr/core/src/java/org/apache/solr/search/DisMaxQParserPlugin.java
@@ -34,7 +34,7 @@ import org.apache.solr.request.SolrQueryRequest;
*
* <p>
* All of the following options may be configured for this plugin
- * in the solrconfig as defaults, and may be overriden as request parameters
+ * in the solrconfig as defaults, and may be overridden as request parameters
* </p>
*
* <ul>
diff --git a/solr/core/src/test/org/apache/solr/response/JSONWriterTest.java
b/solr/core/src/test/org/apache/solr/response/JSONWriterTest.java
index a5a3396..b62ba7e 100644
--- a/solr/core/src/test/org/apache/solr/response/JSONWriterTest.java
+++ b/solr/core/src/test/org/apache/solr/response/JSONWriterTest.java
@@ -191,25 +191,25 @@ public class JSONWriterTest extends SolrTestCaseJ4 {
@Test
public void testArrntvWriterOverridesAllWrites() {
// List rather than Set because two not-overridden methods could share
name but not signature
- final List<String> methodsExpectedNotOverriden = new ArrayList<>(14);
- methodsExpectedNotOverriden.add("writeResponse");
- methodsExpectedNotOverriden.add("writeKey");
- methodsExpectedNotOverriden.add("writeNamedListAsMapMangled");
- methodsExpectedNotOverriden.add("writeNamedListAsMapWithDups");
- methodsExpectedNotOverriden.add("writeNamedListAsArrMap");
- methodsExpectedNotOverriden.add("writeNamedListAsArrArr");
- methodsExpectedNotOverriden.add("writeNamedListAsFlat");
- methodsExpectedNotOverriden.add("writeEndDocumentList");
- methodsExpectedNotOverriden.add("writeMapOpener");
- methodsExpectedNotOverriden.add("writeMapSeparator");
- methodsExpectedNotOverriden.add("writeMapCloser");
- methodsExpectedNotOverriden.add("public default void
org.apache.solr.common.util.JsonTextWriter.writeArray(java.lang.String,java.util.List,boolean)
throws java.io.IOException");
- methodsExpectedNotOverriden.add("writeArrayOpener");
- methodsExpectedNotOverriden.add("writeArraySeparator");
- methodsExpectedNotOverriden.add("writeArrayCloser");
- methodsExpectedNotOverriden.add("public default void
org.apache.solr.common.util.JsonTextWriter.writeMap(org.apache.solr.common.MapWriter)
throws java.io.IOException");
- methodsExpectedNotOverriden.add("public default void
org.apache.solr.common.util.JsonTextWriter.writeIterator(org.apache.solr.common.IteratorWriter)
throws java.io.IOException");
- methodsExpectedNotOverriden.add("public default void
org.apache.solr.common.util.JsonTextWriter.writeJsonIter(java.util.Iterator,boolean)
throws java.io.IOException");
+ final List<String> methodsExpectedNotOverridden = new ArrayList<>(14);
+ methodsExpectedNotOverridden.add("writeResponse");
+ methodsExpectedNotOverridden.add("writeKey");
+ methodsExpectedNotOverridden.add("writeNamedListAsMapMangled");
+ methodsExpectedNotOverridden.add("writeNamedListAsMapWithDups");
+ methodsExpectedNotOverridden.add("writeNamedListAsArrMap");
+ methodsExpectedNotOverridden.add("writeNamedListAsArrArr");
+ methodsExpectedNotOverridden.add("writeNamedListAsFlat");
+ methodsExpectedNotOverridden.add("writeEndDocumentList");
+ methodsExpectedNotOverridden.add("writeMapOpener");
+ methodsExpectedNotOverridden.add("writeMapSeparator");
+ methodsExpectedNotOverridden.add("writeMapCloser");
+ methodsExpectedNotOverridden.add("public default void
org.apache.solr.common.util.JsonTextWriter.writeArray(java.lang.String,java.util.List,boolean)
throws java.io.IOException");
+ methodsExpectedNotOverridden.add("writeArrayOpener");
+ methodsExpectedNotOverridden.add("writeArraySeparator");
+ methodsExpectedNotOverridden.add("writeArrayCloser");
+ methodsExpectedNotOverridden.add("public default void
org.apache.solr.common.util.JsonTextWriter.writeMap(org.apache.solr.common.MapWriter)
throws java.io.IOException");
+ methodsExpectedNotOverridden.add("public default void
org.apache.solr.common.util.JsonTextWriter.writeIterator(org.apache.solr.common.IteratorWriter)
throws java.io.IOException");
+ methodsExpectedNotOverridden.add("public default void
org.apache.solr.common.util.JsonTextWriter.writeJsonIter(java.util.Iterator,boolean)
throws java.io.IOException");
final Class<?> subClass =
JSONResponseWriter.ArrayOfNameTypeValueJSONWriter.class;
final Class<?> superClass = subClass.getSuperclass();
@@ -229,12 +229,12 @@ public class JSONWriterTest extends SolrTestCaseJ4 {
if (Modifier.isStatic(modifiers)) continue;
if (Modifier.isPrivate(modifiers)) continue;
- final boolean expectOverriden =
!methodsExpectedNotOverriden.contains(methodName)
- && !methodsExpectedNotOverriden.contains(methodFullName);
+ final boolean expectOverridden =
!methodsExpectedNotOverridden.contains(methodName)
+ && !methodsExpectedNotOverridden.contains(methodFullName);
try {
final Method subClassMethod =
getDeclaredMethodInClasses(superClassMethod, subClass);
- if (expectOverriden) {
+ if (expectOverridden) {
assertEquals("getReturnType() difference",
superClassMethod.getReturnType(),
subClassMethod.getReturnType());
@@ -242,16 +242,16 @@ public class JSONWriterTest extends SolrTestCaseJ4 {
fail(subClass + " must not override '" + superClassMethod + "'");
}
} catch (NoSuchMethodException e) {
- if (expectOverriden) {
+ if (expectOverridden) {
fail(subClass + " needs to override '" + superClassMethod + "'");
} else {
- assertTrue(methodName+" not found in remaining
"+methodsExpectedNotOverriden, methodsExpectedNotOverriden.remove(methodName)||
methodsExpectedNotOverriden.remove(methodFullName));
+ assertTrue(methodName+" not found in remaining
"+methodsExpectedNotOverridden,
methodsExpectedNotOverridden.remove(methodName)||
methodsExpectedNotOverridden.remove(methodFullName));
}
}
}
- assertTrue("methodsExpected NotOverriden but NotFound instead:
"+methodsExpectedNotOverriden,
- methodsExpectedNotOverriden.isEmpty());
+ assertTrue("methodsExpected NotOverridden but NotFound instead:
"+methodsExpectedNotOverridden,
+ methodsExpectedNotOverridden.isEmpty());
}
@Test
diff --git
a/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3ReadWriteTest.java
b/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3ReadWriteTest.java
index 815238a..50b7b71 100644
---
a/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3ReadWriteTest.java
+++
b/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3ReadWriteTest.java
@@ -69,7 +69,7 @@ public class S3ReadWriteTest extends AbstractS3ClientTest {
InputStream stream = client.pullStream("/override");
assertEquals(
- "File contents should have been overriden",
+ "File contents should have been overridden",
"new content",
IOUtils.toString(stream, Charset.defaultCharset()));
}
diff --git
a/solr/solr-ref-guide/modules/query-guide/pages/result-clustering.adoc
b/solr/solr-ref-guide/modules/query-guide/pages/result-clustering.adoc
index 75b6551..f91450d 100644
--- a/solr/solr-ref-guide/modules/query-guide/pages/result-clustering.adoc
+++ b/solr/solr-ref-guide/modules/query-guide/pages/result-clustering.adoc
@@ -377,7 +377,7 @@ If there is no need for this synthetic cluster, it can be
set to `false`.
Location of algorithm-specific resources and configuration files (stop words,
other lexical resources, default settings).
This property is `null` by default and all resources are read from their
respective algorithm default resource pool (JARs).
If this property is not empty, it resolves relative to Solr core's
configuration directory.
-This parameter can be applied during Solr startup _only_, it can't be
overriden per-request.
+This parameter can be applied during Solr startup _only_, it can't be
overridden per-request.
There are more properties applying to engine configuration.
We describe these in functional sections that follow.
diff --git a/solr/solrj/src/java/org/apache/solr/common/params/FacetParams.java
b/solr/solrj/src/java/org/apache/solr/common/params/FacetParams.java
index abc41d6..77c0fbf 100644
--- a/solr/solrj/src/java/org/apache/solr/common/params/FacetParams.java
+++ b/solr/solrj/src/java/org/apache/solr/common/params/FacetParams.java
@@ -192,18 +192,18 @@ public interface FacetParams {
public static final String FACET_DATE = FACET + ".date";
/**
* Date string indicating the starting point for a date facet range.
- * Can be overriden on a per field basis.
+ * Can be overridden on a per field basis.
*/
public static final String FACET_DATE_START = FACET_DATE + ".start";
/**
* Date string indicating the ending point for a date facet range.
- * Can be overriden on a per field basis.
+ * Can be overridden on a per field basis.
*/
public static final String FACET_DATE_END = FACET_DATE + ".end";
/**
* Date Math string indicating the interval of sub-ranges for a date
* facet range.
- * Can be overriden on a per field basis.
+ * Can be overridden on a per field basis.
*/
public static final String FACET_DATE_GAP = FACET_DATE + ".gap";
/**
@@ -217,13 +217,13 @@ public interface FacetParams {
* results in the range between 'start' and 'end' being evenly
* divisible by 'gap'.
* The default is false.
- * Can be overriden on a per field basis.
+ * Can be overridden on a per field basis.
*/
public static final String FACET_DATE_HARD_END = FACET_DATE + ".hardend";
/**
* String indicating what "other" ranges should be computed for a
* date facet range (multi-value).
- * Can be overriden on a per field basis.
+ * Can be overridden on a per field basis.
* @see FacetRangeOther
*/
public static final String FACET_DATE_OTHER = FACET_DATE + ".other";
@@ -238,7 +238,7 @@ public interface FacetParams {
* The default value if none are specified is: [lower,upper,edge] <i>(NOTE:
This is different then FACET_RANGE_INCLUDE)</i>
* </p>
* <p>
- * Can be overriden on a per field basis.
+ * Can be overridden on a per field basis.
* </p>
* @see FacetRangeInclude
* @see #FACET_RANGE_INCLUDE
@@ -252,18 +252,18 @@ public interface FacetParams {
public static final String FACET_RANGE = FACET + ".range";
/**
* Number indicating the starting point for a numerical range facet.
- * Can be overriden on a per field basis.
+ * Can be overridden on a per field basis.
*/
public static final String FACET_RANGE_START = FACET_RANGE + ".start";
/**
* Number indicating the ending point for a numerical range facet.
- * Can be overriden on a per field basis.
+ * Can be overridden on a per field basis.
*/
public static final String FACET_RANGE_END = FACET_RANGE + ".end";
/**
* Number indicating the interval of sub-ranges for a numerical
* facet range.
- * Can be overriden on a per field basis.
+ * Can be overridden on a per field basis.
*/
public static final String FACET_RANGE_GAP = FACET_RANGE + ".gap";
/**
@@ -277,13 +277,13 @@ public interface FacetParams {
* results in the range between 'start' and 'end' being evenly
* divisible by 'gap'.
* The default is false.
- * Can be overriden on a per field basis.
+ * Can be overridden on a per field basis.
*/
public static final String FACET_RANGE_HARD_END = FACET_RANGE + ".hardend";
/**
* String indicating what "other" ranges should be computed for a
* numerical range facet (multi-value).
- * Can be overriden on a per field basis.
+ * Can be overridden on a per field basis.
*/
public static final String FACET_RANGE_OTHER = FACET_RANGE + ".other";
@@ -297,7 +297,7 @@ public interface FacetParams {
* The default value if none are specified is: lower
* </p>
* <p>
- * Can be overriden on a per field basis.
+ * Can be overridden on a per field basis.
* </p>
* @see FacetRangeInclude
*/
@@ -306,7 +306,7 @@ public interface FacetParams {
/**
* String indicating the method to use to resolve range facets.
* <p>
- * Can be overriden on a per field basis.
+ * Can be overridden on a per field basis.
* @see FacetRangeMethod
*/
public static final String FACET_RANGE_METHOD = FACET_RANGE + ".method";
diff --git
a/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java
b/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java
index d11d22e..8eb9dd4 100644
---
a/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java
+++
b/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java
@@ -109,7 +109,7 @@ public class MiniSolrCloudCluster {
" <str
name=\"distributedClusterStateUpdates\">${solr.distributedClusterStateUpdates:false}</str>
\n" +
" <str
name=\"distributedCollectionConfigSetExecution\">${solr.distributedCollectionConfigSetExecution:false}</str>
\n" +
" </solrcloud>\n" +
- // NOTE: this turns off the metrics collection unless overriden by a
sysprop
+ // NOTE: this turns off the metrics collection unless overridden by a
sysprop
" <metrics enabled=\"${metricsEnabled:false}\">\n" +
" <reporter name=\"default\"
class=\"org.apache.solr.metrics.reporters.SolrJmxReporter\">\n" +
" <str name=\"rootName\">solr_${hostPort:8983}</str>\n" +
