file rename/relocate

Author: Ian-Nara

…2/optout/vertx/OptOutSqsLogProducer.java …ircuit-breaker/OptOutSqsLogProducer.javasrc/main/java/com/uid2/optout/vertx/OptOutSqsLogProducer.java renamed to src/main/java/com/uid2/optout/circuit-breaker/OptOutSqsLogProducer.java src/main/java/com/uid2/optout/vertx/OptOutSqsLogProducer.java renamed to src/main/java/com/uid2/optout/circuit-breaker/OptOutSqsLogProducer.java

@@ -3,12 +3,12 @@
 import com.uid2.optout.Const;
 import com.uid2.optout.auth.InternalAuthMiddleware;
 import com.uid2.optout.delta.DeltaFileWriter;
-import com.uid2.optout.delta.DeltaManualOverrideService;
+import com.uid2.optout.delta.ManualOverrideService;
 import com.uid2.optout.delta.DeltaProductionJobStatus;
-import com.uid2.optout.delta.DeltaProductionResult;
 import com.uid2.optout.delta.DeltaProductionMetrics;
 import com.uid2.optout.delta.DeltaProductionOrchestrator;
-import com.uid2.optout.delta.DeltaUploadService;
+import com.uid2.optout.delta.DeltaProductionResult;
+import com.uid2.optout.delta.S3UploadService;
 import com.uid2.optout.delta.StopReason;
 import com.uid2.optout.sqs.SqsWindowReader;
 import com.uid2.optout.vertx.OptOutTrafficCalculator.MalformedTrafficCalcConfigException;
@@ -128,9 +128,9 @@ public OptOutSqsLogProducer(JsonObject jsonConfig, ICloudStorage cloudStorage, I
 
         // Orchestrator setup
         DeltaFileWriter deltaFileWriter = new DeltaFileWriter(bufferSize);
-        DeltaUploadService deltaUploadService = new DeltaUploadService(cloudStorage, this.sqsClient, queueUrl);
-        DeltaUploadService droppedRequestUploadService = new DeltaUploadService(cloudStorageDroppedRequests, this.sqsClient, queueUrl) ;
-        DeltaManualOverrideService manualOverrideService = new DeltaManualOverrideService(cloudStorage, jsonConfig.getString(Const.Config.ManualOverrideS3PathProp));
+        S3UploadService deltaUploadService = new S3UploadService(cloudStorage, this.sqsClient, queueUrl);
+        S3UploadService droppedRequestUploadService = new S3UploadService(cloudStorageDroppedRequests, this.sqsClient, queueUrl) ;
+        ManualOverrideService manualOverrideService = new ManualOverrideService(cloudStorage, jsonConfig.getString(Const.Config.ManualOverrideS3PathProp));
         SqsWindowReader windowReader = new SqsWindowReader(
             this.sqsClient, queueUrl, maxMessagesPerPoll, 
             visibilityTimeout, deltaWindowSeconds, maxMessagesPerFile

…ptout/vertx/OptOutTrafficCalculator.java …uit-breaker/OptOutTrafficCalculator.javasrc/main/java/com/uid2/optout/vertx/OptOutTrafficCalculator.java renamed to src/main/java/com/uid2/optout/circuit-breaker/OptOutTrafficCalculator.java src/main/java/com/uid2/optout/vertx/OptOutTrafficCalculator.java renamed to src/main/java/com/uid2/optout/circuit-breaker/OptOutTrafficCalculator.java

@@ -6,6 +6,7 @@
 import com.uid2.shared.optout.OptOutUtils;
 import com.uid2.optout.Const;
 import com.uid2.optout.sqs.SqsMessageOperations;
+
 import io.vertx.core.json.JsonObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/com/uid2/optout/delta/DeltaProductionOrchestrator.java

@@ -46,9 +46,9 @@ public class DeltaProductionOrchestrator {
 
     private final SqsWindowReader windowReader;
     private final DeltaFileWriter deltaFileWriter;
-    private final DeltaUploadService deltaUploadService;
-    private final DeltaUploadService droppedRequestUploadService;
-    private final DeltaManualOverrideService manualOverrideService;
+    private final S3UploadService deltaUploadService;
+    private final S3UploadService droppedRequestUploadService;
+    private final ManualOverrideService manualOverrideService;
     private final OptOutTrafficFilter trafficFilter;
     private final OptOutTrafficCalculator trafficCalculator;
     private final OptOutCloudSync cloudSync;
@@ -62,9 +62,9 @@ public DeltaProductionOrchestrator(
             int jobTimeoutSeconds,
             SqsWindowReader windowReader,
             DeltaFileWriter deltaFileWriter,
-            DeltaUploadService deltaUploadService,
-            DeltaUploadService droppedRequestUploadService,
-            DeltaManualOverrideService manualOverrideService,
+            S3UploadService deltaUploadService,
+            S3UploadService droppedRequestUploadService,
+            ManualOverrideService manualOverrideService,
             OptOutTrafficFilter trafficFilter,
             OptOutTrafficCalculator trafficCalculator,
             OptOutCloudSync cloudSync,

…ut/delta/DeltaManualOverrideService.java …/optout/delta/ManualOverrideService.javasrc/main/java/com/uid2/optout/delta/DeltaManualOverrideService.java renamed to src/main/java/com/uid2/optout/delta/ManualOverrideService.java src/main/java/com/uid2/optout/delta/DeltaManualOverrideService.java renamed to src/main/java/com/uid2/optout/delta/ManualOverrideService.java

@@ -20,8 +20,8 @@
  * {"manual_override": "DELAYED_PROCESSING"}
  * </pre>
  */
-public class DeltaManualOverrideService {
-    private static final Logger LOGGER = LoggerFactory.getLogger(DeltaManualOverrideService.class);
+public class ManualOverrideService {
+    private static final Logger LOGGER = LoggerFactory.getLogger(ManualOverrideService.class);
 
     private static final String OVERRIDE_KEY = "manual_override";
     private static final String DELAYED_PROCESSING_VALUE = "DELAYED_PROCESSING";
@@ -35,7 +35,7 @@ public class DeltaManualOverrideService {
      * @param cloudStorage Cloud storage client for reading/writing override file
      * @param overrideS3Path S3 path where the override file is stored
      */
-    public DeltaManualOverrideService(ICloudStorage cloudStorage, String overrideS3Path) {
+    public ManualOverrideService(ICloudStorage cloudStorage, String overrideS3Path) {
         this.cloudStorage = cloudStorage;
         this.overrideS3Path = overrideS3Path;
     }

…id2/optout/delta/DeltaUploadService.java …m/uid2/optout/delta/S3UploadService.javasrc/main/java/com/uid2/optout/delta/DeltaUploadService.java renamed to src/main/java/com/uid2/optout/delta/S3UploadService.java src/main/java/com/uid2/optout/delta/DeltaUploadService.java renamed to src/main/java/com/uid2/optout/delta/S3UploadService.java

@@ -17,8 +17,8 @@
  * This class encapsulates the critical "upload then delete" pattern that ensures
  * data is persisted to S3 before messages are removed from the queue.
  */
-public class DeltaUploadService {
-    private static final Logger LOGGER = LoggerFactory.getLogger(DeltaUploadService.class);
+public class S3UploadService {
+    private static final Logger LOGGER = LoggerFactory.getLogger(S3UploadService.class);
 
     private final ICloudStorage cloudStorage;
     private final SqsClient sqsClient;
@@ -44,7 +44,7 @@ public interface UploadSuccessCallback {
      * @param sqsClient SQS client for message deletion
      * @param queueUrl SQS queue URL
      */
-    public DeltaUploadService(ICloudStorage cloudStorage, SqsClient sqsClient, String queueUrl) {
+    public S3UploadService(ICloudStorage cloudStorage, SqsClient sqsClient, String queueUrl) {
         this.cloudStorage = cloudStorage;
         this.sqsClient = sqsClient;
         this.queueUrl = queueUrl;
@@ -81,4 +81,3 @@ public void uploadAndDeleteMessages(byte[] data, String s3Path, List<Message> me
         }
     }
 }
-