From d45fe43a68b4706745f34533dd7d2b53614c2167 Mon Sep 17 00:00:00 2001 From: Kazuhiro Sera Date: Thu, 4 Oct 2018 02:11:39 +0900 Subject: [PATCH] Fix a variety of typos and misspelled words (#32792) --- CONTRIBUTING.md | 2 +- TESTING.asciidoc | 2 +- .../gradle/VersionCollection.groovy | 2 +- .../doc/RestTestsFromSnippetsTask.groovy | 2 +- .../elasticsearch/gradle/test/NodeInfo.groovy | 2 +- .../build.gradle | 4 +- .../client/ml/job/config/Detector.java | 2 +- .../tools/launchers/JvmOptionsParser.java | 2 +- docs/java-rest/low-level/usage.asciidoc | 2 +- docs/painless/painless-api-reference.asciidoc | 2 +- docs/plugins/repository-hdfs.asciidoc | 8 ++-- docs/reference/commands/certutil.asciidoc | 2 +- docs/reference/ml/apis/jobcounts.asciidoc | 2 +- .../rollup/apis/rollup-caps.asciidoc | 2 +- docs/reference/sql/concepts.asciidoc | 2 +- docs/reference/sql/endpoints/jdbc.asciidoc | 4 +- .../painless/node/package-info.java | 4 +- .../painless/PainlessDocGenerator.java | 2 +- .../painless/PainlessExecuteRequestTests.java | 2 +- .../index/rankeval/RankEvalResponse.java | 4 +- .../reindex/AsyncBulkByScrollActionTests.java | 2 +- .../index/reindex/CancelTests.java | 2 +- .../ICUCollationKeywordFieldMapperIT.java | 48 +++++++++---------- .../test/custom-suggester/20_suggest.yml | 2 +- .../src/main/resources/regexes.yml | 4 +- .../test/old_cluster/10_basic.yml | 2 +- .../resources/packaging/tests/60_systemd.bats | 2 +- .../tests/module_and_plugin_test_cases.bash | 2 +- .../test/resources/packaging/utils/utils.bash | 2 +- .../action/search/SearchPhaseController.java | 4 +- .../org/elasticsearch/bootstrap/Natives.java | 4 +- .../metadata/IndexNameExpressionResolver.java | 2 +- .../metadata/MetaDataIndexUpgradeService.java | 4 +- .../metadata/TemplateUpgradeService.java | 2 +- .../routing/IndexShardRoutingTable.java | 2 +- .../common/time/DateMathParser.java | 2 +- .../analysis/PreConfiguredCharFilter.java | 2 +- .../reindex/AbstractBulkByScrollRequest.java | 2 +- .../elasticsearch/index/shard/IndexShard.java | 2 +- .../org/elasticsearch/index/store/Store.java | 2 +- .../index/translog/TranslogStats.java | 4 +- .../filter/FilterAggregatorFactory.java | 2 +- .../highlight/FragmentBuilderHelper.java | 2 +- .../elasticsearch/transport/Transport.java | 2 +- .../action/bulk/BulkRequestTests.java | 2 +- .../TransportReplicationActionTests.java | 2 +- .../routing/OperationRoutingTests.java | 2 +- .../decider/FilterAllocationDeciderTests.java | 2 +- .../mapper/MultiFieldCopyToMapperTests.java | 2 +- .../index/shard/IndexShardIT.java | 2 +- .../index/translog/TranslogTests.java | 2 +- .../monitor/process/ProcessProbeTests.java | 2 +- .../metrics/InternalScriptedMetricTests.java | 2 +- .../metrics/InternalTopHitsTests.java | 2 +- .../search/sort/FieldSortBuilderTests.java | 8 ++-- .../sort/GeoDistanceSortBuilderTests.java | 4 +- .../search/sort/ScriptSortBuilderTests.java | 2 +- .../action/bulk/simple-bulk7.json | 2 +- .../dynamictemplate/simple/test-mapping.json | 2 +- .../TestThreadInfoPatternConverterTests.java | 2 +- .../rest/yaml/section/DoSectionTests.java | 4 +- .../test/test/InternalTestClusterTests.java | 2 +- x-pack/docs/en/watcher/actions/email.asciidoc | 2 +- .../protocol/xpack/graph/Hop.java | 2 +- .../elasticsearch/xpack/core/XPackPlugin.java | 2 +- .../xpack/core/ml/job/config/Detector.java | 2 +- .../core/watcher/history/WatchRecord.java | 2 +- .../action/TransportGraphExploreAction.java | 2 +- .../xpack/ml/MlSingleNodeTestCase.java | 2 +- .../integration/BasicDistributedJobsIT.java | 2 +- .../xpack/rollup/job/RollupJobTask.java | 4 +- .../xpack/rollup/job/RollupJobTaskTests.java | 4 +- .../authc/ldap/LdapSessionFactory.java | 2 +- .../authc/support/UserRoleMapper.java | 2 +- .../transport/ServerTransportFilter.java | 2 +- .../xpack/security/TemplateUpgraderTests.java | 2 +- .../support/LdapMetaDataResolverTests.java | 4 +- .../authc/saml/SamlAuthenticatorTests.java | 8 ++-- .../filter/IpFilteringUpdateTests.java | 2 +- .../security/authz/store/invalid_roles.yml | 2 +- .../xpack/sql/jdbc/debug/Debug.java | 2 +- .../function/FunctionDefinition.java | 4 +- .../scalar/string/StringFunctionUtils.java | 2 +- .../xpack/sql/parser/ExpressionBuilder.java | 4 +- .../rest-api-spec/test/ml/datafeeds_crud.yml | 2 +- .../test/monitoring/bulk/20_privileges.yml | 6 +-- .../rest-api-spec/test/rollup/delete_job.yml | 2 +- .../rest-api-spec/test/rollup/start_job.yml | 2 +- .../rest-api-spec/test/rollup/stop_job.yml | 2 +- .../10_small_users_one_index.yml | 2 +- .../30_reset_ack_after_unmet_condition.yml | 2 +- .../xpack/upgrade/IndexUpgradeIT.java | 2 +- .../watcher/WatcherIndexingListener.java | 2 +- .../watcher/execution/ExecutionService.java | 4 +- .../actions/slack/SlackActionTests.java | 2 +- .../watcher/common/http/HttpClientTests.java | 2 +- .../action/delete/DeleteWatchTests.java | 2 +- .../action/execute/ExecuteWatchTests.java | 2 +- .../test/20_small_users_one_index.yml | 4 +- .../qa/sql/security/RestSqlSecurityIT.java | 2 +- .../qa/sql/security/SqlSecurityTestCase.java | 2 +- 101 files changed, 153 insertions(+), 153 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ba3e3c1175b..0d8826ad8d6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -320,7 +320,7 @@ have to test Elasticsearch. #### Configurations Gradle organizes dependencies and build artifacts into "configurations" and -allows you to use these configurations arbitrarilly. Here are some of the most +allows you to use these configurations arbitrarily. Here are some of the most common configurations in our build and how we use them:
diff --git a/TESTING.asciidoc b/TESTING.asciidoc index d3321f7f8cc..55d41dee1ee 100644 --- a/TESTING.asciidoc +++ b/TESTING.asciidoc @@ -250,7 +250,7 @@ Pass arbitrary jvm arguments. Running backwards compatibility tests is disabled by default since it requires a release version of elasticsearch to be present on the test system. -To run backwards compatibilty tests untar or unzip a release and run the tests +To run backwards compatibility tests untar or unzip a release and run the tests with the following command: --------------------------------------------------------------------------- diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/VersionCollection.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/VersionCollection.groovy index daab0efc8c6..063dcf7d3bb 100644 --- a/buildSrc/src/main/groovy/org/elasticsearch/gradle/VersionCollection.groovy +++ b/buildSrc/src/main/groovy/org/elasticsearch/gradle/VersionCollection.groovy @@ -122,7 +122,7 @@ class VersionCollection { if (isReleased(version) == false) { // caveat 1 - This should only ever contain 2 non released branches in flight. An example is 6.x is frozen, // and 6.2 is cut but not yet released there is some simple logic to make sure that in the case of more than 2, - // it will bail. The order is that the minor snapshot is fufilled first, and then the staged minor snapshot + // it will bail. The order is that the minor snapshot is fulfilled first, and then the staged minor snapshot if (nextMinorSnapshot == null) { // it has not been set yet nextMinorSnapshot = replaceAsSnapshot(version) diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/doc/RestTestsFromSnippetsTask.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/doc/RestTestsFromSnippetsTask.groovy index f2105086f25..ac258f76e33 100644 --- a/buildSrc/src/main/groovy/org/elasticsearch/gradle/doc/RestTestsFromSnippetsTask.groovy +++ b/buildSrc/src/main/groovy/org/elasticsearch/gradle/doc/RestTestsFromSnippetsTask.groovy @@ -72,7 +72,7 @@ public class RestTestsFromSnippetsTask extends SnippetsTask { /** * Root directory containing all the files generated by this task. It is - * contained withing testRoot. + * contained within testRoot. */ File outputRoot() { return new File(testRoot, '/rest-api-spec/test') diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/NodeInfo.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/NodeInfo.groovy index aaf4e468182..b96bdfae200 100644 --- a/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/NodeInfo.groovy +++ b/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/NodeInfo.groovy @@ -337,7 +337,7 @@ class NodeInfo { case 'deb': return new File(baseDir, "${distro}-extracted/etc/elasticsearch") default: - throw new InvalidUserDataException("Unkown distribution: ${distro}") + throw new InvalidUserDataException("Unknown distribution: ${distro}") } } } diff --git a/buildSrc/src/testKit/elasticsearch-build-resources/build.gradle b/buildSrc/src/testKit/elasticsearch-build-resources/build.gradle index 95d1453025e..c87c097e6be 100644 --- a/buildSrc/src/testKit/elasticsearch-build-resources/build.gradle +++ b/buildSrc/src/testKit/elasticsearch-build-resources/build.gradle @@ -22,7 +22,7 @@ task sample { // dependsOn buildResources.outputDir // for now it's just dependsOn buildResources - // we have to refference it at configuration time in order to be picked up + // we have to reference it at configuration time in order to be picked up ext.checkstyle_suppressions = buildResources.copy('checkstyle_suppressions.xml') doLast { println "This task is using ${file(checkstyle_suppressions)}" @@ -35,4 +35,4 @@ task noConfigAfterExecution { println "This should cause an error because we are refferencing " + "${buildResources.copy('checkstyle_suppressions.xml')} after the `buildResources` task has ran." } -} \ No newline at end of file +} diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/ml/job/config/Detector.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/ml/job/config/Detector.java index e1af60269b5..44fc18032d2 100644 --- a/client/rest-high-level/src/main/java/org/elasticsearch/client/ml/job/config/Detector.java +++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/ml/job/config/Detector.java @@ -215,7 +215,7 @@ public class Detector implements ToXContentObject { } /** - * Excludes frequently-occuring metrics from the analysis; + * Excludes frequently-occurring metrics from the analysis; * can apply to 'by' field, 'over' field, or both * * @return the value that the user set diff --git a/distribution/tools/launchers/src/main/java/org/elasticsearch/tools/launchers/JvmOptionsParser.java b/distribution/tools/launchers/src/main/java/org/elasticsearch/tools/launchers/JvmOptionsParser.java index c19c12cfe44..d74f106c50b 100644 --- a/distribution/tools/launchers/src/main/java/org/elasticsearch/tools/launchers/JvmOptionsParser.java +++ b/distribution/tools/launchers/src/main/java/org/elasticsearch/tools/launchers/JvmOptionsParser.java @@ -228,7 +228,7 @@ final class JvmOptionsParser { // no range is present, apply the JVM option to the specified major version only upper = lower; } else if (end == null) { - // a range of the form \\d+- is present, apply the JVM option to all major versions larger than the specifed one + // a range of the form \\d+- is present, apply the JVM option to all major versions larger than the specified one upper = Integer.MAX_VALUE; } else { // a range of the form \\d+-\\d+ is present, apply the JVM option to the specified range of major versions diff --git a/docs/java-rest/low-level/usage.asciidoc b/docs/java-rest/low-level/usage.asciidoc index 71fadd98988..38104215720 100644 --- a/docs/java-rest/low-level/usage.asciidoc +++ b/docs/java-rest/low-level/usage.asciidoc @@ -307,7 +307,7 @@ You can also customize the response consumer used to buffer the asynchronous responses. The default consumer will buffer up to 100MB of response on the JVM heap. If the response is larger then the request will fail. You could, for example, lower the maximum size which might be useful if you are running -in a heap constrained environment like the exmaple above. +in a heap constrained environment like the example above. Once you've created the singleton you can use it when making requests: diff --git a/docs/painless/painless-api-reference.asciidoc b/docs/painless/painless-api-reference.asciidoc index 54b1f20977b..814824b0db9 100644 --- a/docs/painless/painless-api-reference.asciidoc +++ b/docs/painless/painless-api-reference.asciidoc @@ -3,7 +3,7 @@ Painless has a strict whitelist for methods and classes to ensure all painless scripts are secure. Most of these methods are exposed directly -from the Java Runtime Enviroment (JRE) while others are part of +from the Java Runtime Environment (JRE) while others are part of Elasticsearch or Painless itself. Below is a list of all available classes grouped with their respected methods. Clicking on the method name takes you to the documentation for that specific method. Methods diff --git a/docs/plugins/repository-hdfs.asciidoc b/docs/plugins/repository-hdfs.asciidoc index ffd5ecebc25..1b975ef761d 100644 --- a/docs/plugins/repository-hdfs.asciidoc +++ b/docs/plugins/repository-hdfs.asciidoc @@ -32,7 +32,7 @@ PUT _snapshot/my_hdfs_repository "type": "hdfs", "settings": { "uri": "hdfs://namenode:8020/", - "path": "elasticsearch/respositories/my_hdfs_repository", + "path": "elasticsearch/repositories/my_hdfs_repository", "conf.dfs.client.read.shortcircuit": "true" } } @@ -149,7 +149,7 @@ PUT _snapshot/my_hdfs_repository "type": "hdfs", "settings": { "uri": "hdfs://namenode:8020/", - "path": "/user/elasticsearch/respositories/my_hdfs_repository", + "path": "/user/elasticsearch/repositories/my_hdfs_repository", "security.principal": "elasticsearch@REALM" } } @@ -167,7 +167,7 @@ PUT _snapshot/my_hdfs_repository "type": "hdfs", "settings": { "uri": "hdfs://namenode:8020/", - "path": "/user/elasticsearch/respositories/my_hdfs_repository", + "path": "/user/elasticsearch/repositories/my_hdfs_repository", "security.principal": "elasticsearch/_HOST@REALM" } } @@ -186,4 +186,4 @@ extracts for file access checks will be `elasticsearch`. NOTE: The repository plugin makes no assumptions of what Elasticsearch's principal name is. The main fragment of the Kerberos principal is not required to be `elasticsearch`. If you have a principal or service name that works better -for you or your organization then feel free to use it instead! \ No newline at end of file +for you or your organization then feel free to use it instead! diff --git a/docs/reference/commands/certutil.asciidoc b/docs/reference/commands/certutil.asciidoc index e0c6c701e31..4b04f95445e 100644 --- a/docs/reference/commands/certutil.asciidoc +++ b/docs/reference/commands/certutil.asciidoc @@ -72,7 +72,7 @@ parameter or in the `filename` field in an input YAML file. You can optionally provide IP addresses or DNS names for each instance. If neither IP addresses nor DNS names are specified, the Elastic stack products cannot perform hostname verification and you might need to configure the -`verfication_mode` security setting to `certificate` only. For more information +`verification_mode` security setting to `certificate` only. For more information about this setting, see <>. All certificates that are generated by this command are signed by a CA. You can diff --git a/docs/reference/ml/apis/jobcounts.asciidoc b/docs/reference/ml/apis/jobcounts.asciidoc index d0169e228d5..e6af7ac569c 100644 --- a/docs/reference/ml/apis/jobcounts.asciidoc +++ b/docs/reference/ml/apis/jobcounts.asciidoc @@ -207,7 +207,7 @@ The `forecasts_stats` object shows statistics about forecasts. It has the follow (object) Counts per forecast status, for example: {"finished" : 2}. NOTE: `memory_bytes`, `records`, `processing_time_ms` and `status` require at least 1 forecast, otherwise -these fields are ommitted. +these fields are omitted. [float] [[ml-stats-node]] diff --git a/docs/reference/rollup/apis/rollup-caps.asciidoc b/docs/reference/rollup/apis/rollup-caps.asciidoc index 907efb94c17..274037cae8f 100644 --- a/docs/reference/rollup/apis/rollup-caps.asciidoc +++ b/docs/reference/rollup/apis/rollup-caps.asciidoc @@ -45,7 +45,7 @@ For more information, see ==== Examples Imagine we have an index named `sensor-1` full of raw data. We know that the data will grow over time, so there -will be a `sensor-2`, `sensor-3`, etc. Let's create a Rollup job that targets the index pattern `sensor-*` to accomodate +will be a `sensor-2`, `sensor-3`, etc. Let's create a Rollup job that targets the index pattern `sensor-*` to accommodate this future scaling: [source,js] diff --git a/docs/reference/sql/concepts.asciidoc b/docs/reference/sql/concepts.asciidoc index dab33618762..aceea1949a2 100644 --- a/docs/reference/sql/concepts.asciidoc +++ b/docs/reference/sql/concepts.asciidoc @@ -62,4 +62,4 @@ Multiple clusters, each with its own namespace, connected to each other in a fed |=== -As one can see while the mapping between the concepts are not exactly one to one and the semantics somewhat different, there are more things in common than differences. In fact, thanks to SQL declarative nature, many concepts can move across {es} transparently and the terminology of the two likely to be used interchangeably through-out the rest of the material. \ No newline at end of file +As one can see while the mapping between the concepts are not exactly one to one and the semantics somewhat different, there are more things in common than differences. In fact, thanks to SQL declarative nature, many concepts can move across {es} transparently and the terminology of the two likely to be used interchangeably through-out the rest of the material. diff --git a/docs/reference/sql/endpoints/jdbc.asciidoc b/docs/reference/sql/endpoints/jdbc.asciidoc index a8a866ac93c..98589043f61 100644 --- a/docs/reference/sql/endpoints/jdbc.asciidoc +++ b/docs/reference/sql/endpoints/jdbc.asciidoc @@ -44,7 +44,7 @@ from `artifacts.elastic.co/maven` by adding it to the repositories list: === Setup The driver main class is `org.elasticsearch.xpack.sql.jdbc.jdbc.JdbcDriver`. -Note the driver implements the JDBC 4.0 +Service Provider+ mechanism meaning it is registerd automatically +Note the driver implements the JDBC 4.0 +Service Provider+ mechanism meaning it is registered automatically as long as its available in the classpath. Once registered, the driver understands the following syntax as an URL: @@ -182,4 +182,4 @@ connection. For example: ["source","java",subs="attributes,callouts,macros"] -------------------------------------------------- include-tagged::{jdbc-tests}/SimpleExampleTestCase.java[simple_example] --------------------------------------------------- \ No newline at end of file +-------------------------------------------------- diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/package-info.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/package-info.java index b8a1af073bf..8ba8b79b74a 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/package-info.java +++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/package-info.java @@ -143,7 +143,7 @@ * described by later documentation. *

* Storebable nodes have three methods for writing -- setup, load, and store. These methods - * are used in conjuction with a parent node aware of the storeable node (lhs) that has a node + * are used in conjunction with a parent node aware of the storeable node (lhs) that has a node * representing a value to store (rhs). The setup method is always once called before a store * to give storeable nodes a chance to write any prefixes they may have and any values such as * array indices before the store happens. Load is called on a storeable node that must also @@ -152,7 +152,7 @@ * Sub nodes are partial nodes that require a parent to work correctly. These nodes can really * represent anything the parent node would like to split up into logical pieces and don't really * have any distinct set of rules. The currently existing subnodes all have ANode as a super class - * somewhere in their class heirachy so the parent node can defer some analysis and writing to + * somewhere in their class hierarchy so the parent node can defer some analysis and writing to * the sub node. */ package org.elasticsearch.painless.node; diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/PainlessDocGenerator.java b/modules/lang-painless/src/test/java/org/elasticsearch/painless/PainlessDocGenerator.java index 1460d5f2359..444d1cd4f94 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/PainlessDocGenerator.java +++ b/modules/lang-painless/src/test/java/org/elasticsearch/painless/PainlessDocGenerator.java @@ -434,7 +434,7 @@ public class PainlessDocGenerator { if (classPackage.startsWith("org.apache.lucene")) { return "lucene-core"; } - throw new IllegalArgumentException("Unrecognized packge: " + classPackage); + throw new IllegalArgumentException("Unrecognized package: " + classPackage); } private static void emitGeneratedWarning(PrintStream stream) { diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/PainlessExecuteRequestTests.java b/modules/lang-painless/src/test/java/org/elasticsearch/painless/PainlessExecuteRequestTests.java index 44cd6b5304d..e70d728091f 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/PainlessExecuteRequestTests.java +++ b/modules/lang-painless/src/test/java/org/elasticsearch/painless/PainlessExecuteRequestTests.java @@ -83,7 +83,7 @@ public class PainlessExecuteRequestTests extends AbstractStreamableXContentTestC QueryBuilder query = randomBoolean() ? new MatchAllQueryBuilder() : null; // TODO: pass down XContextType to createTestInstance() method. // otherwise the document itself is different causing test failures. - // This should be done in a seperate change as the test instance is created before xcontent type is randomly picked and + // This should be done in a separate change as the test instance is created before xcontent type is randomly picked and // all the createTestInstance() methods need to be changed, which will make this a big chnage // BytesReference doc = randomBoolean() ? new BytesArray("{}") : null; BytesReference doc = null; diff --git a/modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/RankEvalResponse.java b/modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/RankEvalResponse.java index 6efff154b62..991d97b6196 100644 --- a/modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/RankEvalResponse.java +++ b/modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/RankEvalResponse.java @@ -42,8 +42,8 @@ import java.util.stream.Collectors; /** * Returns the results for a {@link RankEvalRequest}.
- * The repsonse contains a detailed section for each evaluation query in the request and - * possible failures that happened when executin individual queries. + * The response contains a detailed section for each evaluation query in the request and + * possible failures that happened when execution individual queries. **/ public class RankEvalResponse extends ActionResponse implements ToXContentObject { diff --git a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/AsyncBulkByScrollActionTests.java b/modules/reindex/src/test/java/org/elasticsearch/index/reindex/AsyncBulkByScrollActionTests.java index 5c12e85bb4c..7efd1ee5d6e 100644 --- a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/AsyncBulkByScrollActionTests.java +++ b/modules/reindex/src/test/java/org/elasticsearch/index/reindex/AsyncBulkByScrollActionTests.java @@ -481,7 +481,7 @@ public class AsyncBulkByScrollActionTests extends ESTestCase { /** * Execute a bulk retry test case. The total number of failures is random and the number of retries attempted is set to - * testRequest.getMaxRetries and controled by the failWithRejection parameter. + * testRequest.getMaxRetries and controlled by the failWithRejection parameter. */ private void bulkRetryTestCase(boolean failWithRejection) throws Exception { int totalFailures = randomIntBetween(1, testRequest.getMaxRetries()); diff --git a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/CancelTests.java b/modules/reindex/src/test/java/org/elasticsearch/index/reindex/CancelTests.java index d2110c5cded..6b7b21a5514 100644 --- a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/CancelTests.java +++ b/modules/reindex/src/test/java/org/elasticsearch/index/reindex/CancelTests.java @@ -122,7 +122,7 @@ public class CancelTests extends ReindexTestCase { logger.debug("waiting for updates to be blocked"); boolean blocked = awaitBusy( () -> ALLOWED_OPERATIONS.hasQueuedThreads() && ALLOWED_OPERATIONS.availablePermits() == 0, - 1, TimeUnit.MINUTES); // 10 seconds is usually fine but on heavilly loaded machines this can wake a while + 1, TimeUnit.MINUTES); // 10 seconds is usually fine but on heavily loaded machines this can take a while assertTrue("updates blocked", blocked); // Status should show the task running diff --git a/plugins/analysis-icu/src/test/java/org/elasticsearch/index/mapper/ICUCollationKeywordFieldMapperIT.java b/plugins/analysis-icu/src/test/java/org/elasticsearch/index/mapper/ICUCollationKeywordFieldMapperIT.java index ce8a635ffb6..3bcefe0cf56 100644 --- a/plugins/analysis-icu/src/test/java/org/elasticsearch/index/mapper/ICUCollationKeywordFieldMapperIT.java +++ b/plugins/analysis-icu/src/test/java/org/elasticsearch/index/mapper/ICUCollationKeywordFieldMapperIT.java @@ -60,7 +60,7 @@ public class ICUCollationKeywordFieldMapperIT extends ESIntegTestCase { String index = "foo"; String type = "mytype"; - String[] equilavent = {"I WİLL USE TURKİSH CASING", "ı will use turkish casıng"}; + String[] equivalent = {"I WİLL USE TURKİSH CASING", "ı will use turkish casıng"}; XContentBuilder builder = jsonBuilder() .startObject().startObject("properties") @@ -75,8 +75,8 @@ public class ICUCollationKeywordFieldMapperIT extends ESIntegTestCase { // both values should collate to same value indexRandom(true, - client().prepareIndex(index, type, "1").setSource("{\"collate\":\"" + equilavent[0] + "\"}", XContentType.JSON), - client().prepareIndex(index, type, "2").setSource("{\"collate\":\"" + equilavent[1] + "\"}", XContentType.JSON) + client().prepareIndex(index, type, "1").setSource("{\"collate\":\"" + equivalent[0] + "\"}", XContentType.JSON), + client().prepareIndex(index, type, "2").setSource("{\"collate\":\"" + equivalent[1] + "\"}", XContentType.JSON) ); // searching for either of the terms should return both results since they collate to the same value @@ -85,7 +85,7 @@ public class ICUCollationKeywordFieldMapperIT extends ESIntegTestCase { .types(type) .source(new SearchSourceBuilder() .fetchSource(false) - .query(QueryBuilders.termQuery("collate", randomBoolean() ? equilavent[0] : equilavent[1])) + .query(QueryBuilders.termQuery("collate", randomBoolean() ? equivalent[0] : equivalent[1])) .sort("collate") .sort("_id", SortOrder.DESC) // secondary sort should kick in because both will collate to same value ); @@ -100,7 +100,7 @@ public class ICUCollationKeywordFieldMapperIT extends ESIntegTestCase { String index = "foo"; String type = "mytype"; - String[] equilavent = {"a", "C", "a", "B"}; + String[] equivalent = {"a", "C", "a", "B"}; XContentBuilder builder = jsonBuilder() .startObject().startObject("properties") @@ -114,9 +114,9 @@ public class ICUCollationKeywordFieldMapperIT extends ESIntegTestCase { // everything should be indexed fine, no exceptions indexRandom(true, - client().prepareIndex(index, type, "1").setSource("{\"collate\":[\"" + equilavent[0] + "\", \"" - + equilavent[1] + "\"]}", XContentType.JSON), - client().prepareIndex(index, type, "2").setSource("{\"collate\":\"" + equilavent[2] + "\"}", XContentType.JSON) + client().prepareIndex(index, type, "1").setSource("{\"collate\":[\"" + equivalent[0] + "\", \"" + + equivalent[1] + "\"]}", XContentType.JSON), + client().prepareIndex(index, type, "2").setSource("{\"collate\":\"" + equivalent[2] + "\"}", XContentType.JSON) ); // using sort mode = max, values B and C will be used for the sort @@ -161,7 +161,7 @@ public class ICUCollationKeywordFieldMapperIT extends ESIntegTestCase { String index = "foo"; String type = "mytype"; - String[] equilavent = {"I W\u0049\u0307LL USE TURKİSH CASING", "ı will use turkish casıng"}; + String[] equivalent = {"I W\u0049\u0307LL USE TURKİSH CASING", "ı will use turkish casıng"}; XContentBuilder builder = jsonBuilder() .startObject().startObject("properties") @@ -176,8 +176,8 @@ public class ICUCollationKeywordFieldMapperIT extends ESIntegTestCase { assertAcked(client().admin().indices().prepareCreate(index).addMapping(type, builder)); indexRandom(true, - client().prepareIndex(index, type, "1").setSource("{\"collate\":\"" + equilavent[0] + "\"}", XContentType.JSON), - client().prepareIndex(index, type, "2").setSource("{\"collate\":\"" + equilavent[1] + "\"}", XContentType.JSON) + client().prepareIndex(index, type, "1").setSource("{\"collate\":\"" + equivalent[0] + "\"}", XContentType.JSON), + client().prepareIndex(index, type, "2").setSource("{\"collate\":\"" + equivalent[1] + "\"}", XContentType.JSON) ); // searching for either of the terms should return both results since they collate to the same value @@ -186,7 +186,7 @@ public class ICUCollationKeywordFieldMapperIT extends ESIntegTestCase { .types(type) .source(new SearchSourceBuilder() .fetchSource(false) - .query(QueryBuilders.termQuery("collate", randomBoolean() ? equilavent[0] : equilavent[1])) + .query(QueryBuilders.termQuery("collate", randomBoolean() ? equivalent[0] : equivalent[1])) .sort("collate") .sort("_id", SortOrder.DESC) // secondary sort should kick in because both will collate to same value ); @@ -204,7 +204,7 @@ public class ICUCollationKeywordFieldMapperIT extends ESIntegTestCase { String index = "foo"; String type = "mytype"; - String[] equilavent = {"TESTING", "testing"}; + String[] equivalent = {"TESTING", "testing"}; XContentBuilder builder = jsonBuilder() .startObject().startObject("properties") @@ -219,8 +219,8 @@ public class ICUCollationKeywordFieldMapperIT extends ESIntegTestCase { assertAcked(client().admin().indices().prepareCreate(index).addMapping(type, builder)); indexRandom(true, - client().prepareIndex(index, type, "1").setSource("{\"collate\":\"" + equilavent[0] + "\"}", XContentType.JSON), - client().prepareIndex(index, type, "2").setSource("{\"collate\":\"" + equilavent[1] + "\"}", XContentType.JSON) + client().prepareIndex(index, type, "1").setSource("{\"collate\":\"" + equivalent[0] + "\"}", XContentType.JSON), + client().prepareIndex(index, type, "2").setSource("{\"collate\":\"" + equivalent[1] + "\"}", XContentType.JSON) ); SearchRequest request = new SearchRequest() @@ -228,7 +228,7 @@ public class ICUCollationKeywordFieldMapperIT extends ESIntegTestCase { .types(type) .source(new SearchSourceBuilder() .fetchSource(false) - .query(QueryBuilders.termQuery("collate", randomBoolean() ? equilavent[0] : equilavent[1])) + .query(QueryBuilders.termQuery("collate", randomBoolean() ? equivalent[0] : equivalent[1])) .sort("collate") .sort("_id", SortOrder.DESC) // secondary sort should kick in because both will collate to same value ); @@ -247,7 +247,7 @@ public class ICUCollationKeywordFieldMapperIT extends ESIntegTestCase { String index = "foo"; String type = "mytype"; - String[] equilavent = {"foo-bar", "foo bar"}; + String[] equivalent = {"foo-bar", "foo bar"}; XContentBuilder builder = jsonBuilder() .startObject().startObject("properties") @@ -262,8 +262,8 @@ public class ICUCollationKeywordFieldMapperIT extends ESIntegTestCase { assertAcked(client().admin().indices().prepareCreate(index).addMapping(type, builder)); indexRandom(true, - client().prepareIndex(index, type, "1").setSource("{\"collate\":\"" + equilavent[0] + "\"}", XContentType.JSON), - client().prepareIndex(index, type, "2").setSource("{\"collate\":\"" + equilavent[1] + "\"}", XContentType.JSON) + client().prepareIndex(index, type, "1").setSource("{\"collate\":\"" + equivalent[0] + "\"}", XContentType.JSON), + client().prepareIndex(index, type, "2").setSource("{\"collate\":\"" + equivalent[1] + "\"}", XContentType.JSON) ); SearchRequest request = new SearchRequest() @@ -271,7 +271,7 @@ public class ICUCollationKeywordFieldMapperIT extends ESIntegTestCase { .types(type) .source(new SearchSourceBuilder() .fetchSource(false) - .query(QueryBuilders.termQuery("collate", randomBoolean() ? equilavent[0] : equilavent[1])) + .query(QueryBuilders.termQuery("collate", randomBoolean() ? equivalent[0] : equivalent[1])) .sort("collate") .sort("_id", SortOrder.DESC) // secondary sort should kick in because both will collate to same value ); @@ -467,7 +467,7 @@ public class ICUCollationKeywordFieldMapperIT extends ESIntegTestCase { RuleBasedCollator tailoredCollator = new RuleBasedCollator(baseCollator.getRules() + DIN5007_2_tailorings); String tailoredRules = tailoredCollator.getRules(); - String[] equilavent = {"Töne", "Toene"}; + String[] equivalent = {"Töne", "Toene"}; XContentBuilder builder = jsonBuilder() .startObject().startObject("properties") @@ -481,8 +481,8 @@ public class ICUCollationKeywordFieldMapperIT extends ESIntegTestCase { assertAcked(client().admin().indices().prepareCreate(index).addMapping(type, builder)); indexRandom(true, - client().prepareIndex(index, type, "1").setSource("{\"collate\":\"" + equilavent[0] + "\"}", XContentType.JSON), - client().prepareIndex(index, type, "2").setSource("{\"collate\":\"" + equilavent[1] + "\"}", XContentType.JSON) + client().prepareIndex(index, type, "1").setSource("{\"collate\":\"" + equivalent[0] + "\"}", XContentType.JSON), + client().prepareIndex(index, type, "2").setSource("{\"collate\":\"" + equivalent[1] + "\"}", XContentType.JSON) ); SearchRequest request = new SearchRequest() @@ -490,7 +490,7 @@ public class ICUCollationKeywordFieldMapperIT extends ESIntegTestCase { .types(type) .source(new SearchSourceBuilder() .fetchSource(false) - .query(QueryBuilders.termQuery("collate", randomBoolean() ? equilavent[0] : equilavent[1])) + .query(QueryBuilders.termQuery("collate", randomBoolean() ? equivalent[0] : equivalent[1])) .sort("collate", SortOrder.ASC) .sort("_id", SortOrder.DESC) // secondary sort should kick in because both will collate to same value ); diff --git a/plugins/examples/custom-suggester/src/test/resources/rest-api-spec/test/custom-suggester/20_suggest.yml b/plugins/examples/custom-suggester/src/test/resources/rest-api-spec/test/custom-suggester/20_suggest.yml index 3731a8b2112..bac4e1014ef 100644 --- a/plugins/examples/custom-suggester/src/test/resources/rest-api-spec/test/custom-suggester/20_suggest.yml +++ b/plugins/examples/custom-suggester/src/test/resources/rest-api-spec/test/custom-suggester/20_suggest.yml @@ -1,7 +1,7 @@ # tests that the custom suggester works # the issue that prompted serializing Suggestion as a registered named writeable was not revealed until -# a user found that it would fail when reducing suggestions in a multi node envrionment +# a user found that it would fail when reducing suggestions in a multi node environment # https://github.com/elastic/elasticsearch/issues/26585 "test custom suggester": - do: diff --git a/plugins/ingest-user-agent/src/main/resources/regexes.yml b/plugins/ingest-user-agent/src/main/resources/regexes.yml index 6c3369dc2f7..d9c16403cb8 100644 --- a/plugins/ingest-user-agent/src/main/resources/regexes.yml +++ b/plugins/ingest-user-agent/src/main/resources/regexes.yml @@ -748,7 +748,7 @@ os_parsers: # possibility of false positive when different marketing names share same NT kernel # e.g. windows server 2003 and windows xp # lots of ua strings have Windows NT 4.1 !?!?!?!? !?!? !? !????!?! !!! ??? !?!?! ? - # (very) roughly ordered in terms of frequency of occurence of regex (win xp currently most frequent, etc) + # (very) roughly ordered in terms of frequency of occurrence of regex (win xp currently most frequent, etc) ########## # ie mobile desktop mode @@ -2848,7 +2848,7 @@ device_parsers: device_replacement: 'Micromax $1' brand_replacement: 'Micromax' model_replacement: '$1' - # be carefull here with Acer e.g. A500 + # be careful here with Acer e.g. A500 - regex: '; *(A\d{2}|A[12]\d{2}|A90S|A110Q) Build' regex_flag: 'i' device_replacement: 'Micromax $1' diff --git a/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/10_basic.yml b/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/10_basic.yml index 04d85eb6078..9b899fe800c 100644 --- a/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/10_basic.yml +++ b/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/10_basic.yml @@ -1,5 +1,5 @@ --- -"Create things in the cluster state that we'll validate are there after the ugprade": +"Create things in the cluster state that we'll validate are there after the upgrade": - do: snapshot.create_repository: repository: my_repo diff --git a/qa/vagrant/src/test/resources/packaging/tests/60_systemd.bats b/qa/vagrant/src/test/resources/packaging/tests/60_systemd.bats index a7628d08bba..db062eb337e 100644 --- a/qa/vagrant/src/test/resources/packaging/tests/60_systemd.bats +++ b/qa/vagrant/src/test/resources/packaging/tests/60_systemd.bats @@ -190,7 +190,7 @@ setup() { @test "[SYSTEMD] start Elasticsearch with custom JVM options" { assert_file_exist $ESENVFILE # The custom config directory is not under /tmp or /var/tmp because - # systemd's private temp directory functionaly means different + # systemd's private temp directory functionally means different # processes can have different views of what's in these directories local temp=`mktemp -p /etc -d` cp "$ESCONFIG"/elasticsearch.yml "$temp" diff --git a/qa/vagrant/src/test/resources/packaging/tests/module_and_plugin_test_cases.bash b/qa/vagrant/src/test/resources/packaging/tests/module_and_plugin_test_cases.bash index 9a1ff6f2e23..622f570769c 100644 --- a/qa/vagrant/src/test/resources/packaging/tests/module_and_plugin_test_cases.bash +++ b/qa/vagrant/src/test/resources/packaging/tests/module_and_plugin_test_cases.bash @@ -97,7 +97,7 @@ fi rm -rf "$ESPLUGINS" # The custom plugins directory is not under /tmp or /var/tmp because - # systemd's private temp directory functionaly means different + # systemd's private temp directory functionally means different # processes can have different views of what's in these directories local es_plugins=$(mktemp -p /var -d -t 'plugins.XXXX') chown -R elasticsearch:elasticsearch "$es_plugins" diff --git a/qa/vagrant/src/test/resources/packaging/utils/utils.bash b/qa/vagrant/src/test/resources/packaging/utils/utils.bash index cb71e9e6ec1..f5a9f25df16 100644 --- a/qa/vagrant/src/test/resources/packaging/utils/utils.bash +++ b/qa/vagrant/src/test/resources/packaging/utils/utils.bash @@ -556,7 +556,7 @@ run_elasticsearch_tests() { move_config() { local oldConfig="$ESCONFIG" # The custom config directory is not under /tmp or /var/tmp because - # systemd's private temp directory functionaly means different + # systemd's private temp directory functionally means different # processes can have different views of what's in these directories export ESCONFIG="${1:-$(mktemp -p /etc -d -t 'config.XXXX')}" echo "Moving configuration directory from $oldConfig to $ESCONFIG" diff --git a/server/src/main/java/org/elasticsearch/action/search/SearchPhaseController.java b/server/src/main/java/org/elasticsearch/action/search/SearchPhaseController.java index 9b4d232f23c..7d08c9f864e 100644 --- a/server/src/main/java/org/elasticsearch/action/search/SearchPhaseController.java +++ b/server/src/main/java/org/elasticsearch/action/search/SearchPhaseController.java @@ -328,7 +328,7 @@ public final class SearchPhaseController extends AbstractComponent { SearchPhaseResult searchResultProvider = resultsLookup.apply(shardDoc.shardIndex); if (searchResultProvider == null) { // this can happen if we are hitting a shard failure during the fetch phase - // in this case we referenced the shard result via teh ScoreDoc but never got a + // in this case we referenced the shard result via the ScoreDoc but never got a // result from fetch. // TODO it would be nice to assert this in the future continue; @@ -380,7 +380,7 @@ public final class SearchPhaseController extends AbstractComponent { SearchPhaseResult fetchResultProvider = resultsLookup.apply(shardDoc.shardIndex); if (fetchResultProvider == null) { // this can happen if we are hitting a shard failure during the fetch phase - // in this case we referenced the shard result via teh ScoreDoc but never got a + // in this case we referenced the shard result via the ScoreDoc but never got a // result from fetch. // TODO it would be nice to assert this in the future continue; diff --git a/server/src/main/java/org/elasticsearch/bootstrap/Natives.java b/server/src/main/java/org/elasticsearch/bootstrap/Natives.java index e428df66f14..9bd2a5c2f3d 100644 --- a/server/src/main/java/org/elasticsearch/bootstrap/Natives.java +++ b/server/src/main/java/org/elasticsearch/bootstrap/Natives.java @@ -84,7 +84,7 @@ final class Natives { */ static String getShortPathName(final String path) { if (!JNA_AVAILABLE) { - logger.warn("cannot obtain short path for [{}] because JNA is not avilable", path); + logger.warn("cannot obtain short path for [{}] because JNA is not available", path); return path; } return JNANatives.getShortPathName(path); @@ -123,7 +123,7 @@ final class Natives { static void trySetMaxSizeVirtualMemory() { if (!JNA_AVAILABLE) { - logger.warn("cannot getrlimit RLIMIT_AS beacuse JNA is not available"); + logger.warn("cannot getrlimit RLIMIT_AS because JNA is not available"); return; } JNANatives.trySetMaxSizeVirtualMemory(); diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolver.java b/server/src/main/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolver.java index 09fde36e1f9..d0824ea7d8f 100644 --- a/server/src/main/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolver.java +++ b/server/src/main/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolver.java @@ -367,7 +367,7 @@ public class IndexNameExpressionResolver extends AbstractComponent { } aliases.add(alias); } else { - // If not, we have a non required alias for this index - no futher checking needed + // If not, we have a non required alias for this index - no further checking needed return null; } } diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexUpgradeService.java b/server/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexUpgradeService.java index 3ab20f62237..3d879907976 100644 --- a/server/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexUpgradeService.java +++ b/server/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexUpgradeService.java @@ -135,11 +135,11 @@ public class MetaDataIndexUpgradeService extends AbstractComponent { private void checkMappingsCompatibility(IndexMetaData indexMetaData) { try { - // We cannot instantiate real analysis server or similiarity service at this point because the node + // We cannot instantiate real analysis server or similarity service at this point because the node // might not have been started yet. However, we don't really need real analyzers or similarities at // this stage - so we can fake it using constant maps accepting every key. // This is ok because all used similarities and analyzers for this index were known before the upgrade. - // Missing analyzers and similarities plugin will still trigger the apropriate error during the + // Missing analyzers and similarities plugin will still trigger the appropriate error during the // actual upgrade. IndexSettings indexSettings = new IndexSettings(indexMetaData, this.settings); diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/TemplateUpgradeService.java b/server/src/main/java/org/elasticsearch/cluster/metadata/TemplateUpgradeService.java index af8289d03c1..1f042b4c576 100644 --- a/server/src/main/java/org/elasticsearch/cluster/metadata/TemplateUpgradeService.java +++ b/server/src/main/java/org/elasticsearch/cluster/metadata/TemplateUpgradeService.java @@ -200,7 +200,7 @@ public class TemplateUpgradeService extends AbstractComponent implements Cluster if (anyUpgradeFailed.get()) { logger.info("Templates were partially upgraded to version {}", Version.CURRENT); } else { - logger.info("Templates were upgraded successfuly to version {}", Version.CURRENT); + logger.info("Templates were upgraded successfully to version {}", Version.CURRENT); } // Check upgraders are satisfied after the update completed. If they still // report that changes are required, this might indicate a bug or that something diff --git a/server/src/main/java/org/elasticsearch/cluster/routing/IndexShardRoutingTable.java b/server/src/main/java/org/elasticsearch/cluster/routing/IndexShardRoutingTable.java index 0c263ec3c60..e3e4da481ce 100644 --- a/server/src/main/java/org/elasticsearch/cluster/routing/IndexShardRoutingTable.java +++ b/server/src/main/java/org/elasticsearch/cluster/routing/IndexShardRoutingTable.java @@ -265,7 +265,7 @@ public class IndexShardRoutingTable implements Iterable { /** * Returns an iterator over active and initializing shards, ordered by the adaptive replica - * selection forumla. Making sure though that its random within the active shards of the same + * selection formula. Making sure though that its random within the active shards of the same * (or missing) rank, and initializing shards are the last to iterate through. */ public ShardIterator activeInitializingShardsRankedIt(@Nullable ResponseCollectorService collector, diff --git a/server/src/main/java/org/elasticsearch/common/time/DateMathParser.java b/server/src/main/java/org/elasticsearch/common/time/DateMathParser.java index b2cb319071f..1e997cce23b 100644 --- a/server/src/main/java/org/elasticsearch/common/time/DateMathParser.java +++ b/server/src/main/java/org/elasticsearch/common/time/DateMathParser.java @@ -51,7 +51,7 @@ public interface DateMathParser { * * Examples are * - * 2014-11-18||-2y substracts two years from the input date + * 2014-11-18||-2y subtracts two years from the input date * now/m rounds the current time to minute granularity * * Supported rounding units are diff --git a/server/src/main/java/org/elasticsearch/index/analysis/PreConfiguredCharFilter.java b/server/src/main/java/org/elasticsearch/index/analysis/PreConfiguredCharFilter.java index 84eb0c4c349..a3fddce3e06 100644 --- a/server/src/main/java/org/elasticsearch/index/analysis/PreConfiguredCharFilter.java +++ b/server/src/main/java/org/elasticsearch/index/analysis/PreConfiguredCharFilter.java @@ -41,7 +41,7 @@ public class PreConfiguredCharFilter extends PreConfiguredAnalysisComponent create) { diff --git a/server/src/main/java/org/elasticsearch/index/reindex/AbstractBulkByScrollRequest.java b/server/src/main/java/org/elasticsearch/index/reindex/AbstractBulkByScrollRequest.java index b2e6f98f126..4aa9bc5ce14 100644 --- a/server/src/main/java/org/elasticsearch/index/reindex/AbstractBulkByScrollRequest.java +++ b/server/src/main/java/org/elasticsearch/index/reindex/AbstractBulkByScrollRequest.java @@ -150,7 +150,7 @@ public abstract class AbstractBulkByScrollRequest 0)) { e = addValidationError( diff --git a/server/src/main/java/org/elasticsearch/index/shard/IndexShard.java b/server/src/main/java/org/elasticsearch/index/shard/IndexShard.java index 11d8f44bef1..17756630517 100644 --- a/server/src/main/java/org/elasticsearch/index/shard/IndexShard.java +++ b/server/src/main/java/org/elasticsearch/index/shard/IndexShard.java @@ -791,7 +791,7 @@ public class IndexShard extends AbstractIndexShardComponent implements IndicesCl + "]"; ensureWriteAllowed(origin); // When there is a single type, the unique identifier is only composed of the _id, - // so there is no way to differenciate foo#1 from bar#1. This is especially an issue + // so there is no way to differentiate foo#1 from bar#1. This is especially an issue // if a user first deletes foo#1 and then indexes bar#1: since we do not encode the // _type in the uid it might look like we are reindexing the same document, which // would fail if bar#1 is indexed with a lower version than foo#1 was deleted with. diff --git a/server/src/main/java/org/elasticsearch/index/store/Store.java b/server/src/main/java/org/elasticsearch/index/store/Store.java index 13499dfd60c..18ccb988b8c 100644 --- a/server/src/main/java/org/elasticsearch/index/store/Store.java +++ b/server/src/main/java/org/elasticsearch/index/store/Store.java @@ -1047,7 +1047,7 @@ public class Store extends AbstractIndexShardComponent implements Closeable, Ref } /** - * returns the history uuid the store points at, or null if not existant. + * returns the history uuid the store points at, or null if nonexistent. */ public String getHistoryUUID() { return commitUserData.get(Engine.HISTORY_UUID_KEY); diff --git a/server/src/main/java/org/elasticsearch/index/translog/TranslogStats.java b/server/src/main/java/org/elasticsearch/index/translog/TranslogStats.java index 8dd5ddcee3b..1f877927455 100644 --- a/server/src/main/java/org/elasticsearch/index/translog/TranslogStats.java +++ b/server/src/main/java/org/elasticsearch/index/translog/TranslogStats.java @@ -85,12 +85,12 @@ public class TranslogStats implements Streamable, ToXContentFragment { return numberOfOperations; } - /** the size of the generations in the translog that weren't yet to comitted to lucene */ + /** the size of the generations in the translog that weren't yet to committed to lucene */ public long getUncommittedSizeInBytes() { return uncommittedSizeInBytes; } - /** the number of operations in generations of the translog that weren't yet to comitted to lucene */ + /** the number of operations in generations of the translog that weren't yet to committed to lucene */ public int getUncommittedOperations() { return uncommittedOperations; } diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FilterAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FilterAggregatorFactory.java index c8b1e630b85..c7d500e81ca 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FilterAggregatorFactory.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FilterAggregatorFactory.java @@ -50,7 +50,7 @@ public class FilterAggregatorFactory extends AggregatorFactory subInfos = fragInfo.getSubInfos(); diff --git a/server/src/main/java/org/elasticsearch/transport/Transport.java b/server/src/main/java/org/elasticsearch/transport/Transport.java index 90adf2ab9e7..fc1f0c9e5ec 100644 --- a/server/src/main/java/org/elasticsearch/transport/Transport.java +++ b/server/src/main/java/org/elasticsearch/transport/Transport.java @@ -150,7 +150,7 @@ public interface Transport extends LifecycleComponent { } /** - * This class represents a response context that encapsulates the actual response handler, the action and the conneciton it was + * This class represents a response context that encapsulates the actual response handler, the action and the connection it was * executed on. */ final class ResponseContext { diff --git a/server/src/test/java/org/elasticsearch/action/bulk/BulkRequestTests.java b/server/src/test/java/org/elasticsearch/action/bulk/BulkRequestTests.java index f1842b5b0dd..1b2c238098e 100644 --- a/server/src/test/java/org/elasticsearch/action/bulk/BulkRequestTests.java +++ b/server/src/test/java/org/elasticsearch/action/bulk/BulkRequestTests.java @@ -149,7 +149,7 @@ public class BulkRequestTests extends ESTestCase { IllegalArgumentException exc = expectThrows(IllegalArgumentException.class, () -> bulkRequest.add(bulkAction.getBytes(StandardCharsets.UTF_8), 0, bulkAction.length(), null, null, XContentType.JSON)); assertThat(exc.getMessage(), - containsString("Malformed action/metadata line [5], expected a simple value for field [_unkown] but found [START_ARRAY]")); + containsString("Malformed action/metadata line [5], expected a simple value for field [_unknown] but found [START_ARRAY]")); } public void testSimpleBulk8() throws Exception { diff --git a/server/src/test/java/org/elasticsearch/action/support/replication/TransportReplicationActionTests.java b/server/src/test/java/org/elasticsearch/action/support/replication/TransportReplicationActionTests.java index 6c084cb29cd..ff868c3250a 100644 --- a/server/src/test/java/org/elasticsearch/action/support/replication/TransportReplicationActionTests.java +++ b/server/src/test/java/org/elasticsearch/action/support/replication/TransportReplicationActionTests.java @@ -1020,7 +1020,7 @@ public class TransportReplicationActionTests extends ESTestCase { // publish a new state (same as the old state with the version incremented) setState(clusterService, stateWithNodes); - // Assert that the request was retried, this time successfull + // Assert that the request was retried, this time successful assertTrue("action should have been successfully called on retry but was not", calledSuccessfully.get()); transportService.stop(); } diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/OperationRoutingTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/OperationRoutingTests.java index de3223517b9..7e74a35cf55 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/OperationRoutingTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/OperationRoutingTests.java @@ -599,7 +599,7 @@ public class OperationRoutingTests extends ESTestCase{ collector.addNodeStatistics("node_1", 4, TimeValue.timeValueMillis(300).nanos(), TimeValue.timeValueMillis(250).nanos()); groupIterator = opRouting.searchShards(state, indexNames, null, null, collector, outstandingRequests); shardChoice = groupIterator.get(0).nextOrNull(); - // finally, node 2 is choosen instead + // finally, node 2 is chosen instead assertThat(shardChoice.currentNodeId(), equalTo("node_2")); IOUtils.close(clusterService); diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/FilterAllocationDeciderTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/FilterAllocationDeciderTests.java index ba6fe5b9a5a..4d5639a05ea 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/FilterAllocationDeciderTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/FilterAllocationDeciderTests.java @@ -63,7 +63,7 @@ public class FilterAllocationDeciderTests extends ESAllocationTestCase { "node2").build()); RoutingTable routingTable = state.routingTable(); - // we can initally only allocate on node2 + // we can initially only allocate on node2 assertEquals(routingTable.index("idx").shard(0).shards().get(0).state(), INITIALIZING); assertEquals(routingTable.index("idx").shard(0).shards().get(0).currentNodeId(), "node2"); routingTable = service.applyFailedShard(state, routingTable.index("idx").shard(0).shards().get(0), randomBoolean()).routingTable(); diff --git a/server/src/test/java/org/elasticsearch/index/mapper/MultiFieldCopyToMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/MultiFieldCopyToMapperTests.java index 9e31bd76c30..b17abcc17b3 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/MultiFieldCopyToMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/MultiFieldCopyToMapperTests.java @@ -37,7 +37,7 @@ public class MultiFieldCopyToMapperTests extends ESTestCase { public void testExceptionForCopyToInMultiFields() throws IOException { XContentBuilder mapping = createMappinmgWithCopyToInMultiField(); - // first check that for newer versions we throw exception if copy_to is found withing multi field + // first check that for newer versions we throw exception if copy_to is found within multi field MapperService mapperService = MapperTestUtils.newMapperService(xContentRegistry(), createTempDir(), Settings.EMPTY, "test"); try { mapperService.parse("type", new CompressedXContent(Strings.toString(mapping)), true); diff --git a/server/src/test/java/org/elasticsearch/index/shard/IndexShardIT.java b/server/src/test/java/org/elasticsearch/index/shard/IndexShardIT.java index 56a14da845f..5c610feba19 100644 --- a/server/src/test/java/org/elasticsearch/index/shard/IndexShardIT.java +++ b/server/src/test/java/org/elasticsearch/index/shard/IndexShardIT.java @@ -579,7 +579,7 @@ public class IndexShardIT extends ESSingleNodeTestCase { // Generate a couple of segments client().prepareIndex("test", "_doc", "1").setSource("{\"foo\":\"" + randomAlphaOfLength(100) + "\"}", XContentType.JSON) .setRefreshPolicy(IMMEDIATE).get(); - // Use routing so 2 documents are guarenteed to be on the same shard + // Use routing so 2 documents are guaranteed to be on the same shard String routing = randomAlphaOfLength(5); client().prepareIndex("test", "_doc", "2").setSource("{\"foo\":\"" + randomAlphaOfLength(100) + "\"}", XContentType.JSON) .setRefreshPolicy(IMMEDIATE).setRouting(routing).get(); diff --git a/server/src/test/java/org/elasticsearch/index/translog/TranslogTests.java b/server/src/test/java/org/elasticsearch/index/translog/TranslogTests.java index 9d18845a05e..19c25fed072 100644 --- a/server/src/test/java/org/elasticsearch/index/translog/TranslogTests.java +++ b/server/src/test/java/org/elasticsearch/index/translog/TranslogTests.java @@ -2323,7 +2323,7 @@ public class TranslogTests extends ESTestCase { @Override void deleteReaderFiles(TranslogReader reader) { if (fail.fail()) { - // simulate going OOM and dieing just at the wrong moment. + // simulate going OOM and dying just at the wrong moment. throw new RuntimeException("simulated"); } else { super.deleteReaderFiles(reader); diff --git a/server/src/test/java/org/elasticsearch/monitor/process/ProcessProbeTests.java b/server/src/test/java/org/elasticsearch/monitor/process/ProcessProbeTests.java index 4a44c518051..aceee1474c6 100644 --- a/server/src/test/java/org/elasticsearch/monitor/process/ProcessProbeTests.java +++ b/server/src/test/java/org/elasticsearch/monitor/process/ProcessProbeTests.java @@ -69,7 +69,7 @@ public class ProcessProbeTests extends ESTestCase { ProcessStats.Mem mem = stats.getMem(); assertNotNull(mem); - // Commited total virtual memory can return -1 if not supported, let's see which platforms fail + // Committed total virtual memory can return -1 if not supported, let's see which platforms fail assertThat(mem.getTotalVirtual().getBytes(), greaterThan(0L)); } } diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalScriptedMetricTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalScriptedMetricTests.java index d1918c170ed..7d10f49ea86 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalScriptedMetricTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalScriptedMetricTests.java @@ -113,7 +113,7 @@ public class InternalScriptedMetricTests extends InternalAggregationTestCase ((List) script.get("states")).size()), diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalTopHitsTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalTopHitsTests.java index 2cee3548aba..c5c99a5b136 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalTopHitsTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalTopHitsTests.java @@ -170,7 +170,7 @@ public class InternalTopHitsTests extends InternalAggregationTestCase clusterUniqueSettings = new HashSet<>(); diff --git a/x-pack/docs/en/watcher/actions/email.asciidoc b/x-pack/docs/en/watcher/actions/email.asciidoc index 8c56f2e5da3..acaa85c3c03 100644 --- a/x-pack/docs/en/watcher/actions/email.asciidoc +++ b/x-pack/docs/en/watcher/actions/email.asciidoc @@ -61,7 +61,7 @@ configuring the `http` attachment type, you must specify the request URL. The `reporting` attachment type is a special type to include PDF rendered dashboards from kibana. This type is consistently polling the kibana app if the dashboard rendering is done, preventing long running HTTP connections, that are potentially -killed by firewalls or load balancers inbetween. +killed by firewalls or load balancers in-between. [source,js] -------------------------------------------------- diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/graph/Hop.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/graph/Hop.java index e61403e8b37..ee5d3a279a5 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/graph/Hop.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/graph/Hop.java @@ -35,7 +35,7 @@ import java.util.List; *

* Optionally, each hop can contain a "guiding query" that further limits the set of documents considered. * In our weblog example above we might choose to constrain the second hop to only look at log records that - * had a reponse code of 404. + * had a response code of 404. *

*

* If absent, the list of {@link VertexRequest}s is inherited from the prior Hop's list to avoid repeating diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/XPackPlugin.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/XPackPlugin.java index ca76e71e052..c2be7f828b1 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/XPackPlugin.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/XPackPlugin.java @@ -123,7 +123,7 @@ public class XPackPlugin extends XPackClientPlugin implements ScriptPlugin, Exte //private final Environment env; protected boolean transportClientMode; protected final Licensing licensing; - // These should not be directly accessed as they cannot be overriden in tests. Please use the getters so they can be overridden. + // These should not be directly accessed as they cannot be overridden in tests. Please use the getters so they can be overridden. private static final SetOnce licenseState = new SetOnce<>(); private static final SetOnce sslService = new SetOnce<>(); private static final SetOnce licenseService = new SetOnce<>(); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/config/Detector.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/config/Detector.java index b5083aeecb9..b6275c6e057 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/config/Detector.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/config/Detector.java @@ -385,7 +385,7 @@ public class Detector implements ToXContentObject, Writeable { } /** - * Excludes frequently-occuring metrics from the analysis; + * Excludes frequently-occurring metrics from the analysis; * can apply to 'by' field, 'over' field, or both * * @return the value that the user set diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/history/WatchRecord.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/history/WatchRecord.java index 2b28c2f15c9..b972781695a 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/history/WatchRecord.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/history/WatchRecord.java @@ -106,7 +106,7 @@ public abstract class WatchRecord implements ToXContentObject { } if (executionResult.conditionResult().met()) { final Collection values = executionResult.actionsResults().values(); - // acknowledged as state wins because the user had explicitely set this, where as throttled may happen due to execution + // acknowledged as state wins because the user had explicitly set this, where as throttled may happen due to execution if (values.stream().anyMatch((r) -> r.action().status() == Action.Result.Status.ACKNOWLEDGED)) { return ExecutionState.ACKNOWLEDGED; } else if (values.stream().anyMatch((r) -> r.action().status() == Action.Result.Status.THROTTLED)) { diff --git a/x-pack/plugin/graph/src/main/java/org/elasticsearch/xpack/graph/action/TransportGraphExploreAction.java b/x-pack/plugin/graph/src/main/java/org/elasticsearch/xpack/graph/action/TransportGraphExploreAction.java index 25f2511fbc0..096f6bf63be 100644 --- a/x-pack/plugin/graph/src/main/java/org/elasticsearch/xpack/graph/action/TransportGraphExploreAction.java +++ b/x-pack/plugin/graph/src/main/java/org/elasticsearch/xpack/graph/action/TransportGraphExploreAction.java @@ -193,7 +193,7 @@ public class TransportGraphExploreAction extends HandledTransportAction { - logger.debug("Succesfully updated state for rollup job [" + job.getConfig().getId() + "] to [" + logger.debug("Successfully updated state for rollup job [" + job.getConfig().getId() + "] to [" + state.getIndexerState() + "][" + state.getPosition() + "]"); listener.onResponse(new StartRollupJobAction.Response(true)); }, @@ -308,7 +308,7 @@ public class RollupJobTask extends AllocatedPersistentTask implements SchedulerE updatePersistentTaskState(state, ActionListener.wrap( (task) -> { - logger.debug("Succesfully updated state for rollup job [" + job.getConfig().getId() + logger.debug("Successfully updated state for rollup job [" + job.getConfig().getId() + "] to [" + state.getIndexerState() + "]"); listener.onResponse(new StopRollupJobAction.Response(true)); }, diff --git a/x-pack/plugin/rollup/src/test/java/org/elasticsearch/xpack/rollup/job/RollupJobTaskTests.java b/x-pack/plugin/rollup/src/test/java/org/elasticsearch/xpack/rollup/job/RollupJobTaskTests.java index a47d057b5d5..59073e763c2 100644 --- a/x-pack/plugin/rollup/src/test/java/org/elasticsearch/xpack/rollup/job/RollupJobTaskTests.java +++ b/x-pack/plugin/rollup/src/test/java/org/elasticsearch/xpack/rollup/job/RollupJobTaskTests.java @@ -202,7 +202,7 @@ public class RollupJobTaskTests extends ESTestCase { } else if (c == 1) { assertThat(((RollupJobStatus) taskState).getIndexerState(), equalTo(IndexerState.STOPPED)); } else { - fail("Should not have updated persistent statuse > 2 times"); + fail("Should not have updated persistent statuses > 2 times"); } listener.onResponse(new PersistentTasksCustomMetaData.PersistentTask<>("foo", RollupField.TASK_NAME, job, 1, new PersistentTasksCustomMetaData.Assignment("foo", "foo"))); @@ -688,7 +688,7 @@ public class RollupJobTaskTests extends ESTestCase { } else if (c == 2) { assertThat(((RollupJobStatus) taskState).getIndexerState(), equalTo(IndexerState.STOPPED)); } else { - fail("Should not have updated persistent statuse > 3 times"); + fail("Should not have updated persistent statuses > 3 times"); } listener.onResponse(new PersistentTasksCustomMetaData.PersistentTask<>("foo", RollupField.TASK_NAME, job, 1, new PersistentTasksCustomMetaData.Assignment("foo", "foo"))); diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/ldap/LdapSessionFactory.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/ldap/LdapSessionFactory.java index 70b2f0015cf..464a0cfc61c 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/ldap/LdapSessionFactory.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/ldap/LdapSessionFactory.java @@ -115,7 +115,7 @@ public class LdapSessionFactory extends SessionFactory { * Securely escapes the username and inserts it into the template using MessageFormat * * @param username username to insert into the DN template. Any commas, equals or plus will be escaped. - * @return DN (distinquished name) build from the template. + * @return DN (distinguished name) build from the template. */ String buildDnFromTemplate(String username, String template) { //this value must be escaped to avoid manipulation of the template DN. diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/support/UserRoleMapper.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/support/UserRoleMapper.java index 8c60e565e68..2c728fa002c 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/support/UserRoleMapper.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/support/UserRoleMapper.java @@ -151,7 +151,7 @@ public interface UserRoleMapper { * {@link ExpressionModel} class can take a custom {@code Predicate} that tests whether the data in the model * matches the {@link FieldExpression.FieldValue value} in the expression. * - * The string constructor parameter may or may not actaully parse as a DN - the "dn" field should + * The string constructor parameter may or may not actually parse as a DN - the "dn" field should * always be a DN, however groups will be a DN if they're from an LDAP/AD realm, but often won't be for a SAML realm. * * Because the {@link FieldExpression.FieldValue} might be a pattern ({@link CharacterRunAutomaton automaton}), diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/transport/ServerTransportFilter.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/transport/ServerTransportFilter.java index fcbae00ba09..d59064619fc 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/transport/ServerTransportFilter.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/transport/ServerTransportFilter.java @@ -53,7 +53,7 @@ public interface ServerTransportFilter { throws IOException; /** - * The server trasnport filter that should be used in nodes as it ensures that an incoming + * The server transport filter that should be used in nodes as it ensures that an incoming * request is properly authenticated and authorized */ class NodeProfile implements ServerTransportFilter { diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/TemplateUpgraderTests.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/TemplateUpgraderTests.java index 2d891afea8c..95d821cb256 100644 --- a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/TemplateUpgraderTests.java +++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/TemplateUpgraderTests.java @@ -31,7 +31,7 @@ import static org.hamcrest.Matchers.not; /** * This test ensures, that the plugin template upgrader can add and remove * templates when started within security, as this requires certain - * system priviliges + * system privileges */ @ClusterScope(maxNumDataNodes = 1, scope = Scope.SUITE, numClientNodes = 0) public class TemplateUpgraderTests extends SecurityIntegTestCase { diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/support/LdapMetaDataResolverTests.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/support/LdapMetaDataResolverTests.java index bddfd3f4bcf..74502b4e2b3 100644 --- a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/support/LdapMetaDataResolverTests.java +++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/support/LdapMetaDataResolverTests.java @@ -40,7 +40,7 @@ public class LdapMetaDataResolverTests extends ESTestCase { new Attribute("cn", "Clint Barton"), new Attribute("uid", "hawkeye"), new Attribute("email", "clint.barton@shield.gov"), - new Attribute("memberOf", "cn=staff,ou=groups,dc=exmaple,dc=com", "cn=admin,ou=groups,dc=exmaple,dc=com") + new Attribute("memberOf", "cn=staff,ou=groups,dc=example,dc=com", "cn=admin,ou=groups,dc=example,dc=com") ); final Map map = resolve(attributes); assertThat(map.size(), equalTo(2)); @@ -75,4 +75,4 @@ public class LdapMetaDataResolverTests extends ESTestCase { resolver.resolve(null, HAWKEYE_DN, TimeValue.timeValueSeconds(1), logger, attributes, future); return future.get(); } -} \ No newline at end of file +} diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/saml/SamlAuthenticatorTests.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/saml/SamlAuthenticatorTests.java index 7ae41de900e..22071d6010d 100644 --- a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/saml/SamlAuthenticatorTests.java +++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/saml/SamlAuthenticatorTests.java @@ -1636,7 +1636,7 @@ public class SamlAuthenticatorTests extends SamlTestCase { /* Permutation 7 - Mangle the contents of the response to be - + @@ -1645,16 +1645,16 @@ public class SamlAuthenticatorTests extends SamlTestCase { */ final Element response = (Element) legitimateDocument. getElementsByTagNameNS(SAML20P_NS, "Response").item(0); - final Element extentions = legitimateDocument.createElement("Extensions"); + final Element extensions = legitimateDocument.createElement("Extensions"); final Element assertion = (Element) legitimateDocument. getElementsByTagNameNS(SAML20_NS, "Assertion").item(0); - response.insertBefore(extentions, assertion); + response.insertBefore(extensions, assertion); final Element forgedAssertion = (Element) assertion.cloneNode(true); forgedAssertion.setAttribute("ID", "_forged_assertion_id"); final Element forgedSignature = (Element) forgedAssertion. getElementsByTagNameNS("http://www.w3.org/2000/09/xmldsig#", "Signature").item(0); forgedAssertion.removeChild(forgedSignature); - extentions.appendChild(forgedAssertion); + extensions.appendChild(forgedAssertion); final SamlToken forgedToken = token(SamlUtils.toString((legitimateDocument.getDocumentElement()))); final ElasticsearchSecurityException exception = expectSamlException(() -> authenticator.authenticate(forgedToken)); assertThat(exception.getMessage(), containsString("Failed to parse SAML")); diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/transport/filter/IpFilteringUpdateTests.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/transport/filter/IpFilteringUpdateTests.java index 9a960eae2d6..65a5fb080cd 100644 --- a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/transport/filter/IpFilteringUpdateTests.java +++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/transport/filter/IpFilteringUpdateTests.java @@ -121,7 +121,7 @@ public class IpFilteringUpdateTests extends SecurityIntegTestCase { } } - // issue #762, occured because in the above test we use HTTP and transport + // issue #762, occurred because in the above test we use HTTP and transport public void testThatDisablingIpFilterWorksAsExpected() throws Exception { Settings settings = Settings.builder() .put("xpack.security.transport.filter.deny", "127.0.0.8") diff --git a/x-pack/plugin/security/src/test/resources/org/elasticsearch/xpack/security/authz/store/invalid_roles.yml b/x-pack/plugin/security/src/test/resources/org/elasticsearch/xpack/security/authz/store/invalid_roles.yml index 11657750c51..1bef00f7371 100644 --- a/x-pack/plugin/security/src/test/resources/org/elasticsearch/xpack/security/authz/store/invalid_roles.yml +++ b/x-pack/plugin/security/src/test/resources/org/elasticsearch/xpack/security/authz/store/invalid_roles.yml @@ -23,7 +23,7 @@ role3: cluster: ALL indices: '*': ALL -# invalid role indices privilegs +# invalid role indices privileges role4: cluster: ALL indices: diff --git a/x-pack/plugin/sql/jdbc/src/main/java/org/elasticsearch/xpack/sql/jdbc/debug/Debug.java b/x-pack/plugin/sql/jdbc/src/main/java/org/elasticsearch/xpack/sql/jdbc/debug/Debug.java index ccba7429a4b..831b3177f56 100644 --- a/x-pack/plugin/sql/jdbc/src/main/java/org/elasticsearch/xpack/sql/jdbc/debug/Debug.java +++ b/x-pack/plugin/sql/jdbc/src/main/java/org/elasticsearch/xpack/sql/jdbc/debug/Debug.java @@ -43,7 +43,7 @@ import javax.sql.DataSource; * This class tries to cater to both audiences - use the legacy, Writer way if needed though strive to use the * proper typical approach, that of specifying intention and output (file) in the URL. * - * For this reason the {@link System#out} and {@link System#err} are being refered in this class though are used only + * For this reason the {@link System#out} and {@link System#err} are being referred in this class though are used only * when needed. */ public final class Debug { diff --git a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/expression/function/FunctionDefinition.java b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/expression/function/FunctionDefinition.java index ec76b6ab34a..d513ca07df4 100644 --- a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/expression/function/FunctionDefinition.java +++ b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/expression/function/FunctionDefinition.java @@ -23,7 +23,7 @@ public class FunctionDefinition { private final List aliases; private final Class clazz; /** - * Is this a datetime function comaptible with {@code EXTRACT}. + * Is this a datetime function compatible with {@code EXTRACT}. */ private final boolean datetime; private final Builder builder; @@ -60,7 +60,7 @@ public class FunctionDefinition { } /** - * Is this a datetime function comaptible with {@code EXTRACT}. + * Is this a datetime function compatible with {@code EXTRACT}. */ boolean datetime() { return datetime; diff --git a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/expression/function/scalar/string/StringFunctionUtils.java b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/expression/function/scalar/string/StringFunctionUtils.java index 1f38456cba1..33eb61012ea 100644 --- a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/expression/function/scalar/string/StringFunctionUtils.java +++ b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/expression/function/scalar/string/StringFunctionUtils.java @@ -15,7 +15,7 @@ abstract class StringFunctionUtils { * * @param s the original String * @param start starting position for the substring within the original string. 0-based index position - * @param length length in characters of the substracted substring + * @param length length in characters of the subtracted substring * @return the resulting String */ static String substring(String s, int start, int length) { diff --git a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/parser/ExpressionBuilder.java b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/parser/ExpressionBuilder.java index 640008aae3c..0c738bcc1e9 100644 --- a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/parser/ExpressionBuilder.java +++ b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/parser/ExpressionBuilder.java @@ -291,7 +291,7 @@ abstract class ExpressionBuilder extends IdentifierBuilder { } return new Neg(source(ctx.operator), value); default: - throw new ParsingException(loc, "Unknown arithemtic {}", ctx.operator.getText()); + throw new ParsingException(loc, "Unknown arithmetic {}", ctx.operator.getText()); } } @@ -314,7 +314,7 @@ abstract class ExpressionBuilder extends IdentifierBuilder { case SqlBaseParser.MINUS: return new Sub(loc, left, right); default: - throw new ParsingException(loc, "Unknown arithemtic {}", ctx.operator.getText()); + throw new ParsingException(loc, "Unknown arithmetic {}", ctx.operator.getText()); } } diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/test/ml/datafeeds_crud.yml b/x-pack/plugin/src/test/resources/rest-api-spec/test/ml/datafeeds_crud.yml index a0f79b7caba..bf2f3bcec1c 100644 --- a/x-pack/plugin/src/test/resources/rest-api-spec/test/ml/datafeeds_crud.yml +++ b/x-pack/plugin/src/test/resources/rest-api-spec/test/ml/datafeeds_crud.yml @@ -172,7 +172,7 @@ setup: "job_id":"datafeeds-crud-1", "indexes":["index-foo"], "types":["type-bar"], - "query":{"match_all_mispelled":{}} + "query":{"match_all_misspelled":{}} } --- diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/test/monitoring/bulk/20_privileges.yml b/x-pack/plugin/src/test/resources/rest-api-spec/test/monitoring/bulk/20_privileges.yml index b1d4158ac15..9f065bb5522 100644 --- a/x-pack/plugin/src/test/resources/rest-api-spec/test/monitoring/bulk/20_privileges.yml +++ b/x-pack/plugin/src/test/resources/rest-api-spec/test/monitoring/bulk/20_privileges.yml @@ -34,7 +34,7 @@ setup: # read the monitoring indices. - do: xpack.security.put_role: - name: "unkown_agent_role" + name: "unknown_agent_role" body: > { "cluster": ["monitor"], @@ -51,7 +51,7 @@ setup: body: > { "password": "s3krit", - "roles" : [ "unkown_agent_role" ] + "roles" : [ "unknown_agent_role" ] } --- @@ -70,7 +70,7 @@ teardown: ignore: 404 - do: xpack.security.delete_role: - name: "unkown_agent_role" + name: "unknown_agent_role" ignore: 404 --- diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/test/rollup/delete_job.yml b/x-pack/plugin/src/test/resources/rest-api-spec/test/rollup/delete_job.yml index 298cf27fa2f..e5c7c762340 100644 --- a/x-pack/plugin/src/test/resources/rest-api-spec/test/rollup/delete_job.yml +++ b/x-pack/plugin/src/test/resources/rest-api-spec/test/rollup/delete_job.yml @@ -177,7 +177,7 @@ setup: - is_true: acknowledged --- -"Test delete non-existant job": +"Test delete non-existent job": - do: catch: /the task with id does_not_exist doesn't exist/ diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/test/rollup/start_job.yml b/x-pack/plugin/src/test/resources/rest-api-spec/test/rollup/start_job.yml index 7adba9035eb..38a357bcd68 100644 --- a/x-pack/plugin/src/test/resources/rest-api-spec/test/rollup/start_job.yml +++ b/x-pack/plugin/src/test/resources/rest-api-spec/test/rollup/start_job.yml @@ -37,7 +37,7 @@ setup: } --- -"Test start non-existant job": +"Test start nonexistent job": - do: catch: /Task for Rollup Job \[does_not_exist\] not found/ diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/test/rollup/stop_job.yml b/x-pack/plugin/src/test/resources/rest-api-spec/test/rollup/stop_job.yml index 42a1dea8163..849aca3332d 100644 --- a/x-pack/plugin/src/test/resources/rest-api-spec/test/rollup/stop_job.yml +++ b/x-pack/plugin/src/test/resources/rest-api-spec/test/rollup/stop_job.yml @@ -37,7 +37,7 @@ setup: } --- -"Test stop non-existant job": +"Test stop nonexistent job": - do: catch: /Task for Rollup Job \[does_not_exist\] not found/ diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/test/set_security_user/10_small_users_one_index.yml b/x-pack/plugin/src/test/resources/rest-api-spec/test/set_security_user/10_small_users_one_index.yml index 0e42a13b8fd..24ea7c03c80 100644 --- a/x-pack/plugin/src/test/resources/rest-api-spec/test/set_security_user/10_small_users_one_index.yml +++ b/x-pack/plugin/src/test/resources/rest-api-spec/test/set_security_user/10_small_users_one_index.yml @@ -91,7 +91,7 @@ teardown: ignore: 404 --- -"Test shared index seperating user by using DLS": +"Test shared index separating user by using DLS": - do: headers: Authorization: "Basic am9lOngtcGFjay10ZXN0LXBhc3N3b3Jk" diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/test/watcher/ack_watch/30_reset_ack_after_unmet_condition.yml b/x-pack/plugin/src/test/resources/rest-api-spec/test/watcher/ack_watch/30_reset_ack_after_unmet_condition.yml index 5b2d00235c5..2f3a8153464 100644 --- a/x-pack/plugin/src/test/resources/rest-api-spec/test/watcher/ack_watch/30_reset_ack_after_unmet_condition.yml +++ b/x-pack/plugin/src/test/resources/rest-api-spec/test/watcher/ack_watch/30_reset_ack_after_unmet_condition.yml @@ -12,7 +12,7 @@ teardown: ignore: 404 --- -"Ensure that ack status is reset after unsuccesful execution": +"Ensure that ack status is reset after unsuccessful execution": - do: xpack.watcher.put_watch: diff --git a/x-pack/plugin/upgrade/src/test/java/org/elasticsearch/xpack/upgrade/IndexUpgradeIT.java b/x-pack/plugin/upgrade/src/test/java/org/elasticsearch/xpack/upgrade/IndexUpgradeIT.java index 74eb029e916..56a17674b49 100644 --- a/x-pack/plugin/upgrade/src/test/java/org/elasticsearch/xpack/upgrade/IndexUpgradeIT.java +++ b/x-pack/plugin/upgrade/src/test/java/org/elasticsearch/xpack/upgrade/IndexUpgradeIT.java @@ -47,7 +47,7 @@ public class IndexUpgradeIT extends IndexUpgradeIntegTestCase { public void testIndexUpgradeInfoLicense() throws Exception { // This test disables all licenses and generates a new one using dev private key - // in non-snapshot builds we are using produciton public key for license verification + // in non-snapshot builds we are using production public key for license verification // which makes this test to fail assumeTrue("License is only valid when tested against snapshot/test keys", Build.CURRENT.isSnapshot()); assertAcked(client().admin().indices().prepareCreate("test").get()); diff --git a/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherIndexingListener.java b/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherIndexingListener.java index f3b77b922aa..086528054bc 100644 --- a/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherIndexingListener.java +++ b/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/WatcherIndexingListener.java @@ -143,7 +143,7 @@ final class WatcherIndexingListener extends AbstractComponent implements Indexin * * @param shardId The shard id object of the document being processed * @param index The index operation - * @param ex The exception occured during indexing + * @param ex The exception occurred during indexing */ @Override public void postIndex(ShardId shardId, Engine.Index index, Exception ex) { diff --git a/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/ExecutionService.java b/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/ExecutionService.java index 3507bd4eb36..7a0b7f14bca 100644 --- a/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/ExecutionService.java +++ b/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/execution/ExecutionService.java @@ -122,7 +122,7 @@ public class ExecutionService extends AbstractComponent { /** * Pause the execution of the watcher executor, and empty the state. - * Pausing means, that no new watch executions will be done unless this pausing is explicitely unset. + * Pausing means, that no new watch executions will be done unless this pausing is explicitly unset. * This is important when watcher is stopped, so that scheduled watches do not accidentally get executed. * This should not be used when we need to reload watcher based on some cluster state changes, then just calling * {@link #clearExecutionsAndQueue()} is the way to go @@ -338,7 +338,7 @@ public class ExecutionService extends AbstractComponent { public void updateWatchStatus(Watch watch) throws IOException { // at the moment we store the status together with the watch, // so we just need to update the watch itself - // we do not want to update the status.state field, as it might have been deactivated inbetween + // we do not want to update the status.state field, as it might have been deactivated in-between Map parameters = MapBuilder.newMapBuilder() .put(Watch.INCLUDE_STATUS_KEY, "true") .put(WatchStatus.INCLUDE_STATE, "false") diff --git a/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/slack/SlackActionTests.java b/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/slack/SlackActionTests.java index 29eaece9037..ce7ed9fdbde 100644 --- a/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/slack/SlackActionTests.java +++ b/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/actions/slack/SlackActionTests.java @@ -117,7 +117,7 @@ public class SlackActionTests extends ESTestCase { hasError = true; break; case 1: - when(response.status()).thenReturn(randomIntBetween(300, 600)); // error reponse + when(response.status()).thenReturn(randomIntBetween(300, 600)); // error response messages.add(SentMessages.SentMessage.responded(randomAlphaOfLength(10), message, request, response)); hasError = true; break; diff --git a/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/common/http/HttpClientTests.java b/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/common/http/HttpClientTests.java index a8330743c0a..519dbbeee86 100644 --- a/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/common/http/HttpClientTests.java +++ b/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/common/http/HttpClientTests.java @@ -522,7 +522,7 @@ public class HttpClientTests extends ESTestCase { }); HttpRequest request = HttpRequest.builder("localhost", serverSocket.getLocalPort()).path("/").build(); expectThrows(ClientProtocolException.class, () -> httpClient.execute(request)); - assertThat("A server side exception occured, but shouldn't", hasExceptionHappened.get(), is(nullValue())); + assertThat("A server side exception occurred, but shouldn't", hasExceptionHappened.get(), is(nullValue())); } finally { terminate(executor); } diff --git a/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/delete/DeleteWatchTests.java b/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/delete/DeleteWatchTests.java index 2f502cb95aa..065981a4260 100644 --- a/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/delete/DeleteWatchTests.java +++ b/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/delete/DeleteWatchTests.java @@ -83,7 +83,7 @@ public class DeleteWatchTests extends AbstractWatcherIntegrationTestCase { // watch has been executed successfully String state = ObjectPath.eval("state", source); assertThat(state, is("executed")); - // no exception occured + // no exception occurred assertThat(source, not(hasKey("exception"))); } } diff --git a/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/execute/ExecuteWatchTests.java b/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/execute/ExecuteWatchTests.java index 53d5458706a..c743922a4d7 100644 --- a/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/execute/ExecuteWatchTests.java +++ b/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/execute/ExecuteWatchTests.java @@ -105,7 +105,7 @@ public class ExecuteWatchTests extends AbstractWatcherIntegrationTestCase { } if (mode.force()) { - // since we're forcing, lets ack the action, such that it'd suppoed to be throttled + // since we're forcing, lets ack the action, such that it'd supposed to be throttled // but forcing will ignore the throttling // lets wait for the watch to be ackable diff --git a/x-pack/qa/smoke-test-security-with-mustache/src/test/resources/rest-api-spec/test/20_small_users_one_index.yml b/x-pack/qa/smoke-test-security-with-mustache/src/test/resources/rest-api-spec/test/20_small_users_one_index.yml index a015a88a315..ff5fad0e82d 100644 --- a/x-pack/qa/smoke-test-security-with-mustache/src/test/resources/rest-api-spec/test/20_small_users_one_index.yml +++ b/x-pack/qa/smoke-test-security-with-mustache/src/test/resources/rest-api-spec/test/20_small_users_one_index.yml @@ -62,7 +62,7 @@ teardown: ignore: 404 --- -"Test shared index seperating user by using DLS role query with user's username": +"Test shared index separating user by using DLS role query with user's username": - do: xpack.security.put_role: name: "small_companies_role" @@ -130,7 +130,7 @@ teardown: - match: { hits.hits.0._source.user.username: john} --- -"Test shared index seperating user by using DLS role query with user's metadata": +"Test shared index separating user by using DLS role query with user's metadata": - do: xpack.security.put_role: name: "small_companies_role" diff --git a/x-pack/qa/sql/security/src/test/java/org/elasticsearch/xpack/qa/sql/security/RestSqlSecurityIT.java b/x-pack/qa/sql/security/src/test/java/org/elasticsearch/xpack/qa/sql/security/RestSqlSecurityIT.java index e1c94ce463f..51440cc68dd 100644 --- a/x-pack/qa/sql/security/src/test/java/org/elasticsearch/xpack/qa/sql/security/RestSqlSecurityIT.java +++ b/x-pack/qa/sql/security/src/test/java/org/elasticsearch/xpack/qa/sql/security/RestSqlSecurityIT.java @@ -213,7 +213,7 @@ public class RestSqlSecurityIT extends SqlSecurityTestCase { /** * Test the hijacking a scroll fails. This test is only implemented for * REST because it is the only API where it is simple to hijack a scroll. - * It should excercise the same code as the other APIs but if we were truly + * It should exercise the same code as the other APIs but if we were truly * paranoid we'd hack together something to test the others as well. */ public void testHijackScrollFails() throws Exception { diff --git a/x-pack/qa/sql/security/src/test/java/org/elasticsearch/xpack/qa/sql/security/SqlSecurityTestCase.java b/x-pack/qa/sql/security/src/test/java/org/elasticsearch/xpack/qa/sql/security/SqlSecurityTestCase.java index 1bea73b56a2..c9076e38a0d 100644 --- a/x-pack/qa/sql/security/src/test/java/org/elasticsearch/xpack/qa/sql/security/SqlSecurityTestCase.java +++ b/x-pack/qa/sql/security/src/test/java/org/elasticsearch/xpack/qa/sql/security/SqlSecurityTestCase.java @@ -264,7 +264,7 @@ public abstract class SqlSecurityTestCase extends ESRestTestCase { createAuditLogAsserter() .expectSqlCompositeAction("test_admin", "test") /* Scrolling doesn't have to access the index again, at least not through sql. - * If we asserted query and scroll logs then we would see the scoll. */ + * If we asserted query and scroll logs then we would see the scroll. */ .expect(true, SQL_ACTION_NAME, "test_admin", empty()) .expect(true, SQL_ACTION_NAME, "test_admin", empty()) .expectSqlCompositeAction("only_a", "test")