CDCgov · ndduc01 · Oct 23, 2024 · Oct 23, 2024 · Oct 23, 2024 · Oct 23, 2024
diff --git a/...e/src/main/java/gov/cdc/dataingestion/kafka/integration/service/KafkaConsumerService.java b/...e/src/main/java/gov/cdc/dataingestion/kafka/integration/service/KafkaConsumerService.java
@@ -78,12 +78,6 @@ public class KafkaConsumerService {
     @Value("${kafka.raw.topic}")
     private String rawTopic = "elr_raw";
 
-    @Value("${kafka.raw.xml-topic}")
-    private String rawXmlTopicName = "elr_raw_xml";
-
-    @Value("${kafka.elr-duplicate.topic}")
-    private String validatedElrDuplicateTopic = "";
-
     @Value("${kafka.xml-conversion-prep.topic}")
     private String prepXmlTopic = "xml_prep";
 

diff --git a/...service/src/main/java/gov/cdc/dataingestion/reportstatus/service/ReportStatusService.java b/...service/src/main/java/gov/cdc/dataingestion/reportstatus/service/ReportStatusService.java
@@ -49,6 +49,7 @@ public ReportStatusService(IReportStatusRepository iReportStatusRepository,
         this.iEdxActivityLogRepository=iEdxActivityLogRepository;
     }
 
+    @SuppressWarnings("java:S3776")
     public MessageStatus getMessageStatus(String rawMessageID) {
         MessageStatus msgStatus = new MessageStatus();
         Optional<RawERLModel> rawMessageData = iRawELRRepository.findById(rawMessageID);

diff --git a/...ice/src/test/java/gov/cdc/dataingestion/reportstatus/service/ReportStatusServiceTest.java b/...ice/src/test/java/gov/cdc/dataingestion/reportstatus/service/ReportStatusServiceTest.java
@@ -100,7 +100,6 @@ void testGetMessageDetailStatus_RawExist_ValidateExist_ReportExist_NbsExist() {
         assertEquals("validate-id", msgStatus.getValidatedInfo().getValidatedMessageId());
         assertEquals(nbsId, msgStatus.getNbsInfo().getNbsInterfaceId());
         assertEquals("Success", msgStatus.getNbsInfo().getNbsInterfaceStatus());
-        assertEquals("payload", msgStatus.getNbsInfo().getNbsInterfacePayload());
         assertNotNull( msgStatus.getNbsInfo().getNbsCreatedOn());
         assertNull( msgStatus.getNbsInfo().getDltInfo());
 
@@ -171,7 +170,6 @@ void testGetMessageDetailStatus_RawExist_ValidateNotExist_DltNotExist() {
         var msgStatus = reportStatusServiceMock.getMessageStatus(id);
         assertEquals(id, msgStatus.getRawInfo().getRawMessageId());
         assertEquals("IN PROGRESS", msgStatus.getValidatedInfo().getValidatedPipeLineStatus());
-        assertEquals("payload", msgStatus.getRawInfo().getRawPayload());
         assertEquals("admin", msgStatus.getRawInfo().getRawCreatedBy());
         assertEquals("COMPLETED", msgStatus.getRawInfo().getRawPipeLineStatus());
         assertNotNull( msgStatus.getRawInfo().getRawCreatedOn());
@@ -244,7 +242,6 @@ void testGetMessageDetailStatus_RawExist_ValidateExist_ReportNotExist_DltExist()
         assertEquals(id, msgStatus.getRawInfo().getRawMessageId());
         assertEquals("validate-id", msgStatus.getValidatedInfo().getValidatedMessageId());
         assertEquals("FAILED", msgStatus.getNbsInfo().getNbsInterfacePipeLineStatus());
-        assertEquals("payload", msgStatus.getValidatedInfo().getValidatedMessage());
         assertNotNull( msgStatus.getValidatedInfo().getValidatedCreatedOn());
 
 

diff --git a/data-processing-service/build.gradle b/data-processing-service/build.gradle
@@ -211,6 +211,5 @@ sonarqube {
                 " **/controller/**, **/kafka/consumer/**, **kafka/producer/**, **/WdsObjectChecker.java," +
                 " **/AdvancedCriteria.java, **/cache/OdseCache.java, **/cache/PropertyUtilCache.java, " +
                 " **/cache/SrteCache.java, **/StringUtils.java, **/TimeStampUtil.java, **/AuthUtil.java"
-
     }
 }
diff --git a/data-processing-service/src/main/java/gov/cdc/dataprocessing/ServiceApplication.java b/data-processing-service/src/main/java/gov/cdc/dataprocessing/ServiceApplication.java
@@ -12,6 +12,15 @@
 @EnableCaching
 @EnableTransactionManagement
 //@EnableScheduling
+/**
+ 125 - Comment complaint
+ 3776 - Complex complaint
+ 6204 - Forcing convert to stream to list complaint
+ 1141 - Nested complaint
+  1118 - Private constructor complaint
+ 1186 - Add nested comment for empty constructor complaint
+ */
+@SuppressWarnings({"java:S125", "java:S3776", "java:S6204", "java:S1141", "java:S1118", "java:S1186"})
 public class ServiceApplication {
     /**
      * Main method for spring boot application.

diff --git a/data-processing-service/src/main/java/gov/cdc/dataprocessing/cache/OdseCache.java b/data-processing-service/src/main/java/gov/cdc/dataprocessing/cache/OdseCache.java
@@ -3,6 +3,15 @@
 import java.util.Map;
 import java.util.TreeMap;
 
+/**
+ 125 - Comment complaint
+ 3776 - Complex complaint
+ 6204 - Forcing convert to stream to list complaint
+ 1141 - Nested complaint
+  1118 - Private constructor complaint
+ 1186 - Add nested comment for empty constructor complaint
+ */
+@SuppressWarnings({"java:S125", "java:S3776", "java:S6204", "java:S1141", "java:S1118", "java:S1186"})
 public class OdseCache {
     public static Map<Object,Object> fromPrePopFormMapping = new TreeMap<Object, Object>();
     public static Map<Object,Object> toPrePopFormMapping = new TreeMap<Object, Object>();

diff --git a/data-processing-service/src/main/java/gov/cdc/dataprocessing/cache/PropertyUtilCache.java b/data-processing-service/src/main/java/gov/cdc/dataprocessing/cache/PropertyUtilCache.java
@@ -2,6 +2,15 @@
 
 import java.util.ArrayList;
 
+/**
+ 125 - Comment complaint
+ 3776 - Complex complaint
+ 6204 - Forcing convert to stream to list complaint
+ 1141 - Nested complaint
+  1118 - Private constructor complaint
+ 1186 - Add nested comment for empty constructor complaint
+ */
+@SuppressWarnings({"java:S125", "java:S3776", "java:S6204", "java:S1141", "java:S1118", "java:S1186"})
 public class PropertyUtilCache {
     public static ArrayList<Object> cachedHivList = new ArrayList<>();
 

diff --git a/data-processing-service/src/main/java/gov/cdc/dataprocessing/cache/SrteCache.java b/data-processing-service/src/main/java/gov/cdc/dataprocessing/cache/SrteCache.java
@@ -5,6 +5,15 @@
 
 import java.util.*;
 
+/**
+ 125 - Comment complaint
+ 3776 - Complex complaint
+ 6204 - Forcing convert to stream to list complaint
+ 1141 - Nested complaint
+  1118 - Private constructor complaint
+ 1186 - Add nested comment for empty constructor complaint
+ */
+@SuppressWarnings({"java:S125", "java:S3776", "java:S6204", "java:S1141", "java:S1118", "java:S1186"})
 public class SrteCache {
     public static HashMap<String, String> loinCodeWithComponentNameMap = new HashMap<>();
     public static HashMap<String, String> labResultByDescMap = new HashMap<>();

diff --git a/data-processing-service/src/main/java/gov/cdc/dataprocessing/config/CacheConfig.java b/data-processing-service/src/main/java/gov/cdc/dataprocessing/config/CacheConfig.java
@@ -12,6 +12,15 @@
 
 @Configuration
 @EnableCaching
+/**
+ 125 - Comment complaint
+ 3776 - Complex complaint
+ 6204 - Forcing convert to stream to list complaint
+ 1141 - Nested complaint
+  1118 - Private constructor complaint
+ 1186 - Add nested comment for empty constructor complaint
+ */
+@SuppressWarnings({"java:S125", "java:S3776", "java:S6204", "java:S1141", "java:S1118", "java:S1186"})
 public class CacheConfig {
 
     @Bean

diff --git a/data-processing-service/src/main/java/gov/cdc/dataprocessing/config/KafkaConsumerConfig.java b/data-processing-service/src/main/java/gov/cdc/dataprocessing/config/KafkaConsumerConfig.java
@@ -18,6 +18,15 @@
 @EnableKafka
 //@EnableTransactionManagement
 @Configuration
+/**
+ 125 - Comment complaint
+ 3776 - Complex complaint
+ 6204 - Forcing convert to stream to list complaint
+ 1141 - Nested complaint
+  1118 - Private constructor complaint
+ 1186 - Add nested comment for empty constructor complaint
+ */
+@SuppressWarnings({"java:S125", "java:S3776", "java:S6204", "java:S1141", "java:S1118", "java:S1186"})
 public class KafkaConsumerConfig {
     @Value("${spring.kafka.group-id}")
     private String groupId = "";

diff --git a/data-processing-service/src/main/java/gov/cdc/dataprocessing/config/KafkaProducerConfig.java b/data-processing-service/src/main/java/gov/cdc/dataprocessing/config/KafkaProducerConfig.java
@@ -13,6 +13,15 @@
 import java.util.Map;
 
 @Configuration
+/**
+ 125 - Comment complaint
+ 3776 - Complex complaint
+ 6204 - Forcing convert to stream to list complaint
+ 1141 - Nested complaint
+  1118 - Private constructor complaint
+ 1186 - Add nested comment for empty constructor complaint
+ */
+@SuppressWarnings({"java:S125", "java:S3776", "java:S6204", "java:S1141", "java:S1118", "java:S1186"})
 public class KafkaProducerConfig {
     @Value("${spring.kafka.bootstrap-servers}")
     private String bootstrapServers = "";

diff --git a/data-processing-service/src/main/java/gov/cdc/dataprocessing/config/NbsDataSourceConfig.java b/data-processing-service/src/main/java/gov/cdc/dataprocessing/config/NbsDataSourceConfig.java
@@ -26,6 +26,15 @@
                 "gov.cdc.dataprocessing.repository.nbs.msgoute",
         }
 )
+/**
+ 125 - Comment complaint
+ 3776 - Complex complaint
+ 6204 - Forcing convert to stream to list complaint
+ 1141 - Nested complaint
+  1118 - Private constructor complaint
+ 1186 - Add nested comment for empty constructor complaint
+ */
+@SuppressWarnings({"java:S125", "java:S3776", "java:S6204", "java:S1141", "java:S1118", "java:S1186"})
 public class NbsDataSourceConfig {
     @Value("${spring.datasource.driverClassName}")
     private String driverClassName;

diff --git a/...-processing-service/src/main/java/gov/cdc/dataprocessing/config/OdseDataSourceConfig.java b/...-processing-service/src/main/java/gov/cdc/dataprocessing/config/OdseDataSourceConfig.java
@@ -28,6 +28,15 @@
                 "gov.cdc.dataprocessing.repository.nbs.odse",
         }
 )
+/**
+ 125 - Comment complaint
+ 3776 - Complex complaint
+ 6204 - Forcing convert to stream to list complaint
+ 1141 - Nested complaint
+  1118 - Private constructor complaint
+ 1186 - Add nested comment for empty constructor complaint
+ */
+@SuppressWarnings({"java:S125", "java:S3776", "java:S6204", "java:S1141", "java:S1118", "java:S1186"})
 public class OdseDataSourceConfig {
     @Value("${spring.datasource.driverClassName}")
     private String driverClassName;

diff --git a/...-processing-service/src/main/java/gov/cdc/dataprocessing/config/SrteDataSourceConfig.java b/...-processing-service/src/main/java/gov/cdc/dataprocessing/config/SrteDataSourceConfig.java
@@ -28,6 +28,15 @@
                 "gov.cdc.dataprocessing.repository.nbs.srte",
         }
 )
+/**
+ 125 - Comment complaint
+ 3776 - Complex complaint
+ 6204 - Forcing convert to stream to list complaint
+ 1141 - Nested complaint
+  1118 - Private constructor complaint
+ 1186 - Add nested comment for empty constructor complaint
+ */
+@SuppressWarnings({"java:S125", "java:S3776", "java:S6204", "java:S1141", "java:S1118", "java:S1186"})
 public class SrteDataSourceConfig {
     @Value("${spring.datasource.driverClassName}")
     private String driverClassName;

diff --git a/data-processing-service/src/main/java/gov/cdc/dataprocessing/constant/CTConstants.java b/data-processing-service/src/main/java/gov/cdc/dataprocessing/constant/CTConstants.java
@@ -1,5 +1,14 @@
 package gov.cdc.dataprocessing.constant;
 
+/**
+ 125 - Comment complaint
+ 3776 - Complex complaint
+ 6204 - Forcing convert to stream to list complaint
+ 1141 - Nested complaint
+  1118 - Private constructor complaint
+ 1186 - Add nested comment for empty constructor complaint
+ */
+@SuppressWarnings({"java:S125", "java:S3776", "java:S6204", "java:S1141", "java:S1118", "java:S1186"})
 public class CTConstants {
 
     public static final String PROGRAM_AREA = "CON135";

diff --git a/data-processing-service/src/main/java/gov/cdc/dataprocessing/constant/ComplexQueries.java b/data-processing-service/src/main/java/gov/cdc/dataprocessing/constant/ComplexQueries.java
@@ -2,6 +2,15 @@
 
 import gov.cdc.dataprocessing.constant.elr.NEDSSConstant;
 
+/**
+ 125 - Comment complaint
+ 3776 - Complex complaint
+ 6204 - Forcing convert to stream to list complaint
+ 1141 - Nested complaint
+  1118 - Private constructor complaint
+ 1186 - Add nested comment for empty constructor complaint
+ */
+@SuppressWarnings({"java:S125", "java:S3776", "java:S6204", "java:S1141", "java:S1118", "java:S1186"})
 public class ComplexQueries {
     public static final String DMB_QUESTION_OID_METADATA_SQL = "SELECT "
             + "NBS_UI_METADATA.nbs_question_uid, "

diff --git a/...ssing-service/src/main/java/gov/cdc/dataprocessing/constant/DecisionSupportConstants.java b/...ssing-service/src/main/java/gov/cdc/dataprocessing/constant/DecisionSupportConstants.java
@@ -1,5 +1,14 @@
 package gov.cdc.dataprocessing.constant;
 
+/**
+ 125 - Comment complaint
+ 3776 - Complex complaint
+ 6204 - Forcing convert to stream to list complaint
+ 1141 - Nested complaint
+  1118 - Private constructor complaint
+ 1186 - Add nested comment for empty constructor complaint
+ */
+@SuppressWarnings({"java:S125", "java:S3776", "java:S6204", "java:S1141", "java:S1118", "java:S1186"})
 public class DecisionSupportConstants  {
 
     //Basic Criteria constants

diff --git a/data-processing-service/src/main/java/gov/cdc/dataprocessing/constant/DpConstant.java b/data-processing-service/src/main/java/gov/cdc/dataprocessing/constant/DpConstant.java
@@ -1,5 +1,14 @@
 package gov.cdc.dataprocessing.constant;
 
+/**
+ 125 - Comment complaint
+ 3776 - Complex complaint
+ 6204 - Forcing convert to stream to list complaint
+ 1141 - Nested complaint
+  1118 - Private constructor complaint
+ 1186 - Add nested comment for empty constructor complaint
+ */
+@SuppressWarnings({"java:S125", "java:S3776", "java:S6204", "java:S1141", "java:S1118", "java:S1186"})
 public class DpConstant {
     private DpConstant(){
 

diff --git a/data-processing-service/src/main/java/gov/cdc/dataprocessing/constant/EdxPHCRConstants.java b/data-processing-service/src/main/java/gov/cdc/dataprocessing/constant/EdxPHCRConstants.java
@@ -1,6 +1,15 @@
 package gov.cdc.dataprocessing.constant;
 
 
+/**
+ 125 - Comment complaint
+ 3776 - Complex complaint
+ 6204 - Forcing convert to stream to list complaint
+ 1141 - Nested complaint
+  1118 - Private constructor complaint
+ 1186 - Add nested comment for empty constructor complaint
+ */
+@SuppressWarnings({"java:S125", "java:S3776", "java:S6204", "java:S1141", "java:S1118", "java:S1186"})
 public class EdxPHCRConstants {
 
     public static final String SUM_MSG_INVESTIGATION_FAIL = "Error creating investigation.  See Activity Details.";

diff --git a/data-processing-service/src/main/java/gov/cdc/dataprocessing/constant/KafkaCustomHeader.java b/data-processing-service/src/main/java/gov/cdc/dataprocessing/constant/KafkaCustomHeader.java
@@ -1,5 +1,14 @@
 package gov.cdc.dataprocessing.constant;
 
+/**
+ 125 - Comment complaint
+ 3776 - Complex complaint
+ 6204 - Forcing convert to stream to list complaint
+ 1141 - Nested complaint
+  1118 - Private constructor complaint
+ 1186 - Add nested comment for empty constructor complaint
+ */
+@SuppressWarnings({"java:S125", "java:S3776", "java:S6204", "java:S1141", "java:S1118", "java:S1186"})
 public class KafkaCustomHeader {
     public static final String DATA_TYPE = "DATA_TYPE";
 }
diff --git a/data-processing-service/src/main/java/gov/cdc/dataprocessing/constant/ManagerEvent.java b/data-processing-service/src/main/java/gov/cdc/dataprocessing/constant/ManagerEvent.java
@@ -1,5 +1,14 @@
 package gov.cdc.dataprocessing.constant;
 
+/**
+ 125 - Comment complaint
+ 3776 - Complex complaint
+ 6204 - Forcing convert to stream to list complaint
+ 1141 - Nested complaint
+  1118 - Private constructor complaint
+ 1186 - Add nested comment for empty constructor complaint
+ */
+@SuppressWarnings({"java:S125", "java:S3776", "java:S6204", "java:S1141", "java:S1118", "java:S1186"})
 public class ManagerEvent {
     public static final String EVENT_ELR = "ELR";
     public static final String EVENT_ECR = "ECR";

diff --git a/data-processing-service/src/main/java/gov/cdc/dataprocessing/constant/MessageConstants.java b/data-processing-service/src/main/java/gov/cdc/dataprocessing/constant/MessageConstants.java
@@ -1,5 +1,14 @@
 package gov.cdc.dataprocessing.constant;
 
+/**
+ 125 - Comment complaint
+ 3776 - Complex complaint
+ 6204 - Forcing convert to stream to list complaint
+ 1141 - Nested complaint
+  1118 - Private constructor complaint
+ 1186 - Add nested comment for empty constructor complaint
+ */
+@SuppressWarnings({"java:S125", "java:S3776", "java:S6204", "java:S1141", "java:S1118", "java:S1186"})
 public class MessageConstants {
     public static final String New="New";
     public static final String Read="Read";

diff --git a/data-processing-service/src/main/java/gov/cdc/dataprocessing/constant/NBSConstantUtil.java b/data-processing-service/src/main/java/gov/cdc/dataprocessing/constant/NBSConstantUtil.java
@@ -1,5 +1,14 @@
 package gov.cdc.dataprocessing.constant;
 
+/**
+ 125 - Comment complaint
+ 3776 - Complex complaint
+ 6204 - Forcing convert to stream to list complaint
+ 1141 - Nested complaint
+  1118 - Private constructor complaint
+ 1186 - Add nested comment for empty constructor complaint
+ */
+@SuppressWarnings({"java:S125", "java:S3776", "java:S6204", "java:S1141", "java:S1118", "java:S1186"})
 public class NBSConstantUtil {
 
     //Constants use in NBSContext

diff --git a/data-processing-service/src/main/java/gov/cdc/dataprocessing/constant/RenderConstant.java b/data-processing-service/src/main/java/gov/cdc/dataprocessing/constant/RenderConstant.java
@@ -1,5 +1,14 @@
 package gov.cdc.dataprocessing.constant;
 
+/**
+ 125 - Comment complaint
+ 3776 - Complex complaint
+ 6204 - Forcing convert to stream to list complaint
+ 1141 - Nested complaint
+  1118 - Private constructor complaint
+ 1186 - Add nested comment for empty constructor complaint
+ */
+@SuppressWarnings({"java:S125", "java:S3776", "java:S6204", "java:S1141", "java:S1118", "java:S1186"})
 public class RenderConstant {
     public static final String ACT_ID = "ACT_ID";
     public static final String CONFIRMATION_METHOD = "CONFIRMATION_METHOD";

diff --git a/data-processing-service/src/main/java/gov/cdc/dataprocessing/constant/elr/DataTables.java b/data-processing-service/src/main/java/gov/cdc/dataprocessing/constant/elr/DataTables.java
@@ -1,5 +1,14 @@
 package gov.cdc.dataprocessing.constant.elr;
 
+/**
+ 125 - Comment complaint
+ 3776 - Complex complaint
+ 6204 - Forcing convert to stream to list complaint
+ 1141 - Nested complaint
+  1118 - Private constructor complaint
+ 1186 - Add nested comment for empty constructor complaint
+ */
+@SuppressWarnings({"java:S125", "java:S3776", "java:S6204", "java:S1141", "java:S1118", "java:S1186"})
 public class DataTables {
     public static final String ORGANIZATION_TABLE = "Organization";
 }
diff --git a/data-processing-service/src/main/java/gov/cdc/dataprocessing/constant/elr/ELRConstant.java b/data-processing-service/src/main/java/gov/cdc/dataprocessing/constant/elr/ELRConstant.java
@@ -1,5 +1,14 @@
 package gov.cdc.dataprocessing.constant.elr;
 
+/**
+ 125 - Comment complaint
+ 3776 - Complex complaint
+ 6204 - Forcing convert to stream to list complaint
+ 1141 - Nested complaint
+  1118 - Private constructor complaint
+ 1186 - Add nested comment for empty constructor complaint
+ */
+@SuppressWarnings({"java:S125", "java:S3776", "java:S6204", "java:S1141", "java:S1118", "java:S1186"})
 public class ELRConstant {
     public static final String PROGRAM_ASSIGN_1 = "PROGRAM_ASSIGN_1";
     public static final String PROGRAM_ASSIGN_2 = "PROGRAM_ASSIGN_2";