Refactor for depreciation of MasterService (opensearch-project#531)

* Address core changes Signed-off-by: Khushboo Rajput <khushbr@amazon.com>
shivamg2017 · Sep 7, 2023 · fc93dc1 · fc93dc1
1 parent 7a6f789
commit fc93dc1
Show file tree

Hide file tree

Showing 26 changed files with 17 additions and 15 deletions.
diff --git a/build.gradle b/build.gradle
@@ -293,7 +293,7 @@ dependencies {
             force "com.fasterxml.jackson.dataformat:jackson-dataformat-smile:${jacksonVersion}"
             force "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${jacksonVersion}"
             force "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${jacksonVersion}"
-            force "org.apache.commons:commons-lang3:3.12.0"
+            force "org.apache.commons:commons-lang3:${versions.commonslang}"
             force "org.slf4j:slf4j-api:2.0.0"
             force "org.apache.bcel:bcel:6.6.0" // This line should be removed once Spotbugs is upgraded to 4.7.4
         }

diff --git a/licenses/bcprov-jdk15to18-LICENSE.txt b/licenses/bcprov-jdk15to18-LICENSE.txt
@@ -5,4 +5,4 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of
 
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/licenses/netty-buffer-4.1.96.Final.jar.sha1 b/licenses/netty-buffer-4.1.96.Final.jar.sha1
diff --git a/licenses/netty-buffer-4.1.97.Final.jar.sha1 b/licenses/netty-buffer-4.1.97.Final.jar.sha1
@@ -0,0 +1 @@
+f8f3d8644afa5e6e1a40a3a6aeb9d9aa970ecb4f
diff --git a/licenses/netty-codec-4.1.96.Final.jar.sha1 b/licenses/netty-codec-4.1.96.Final.jar.sha1
diff --git a/licenses/netty-codec-4.1.97.Final.jar.sha1 b/licenses/netty-codec-4.1.97.Final.jar.sha1
@@ -0,0 +1 @@
+384ba4d75670befbedb45c4d3b497a93639c206d
diff --git a/licenses/netty-codec-http-4.1.96.Final.jar.sha1 b/licenses/netty-codec-http-4.1.96.Final.jar.sha1
diff --git a/licenses/netty-codec-http-4.1.97.Final.jar.sha1 b/licenses/netty-codec-http-4.1.97.Final.jar.sha1
@@ -0,0 +1 @@
+af78acec783ffd77c63d8aeecc21041fd39ac54f
diff --git a/licenses/netty-codec-http2-4.1.96.Final.jar.sha1 b/licenses/netty-codec-http2-4.1.96.Final.jar.sha1
diff --git a/licenses/netty-codec-http2-4.1.97.Final.jar.sha1 b/licenses/netty-codec-http2-4.1.97.Final.jar.sha1
@@ -0,0 +1 @@
+893888d09a7bef0d0ba973d7471943e765d0fd08
diff --git a/licenses/netty-codec-socks-4.1.96.Final.jar.sha1 b/licenses/netty-codec-socks-4.1.96.Final.jar.sha1
diff --git a/licenses/netty-codec-socks-4.1.97.Final.jar.sha1 b/licenses/netty-codec-socks-4.1.97.Final.jar.sha1
@@ -0,0 +1 @@
+30e8fa29a349db5a933225d61891b8802836bb79
diff --git a/licenses/netty-common-4.1.96.Final.jar.sha1 b/licenses/netty-common-4.1.96.Final.jar.sha1
diff --git a/licenses/netty-common-4.1.97.Final.jar.sha1 b/licenses/netty-common-4.1.97.Final.jar.sha1
@@ -0,0 +1 @@
+7cceacaf11df8dc63f23d0fb58e9d4640fc88404
diff --git a/licenses/netty-handler-4.1.96.Final.jar.sha1 b/licenses/netty-handler-4.1.96.Final.jar.sha1
diff --git a/licenses/netty-handler-4.1.97.Final.jar.sha1 b/licenses/netty-handler-4.1.97.Final.jar.sha1
@@ -0,0 +1 @@
+abb86c6906bf512bf2b797a41cd7d2e8d3cd7c36
diff --git a/licenses/netty-handler-proxy-4.1.96.Final.jar.sha1 b/licenses/netty-handler-proxy-4.1.96.Final.jar.sha1
diff --git a/licenses/netty-handler-proxy-4.1.97.Final.jar.sha1 b/licenses/netty-handler-proxy-4.1.97.Final.jar.sha1
@@ -0,0 +1 @@
+a99ecef0e1d86a92e40a7c89805c236d9cd7493e
diff --git a/licenses/netty-resolver-4.1.96.Final.jar.sha1 b/licenses/netty-resolver-4.1.96.Final.jar.sha1
diff --git a/licenses/netty-resolver-4.1.97.Final.jar.sha1 b/licenses/netty-resolver-4.1.97.Final.jar.sha1
@@ -0,0 +1 @@
+cec8348108dc76c47cf87c669d514be52c922144
diff --git a/licenses/netty-transport-4.1.96.Final.jar.sha1 b/licenses/netty-transport-4.1.96.Final.jar.sha1
diff --git a/licenses/netty-transport-4.1.97.Final.jar.sha1 b/licenses/netty-transport-4.1.97.Final.jar.sha1
@@ -0,0 +1 @@
+f37380d23c9bb079bc702910833b2fd532c9abd0
diff --git a/licenses/netty-transport-native-unix-common-4.1.96.Final.jar.sha1 b/licenses/netty-transport-native-unix-common-4.1.96.Final.jar.sha1
diff --git a/licenses/netty-transport-native-unix-common-4.1.97.Final.jar.sha1 b/licenses/netty-transport-native-unix-common-4.1.97.Final.jar.sha1
@@ -0,0 +1 @@
+d469d84265ab70095b01b40886cabdd433b6e664
diff --git a/licenses/performance-analyzer-commons-1.0.0-SNAPSHOT.jar.sha1 b/licenses/performance-analyzer-commons-1.0.0-SNAPSHOT.jar.sha1
@@ -1 +1 @@
-50c9a65da3acb24e94c6dbb5e2afda2d7dd536ad
+0f872542fa9a89746f0cd60fc465c33537d41701
diff --git a/...java/org/opensearch/performanceanalyzer/collectors/ClusterManagerServiceEventMetrics.java b/...java/org/opensearch/performanceanalyzer/collectors/ClusterManagerServiceEventMetrics.java
@@ -188,8 +188,10 @@ void generateFinishMetrics(long startTime) {
 
     // - Separated to have a unit test; and catch any code changes around this field
     Field getClusterManagerServiceTPExecutorField() throws NoSuchFieldException {
+        // Currently ClusterManagerService extends MasterService, remove getSuperClass(),
+        // once MasterService contents are moved and class is removed.
         Field threadPoolExecutorField =
-                ClusterManagerService.class.getDeclaredField("threadPoolExecutor");
+                ClusterManagerService.class.getSuperclass().getDeclaredField("threadPoolExecutor");
         threadPoolExecutorField.setAccessible(true);
         return threadPoolExecutorField;
     }