From 8e711ab9229d2142356d132057aa4b3db00627b1 Mon Sep 17 00:00:00 2001 From: Himanshu Setia <58999915+setiah@users.noreply.github.com> Date: Thu, 18 Mar 2021 14:46:43 -0700 Subject: [PATCH] [Rename] Refactor o.e.watcher (#399) This commit refactors the o.e.watcher package. References throughout the codebase are also refactored. Signed-off-by: Himanshu Setia --- .../opensearch/analysis/common/CommonAnalysisPlugin.java | 2 +- .../main/java/org/opensearch/painless/PainlessPlugin.java | 2 +- .../java/org/opensearch/index/reindex/ReindexPlugin.java | 2 +- .../org/opensearch/index/reindex/ReindexSslConfig.java | 6 +++--- .../reindex/ReindexFromRemoteBuildRestClientTests.java | 2 +- .../index/reindex/ReindexFromRemoteWithAuthTests.java | 2 +- .../index/reindex/ReindexRestClientSslTests.java | 2 +- .../main/java/org/opensearch/systemd/SystemdPlugin.java | 2 +- .../org/opensearch/common/settings/ClusterSettings.java | 2 +- server/src/main/java/org/opensearch/node/Node.java | 2 +- server/src/main/java/org/opensearch/plugins/Plugin.java | 2 +- .../watcher/AbstractResourceWatcher.java | 4 ++-- .../watcher/FileChangesListener.java | 4 ++-- .../watcher/FileWatcher.java | 4 ++-- .../watcher/ResourceWatcher.java | 4 ++-- .../watcher/ResourceWatcherService.java | 8 ++++---- .../watcher/WatcherHandle.java | 4 ++-- .../watcher/FileWatcherTests.java | 6 ++++-- .../watcher/ResourceWatcherServiceTests.java | 7 +++++-- 19 files changed, 36 insertions(+), 31 deletions(-) rename server/src/main/java/org/{elasticsearch => opensearch}/watcher/AbstractResourceWatcher.java (96%) rename server/src/main/java/org/{elasticsearch => opensearch}/watcher/FileChangesListener.java (95%) rename server/src/main/java/org/{elasticsearch => opensearch}/watcher/FileWatcher.java (99%) rename server/src/main/java/org/{elasticsearch => opensearch}/watcher/ResourceWatcher.java (94%) rename server/src/main/java/org/{elasticsearch => opensearch}/watcher/ResourceWatcherService.java (95%) rename server/src/main/java/org/{elasticsearch => opensearch}/watcher/WatcherHandle.java (94%) rename server/src/test/java/org/{elasticsearch => opensearch}/watcher/FileWatcherTests.java (98%) rename server/src/test/java/org/{elasticsearch => opensearch}/watcher/ResourceWatcherServiceTests.java (95%) diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CommonAnalysisPlugin.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CommonAnalysisPlugin.java index 22aaa1cc05a..e96d50f1316 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CommonAnalysisPlugin.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CommonAnalysisPlugin.java @@ -140,7 +140,7 @@ import org.opensearch.repositories.RepositoriesService; import org.opensearch.script.ScriptContext; import org.opensearch.script.ScriptService; import org.opensearch.threadpool.ThreadPool; -import org.elasticsearch.watcher.ResourceWatcherService; +import org.opensearch.watcher.ResourceWatcherService; import org.tartarus.snowball.ext.DutchStemmer; import org.tartarus.snowball.ext.FrenchStemmer; diff --git a/modules/lang-painless/src/main/java/org/opensearch/painless/PainlessPlugin.java b/modules/lang-painless/src/main/java/org/opensearch/painless/PainlessPlugin.java index b8ead6e6ed7..64697ab58c2 100644 --- a/modules/lang-painless/src/main/java/org/opensearch/painless/PainlessPlugin.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/PainlessPlugin.java @@ -55,7 +55,7 @@ import org.opensearch.script.ScriptEngine; import org.opensearch.script.ScriptService; import org.opensearch.search.aggregations.pipeline.MovingFunctionScript; import org.opensearch.threadpool.ThreadPool; -import org.elasticsearch.watcher.ResourceWatcherService; +import org.opensearch.watcher.ResourceWatcherService; import java.util.ArrayList; import java.util.Arrays; diff --git a/modules/reindex/src/main/java/org/opensearch/index/reindex/ReindexPlugin.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/ReindexPlugin.java index c9b003e45a6..fbaabb2f27c 100644 --- a/modules/reindex/src/main/java/org/opensearch/index/reindex/ReindexPlugin.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/ReindexPlugin.java @@ -46,7 +46,7 @@ import org.opensearch.rest.RestHandler; import org.opensearch.script.ScriptService; import org.opensearch.tasks.Task; import org.opensearch.threadpool.ThreadPool; -import org.elasticsearch.watcher.ResourceWatcherService; +import org.opensearch.watcher.ResourceWatcherService; import java.util.ArrayList; import java.util.Arrays; diff --git a/modules/reindex/src/main/java/org/opensearch/index/reindex/ReindexSslConfig.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/ReindexSslConfig.java index f2d6c102555..4fa6f000e31 100644 --- a/modules/reindex/src/main/java/org/opensearch/index/reindex/ReindexSslConfig.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/ReindexSslConfig.java @@ -31,9 +31,9 @@ import org.opensearch.common.ssl.SslConfiguration; import org.opensearch.common.ssl.SslConfigurationKeys; import org.opensearch.common.ssl.SslConfigurationLoader; import org.opensearch.env.Environment; -import org.elasticsearch.watcher.FileChangesListener; -import org.elasticsearch.watcher.FileWatcher; -import org.elasticsearch.watcher.ResourceWatcherService; +import org.opensearch.watcher.FileChangesListener; +import org.opensearch.watcher.FileWatcher; +import org.opensearch.watcher.ResourceWatcherService; import javax.net.ssl.HostnameVerifier; import javax.net.ssl.SSLContext; diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexFromRemoteBuildRestClientTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexFromRemoteBuildRestClientTests.java index 06c59be5f05..973874bfced 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexFromRemoteBuildRestClientTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexFromRemoteBuildRestClientTests.java @@ -28,7 +28,7 @@ import org.opensearch.env.Environment; import org.opensearch.env.TestEnvironment; import org.elasticsearch.index.query.MatchAllQueryBuilder; import org.elasticsearch.index.reindex.RemoteInfo; -import org.elasticsearch.watcher.ResourceWatcherService; +import org.opensearch.watcher.ResourceWatcherService; import java.util.ArrayList; import java.util.HashMap; diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexFromRemoteWithAuthTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexFromRemoteWithAuthTests.java index f6ecba86438..8c81f527e76 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexFromRemoteWithAuthTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexFromRemoteWithAuthTests.java @@ -56,7 +56,7 @@ import org.opensearch.tasks.Task; import org.opensearch.test.OpenSearchSingleNodeTestCase; import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.Netty4Plugin; -import org.elasticsearch.watcher.ResourceWatcherService; +import org.opensearch.watcher.ResourceWatcherService; import org.junit.Before; import java.util.Arrays; diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexRestClientSslTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexRestClientSslTests.java index e7bf5eee5b3..b38d29a87f5 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexRestClientSslTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexRestClientSslTests.java @@ -37,7 +37,7 @@ import org.opensearch.env.TestEnvironment; import org.elasticsearch.index.reindex.RemoteInfo; import org.elasticsearch.mocksocket.MockHttpServer; import org.opensearch.test.OpenSearchTestCase; -import org.elasticsearch.watcher.ResourceWatcherService; +import org.opensearch.watcher.ResourceWatcherService; import org.hamcrest.Matchers; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/modules/systemd/src/main/java/org/opensearch/systemd/SystemdPlugin.java b/modules/systemd/src/main/java/org/opensearch/systemd/SystemdPlugin.java index bd0d34c8d16..92500396294 100644 --- a/modules/systemd/src/main/java/org/opensearch/systemd/SystemdPlugin.java +++ b/modules/systemd/src/main/java/org/opensearch/systemd/SystemdPlugin.java @@ -37,7 +37,7 @@ import org.opensearch.repositories.RepositoriesService; import org.opensearch.script.ScriptService; import org.opensearch.threadpool.Scheduler; import org.opensearch.threadpool.ThreadPool; -import org.elasticsearch.watcher.ResourceWatcherService; +import org.opensearch.watcher.ResourceWatcherService; import java.util.Collection; import java.util.Collections; diff --git a/server/src/main/java/org/opensearch/common/settings/ClusterSettings.java b/server/src/main/java/org/opensearch/common/settings/ClusterSettings.java index 2cc3b01682d..a0b0c068e8a 100644 --- a/server/src/main/java/org/opensearch/common/settings/ClusterSettings.java +++ b/server/src/main/java/org/opensearch/common/settings/ClusterSettings.java @@ -19,7 +19,7 @@ package org.opensearch.common.settings; import org.apache.logging.log4j.LogManager; -import org.elasticsearch.watcher.ResourceWatcherService; +import org.opensearch.watcher.ResourceWatcherService; import org.opensearch.action.admin.cluster.configuration.TransportAddVotingConfigExclusionsAction; import org.opensearch.action.admin.indices.close.TransportCloseIndexAction; import org.opensearch.action.search.TransportSearchAction; diff --git a/server/src/main/java/org/opensearch/node/Node.java b/server/src/main/java/org/opensearch/node/Node.java index 16629478e13..da9041d38d6 100644 --- a/server/src/main/java/org/opensearch/node/Node.java +++ b/server/src/main/java/org/opensearch/node/Node.java @@ -23,7 +23,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.lucene.util.Constants; import org.apache.lucene.util.SetOnce; -import org.elasticsearch.watcher.ResourceWatcherService; +import org.opensearch.watcher.ResourceWatcherService; import org.opensearch.Assertions; import org.opensearch.Build; import org.opensearch.OpenSearchException; diff --git a/server/src/main/java/org/opensearch/plugins/Plugin.java b/server/src/main/java/org/opensearch/plugins/Plugin.java index 4d1291a829a..0c35e9e663a 100644 --- a/server/src/main/java/org/opensearch/plugins/Plugin.java +++ b/server/src/main/java/org/opensearch/plugins/Plugin.java @@ -19,7 +19,7 @@ package org.opensearch.plugins; -import org.elasticsearch.watcher.ResourceWatcherService; +import org.opensearch.watcher.ResourceWatcherService; import org.opensearch.bootstrap.BootstrapCheck; import org.opensearch.client.Client; import org.opensearch.cluster.ClusterState; diff --git a/server/src/main/java/org/elasticsearch/watcher/AbstractResourceWatcher.java b/server/src/main/java/org/opensearch/watcher/AbstractResourceWatcher.java similarity index 96% rename from server/src/main/java/org/elasticsearch/watcher/AbstractResourceWatcher.java rename to server/src/main/java/org/opensearch/watcher/AbstractResourceWatcher.java index 5e367610dfe..a41e20f34a3 100644 --- a/server/src/main/java/org/elasticsearch/watcher/AbstractResourceWatcher.java +++ b/server/src/main/java/org/opensearch/watcher/AbstractResourceWatcher.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.watcher; +package org.opensearch.watcher; import java.io.IOException; import java.util.List; diff --git a/server/src/main/java/org/elasticsearch/watcher/FileChangesListener.java b/server/src/main/java/org/opensearch/watcher/FileChangesListener.java similarity index 95% rename from server/src/main/java/org/elasticsearch/watcher/FileChangesListener.java rename to server/src/main/java/org/opensearch/watcher/FileChangesListener.java index 22e8637053f..f16f47e3034 100644 --- a/server/src/main/java/org/elasticsearch/watcher/FileChangesListener.java +++ b/server/src/main/java/org/opensearch/watcher/FileChangesListener.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.watcher; +package org.opensearch.watcher; import java.nio.file.Path; diff --git a/server/src/main/java/org/elasticsearch/watcher/FileWatcher.java b/server/src/main/java/org/opensearch/watcher/FileWatcher.java similarity index 99% rename from server/src/main/java/org/elasticsearch/watcher/FileWatcher.java rename to server/src/main/java/org/opensearch/watcher/FileWatcher.java index 1150edff5e7..18d617ea709 100644 --- a/server/src/main/java/org/elasticsearch/watcher/FileWatcher.java +++ b/server/src/main/java/org/opensearch/watcher/FileWatcher.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.watcher; +package org.opensearch.watcher; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/server/src/main/java/org/elasticsearch/watcher/ResourceWatcher.java b/server/src/main/java/org/opensearch/watcher/ResourceWatcher.java similarity index 94% rename from server/src/main/java/org/elasticsearch/watcher/ResourceWatcher.java rename to server/src/main/java/org/opensearch/watcher/ResourceWatcher.java index 4356c87f0fc..3d36b911ca2 100644 --- a/server/src/main/java/org/elasticsearch/watcher/ResourceWatcher.java +++ b/server/src/main/java/org/opensearch/watcher/ResourceWatcher.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.watcher; +package org.opensearch.watcher; import java.io.IOException; diff --git a/server/src/main/java/org/elasticsearch/watcher/ResourceWatcherService.java b/server/src/main/java/org/opensearch/watcher/ResourceWatcherService.java similarity index 95% rename from server/src/main/java/org/elasticsearch/watcher/ResourceWatcherService.java rename to server/src/main/java/org/opensearch/watcher/ResourceWatcherService.java index b495e5e05cd..5a377739a33 100644 --- a/server/src/main/java/org/elasticsearch/watcher/ResourceWatcherService.java +++ b/server/src/main/java/org/opensearch/watcher/ResourceWatcherService.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.watcher; +package org.opensearch.watcher; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -36,8 +36,8 @@ import java.util.concurrent.CopyOnWriteArraySet; /** * Generic resource watcher service * - * Other elasticsearch services can register their resource watchers with this service using {@link #add(ResourceWatcher)} - * method. This service will call {@link org.elasticsearch.watcher.ResourceWatcher#checkAndNotify()} method of all + * Other opensearch services can register their resource watchers with this service using {@link #add(ResourceWatcher)} + * method. This service will call {@link org.opensearch.watcher.ResourceWatcher#checkAndNotify()} method of all * registered watcher periodically. The frequency of checks can be specified using {@code resource.reload.interval} setting, which * defaults to {@code 60s}. The service can be disabled by setting {@code resource.reload.enabled} setting to {@code false}. */ diff --git a/server/src/main/java/org/elasticsearch/watcher/WatcherHandle.java b/server/src/main/java/org/opensearch/watcher/WatcherHandle.java similarity index 94% rename from server/src/main/java/org/elasticsearch/watcher/WatcherHandle.java rename to server/src/main/java/org/opensearch/watcher/WatcherHandle.java index 0ef80306df2..3641d325dd9 100644 --- a/server/src/main/java/org/elasticsearch/watcher/WatcherHandle.java +++ b/server/src/main/java/org/opensearch/watcher/WatcherHandle.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.watcher; +package org.opensearch.watcher; public class WatcherHandle { diff --git a/server/src/test/java/org/elasticsearch/watcher/FileWatcherTests.java b/server/src/test/java/org/opensearch/watcher/FileWatcherTests.java similarity index 98% rename from server/src/test/java/org/elasticsearch/watcher/FileWatcherTests.java rename to server/src/test/java/org/opensearch/watcher/FileWatcherTests.java index c69790b1e4e..429d0fc4254 100644 --- a/server/src/test/java/org/elasticsearch/watcher/FileWatcherTests.java +++ b/server/src/test/java/org/opensearch/watcher/FileWatcherTests.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,11 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.watcher; +package org.opensearch.watcher; import org.opensearch.core.internal.io.IOUtils; import org.apache.lucene.util.LuceneTestCase; import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.watcher.FileChangesListener; +import org.opensearch.watcher.FileWatcher; import java.io.BufferedWriter; import java.io.IOException; diff --git a/server/src/test/java/org/elasticsearch/watcher/ResourceWatcherServiceTests.java b/server/src/test/java/org/opensearch/watcher/ResourceWatcherServiceTests.java similarity index 95% rename from server/src/test/java/org/elasticsearch/watcher/ResourceWatcherServiceTests.java rename to server/src/test/java/org/opensearch/watcher/ResourceWatcherServiceTests.java index 75cf6429e58..cdfcc50cdb1 100644 --- a/server/src/test/java/org/elasticsearch/watcher/ResourceWatcherServiceTests.java +++ b/server/src/test/java/org/opensearch/watcher/ResourceWatcherServiceTests.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,12 +17,15 @@ * under the License. */ -package org.elasticsearch.watcher; +package org.opensearch.watcher; import org.opensearch.common.settings.Settings; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; +import org.opensearch.watcher.ResourceWatcher; +import org.opensearch.watcher.ResourceWatcherService; +import org.opensearch.watcher.WatcherHandle; import static org.opensearch.common.unit.TimeValue.timeValueSeconds; import static org.hamcrest.Matchers.equalTo;