Merge pull request #20 from NationalSecurityAgency/task/replace-depre…

…cated-calls Replace Deprecated Calls
NationalSecurityAgency · Nov 1, 2024 · f8fea97 · f8fea97
2 parents b4bd6ca + 5b60973
commit f8fea97
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/service/src/main/java/datawave/microservice/accumulo/admin/AdminService.java b/service/src/main/java/datawave/microservice/accumulo/admin/AdminService.java
@@ -515,7 +515,7 @@ public UpdateResponse updateAccumulo(UpdateRequest request) {
                     AuthorizationFailure failure = new AuthorizationFailure();
 
                     Optional<Map.Entry<String,String>> tableNameToId = warehouseAccumuloClient.tableOperations().tableIdMap().entrySet().stream()
-                                    .filter(entry -> entry.getValue().equals(next.getKey().getTableId().toString())).findAny();
+                                    .filter(entry -> entry.getValue().equals(next.getKey().getTable().canonical())).findAny();
                     String mappedTableName = (tableNameToId.isPresent() ? tableNameToId.get().getKey() : "unknown");
                     failure.setTableName(new OptionallyEncodedString(mappedTableName));
                     failure.setEndRow(new OptionallyEncodedString(next.getKey().getEndRow().toString()));

diff --git a/service/src/main/java/datawave/microservice/accumulo/stats/util/AccumuloMonitorLocator.java b/service/src/main/java/datawave/microservice/accumulo/stats/util/AccumuloMonitorLocator.java
@@ -47,7 +47,7 @@ public String getHostPort(AccumuloClient accumuloClient) {
         Properties clientProps = accumuloClient.properties();
         try (CuratorFramework curator = CuratorFrameworkFactory.newClient(clientProps.getProperty(INSTANCE_ZOOKEEPERS.getKey()), retryPolicy)) {
             curator.start();
-            byte[] bytes = curator.getData().forPath(String.format(MONITOR_HTTP_ADDR, accumuloClient.instanceOperations().getInstanceID()));
+            byte[] bytes = curator.getData().forPath(String.format(MONITOR_HTTP_ADDR, accumuloClient.instanceOperations().getInstanceId()));
             String location = new String(bytes, ENCODING);
             if (location.startsWith("http://")) {
                 URI uri = new URI(location);

diff --git a/service/src/test/java/datawave/microservice/accumulo/stats/StatsServiceTest.java b/service/src/test/java/datawave/microservice/accumulo/stats/StatsServiceTest.java
@@ -193,7 +193,7 @@ public Properties properties() {
                     String.format("localhost:%d", ZK_PORT), new RetryOneTime(500))) {
                 curator.start();
                 curator.create().creatingParentContainersIfNeeded()
-                    .forPath(String.format(ZK_MONITOR_PATH, accumuloClient.instanceOperations().getInstanceID()), ZK_MONITOR_DATA.getBytes());
+                    .forPath(String.format(ZK_MONITOR_PATH, accumuloClient.instanceOperations().getInstanceId()), ZK_MONITOR_DATA.getBytes());
             }
             //@formatter:on
 

diff --git a/...e/src/test/java/datawave/microservice/accumulo/stats/util/AccumuloMonitorLocatorTest.java b/...e/src/test/java/datawave/microservice/accumulo/stats/util/AccumuloMonitorLocatorTest.java
@@ -48,7 +48,7 @@ public Properties properties() {
         try (CuratorFramework curator = CuratorFrameworkFactory.newClient(String.format("localhost:%d", ZK_PORT), new RetryOneTime(500))) {
             curator.start();
             curator.create().creatingParentContainersIfNeeded()
-                            .forPath("/accumulo/" + accumuloClient.instanceOperations().getInstanceID() + "/monitor/http_addr", MONITOR_LOC.getBytes());
+                            .forPath("/accumulo/" + accumuloClient.instanceOperations().getInstanceId() + "/monitor/http_addr", MONITOR_LOC.getBytes());
         }
     }