polish

IABTechLab · Jul 16, 2024 · f129cb0 · f129cb0
1 parent 42fd344
commit f129cb0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/src/main/java/com/uid2/shared/store/reader/RotatingKeysetKeyStore.java b/src/main/java/com/uid2/shared/store/reader/RotatingKeysetKeyStore.java
@@ -2,10 +2,14 @@
 
 import com.uid2.shared.cloud.DownloadCloudStorage;
 import com.uid2.shared.model.KeysetKey;
-import com.uid2.shared.store.*;
+import com.uid2.shared.store.CloudPath;
+import com.uid2.shared.store.IKeysetKeyStore;
+import com.uid2.shared.store.KeysetKeyStoreSnapshot;
+import com.uid2.shared.store.ScopedStoreReader;
 import com.uid2.shared.store.parser.KeysetKeyParser;
 import com.uid2.shared.store.scope.EncryptedScope;
 import com.uid2.shared.store.scope.StoreScope;
+import com.uid2.shared.store.EncryptedScopedStoreReader;
 import io.vertx.core.json.JsonObject;
 
 import java.time.Instant;

diff --git a/src/main/java/com/uid2/shared/store/scope/EncryptedScope.java b/src/main/java/com/uid2/shared/store/scope/EncryptedScope.java
@@ -1,19 +1,17 @@
-
 package com.uid2.shared.store.scope;
 
-
 import com.uid2.shared.store.CloudPath;
 
 public class EncryptedScope implements StoreScope {
+    private final Integer siteId;
+    private final CloudPath rootMetadataPath;
+    private final boolean isPublic;
 
     public EncryptedScope(CloudPath rootMetadataPath, Integer siteId, boolean isPublic){
         this.rootMetadataPath = rootMetadataPath;
         this.siteId = siteId;
         this.isPublic = isPublic;
     }
-    private final Integer siteId;
-    private final CloudPath rootMetadataPath;
-    private final boolean isPublic;
 
     @Override
     public CloudPath getMetadataPath() {

diff --git a/src/test/java/com/uid2/shared/store/scope/EncryptedScopeTest.java b/src/test/java/com/uid2/shared/store/scope/EncryptedScopeTest.java
@@ -9,24 +9,22 @@ class EncryptedScopeTest {
     void getMetadataPath() {
         EncryptedScope scope = new EncryptedScope(new CloudPath("/original/path/metadata.json"), 5,false);
         CloudPath expected = new CloudPath("/original/path/encrypted/5_private/metadata.json");
-
         CloudPath actual = scope.getMetadataPath();
         assertThat(actual).isEqualTo(expected);
     }
 
     @Test
     void resolvesPathsRelativeToSiteDirectory() {
         EncryptedScope scope = new EncryptedScope(new CloudPath("/original/path/metadata.json"), 5,false );
-        CloudPath actual = scope.resolve(new CloudPath("file.xyz"));
         CloudPath expected = new CloudPath("/original/path/encrypted/5_private/file.xyz");
+        CloudPath actual = scope.resolve(new CloudPath("file.xyz"));
         assertThat(actual).isEqualTo(expected);
     }
 
     @Test
     void getMetadataPathPublic() {
         EncryptedScope scope = new EncryptedScope(new CloudPath("/original/path/metadata.json"), 5, true);
         CloudPath expected = new CloudPath("/original/path/encrypted/5_public/metadata.json");
-
         CloudPath actual = scope.getMetadataPath();
         assertThat(actual).isEqualTo(expected);
     }