remove unused config, duplicate files

Author: Ian-Nara

src/main/java/com/uid2/optout/Const.java

@@ -11,16 +11,12 @@ public static class Config extends com.uid2.shared.Const.Config {
         public static final String OptOutPartnerEndpointMockProp = "optout_partner_endpoint_mock";
         public static final String OptOutObserveOnlyProp = "optout_observe_only";
         public static final String OptOutS3PathCompatProp = "optout_s3_path_compat";
-        public static final String OptOutAddEntryTimeoutMsProp = "optout_add_entry_timeout_ms";
         public static final String OptOutProducerBufferSizeProp = "optout_producer_buffer_size";
         public static final String OptOutSenderReplicaIdProp = "optout_sender_replica_id";
         public static final String OptOutDeleteExpiredProp = "optout_delete_expired";
         public static final String PartnersConfigPathProp = "partners_config_path";
         public static final String PartnersMetadataPathProp = "partners_metadata_path";
         public static final String OptOutSqsQueueUrlProp = "optout_sqs_queue_url";
-        public static final String OptOutSqsEnabledProp = "optout_enqueue_sqs_enabled";
-        public static final String OptOutSqsS3FolderProp = "optout_sqs_s3_folder"; // sqs delta producer writes to this folder
-        public static final String OptOutLegacyProducerS3FolderProp = "optout_legacy_producer_s3_folder"; // legacy producer writes to this folder
         public static final String OptOutSqsMaxMessagesPerPollProp = "optout_sqs_max_messages_per_poll";
         public static final String OptOutSqsVisibilityTimeoutProp = "optout_sqs_visibility_timeout";
         public static final String OptOutDeltaJobTimeoutSecondsProp = "optout_delta_job_timeout_seconds";
@@ -38,11 +34,9 @@ public static class Config extends com.uid2.shared.Const.Config {
     }
 
     public static class Event {
-        public static final String DeltaProduce = "delta.produce";
         public static final String DeltaProduced = "delta.produced";
         public static final String DeltaSentRemote = "delta.sent_remote";
         public static final String PartitionProduce = "partition.produce";
         public static final String PartitionProduced = "partition.produced";
-        public static final String EntryAdd = "entry.add";
     }
 }

src/main/java/com/uid2/optout/vertx/DeltaProduceJobStatus.java

@@ -7,7 +7,6 @@
 public enum Endpoints {
     OPS_HEALTHCHECK("/ops/healthcheck"),
     OPTOUT_REFRESH("/optout/refresh"),
-    OPTOUT_WRITE("/optout/write"),
     OPTOUT_REPLICATE("/optout/replicate"),
     OPTOUT_DELTA_PRODUCE("/optout/deltaproduce"),
     OPTOUT_PARTNER_MOCK("/optout/partner_mock");

src/main/java/com/uid2/optout/vertx/DeltaProductionResult.java

@@ -122,7 +122,7 @@ public OptOutSqsLogProducer(JsonObject jsonConfig, ICloudStorage cloudStorage, I
 
         // circuit breaker tools
         this.trafficFilter = new TrafficFilter(jsonConfig.getString(Const.Config.TrafficFilterConfigPathProp));
-        this.trafficCalculator = new TrafficCalculator(cloudStorage, jsonConfig.getString(Const.Config.OptOutSqsS3FolderProp), jsonConfig.getString(Const.Config.TrafficCalcConfigPathProp));
+        this.trafficCalculator = new TrafficCalculator(cloudStorage, jsonConfig.getString(Const.Config.OptOutS3FolderProp), jsonConfig.getString(Const.Config.TrafficCalcConfigPathProp));
 
         // configuration values for orchestrator setup
         int replicaId = OptOutUtils.getReplicaId(jsonConfig); 

src/main/java/com/uid2/optout/vertx/Endpoints.java

@@ -81,7 +81,7 @@ public void setup(Vertx vertx, VertxTestContext testContext) throws Exception {
               .put(Const.Config.TrafficCalcConfigPathProp, TRAFFIC_CALC_CONFIG_PATH)
               .put(Const.Config.ManualOverrideS3PathProp, MANUAL_OVERRIDE_S3_PATH)
               .put(Const.Config.OptOutS3BucketDroppedRequestsProp, TEST_BUCKET_DROPPED_REQUESTS)
-              .put(Const.Config.OptOutSqsS3FolderProp, S3_DELTA_PREFIX)
+              .put(Const.Config.OptOutS3FolderProp, S3_DELTA_PREFIX)
               .put(Const.Config.OptOutMaxMessagesPerFileProp, 100);
 
         // mock cloud sync to return proper s3 paths
@@ -133,7 +133,7 @@ public void setup(Vertx vertx, VertxTestContext testContext) throws Exception {
         }
 
         // create producer with mocks
-        producer = new OptOutSqsLogProducer(config, cloudStorage, cloudStorageDroppedRequests, cloudSync, Const.Event.DeltaProduce, sqsClient);
+        producer = new OptOutSqsLogProducer(config, cloudStorage, cloudStorageDroppedRequests, cloudSync, Const.Event.DeltaProduced, sqsClient);
 
         // deploy verticle
         vertx.deployVerticle(producer, testContext.succeeding(id -> testContext.completeNow()));