pr review comments

Signed-off-by: mehab <[email protected]>
DependencyTrack · Oct 6, 2023 · b4e7579 · b4e7579
1 parent 6fb2abf
commit b4e7579
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/src/main/java/org/dependencytrack/event/kafka/processor/RepositoryMetaResultProcessor.java b/src/main/java/org/dependencytrack/event/kafka/processor/RepositoryMetaResultProcessor.java
@@ -22,6 +22,7 @@
 import javax.jdo.Transaction;
 import java.sql.SQLException;
 import java.util.Date;
+import java.util.Optional;
 
 /**
  * A {@link Processor} responsible for processing result of component repository meta analyses.
@@ -162,19 +163,19 @@ private IntegrityMetaComponent synchronizeIntegrityMetaResult(final Record<Strin
         if (result.hasIntegrityMeta()) {
             if (result.getIntegrityMeta().hasMd5() || result.getIntegrityMeta().hasSha1() || result.getIntegrityMeta().hasSha256()
                     || result.getIntegrityMeta().hasSha512() || result.getIntegrityMeta().hasCurrentVersionPublished()) {
-                persistentIntegrityMetaComponent.setMd5(result.getIntegrityMeta().getMd5());
-                persistentIntegrityMetaComponent.setSha256(result.getIntegrityMeta().getSha256());
-                persistentIntegrityMetaComponent.setSha1(result.getIntegrityMeta().getSha1());
-                persistentIntegrityMetaComponent.setSha512(result.getIntegrityMeta().getSha512());
+                Optional.ofNullable(result.getIntegrityMeta().getMd5()).ifPresent(persistentIntegrityMetaComponent::setMd5);
+                Optional.ofNullable(result.getIntegrityMeta().getSha1()).ifPresent(persistentIntegrityMetaComponent::setSha1);
+                Optional.ofNullable(result.getIntegrityMeta().getSha256()).ifPresent(persistentIntegrityMetaComponent::setSha256);
+                Optional.ofNullable(result.getIntegrityMeta().getSha512()).ifPresent(persistentIntegrityMetaComponent::setSha512);
                 persistentIntegrityMetaComponent.setPurl(result.getComponent().getPurl());
                 persistentIntegrityMetaComponent.setRepositoryUrl(result.getIntegrityMeta().getIntegrityMetaSourceUrl());
-                persistentIntegrityMetaComponent.setPublishedAt(new Date(result.getIntegrityMeta().getCurrentVersionPublished().getSeconds() * 1000));
+                persistentIntegrityMetaComponent.setPublishedAt(result.getIntegrityMeta().hasCurrentVersionPublished() ? new Date(result.getIntegrityMeta().getCurrentVersionPublished().getSeconds() * 1000) : null);
                 persistentIntegrityMetaComponent.setStatus(FetchStatus.PROCESSED);
             } else {
-                persistentIntegrityMetaComponent.setMd5("");
-                persistentIntegrityMetaComponent.setSha256("");
-                persistentIntegrityMetaComponent.setSha1("");
-                persistentIntegrityMetaComponent.setSha512("");
+                persistentIntegrityMetaComponent.setMd5(null);
+                persistentIntegrityMetaComponent.setSha256(null);
+                persistentIntegrityMetaComponent.setSha1(null);
+                persistentIntegrityMetaComponent.setSha512(null);
                 persistentIntegrityMetaComponent.setPurl(purl.toString());
                 persistentIntegrityMetaComponent.setRepositoryUrl(result.getIntegrityMeta().getIntegrityMetaSourceUrl());
                 persistentIntegrityMetaComponent.setStatus(FetchStatus.NOT_AVAILABLE);

diff --git a/src/main/proto/org/hyades/repometaanalysis/v1/repo_meta_analysis.proto b/src/main/proto/org/hyades/repometaanalysis/v1/repo_meta_analysis.proto
@@ -33,9 +33,9 @@ message IntegrityMeta {
   optional string sha1 = 2;
   optional string sha256 = 3;
   optional string sha512 = 4;
-  string integrity_meta_source_url = 5;
   // When the component current version last modified.
-  optional google.protobuf.Timestamp current_version_published = 6;
+  optional google.protobuf.Timestamp current_version_last_modified = 5;
+  string meta_source_url = 6;
 }
 
 message Component {