merge cleanup

Signed-off-by: Nicholas Walter Knize <nknize@apache.org>

Author: nknize

server/src/main/java/org/opensearch/cluster/routing/allocation/DiskThresholdMonitor.java

@@ -52,7 +52,6 @@
 import org.opensearch.cluster.routing.allocation.decider.DiskThresholdDecider;
 import org.opensearch.common.Priority;
 import org.opensearch.common.Strings;
-import org.opensearch.common.collect.ImmutableOpenMap;
 import org.opensearch.common.logging.DeprecationLogger;
 import org.opensearch.common.settings.ClusterSettings;
 import org.opensearch.common.settings.Settings;

server/src/test/java/org/opensearch/cluster/metadata/MetadataCreateIndexServiceTests.java

@@ -32,7 +32,6 @@
 
 package org.opensearch.cluster.metadata;
 
-import com.carrotsearch.hppc.cursors.ObjectObjectCursor;
 import org.hamcrest.Matchers;
 import org.junit.Before;
 import org.opensearch.ExceptionsHelper;
@@ -1732,14 +1731,6 @@ private CompressedXContent createMapping(String fieldName, String fieldType) {
         }
     }
 
-    private static Map<String, CompressedXContent> convertMappings(ImmutableOpenMap<String, CompressedXContent> mappings) {
-        Map<String, CompressedXContent> converted = new HashMap<>(mappings.size());
-        for (ObjectObjectCursor<String, CompressedXContent> cursor : mappings) {
-            converted.put(cursor.key, cursor.value);
-        }
-        return converted;
-    }
-
     private ShardLimitValidator randomShardLimitService() {
         return createTestShardLimitService(randomIntBetween(10, 10000), false);
     }

test/framework/src/main/java/org/opensearch/test/OpenSearchIntegTestCase.java

@@ -1309,7 +1309,7 @@ private ClusterState removePluginCustoms(final ClusterState clusterState) {
             }
         });
         final Metadata.Builder mdBuilder = Metadata.builder(clusterState.metadata());
-        clusterState.metadata().customs().keysIt().forEachRemaining(key -> {
+        clusterState.metadata().customs().keySet().iterator().forEachRemaining(key -> {
             if (SAFE_METADATA_CUSTOMS.contains(key) == false) {
                 mdBuilder.removeCustom(key);
             }