CLEAN and UNIT TEST - (PROBABLY DONT NEED THIS)

data-ingestion-service/src/main/java/gov/cdc/dataingestion/rawmessage/dto/RawERLDto.java

@@ -1,8 +1,11 @@
 package gov.cdc.dataingestion.rawmessage.dto;
 
 import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 
-@Data
+@Getter
+@Setter
 public class RawERLDto {
 
     private String id;

data-processing-service/build.gradle

@@ -61,15 +61,35 @@ jacoco {
 test {
     finalizedBy jacocoTestReport // report is always generated after tests run
 }
+
 jacocoTestReport {
     reports {
         xml.required = true
         csv.required = false
         html.outputLocation = layout.buildDirectory.dir('jacocoHtml')
     }
-    getExecutionData().setFrom(fileTree(buildDir).include("/jacoco/*.exec"))
+
+    getExecutionData().setFrom(fileTree(buildDir).include("**/jacoco/*.exec"))
+
+    afterEvaluate {
+        classDirectories.setFrom(files(classDirectories.files.collect {
+            fileTree(dir: it,
+                    excludes: [
+                            '**/config/NbsDataSourceConfig.java',
+                            '**/config/OdseDataSourceConfig.java',
+                            '**/config/SrteDataSourceConfig.java',
+                            '**/model/dsma_algorithm/**',
+                            '**/model/phdc/**',
+                            '**/security/config/**',
+                            '**/ServiceApplication.java',
+                            '**/DsmLabMatchHelper.java',
+                    ]
+            )
+        }))
+    }
 }
 
+
 task integration(type: Test) {
     useJUnitPlatform()
 }
@@ -205,12 +225,23 @@ sonarqube {
         property "sonar.projectKey", "CDCgov_NEDSS-DataIngestion"
         property "sonar.organization", "cdcgov"
         property "sonar.host.url", "https://sonarcloud.io"
-        property "sonar.exclusions", "**/config/**, **/constant/**, **/exception/**, **/model/container/**, **/model/dsma_algorithm/**, **/model/dto/**, **/model/phdc/**, " +
-                " **/repository/nbs/msgoute/model/**, **/repository/nbs/odse/model/**, **/repository/nbs/srte/model/**, **/security/config/**, **/ServiceApplication.java, " +
-                " **/service/model/**, **/DynamicBeanBinding.java, **/RulesEngineUtil.java, **/utilities/model/**," +
-                " **/controller/**, **/kafka/consumer/**, **kafka/producer/**, **/WdsObjectChecker.java," +
-                " **/AdvancedCriteria.java, **/cache/OdseCache.java, **/cache/PropertyUtilCache.java, " +
-                " **/cache/SrteCache.java, **/StringUtils.java, **/TimeStampUtil.java, **/AuthUtil.java"
-
+        property "sonar.exclusions", [
+                "**/config/NbsDataSourceConfig.java",
+                "**/config/OdseDataSourceConfig.java",
+                "**/config/SrteDataSourceConfig.java",
+                "**/model/dsma_algorithm/**",
+                "**/model/phdc/**",
+                "**/security/config/**",
+                "**/ServiceApplication.java",
+                "**/DsmLabMatchHelper.java",
+                "**/InvestigationService.java",
+                "**/ObservationRequestHandler.java",
+                "**/InvestigationNotificationService.java",
+                "**/ObservationMatchingService.java",
+                "**/ContactSummaryService.java",
+                "**/RetrieveSummaryService.java",
+                "**/ManagerCacheService.java",
+                "**/NBSObjectConverter.java"
+        ].join(",")
     }
-}
+}

data-processing-service/src/main/java/gov/cdc/dataprocessing/ServiceApplication.java

@@ -6,14 +6,15 @@
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 /**
- *  Report service application.
+ * Report service application.
  */
 @SpringBootApplication
 @EnableCaching
 @EnableTransactionManagement
 public class ServiceApplication {
     /**
      * Main method for spring boot application.
+     *
      * @param args
      */
     public static void main(final String[] args) {

data-processing-service/src/main/java/gov/cdc/dataprocessing/cache/OdseCache.java

@@ -4,10 +4,10 @@
 import java.util.TreeMap;
 
 public class OdseCache {
-    public static Map<Object,Object> fromPrePopFormMapping = new TreeMap<Object, Object>();
-    public static Map<Object,Object> toPrePopFormMapping = new TreeMap<Object, Object>();
-    public static Map<Object,Object> dmbMap = new TreeMap<Object, Object>();
-    public static Map<Object,Object> map = new TreeMap<Object, Object>();
+    public static Map<Object, Object> fromPrePopFormMapping = new TreeMap<Object, Object>();
+    public static Map<Object, Object> toPrePopFormMapping = new TreeMap<Object, Object>();
+    public static Map<Object, Object> dmbMap = new TreeMap<Object, Object>();
+    public static Map<Object, Object> map = new TreeMap<Object, Object>();
 
 
 }

data-processing-service/src/main/java/gov/cdc/dataprocessing/config/CacheConfig.java

@@ -8,6 +8,7 @@
 import org.springframework.context.annotation.Configuration;
 
 import java.util.Arrays;
+import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 @Configuration
@@ -17,12 +18,12 @@ public class CacheConfig {
     @Bean
     public CacheManager cacheManager() {
         CaffeineCacheManager cacheManager = new CaffeineCacheManager();
-        cacheManager.setCacheNames(Arrays.asList("srte")); // Add your cache names here
+        cacheManager.setCacheNames(List.of("srte")); // Add your cache names here
         cacheManager.setCaffeine(caffeineConfig());
         return cacheManager;
     }
 
-    private Caffeine caffeineConfig() {
+    protected Caffeine caffeineConfig() {
         return Caffeine.newBuilder()
 //                .maximumSize(500)
                 .expireAfterAccess(60, TimeUnit.MINUTES); // Adjust expiration settings as needed

data-processing-service/src/main/java/gov/cdc/dataprocessing/config/KafkaConsumerConfig.java

@@ -19,15 +19,15 @@
 @Configuration
 public class KafkaConsumerConfig {
     @Value("${spring.kafka.group-id}")
-    private String groupId = "";
+    protected String groupId = "";
 
     @Value("${spring.kafka.bootstrap-servers}")
-    private String bootstrapServers = "";
+    protected String bootstrapServers = "";
 
     // Higher value for more intensive operation, also increase latency
     // default is 30000, equivalent to 5 min
     @Value("${spring.kafka.consumer.maxPollIntervalMs}")
-    private String maxPollInterval = "";
+    protected String maxPollInterval = "";
 
     @Bean
     public ConsumerFactory<String, String> consumerFactory() {
@@ -48,6 +48,6 @@ public ConsumerFactory<String, String> consumerFactory() {
         ConcurrentKafkaListenerContainerFactory<String, String> factory =
                 new ConcurrentKafkaListenerContainerFactory<>();
         factory.setConsumerFactory(consumerFactory());
-        return  factory;
+        return factory;
     }
 }

data-processing-service/src/main/java/gov/cdc/dataprocessing/config/KafkaProducerConfig.java

@@ -15,7 +15,7 @@
 @Configuration
 public class KafkaProducerConfig {
     @Value("${spring.kafka.bootstrap-servers}")
-    private String bootstrapServers = "";
+    protected String bootstrapServers = "";
 
     @Bean
     public ProducerFactory<String, String> producerFactory() {

data-processing-service/src/main/java/gov/cdc/dataprocessing/config/NbsDataSourceConfig.java

@@ -28,16 +28,16 @@
 )
 public class NbsDataSourceConfig {
     @Value("${spring.datasource.driverClassName}")
-    private String driverClassName;
+    protected String driverClassName;
 
     @Value("${spring.datasource.nbs.url}")
-    private String dbUrl;
+    protected String dbUrl;
 
     @Value("${spring.datasource.username}")
-    private String dbUserName;
+    protected String dbUserName;
 
     @Value("${spring.datasource.password}")
-    private String dbUserPassword;
+    protected String dbUserPassword;
 
     @Bean(name = "nbsDataSource")
     public DataSource nbsDataSource() {
@@ -59,7 +59,7 @@ public EntityManagerFactoryBuilder nbsEntityManagerFactoryBuilder() {
     @Bean(name = "nbsEntityManagerFactory")
     public LocalContainerEntityManagerFactoryBean nbsEntityManagerFactory(
             EntityManagerFactoryBuilder nbsEntityManagerFactoryBuilder,
-            @Qualifier("nbsDataSource") DataSource nbsDataSource ) {
+            @Qualifier("nbsDataSource") DataSource nbsDataSource) {
         return nbsEntityManagerFactoryBuilder
                 .dataSource(nbsDataSource)
                 .packages("gov.cdc.dataprocessing.repository.nbs.msgoute.model")
@@ -69,7 +69,7 @@ public LocalContainerEntityManagerFactoryBean nbsEntityManagerFactory(
 
     @Bean(name = "nbsTransactionManager")
     public PlatformTransactionManager nbsTransactionManager(
-            @Qualifier("nbsEntityManagerFactory") EntityManagerFactory nbsEntityManagerFactory ) {
+            @Qualifier("nbsEntityManagerFactory") EntityManagerFactory nbsEntityManagerFactory) {
         return new JpaTransactionManager(nbsEntityManagerFactory);
     }
 }

data-processing-service/src/main/java/gov/cdc/dataprocessing/config/OdseDataSourceConfig.java

@@ -61,7 +61,7 @@ public EntityManagerFactoryBuilder odseEntityManagerFactoryBuilder() {
     @Bean(name = "odseEntityManagerFactory")
     public LocalContainerEntityManagerFactoryBean odseEntityManagerFactory(
             EntityManagerFactoryBuilder odseEntityManagerFactoryBuilder,
-            @Qualifier("odseDataSource") DataSource odseDataSource ) {
+            @Qualifier("odseDataSource") DataSource odseDataSource) {
         return odseEntityManagerFactoryBuilder
                 .dataSource(odseDataSource)
                 .packages("gov.cdc.dataprocessing.repository.nbs.odse.model")
@@ -72,7 +72,7 @@ public LocalContainerEntityManagerFactoryBean odseEntityManagerFactory(
     @Primary
     @Bean(name = "odseTransactionManager")
     public PlatformTransactionManager odseTransactionManager(
-            @Qualifier("odseEntityManagerFactory") EntityManagerFactory odseEntityManagerFactory ) {
+            @Qualifier("odseEntityManagerFactory") EntityManagerFactory odseEntityManagerFactory) {
         return new JpaTransactionManager(odseEntityManagerFactory);
     }
 }

data-processing-service/src/main/java/gov/cdc/dataprocessing/config/SrteDataSourceConfig.java

@@ -18,7 +18,6 @@
 import java.util.HashMap;
 
 
-
 @Configuration
 @EnableTransactionManagement
 @EnableJpaRepositories(
@@ -61,7 +60,7 @@ public EntityManagerFactoryBuilder srteEntityManagerFactoryBuilder() {
     @Bean(name = "srteEntityManagerFactory")
     public LocalContainerEntityManagerFactoryBean srteEntityManagerFactory(
             EntityManagerFactoryBuilder srteEntityManagerFactoryBuilder,
-            @Qualifier("srteDataSource") DataSource srteDataSource ) {
+            @Qualifier("srteDataSource") DataSource srteDataSource) {
         return srteEntityManagerFactoryBuilder
                 .dataSource(srteDataSource)
                 .packages("gov.cdc.dataprocessing.repository.nbs.srte.model")
@@ -71,7 +70,7 @@ public LocalContainerEntityManagerFactoryBean srteEntityManagerFactory(
 
     @Bean(name = "srteTransactionManager")
     public PlatformTransactionManager srteTransactionManager(
-            @Qualifier("srteEntityManagerFactory") EntityManagerFactory srteEntityManagerFactory ) {
+            @Qualifier("srteEntityManagerFactory") EntityManagerFactory srteEntityManagerFactory) {
         return new JpaTransactionManager(srteEntityManagerFactory);
     }
 }

data-processing-service/src/main/java/gov/cdc/dataprocessing/constant/CTConstants.java

@@ -31,7 +31,7 @@ public class CTConstants {
     public static final String SignsSymptomsNotes = "CON130";
     public static final String RiskFactorsForIllness = "CON131";
     public static final String RiskFactorNotes = "CON132";
-    public static final String TestingEvaluationCompleted  = "CON117";
+    public static final String TestingEvaluationCompleted = "CON117";
     public static final String DateOfEvaluation = "CON118";
     public static final String EvaluationFindings = "CON119";
     public static final String WasTreatmentInitiatedForIllness = "CON120";