checkpoint #2

src/main/java/dto/BrewObj.java

@@ -7,22 +7,22 @@ import lombok.ToString;
 import lombok.extern.jackson.Jacksonized;
 import java.io.Serializable;
 
-@ToString
-@Getter
 @AllArgsConstructor
-@Jacksonized
 @Builder
+@Getter
+@ToString
+@Jacksonized
 public class BrewObj implements Serializable {
 
     public static final String SQL = "INSERT INTO brewscans " +
             "(build_system_type, brew_id, brew_nvr, pnc_id, artifact_type, file_name, built_from_source)" +
             "VALUES (? ? ? ? ? ? ?)";
 
-    private String buildSystemType;
-    private String brewId;
-    private String brewNvr;
-    private String pncId;
-    private String artifactType;
-    private String fileName;
-    private Boolean builtFromSource;
+    private final String buildSystemType;
+    private final String brewId;
+    private final String brewNvr;
+    private final String pncId;
+    private final String artifactType;
+    private final String fileName;
+    private final Boolean builtFromSource;
 }

src/main/java/dto/GitObj.java

@@ -5,22 +5,21 @@ import lombok.Builder;
 import lombok.Getter;
 import lombok.ToString;
 import lombok.extern.jackson.Jacksonized;
-
 import java.io.Serializable;
 
-@ToString
-@Getter
 @AllArgsConstructor
-@Jacksonized
 @Builder
+@Getter
+@ToString
+@Jacksonized
 public class GitObj implements Serializable {
 
     public static final String SQL = "INSERT INTO gitscans " +
             "(build_system_type, repository, reference, commit_id)" +
             "VALUES (? ? ? ?)";
 
-    private String buildSystemType;
-    private String repository;
-    private String reference;
-    private String commitId;
+    private final String buildSystemType;
+    private final String repository;
+    private final String reference;
+    private final String commitId;
 }

src/main/java/dto/PncObj.java

@@ -7,15 +7,15 @@ import lombok.ToString;
 import lombok.extern.jackson.Jacksonized;
 import java.io.Serializable;
 
-@ToString
-@Getter
 @AllArgsConstructor
-@Jacksonized
 @Builder
+@Getter
+@ToString
+@Jacksonized
 public class PncObj implements Serializable {
 
     public static final String SQL = "INSERT INTO pncscans (build_system_type, build_id) VALUES (? ?)";
 
-    private String buildSystemType;
-    private String buildId;
+    private final String buildSystemType;
+    private final String buildId;
 }

src/main/java/dto/ScanObj.java

@@ -5,26 +5,25 @@ import lombok.Builder;
 import lombok.Getter;
 import lombok.ToString;
 import lombok.extern.jackson.Jacksonized;
-
 import java.io.Serializable;
 
 //still need to fix all the scan objects to be significantly less poorly written
 //TODO add interface for the scan objects (is probably the cleanest solution)
 
-@ToString
-@Getter
 @AllArgsConstructor
-@Jacksonized
 @Builder
+@Getter
+@ToString
+@Jacksonized
 public class ScanObj implements Serializable {
 
     public static final String SQL = "INSERT INTO scans " +
             "(scan_id, offering_id, event_id, is_managed_service, component_list) " +
             "VALUES (? ? ? ? ?)";
 
-    private String scanId;
-    private String productId;
-    private String eventId;
-    private String isManagedService;
-    private String componentList;
+    private final String scanId;
+    private final String productId;
+    private final String eventId;
+    private final String isManagedService;
+    private final String componentList;
 }

src/test/java/dto/TestPayload.java

@@ -4,6 +4,7 @@ import org.json.JSONObject;
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import static org.junit.jupiter.api.Assertions.*;
 
 class TestPayload {
 
@@ -32,12 +33,12 @@ class TestPayload {
 
         logger.info("BrewObj1: " + brewObj1.toString());
         logger.info("BrewObj2: " + brewObj2.toString());
-        assert(brewObj1.getBuildSystemType().equals(brewObj2.getBuildSystemType()));
-        assert(brewObj1.getBrewId().equals(brewObj2.getBrewId()));
-        assert(brewObj1.getBrewNvr().equals(brewObj2.getBrewNvr()));
-        assert(brewObj1.getPncId().equals(brewObj2.getPncId()));
-        assert(brewObj1.getArtifactType().equals(brewObj2.getArtifactType()));
-        assert(brewObj1.getFileName().equals(brewObj2.getFileName()));
+        assertEquals(brewObj1.getBuildSystemType(), brewObj2.getBuildSystemType());
+        assertEquals(brewObj1.getBrewId(), brewObj2.getBrewId());
+        assertEquals(brewObj1.getBrewNvr(), brewObj2.getBrewNvr());
+        assertEquals(brewObj1.getPncId(), brewObj2.getPncId());
+        assertEquals(brewObj1.getArtifactType(), brewObj2.getArtifactType());
+        assertEquals(brewObj1.getFileName(), brewObj2.getFileName());
         assert(brewObj1.getBuiltFromSource() == brewObj2.getBuiltFromSource());
     }
 
@@ -57,10 +58,10 @@ class TestPayload {
                 jsonObject.getString("commit_id"));
         logger.info("GitObj1: " + gitObj1.toString());
         logger.info("GitObj2: " + gitObj2.toString());
-        assert(gitObj1.getBuildSystemType().equals(gitObj2.getBuildSystemType()));
-        assert(gitObj1.getRepository().equals(gitObj2.getRepository()));
-        assert(gitObj1.getReference().equals(gitObj2.getReference()));
-        assert(gitObj1.getCommitId().equals(gitObj2.getCommitId()));
+        assertEquals(gitObj1.getBuildSystemType(), gitObj2.getBuildSystemType());
+        assertEquals(gitObj1.getRepository(), gitObj2.getRepository());
+        assertEquals(gitObj1.getReference(), gitObj2.getReference());
+        assertEquals(gitObj1.getCommitId(), gitObj2.getCommitId());
     }
 
     @Test
@@ -75,8 +76,8 @@ class TestPayload {
                 jsonObject.getString("build_id"));
         logger.info("PncObj1: " + pncObj1.toString());
         logger.info("PncObj2: " + pncObj2.toString());
-        assert(pncObj1.getBuildSystemType().equals(pncObj2.getBuildSystemType()));
-        assert(pncObj1.getBuildId().equals(pncObj2.getBuildId()));
+        assertEquals(pncObj1.getBuildSystemType(), pncObj2.getBuildSystemType());
+        assertEquals(pncObj1.getBuildId(), pncObj2.getBuildId());
     }
 
     @Test
@@ -97,10 +98,10 @@ class TestPayload {
                 jsonObject.getString("component_list"));
         logger.info("ScanObj1: " + scanObj1.toString());
         logger.info("ScanObj2: " + scanObj2.toString());
-        assert(scanObj1.getScanId().equals(scanObj2.getScanId()));
-        assert(scanObj1.getProductId().equals(scanObj2.getProductId()));
-        assert(scanObj1.getEventId().equals(scanObj2.getEventId()));
-        assert(scanObj1.getIsManagedService().equals(scanObj2.getIsManagedService()));
-        assert(scanObj1.getComponentList().equals(scanObj2.getComponentList()));
+        assertEquals(scanObj1.getScanId(), scanObj2.getScanId());
+        assertEquals(scanObj1.getProductId(), scanObj2.getProductId());
+        assertEquals(scanObj1.getEventId(), scanObj2.getEventId());
+        assertEquals(scanObj1.getIsManagedService(), scanObj2.getIsManagedService());
+        assertEquals(scanObj1.getComponentList(), scanObj2.getComponentList());
     }
 }