Merge pull request #23 from CDOT-CV/develop

Fixes for Default SDX URL, Unit Test Failures, and Key Reference in KafkaConsumerRestDepositor.java
usdot-jpo-ode · Oct 30, 2023 · 2c82ef3 · 2c82ef3
2 parents f867c4b + 9fb5651
commit 2c82ef3
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 28 deletions.
diff --git a/src/main/java/jpo/sdw/depositor/DepositorProperties.java b/src/main/java/jpo/sdw/depositor/DepositorProperties.java
@@ -20,7 +20,7 @@ public class DepositorProperties implements EnvironmentAware {
 
    private static final String DEFAULT_GROUP_ID = "usdot.jpo.sdw";
    private static final String DEFAULT_KAFKA_PORT = "9092";
-   private static final String DEFAULT_DESTINATION_URL = "https://sdx-service.trihydro.com/api/deposit";
+   private static final String DEFAULT_DESTINATION_URL = "https://sdx-service.trihydro.com/api/deposit-multi";
    private static final String[] DEFAULT_SUBSCRIPTION_TOPICS = { "topic.SDWDepositorInput" };
    private static final String DEFAULT_ENCODE_TYPE = "hex";
 
@@ -61,8 +61,9 @@ void initialize() {
       if (getEncodeType() == null)
          setEncodeType(DEFAULT_ENCODE_TYPE);
 
-      if (getDestinationUrl() == null)
+      if (getDestinationUrl() == null || getDestinationUrl().isEmpty()) {
          setDestinationUrl(DEFAULT_DESTINATION_URL);
+      }
 
       if (getSubscriptionTopics() == null || getSubscriptionTopics().length == 0) {
          String topics = String.join(",", DEFAULT_SUBSCRIPTION_TOPICS);

diff --git a/src/main/java/jpo/sdw/depositor/consumerdepositors/KafkaConsumerRestDepositor.java b/src/main/java/jpo/sdw/depositor/consumerdepositors/KafkaConsumerRestDepositor.java
@@ -38,7 +38,7 @@ public KafkaConsumerRestDepositor(KafkaConsumer<String, String> kafkaConsumer, R
       this.setRestDepositor(restDepositor);
       this.jsonMsgList = new JSONObject();
       this.jsonMsg = new JSONObject();
-      this.jsonMsg.put("EncodeType", encodeType);
+      this.jsonMsg.put("encodeType", encodeType);
    }
 
    @Override
@@ -49,8 +49,8 @@ public void run(String... topics) {
          JSONArray jsonRequests = new JSONArray();
          for (ConsumerRecord<String, String> record : records) {
             logger.info("Depositing message {}", record);
-            this.jsonMsg.put("EncodedMsg", record.value());
-            jsonRequests.put(jsonMsg);
+            this.jsonMsg.put("encodedMsg", record.value());
+            jsonRequests.put(new JSONObject(jsonMsg.toString()));
          }
          if (records.count() != 0) {
             this.jsonMsgList.put("depositRequests", jsonRequests);

diff --git a/src/test/java/jpo/sdw/depositor/controller/DepositControllerTest.java b/src/test/java/jpo/sdw/depositor/controller/DepositControllerTest.java
@@ -8,10 +8,11 @@
 
 import jpo.sdw.depositor.DepositorProperties;
 import jpo.sdw.depositor.consumerdepositors.KafkaConsumerRestDepositor;
-import mockit.Capturing;
 import mockit.Expectations;
 import mockit.Injectable;
 import mockit.Tested;
+import mockit.Mocked;
+
 
 public class DepositControllerTest {
 
@@ -24,20 +25,22 @@ public class DepositControllerTest {
    @Injectable
    JavaMailSender sender;
 
-   @Capturing
+   @Mocked
    KafkaConsumerFactory capturingKafkaConsumerFactory;
 
-   @Capturing
+   @Mocked
    KafkaConsumerRestDepositor capturingKafkaConsumerRestDepositor;
 
-   @Capturing
+   @Mocked
    URI capturingURI;
 
-   // currently not running, seems to be in endless loop somewhere
-   // @Test
+   @Test
    public void shouldRun() throws URISyntaxException {
+
       new Expectations() {
          {
+            injectableDepositorProperties.getDestinationUrl(); result = "127.0.0.1";
+
             capturingKafkaConsumerRestDepositor.run((String[]) any);
             times = 1;
          }

diff --git a/src/test/java/jpo/sdw/depositor/controller/KafkaConsumerFactoryTest.java b/src/test/java/jpo/sdw/depositor/controller/KafkaConsumerFactoryTest.java
@@ -25,23 +25,23 @@ public class KafkaConsumerFactoryTest {
    @Mocked
    DepositorProperties mockedDepositorProperties;
 
-   // currently failing due to attempt to connect to Kafka broker on creation of consumer
-   // attempted to mock kafka consumer constructor without luck
-   // @Test
-   // public void createConsumerShouldCreateConsumer() {
-   //    new Expectations() {
-   //       {
-   //          // These are required because Properties throws NPE when values are null
-   //          mockedDepositorProperties.getKafkaBrokers();
-   //          result = "kafkaBrokers";
-
-   //          mockedDepositorProperties.getGroupId();
-   //          result = "groupId";
-
-   //       }
-   //    };
-   //    assertNotNull(KafkaConsumerFactory.createConsumer(mockedDepositorProperties));
-   // }
+
+   @Test
+   public void createConsumerShouldCreateConsumer() {
+
+      new Expectations() {
+         {
+            // These are required because Properties throws NPE when values are null
+            mockedDepositorProperties.getKafkaBrokers();
+            result = "kafkaBrokers";
+
+            mockedDepositorProperties.getGroupId();
+            result = "groupId";
+
+         }
+      };
+      assertNotNull(KafkaConsumerFactory.createConsumer(mockedDepositorProperties));
+   }
 
    @Test
    public void testConstructorIsPrivate()