Fix Sonarqube

CMSgov · Apr 25, 2024 · dd58b45 · dd58b45
1 parent 7b8719e
commit dd58b45
Show file tree

Hide file tree

Showing 16 changed files with 35 additions and 34 deletions.
diff --git a/...aShare/AttributionDataShareConstants.java → ...ashare/AttributionDataShareConstants.java b/...aShare/AttributionDataShareConstants.java → ...ashare/AttributionDataShareConstants.java
@@ -1,4 +1,4 @@
-package gov.cms.ab2d.attributionDataShare;
+package gov.cms.ab2d.attributiondatashare;
 
 import software.amazon.awssdk.regions.Region;
 

diff --git a/...aShare/AttributionDataShareException.java → ...ashare/AttributionDataShareException.java b/...aShare/AttributionDataShareException.java → ...ashare/AttributionDataShareException.java
@@ -1,4 +1,4 @@
-package gov.cms.ab2d.attributionDataShare;
+package gov.cms.ab2d.attributiondatashare;
 
 public class AttributionDataShareException extends RuntimeException {
     public AttributionDataShareException(String message, Exception ex) {

diff --git a/...ataShare/AttributionDataShareHandler.java → ...atashare/AttributionDataShareHandler.java b/...ataShare/AttributionDataShareHandler.java → ...atashare/AttributionDataShareHandler.java
@@ -1,4 +1,4 @@
-package gov.cms.ab2d.attributionDataShare;
+package gov.cms.ab2d.attributiondatashare;
 
 import com.amazonaws.services.lambda.runtime.Context;
 import com.amazonaws.services.lambda.runtime.LambdaLogger;
@@ -12,14 +12,13 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.net.URISyntaxException;
 import java.nio.file.Paths;
 import java.sql.DriverManager;
 import java.sql.SQLException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-import static gov.cms.ab2d.attributionDataShare.AttributionDataShareConstants.*;
+import static gov.cms.ab2d.attributiondatashare.AttributionDataShareConstants.*;
 
 public class AttributionDataShareHandler implements RequestStreamHandler {
 
@@ -41,15 +40,15 @@ public void handleRequest(InputStream inputStream, OutputStream outputStream, Co
             helper.copyDataToFile(dbConnection);
             helper.uploadToS3(getAsyncS3Client(ENDPOINT, parameterStore));
 
-        } catch (NullPointerException | URISyntaxException | SQLException ex) {
+        } catch (NullPointerException | SQLException ex) {
             throwAttributionDataShareException(logger, ex);
         } finally {
             FileUtil.deleteDirectoryRecursion(Paths.get(fileFullPath));
             logger.log("AttributionDataShare Lambda is completed");
         }
     }
 
-    public S3AsyncClient getAsyncS3Client(String endpoint, AttributionParameterStore parameterStore) throws URISyntaxException {
+    public S3AsyncClient getAsyncS3Client(String endpoint, AttributionParameterStore parameterStore) {
         var client = S3AsyncClient.crtCreate();
 
         if (endpoint.equals(ENDPOINT)) {

diff --git a/...DataShare/AttributionDataShareHelper.java → ...datashare/AttributionDataShareHelper.java b/...DataShare/AttributionDataShareHelper.java → ...datashare/AttributionDataShareHelper.java
@@ -1,4 +1,4 @@
-package gov.cms.ab2d.attributionDataShare;
+package gov.cms.ab2d.attributiondatashare;
 
 import com.amazonaws.services.lambda.runtime.LambdaLogger;
 import software.amazon.awssdk.services.s3.S3AsyncClient;
@@ -16,7 +16,7 @@
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-import static gov.cms.ab2d.attributionDataShare.AttributionDataShareConstants.*;
+import static gov.cms.ab2d.attributiondatashare.AttributionDataShareConstants.*;
 
 public class AttributionDataShareHelper {
     LambdaLogger logger;

diff --git a/...nDataShare/AttributionParameterStore.java → ...ndatashare/AttributionParameterStore.java b/...nDataShare/AttributionParameterStore.java → ...ndatashare/AttributionParameterStore.java
@@ -1,9 +1,9 @@
-package gov.cms.ab2d.attributionDataShare;
+package gov.cms.ab2d.attributiondatashare;
 
 import software.amazon.awssdk.services.ssm.SsmClient;
 import software.amazon.awssdk.services.ssm.model.GetParameterRequest;
 
-import static gov.cms.ab2d.attributionDataShare.AttributionDataShareConstants.*;
+import static gov.cms.ab2d.attributiondatashare.AttributionDataShareConstants.*;
 
 public class AttributionParameterStore {
 

diff --git a/...hare/AttributionDataShareHandlerTest.java → ...hare/AttributionDataShareHandlerTest.java b/...hare/AttributionDataShareHandlerTest.java → ...hare/AttributionDataShareHandlerTest.java
@@ -1,4 +1,4 @@
-package gov.cms.ab2d.attributionDataShare;
+package gov.cms.ab2d.attributiondatashare;
 
 import com.amazonaws.services.lambda.runtime.LambdaLogger;
 import gov.cms.ab2d.testutils.AB2DPostgresqlContainer;
@@ -8,11 +8,10 @@
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
-import java.net.URISyntaxException;
 import java.sql.Connection;
 import java.sql.DriverManager;
 
-import static gov.cms.ab2d.attributionDataShare.AttributionDataShareConstants.TEST_ENDPOINT;
+import static gov.cms.ab2d.attributiondatashare.AttributionDataShareConstants.TEST_ENDPOINT;
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.*;
 
@@ -50,7 +49,7 @@ void attributionDataShareExceptionTest() {
     }
 
     @Test
-    void getS3ClientTest() throws URISyntaxException {
+    void getS3ClientTest() {
         assertNotNull(handler.getAsyncS3Client(TEST_ENDPOINT, parameterStore));
     }
 }
diff --git a/...onDataShare/AttributionDataShareTest.java → ...ondatashare/AttributionDataShareTest.java b/...onDataShare/AttributionDataShareTest.java → ...ondatashare/AttributionDataShareTest.java
@@ -1,4 +1,4 @@
-package gov.cms.ab2d.attributionDataShare;
+package gov.cms.ab2d.attributiondatashare;
 
 import com.amazonaws.services.lambda.runtime.LambdaLogger;
 import com.mockrunner.mock.jdbc.MockResultSet;
@@ -22,16 +22,16 @@
 import java.text.SimpleDateFormat;
 import java.util.*;
 
-import static gov.cms.ab2d.attributionDataShare.AttributionDataShareConstants.*;
-import static gov.cms.ab2d.attributionDataShare.AttributionDataShareHelper.getExecuteQuery;
-import static gov.cms.ab2d.attributionDataShare.S3MockAPIExtension.getBucketName;
-import static gov.cms.ab2d.attributionDataShare.S3MockAPIExtension.getUploadPath;
+import static gov.cms.ab2d.attributiondatashare.AttributionDataShareConstants.*;
+import static gov.cms.ab2d.attributiondatashare.AttributionDataShareHelper.getExecuteQuery;
+import static gov.cms.ab2d.attributiondatashare.S3MockAPIExtension.getBucketName;
+import static gov.cms.ab2d.attributiondatashare.S3MockAPIExtension.getUploadPath;
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.*;
 
 @Testcontainers
 @ExtendWith({S3MockAPIExtension.class})
-public class AttributionDataShareTest {
+class AttributionDataShareTest {
     @SuppressWarnings({"rawtypes", "unused"})
     @Container
     private static final PostgreSQLContainer POSTGRE_SQL_CONTAINER = new AB2DPostgresqlContainer();

diff --git a/...ributionDataShare/S3MockAPIExtension.java → ...ributiondatashare/S3MockAPIExtension.java b/...ributionDataShare/S3MockAPIExtension.java → ...ributiondatashare/S3MockAPIExtension.java
@@ -1,4 +1,4 @@
-package gov.cms.ab2d.attributionDataShare;
+package gov.cms.ab2d.attributiondatashare;
 
 import io.findify.s3mock.S3Mock;
 import org.junit.jupiter.api.extension.BeforeAllCallback;
@@ -8,7 +8,7 @@
 
 import java.net.URI;
 
-import static gov.cms.ab2d.attributionDataShare.AttributionDataShareConstants.*;
+import static gov.cms.ab2d.attributiondatashare.AttributionDataShareConstants.*;
 import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL;
 
 public class S3MockAPIExtension implements BeforeAllCallback, ExtensionContext.Store.CloseableResource {

diff --git a/lambda-lib/src/main/java/gov/cms/ab2d/lambdalibs/lib/FileUtil.java b/lambda-lib/src/main/java/gov/cms/ab2d/lambdalibs/lib/FileUtil.java
@@ -7,6 +7,8 @@
 import java.nio.file.Path;
 
 public class FileUtil {
+
+    private FileUtil() {}
     public static void deleteDirectoryRecursion(Path path) throws IOException {
         if (Files.isDirectory(path, LinkOption.NOFOLLOW_LINKS)) {
             try (DirectoryStream<Path> entries = Files.newDirectoryStream(path)) {

diff --git a/lambda-lib/src/test/java/gov/cms/ab2d/lambdalibs/FileUtilTest.java b/lambda-lib/src/test/java/gov/cms/ab2d/lambdalibs/FileUtilTest.java
@@ -11,7 +11,7 @@
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 
-public class FileUtilTest {
+class FileUtilTest {
     final Path FILE_PATH = Paths.get("/tmp/opt/");
     final String FILE_NAME = "testFile.txt";
 

diff --git a/optout/build.gradle b/optout/build.gradle
@@ -49,7 +49,7 @@ test {
 
 sonarqube {
     properties {
-        property 'sonar.coverage.exclusions', "**/OptOutParameterStore.java"
+        property 'sonar.coverage.exclusions', "**/OptOutParameterStore.java, **/OptOutConstants.java"
     }
 }
 

diff --git a/optout/src/main/java/gov/cms/ab2d/optout/OptOutHandler.java b/optout/src/main/java/gov/cms/ab2d/optout/OptOutHandler.java
@@ -43,11 +43,11 @@ public OptOutProcessor processorInit(LambdaLogger logger) {
         return new OptOutProcessor(logger);
     }
 
-    public String getBucketName(S3EventNotification.S3EventNotificationRecord record) {
-        return record.getS3().getBucket().getName();
+    public String getBucketName(S3EventNotification.S3EventNotificationRecord notificationRecord) {
+        return notificationRecord.getS3().getBucket().getName();
     }
 
-    public String getFileName(S3EventNotification.S3EventNotificationRecord record) {
-        return record.getS3().getObject().getUrlDecodedKey();
+    public String getFileName(S3EventNotification.S3EventNotificationRecord notificationRecord) {
+        return notificationRecord.getS3().getObject().getUrlDecodedKey();
     }
 }
diff --git a/optout/src/main/java/gov/cms/ab2d/optout/OptOutProcessor.java b/optout/src/main/java/gov/cms/ab2d/optout/OptOutProcessor.java
@@ -93,8 +93,8 @@ public OptOutInformation createOptOutInformation(String information) {
     }
 
     public void updateOptOut() {
-        try (var dbConnection = DriverManager.getConnection(parameterStore.getDbHost(), parameterStore.getDbUser(), parameterStore.getDbPassword())){
-            var statement = dbConnection.prepareStatement(UPDATE_STATEMENT);
+        try (var dbConnection = DriverManager.getConnection(parameterStore.getDbHost(), parameterStore.getDbUser(), parameterStore.getDbPassword());
+             var statement = dbConnection.prepareStatement(UPDATE_STATEMENT)) {
             for (var optOutInformation : optOutInformationList) {
                 statement.setBoolean(1, optOutInformation.getOptOutFlag());
                 statement.setString(2, optOutInformation.getMbi());
@@ -106,6 +106,7 @@ public void updateOptOut() {
             isRejected = true;
         }
     }
+
     public String createResponseContent() {
         var date = new SimpleDateFormat(EFFECTIVE_DATE_PATTERN).format(new Date());
         var responseContent = new StringBuilder()

diff --git a/optout/src/test/java/gov/cms/ab2d/optout/OptOutHandlerTest.java b/optout/src/test/java/gov/cms/ab2d/optout/OptOutHandlerTest.java
@@ -22,7 +22,7 @@
 import static org.mockito.Mockito.*;
 
 @Testcontainers
-public class OptOutHandlerTest {
+class OptOutHandlerTest {
 
     @SuppressWarnings({"rawtypes", "unused"})
     @Container

diff --git a/optout/src/test/java/gov/cms/ab2d/optout/OptOutProcessorTest.java b/optout/src/test/java/gov/cms/ab2d/optout/OptOutProcessorTest.java
@@ -27,7 +27,7 @@
 import static org.mockito.Mockito.*;
 
 @ExtendWith({S3MockAPIExtension.class})
-public class OptOutProcessorTest {
+class OptOutProcessorTest {
     private static final Connection dbConnection = mock(Connection.class);
     private static final MockedStatic<OptOutParameterStore> parameterStore = mockStatic(OptOutParameterStore.class);
     private static final String DATE = new SimpleDateFormat(EFFECTIVE_DATE_PATTERN).format(new Date());

diff --git a/optout/src/test/java/gov/cms/ab2d/optout/OptOutS3Test.java b/optout/src/test/java/gov/cms/ab2d/optout/OptOutS3Test.java
@@ -20,7 +20,7 @@
 import static org.mockito.Mockito.mock;
 
 @ExtendWith({S3MockAPIExtension.class})
-public class OptOutS3Test {
+class OptOutS3Test {
 
     private static OptOutS3 OPT_OUT_S3;