added interface for readers

src/main/java/com/uid2/shared/cloud/InMemoryStorageMock.java

@@ -46,8 +46,7 @@ public InputStream download(String cloudPath) throws CloudStorageException {
         }
 
         byte[] content = data.clone();
-        ByteArrayInputStream inputStream = new ByteArrayInputStream(content);
-        return inputStream;
+        return new ByteArrayInputStream(content);
     }
 
     @Override

src/main/java/com/uid2/shared/store/reader/RotatingClientKeyProvider.java

@@ -37,7 +37,7 @@
         ...
       ]
 */
-public class RotatingClientKeyProvider implements IClientKeyProvider, IMetadataVersionedStore {
+public class RotatingClientKeyProvider implements IClientKeyProvider, StoreReader<Collection<ClientKey>> {
     private final ScopedStoreReader<Map<String, ClientKey>> reader;
     public RotatingClientKeyProvider(ICloudStorage fileStreamProvider, StoreScope scope) {
         this.reader = new ScopedStoreReader<>(fileStreamProvider, scope, new ClientParser(), "auth keys");

src/main/java/com/uid2/shared/store/reader/RotatingKeyAclProvider.java

@@ -1,15 +1,19 @@
 package com.uid2.shared.store.reader;
 
 import com.uid2.shared.auth.AclSnapshot;
+import com.uid2.shared.auth.EncryptionKeyAcl;
 import com.uid2.shared.cloud.ICloudStorage;
-import com.uid2.shared.store.*;
+import com.uid2.shared.store.CloudPath;
+import com.uid2.shared.store.IKeyAclProvider;
+import com.uid2.shared.store.ScopedStoreReader;
 import com.uid2.shared.store.parser.KeyAclParser;
 import com.uid2.shared.store.scope.StoreScope;
 import io.vertx.core.json.JsonObject;
 
 import java.time.Instant;
+import java.util.Map;
 
-public class RotatingKeyAclProvider implements IKeyAclProvider, IMetadataVersionedStore {
+public class RotatingKeyAclProvider implements IKeyAclProvider, StoreReader<Map<Integer, EncryptionKeyAcl>> {
     private final ScopedStoreReader<AclSnapshot> reader;
 
     public RotatingKeyAclProvider(ICloudStorage fileStreamProvider, StoreScope scope) {
@@ -33,6 +37,12 @@ public long loadContent(JsonObject metadata) throws Exception {
         return reader.loadContent(metadata, "keys_acl");
     }
 
+    @Override
+    public Map<Integer, EncryptionKeyAcl> getAll() {
+        return reader.getSnapshot().getAllAcls();
+    }
+
+    @Override
     public void loadContent() throws Exception {
         this.loadContent(this.getMetadata());
     }

src/main/java/com/uid2/shared/store/reader/RotatingKeyStore.java

@@ -1,6 +1,7 @@
 package com.uid2.shared.store.reader;
 
 import com.uid2.shared.cloud.ICloudStorage;
+import com.uid2.shared.model.EncryptionKey;
 import com.uid2.shared.store.CloudPath;
 import com.uid2.shared.store.IKeyStore;
 import com.uid2.shared.store.ScopedStoreReader;
@@ -9,6 +10,7 @@
 import io.vertx.core.json.JsonObject;
 
 import java.time.Instant;
+import java.util.Collection;
 
 /*
   1. metadata.json format
@@ -41,7 +43,7 @@
   ]
 
  */
-public class RotatingKeyStore implements IKeyStore, IMetadataVersionedStore {
+public class RotatingKeyStore implements IKeyStore, StoreReader<Collection<EncryptionKey>> {
     private final ScopedStoreReader<IKeyStoreSnapshot> reader;
 
     public RotatingKeyStore(ICloudStorage fileStreamProvider, StoreScope scope) {
@@ -75,6 +77,12 @@ public long loadContent(JsonObject metadata) throws Exception {
         return reader.loadContent(metadata, "keys");
     }
 
+    @Override
+    public Collection<EncryptionKey> getAll() {
+        return reader.getSnapshot().getActiveKeySet();
+    }
+
+    @Override
     public void loadContent() throws Exception {
         this.loadContent(this.getMetadata());
     }

src/main/java/com/uid2/shared/store/reader/StoreReader.java

@@ -0,0 +1,9 @@
+package com.uid2.shared.store.reader;
+
+import io.vertx.core.json.JsonObject;
+
+public interface StoreReader<T> extends IMetadataVersionedStore {
+    T getAll();
+    void loadContent() throws Exception;
+    JsonObject getMetadata() throws Exception;
+}