checkstyle

Author: albertzaharovits

test/framework/src/main/java/org/elasticsearch/repositories/blobstore/ESMockAPIBasedRepositoryIntegTestCase.java

@@ -107,14 +107,14 @@ public void tearDownHttpServer() {
             for(Map.Entry<String, HttpHandler> handler : handlers.entrySet()) {
                 httpServer.removeContext(handler.getKey());
                 if (handler.getValue() instanceof BlobStoreHttpHandler) {
-                    blobsOnTearDown((BlobStoreHttpHandler) handler.getValue());
+                    blobsOnTearDown(((BlobStoreHttpHandler) handler.getValue()).blobs());
                 }
             }
         }
     }
 
-    protected void blobsOnTearDown(BlobStoreHttpHandler handler) {
-        List<String> blobs = handler.blobs().keySet().stream().filter(blob -> blob.contains("index") == false).collect(Collectors.toList());
+    protected void blobsOnTearDown(Map<String, BytesReference> blobsMap) {
+        List<String> blobs = blobsMap.keySet().stream().filter(blob -> blob.contains("index") == false).collect(Collectors.toList());
         assertThat("Only index blobs should remain in repository but found " + blobs, blobs, hasSize(0));
     }
 

x-pack/plugin/repository-encrypted/src/test/java/org/elasticsearch/repositories/encrypted/EncryptedAzureBlobStoreRepositoryIntegTests.java

@@ -5,6 +5,7 @@
  */
 package org.elasticsearch.repositories.encrypted;
 
+import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.settings.MockSecureSettings;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.license.License;
@@ -19,6 +20,7 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 import static org.elasticsearch.repositories.encrypted.EncryptedRepository.DEK_ROOT_CONTAINER;
@@ -84,8 +86,8 @@ protected Settings repositorySettings(String repositoryName) {
     }
 
     @Override
-    protected void blobsOnTearDown(BlobStoreHttpHandler handler) {
-        List<String> blobs = handler.blobs().keySet().stream()
+    protected void blobsOnTearDown(Map<String, BytesReference> blobsMap) {
+        List<String> blobs = blobsMap.keySet().stream()
                 .filter(blob -> false == blob.contains("index"))
                 .filter(blob -> false == blob.contains(DEK_ROOT_CONTAINER)) // encryption metadata "leaks"
                 .collect(Collectors.toList());

x-pack/plugin/repository-encrypted/src/test/java/org/elasticsearch/repositories/encrypted/EncryptedGCSBlobStoreRepositoryIntegTests.java

@@ -5,6 +5,7 @@
  */
 package org.elasticsearch.repositories.encrypted;
 
+import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.settings.MockSecureSettings;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.license.License;
@@ -19,6 +20,7 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 import static org.elasticsearch.repositories.encrypted.EncryptedRepository.DEK_ROOT_CONTAINER;
@@ -85,8 +87,8 @@ protected Settings repositorySettings(String repositoryName) {
     }
 
     @Override
-    protected void blobsOnTearDown(BlobStoreHttpHandler handler) {
-        List<String> blobs = handler.blobs().keySet().stream()
+    protected void blobsOnTearDown(Map<String, BytesReference> blobsMap) {
+        List<String> blobs = blobsMap.keySet().stream()
                 .filter(blob -> false == blob.contains("index"))
                 .filter(blob -> false == blob.contains(DEK_ROOT_CONTAINER)) // encryption metadata "leaks"
                 .collect(Collectors.toList());

x-pack/plugin/repository-encrypted/src/test/java/org/elasticsearch/repositories/encrypted/EncryptedS3BlobStoreRepositoryIntegTests.java

@@ -5,6 +5,7 @@
  */
 package org.elasticsearch.repositories.encrypted;
 
+import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.settings.MockSecureSettings;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.license.License;
@@ -19,6 +20,7 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 import static org.elasticsearch.repositories.encrypted.EncryptedRepository.DEK_ROOT_CONTAINER;
@@ -84,8 +86,8 @@ protected Settings repositorySettings(String repositoryName) {
     }
 
     @Override
-    protected void blobsOnTearDown(BlobStoreHttpHandler handler) {
-        List<String> blobs = handler.blobs().keySet().stream()
+    protected void blobsOnTearDown(Map<String, BytesReference> blobsMap) {
+        List<String> blobs = blobsMap.keySet().stream()
                 .filter(blob -> false == blob.contains("index"))
                 .filter(blob -> false == blob.contains(DEK_ROOT_CONTAINER)) // encryption metadata "leaks"
                 .collect(Collectors.toList());