Updated the API readed to make simplier

Author: cody-constine-ttd

src/main/java/com/uid2/operator/reader/ApiStoreReader.java

@@ -21,14 +21,13 @@ public ApiStoreReader(DownloadCloudStorage fileStreamProvider, StoreScope scope,
         super(fileStreamProvider, scope, parser, dataTypeName);
     }
 
-    @Override
-    public long loadContent(JsonObject contents, String dataType) throws Exception {
+    public long loadContent(JsonObject contents) throws Exception {
         if (contents == null) {
-            throw new IllegalArgumentException(String.format("No contents provided for loading data type %s, cannot load content", dataType));
+            throw new IllegalArgumentException(String.format("No contents provided for loading data type %s, cannot load content", dataTypeName));
         }
 
         try {
-            JsonArray dataArray = contents.getJsonArray(dataType);
+            JsonArray dataArray = contents.getJsonArray(dataTypeName);
             if (dataArray == null) {
                 throw new IllegalArgumentException("No array found in the contents");
             }

src/main/java/com/uid2/operator/reader/RotatingCloudEncryptionKeyApiProvider.java

@@ -35,7 +35,7 @@ public CloudPath getMetadataPath() {
 
     @Override
     public long loadContent(JsonObject metadata) throws Exception {
-        return apiStoreReader.loadContent(metadata, "cloudEncryptionKeys");
+        return apiStoreReader.loadContent(metadata);
     }
 
     @Override

src/test/java/com/uid2/operator/ApiStoreReaderTest.java

@@ -51,15 +51,15 @@ void getMetadataPathReturnsPathFromScope() {
 
         @Test
         void loadContentThrowsExceptionWhenContentsAreNull() {
-            assertThatThrownBy(() -> reader.loadContent(null, dataType))
+            assertThatThrownBy(() -> reader.loadContent(null))
                     .isInstanceOf(IllegalArgumentException.class)
                     .hasMessageContaining("No contents provided for loading data type");
         }
 
         @Test
         void loadContentThrowsExceptionWhenArrayNotFound() {
             JsonObject contents = new JsonObject();
-            assertThatThrownBy(() -> reader.loadContent(contents, dataType))
+            assertThatThrownBy(() -> reader.loadContent(contents))
                     .isInstanceOf(IllegalArgumentException.class)
                     .hasMessageContaining("No array found in the contents");
         }
@@ -73,7 +73,7 @@ void loadContentSuccessfullyLoadsData() throws Exception {
             when(mockParser.deserialize(any(InputStream.class)))
                     .thenReturn(new ParsingResult<>(expectedData, expectedData.size()));
 
-            long count = reader.loadContent(contents, dataType);
+            long count = reader.loadContent(contents);
 
             assertThat(count).isEqualTo(2);
             assertThat(reader.getSnapshot()).isEqualTo(expectedData);

src/test/java/com/uid2/operator/RotatingCloudEncryptionKeyApiProviderTest.java

@@ -61,11 +61,11 @@ void testGetMetadataPath() {
     @Test
     void testLoadContentWithMetadata() throws Exception {
         JsonObject metadata = new JsonObject();
-        when(mockApiStoreReader.loadContent(metadata, "cloudEncryptionKeys")).thenReturn(1L);
+        when(mockApiStoreReader.loadContent(metadata)).thenReturn(1L);
 
         long version = rotatingCloudEncryptionKeyApiProvider.loadContent(metadata);
         assertEquals(1L, version);
-        verify(mockApiStoreReader).loadContent(metadata, "cloudEncryptionKeys");
+        verify(mockApiStoreReader).loadContent(metadata);
     }
 
     @Test
@@ -94,10 +94,10 @@ void testGetAllWithNullSnapshot() {
     void testLoadContent() throws Exception {
         JsonObject metadata = new JsonObject().put("version", 1L);
         when(mockApiStoreReader.getMetadata()).thenReturn(metadata);
-        when(mockApiStoreReader.loadContent(metadata, "cloudEncryptionKeys")).thenReturn(1L);
+        when(mockApiStoreReader.loadContent(metadata)).thenReturn(1L);
 
         rotatingCloudEncryptionKeyApiProvider.loadContent();
         verify(mockApiStoreReader).getMetadata();
-        verify(mockApiStoreReader).loadContent(metadata, "cloudEncryptionKeys");
+        verify(mockApiStoreReader).loadContent(metadata);
     }
 }