Merge pull request #403 from IABTechLab/aul-UID2-4573-refactor-existing-cloud-encryption-key-stuff-2

aulme · web-flow · commit 23f3a7d8c58a · 2025-03-26T17:40:07.000+08:00
Renamed cloudEncryption to cloudencryption to comply with Java standards
diff --git a/src/main/java/com/uid2/admin/Main.java b/src/main/java/com/uid2/admin/Main.java
@@ -5,18 +5,18 @@
 import com.uid2.admin.auth.OktaAuthProvider;
 import com.uid2.admin.auth.AuthProvider;
 import com.uid2.admin.auth.TokenRefreshHandler;
-import com.uid2.admin.cloudEncryption.CloudKeyRotationStrategy;
-import com.uid2.admin.cloudEncryption.ExpiredKeyCountRetentionStrategy;
+import com.uid2.admin.cloudencryption.CloudKeyRotationStrategy;
+import com.uid2.admin.cloudencryption.ExpiredKeyCountRetentionStrategy;
 import com.uid2.admin.job.JobDispatcher;
 import com.uid2.admin.job.jobsync.EncryptedFilesSyncJob;
 import com.uid2.admin.job.jobsync.PrivateSiteDataSyncJob;
 import com.uid2.admin.job.jobsync.keyset.ReplaceSharingTypesWithSitesJob;
 import com.uid2.admin.legacy.LegacyClientKeyStoreWriter;
 import com.uid2.admin.legacy.RotatingLegacyClientKeyProvider;
 import com.uid2.admin.managers.KeysetManager;
-import com.uid2.admin.cloudEncryption.CloudSecretGenerator;
+import com.uid2.admin.cloudencryption.CloudSecretGenerator;
 import com.uid2.admin.monitoring.DataStoreMetrics;
-import com.uid2.admin.cloudEncryption.CloudEncryptionKeyManager;
+import com.uid2.admin.cloudencryption.CloudEncryptionKeyManager;
 import com.uid2.admin.secret.*;
 import com.uid2.admin.store.*;
 import com.uid2.admin.store.reader.RotatingAdminKeysetStore;
diff --git a/src/main/java/com/uid2/admin/cloudencryption/CloudEncryptionKeyManager.java b/src/main/java/com/uid2/admin/cloudencryption/CloudEncryptionKeyManager.java
@@ -1,4 +1,4 @@
-package com.uid2.admin.cloudEncryption;
+package com.uid2.admin.cloudencryption;
 
 import com.uid2.admin.store.writer.CloudEncryptionKeyStoreWriter;
 import com.uid2.shared.auth.OperatorKey;
diff --git a/src/main/java/com/uid2/admin/cloudencryption/CloudKeyRetentionStrategy.java b/src/main/java/com/uid2/admin/cloudencryption/CloudKeyRetentionStrategy.java
@@ -1,4 +1,4 @@
-package com.uid2.admin.cloudEncryption;
+package com.uid2.admin.cloudencryption;
 
 import com.uid2.shared.model.CloudEncryptionKey;
 
diff --git a/src/main/java/com/uid2/admin/cloudencryption/CloudKeyRotationStrategy.java b/src/main/java/com/uid2/admin/cloudencryption/CloudKeyRotationStrategy.java
@@ -1,4 +1,4 @@
-package com.uid2.admin.cloudEncryption;
+package com.uid2.admin.cloudencryption;
 
 import com.google.common.collect.Streams;
 import com.uid2.admin.store.Clock;
diff --git a/src/main/java/com/uid2/admin/cloudencryption/CloudSecretGenerator.java b/src/main/java/com/uid2/admin/cloudencryption/CloudSecretGenerator.java
@@ -1,4 +1,4 @@
-package com.uid2.admin.cloudEncryption;
+package com.uid2.admin.cloudencryption;
 
 import com.uid2.shared.secret.SecureKeyGenerator;
 
diff --git a/src/main/java/com/uid2/admin/cloudencryption/ExpiredKeyCountRetentionStrategy.java b/src/main/java/com/uid2/admin/cloudencryption/ExpiredKeyCountRetentionStrategy.java
@@ -1,4 +1,4 @@
-package com.uid2.admin.cloudEncryption;
+package com.uid2.admin.cloudencryption;
 
 import com.uid2.admin.store.Clock;
 import com.uid2.shared.model.CloudEncryptionKey;
diff --git a/src/main/java/com/uid2/admin/vertx/service/CloudEncryptionKeyService.java b/src/main/java/com/uid2/admin/vertx/service/CloudEncryptionKeyService.java
@@ -3,7 +3,7 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.uid2.admin.auth.AdminAuthMiddleware;
-import com.uid2.admin.cloudEncryption.CloudKeyRotationStrategy;
+import com.uid2.admin.cloudencryption.CloudKeyRotationStrategy;
 import com.uid2.admin.model.CloudEncryptionKeyListResponse;
 import com.uid2.admin.model.CloudEncryptionKeySummary;
 import com.uid2.admin.store.writer.CloudEncryptionKeyStoreWriter;
diff --git a/src/main/java/com/uid2/admin/vertx/service/OperatorKeyService.java b/src/main/java/com/uid2/admin/vertx/service/OperatorKeyService.java
@@ -3,7 +3,7 @@
 import com.fasterxml.jackson.databind.ObjectWriter;
 import com.uid2.admin.auth.AdminAuthMiddleware;
 import com.uid2.admin.auth.RevealedKey;
-import com.uid2.admin.cloudEncryption.CloudEncryptionKeyManager;
+import com.uid2.admin.cloudencryption.CloudEncryptionKeyManager;
 import com.uid2.shared.model.Site;
 import com.uid2.shared.secret.IKeyGenerator;
 import com.uid2.admin.store.writer.OperatorKeyStoreWriter;
diff --git a/src/test/java/com/uid2/admin/cloudencryption/CloudEncryptionKeyManagerTest.java b/src/test/java/com/uid2/admin/cloudencryption/CloudEncryptionKeyManagerTest.java
@@ -1,4 +1,4 @@
-package com.uid2.admin.cloudEncryption;
+package com.uid2.admin.cloudencryption;
 
 import com.uid2.admin.store.writer.CloudEncryptionKeyStoreWriter;
 import com.uid2.shared.auth.OperatorKey;
diff --git a/src/test/java/com/uid2/admin/cloudencryption/ExpiredKeyCountRetentionStrategyTest.java b/src/test/java/com/uid2/admin/cloudencryption/ExpiredKeyCountRetentionStrategyTest.java
@@ -1,4 +1,4 @@
-package com.uid2.admin.cloudEncryption;
+package com.uid2.admin.cloudencryption;
 
 import com.uid2.admin.store.Clock;
 import com.uid2.shared.model.CloudEncryptionKey;
diff --git a/src/test/java/com/uid2/admin/vertx/CloudEncryptionKeyServiceTest.java b/src/test/java/com/uid2/admin/vertx/CloudEncryptionKeyServiceTest.java
@@ -3,8 +3,8 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.uid2.admin.cloudEncryption.CloudKeyRotationStrategy;
-import com.uid2.admin.cloudEncryption.ExpiredKeyCountRetentionStrategy;
+import com.uid2.admin.cloudencryption.CloudKeyRotationStrategy;
+import com.uid2.admin.cloudencryption.ExpiredKeyCountRetentionStrategy;
 import com.uid2.admin.model.CloudEncryptionKeyListResponse;
 import com.uid2.admin.model.CloudEncryptionKeySummary;
 import com.uid2.admin.vertx.service.CloudEncryptionKeyService;
diff --git a/src/test/java/com/uid2/admin/vertx/OperatorKeyServiceTest.java b/src/test/java/com/uid2/admin/vertx/OperatorKeyServiceTest.java
@@ -3,7 +3,7 @@
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.uid2.admin.auth.RevealedKey;
-import com.uid2.admin.cloudEncryption.CloudEncryptionKeyManager;
+import com.uid2.admin.cloudencryption.CloudEncryptionKeyManager;
 import com.uid2.admin.vertx.service.IService;
 import com.uid2.admin.vertx.service.OperatorKeyService;
 import com.uid2.admin.vertx.test.ServiceTestBase;
diff --git a/src/test/java/com/uid2/admin/vertx/test/ServiceTestBase.java b/src/test/java/com/uid2/admin/vertx/test/ServiceTestBase.java
@@ -9,7 +9,7 @@
 import com.uid2.admin.legacy.LegacyClientKeyStoreWriter;
 import com.uid2.admin.legacy.RotatingLegacyClientKeyProvider;
 import com.uid2.admin.managers.KeysetManager;
-import com.uid2.admin.cloudEncryption.CloudSecretGenerator;
+import com.uid2.admin.cloudencryption.CloudSecretGenerator;
 import com.uid2.admin.secret.IEncryptionKeyManager;
 import com.uid2.admin.vertx.Endpoints;
 import com.uid2.shared.model.*;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.uid2.admin.cloudEncryption;`
	`1`	`+package com.uid2.admin.cloudencryption;`
`2`	`2`
`3`	`3`	`import com.uid2.admin.store.writer.CloudEncryptionKeyStoreWriter;`
`4`	`4`	`import com.uid2.shared.auth.OperatorKey;`