Update types to be nullable instead of taking in Optional params. Add preliminary unit test

Author: samsnyk

core/src/main/java/io/snyk/plugins/artifactory/model/MonitoredArtifact.java

@@ -75,7 +75,7 @@ public static Optional<MonitoredArtifact> read(ArtifactProperties properties) {
           properties.getArtifactPath(),
           testResult,
           Ignores.read(properties),
-          Optional.empty() // Created date not stored in properties
+          null // Created date not stored in properties
         )
       );
     } catch (RuntimeException e) {

core/src/main/java/io/snyk/plugins/artifactory/model/ValidationSettings.java

@@ -13,13 +13,13 @@ public class ValidationSettings {
 
   private final Optional<Severity> vulnSeverityThreshold;
   private final Optional<Severity> licenseSeverityThreshold;
-  private final Optional<int> createdDelayDays;
+  private final Optional<Integer> createdDelayDays;
 
   public ValidationSettings() {
     this(Optional.of(Severity.HIGH), Optional.of(Severity.HIGH), Optional.of(0));
   }
 
-  private ValidationSettings(Optional<Severity> vulnSeverityThreshold, Optional<Severity> licenseSeverityThreshold, Optional<int> createdDelayDays) {
+  private ValidationSettings(Optional<Severity> vulnSeverityThreshold, Optional<Severity> licenseSeverityThreshold, Optional<Integer> createdDelayDays) {
     this.vulnSeverityThreshold = vulnSeverityThreshold;
     this.licenseSeverityThreshold = licenseSeverityThreshold;
     this.createdDelayDays = createdDelayDays;
@@ -33,7 +33,7 @@ public ValidationSettings withLicenseSeverityThreshold(Optional<Severity> thresh
     return new ValidationSettings(vulnSeverityThreshold, threshold, createdDelayDays);
   }
 
-  public ValidationSettings withCreatedDelayDays(Optional<int> days) {
+  public ValidationSettings withCreatedDelayDays(Optional<Integer> days) {
     return new ValidationSettings(vulnSeverityThreshold, licenseSeverityThreshold, days);
   }
 
@@ -45,7 +45,7 @@ public Optional<Severity> getLicenseSeverityThreshold() {
     return licenseSeverityThreshold;
   }
 
-  public Optional<int> getCreatedDelayDays() {
+  public Optional<Integer> getCreatedDelayDays() {
     return createdDelayDays;
   }
 
@@ -65,7 +65,7 @@ public static ValidationSettings from(String vulnThreshold, String licenseThresh
     return new ValidationSettings(
       parseSeverity(vulnThreshold),
       parseSeverity(licenseThreshold),
-      Integer.parseInt(createdDelayDaysStr)
+      Optional.of(Integer.parseInt(createdDelayDaysStr))
     );
   }
 

core/src/main/java/io/snyk/plugins/artifactory/scanner/PackageValidator.java

@@ -31,8 +31,8 @@ public void validate(MonitoredArtifact artifact) {
   }
 
   private void validateCreatedDelay(MonitoredArtifact artifact) {
-    int delayDays = settings.getCreatedDelayDays();
-    if (delayDays <= 0) {
+    Integer delayDays = settings.getCreatedDelayDays().get();
+    if (delayDays == null || delayDays <= 0) {
       LOG.debug("Created delay is disabled ({} days)", delayDays);
       return;
     }

core/src/main/java/io/snyk/plugins/artifactory/scanner/ScannerModule.java

@@ -22,7 +22,7 @@
 import java.time.Duration;
 import java.time.Instant;
 import java.time.ZoneId;
-import java.util.LocalDate;
+import java.time.LocalDate;
 import java.util.Optional;
 
 import static java.util.Objects.requireNonNull;
@@ -98,23 +98,23 @@ private void filter(MonitoredArtifact artifact) {
 
   private @NotNull MonitoredArtifact toMonitoredArtifact(TestResult testResult, @NotNull RepoPath repoPath) {
     Ignores ignores = Ignores.read(new RepositoryArtifactProperties(repoPath, repositories));
-    Optional<Instant> createdDate = getCreatedDate(repoPath);
+    Instant createdDate = getCreatedDate(repoPath);
     return new MonitoredArtifact(repoPath.toString(), testResult, ignores, createdDate);
   }
 
-  private Optional<Instant> getCreatedDate(RepoPath repoPath) {
+  private Instant getCreatedDate(RepoPath repoPath) {
     try {
       ItemInfo itemInfo = repositories.getItemInfo(repoPath);
       if (itemInfo != null) {
-        LocalDate created = Instant.ofEpochMilli(createdDate).atZone(ZoneId.systemDefault()).toLocalDate();
+        LocalDate created = Instant.ofEpochMilli(itemInfo.getCreated()).atZone(ZoneId.systemDefault()).toLocalDate();
         if (created != null) {
-          return Optional.of(created.atStartOfDay(ZoneId.systemDefault()).toInstant());
+          return created.atStartOfDay(ZoneId.systemDefault()).toInstant();
         }
       }
     } catch (Exception e) {
       LOG.debug("Could not retrieve created date for {}: {}", repoPath, e);
     }
-    return Optional.empty();
+    return null;
   }
 
   private boolean shouldTestContinuously() {

core/src/test/java/io/snyk/plugins/artifactory/scanner/PackageValidatorTest.java

@@ -145,9 +145,9 @@ void validate_includesSnykDetailsUrlInCancelException() {
 
   @Test
   void validate_includesCreatedDateDelay() {
-    int createdDelayDays = 14
+    Integer createdDelayDays = 14;
     ValidationSettings settings = new ValidationSettings()
-    .withCreatedDelayDays(createdDelayDays)
+    .withCreatedDelayDays(Optional.of(createdDelayDays))
     .withVulnSeverityThreshold(Optional.empty())
     .withLicenseSeverityThreshold(Optional.empty());
 
@@ -159,12 +159,12 @@ void validate_includesCreatedDateDelay() {
         IssueSummary.from(Stream.empty()),
         URI.create("https://snyk.io/package/details")
       ),
-      new Ignores()
+      new Ignores(),
       Instant.now()
     );
 
     assertThatThrownBy(() -> validator.validate(artifact))
     .isExactlyInstanceOf(CancelException.class)
-    .hasMessageContaining(format("Artifact was created 0 days ago, which is less than the configured delay of %d days", createdDelayDays))
+    .hasMessageContaining("Artifact was created 0 days ago, which is less than the configured delay of 14 days");
   }
 }