Rename package org.hyades to org.dependencytrack (#454)

* renamed org.hyades to org.dependencytrack Signed-off-by: mehab <[email protected]> * reverting application.properties Signed-off-by: mehab <[email protected]> --------- Signed-off-by: mehab <[email protected]>
DependencyTrack · Nov 25, 2023 · 783d6a3 · 783d6a3
1 parent 16c3193
commit 783d6a3
Show file tree

Hide file tree

Showing 45 changed files with 276 additions and 277 deletions.
diff --git a/src/main/java/org/dependencytrack/event/ComponentRepositoryMetaAnalysisEvent.java b/src/main/java/org/dependencytrack/event/ComponentRepositoryMetaAnalysisEvent.java
@@ -2,7 +2,7 @@
 
 import alpine.event.framework.Event;
 import org.dependencytrack.model.Component;
-import org.hyades.proto.repometaanalysis.v1.FetchMeta;
+import org.dependencytrack.proto.repometaanalysis.v1.FetchMeta;
 
 import java.util.UUID;
 

diff --git a/src/main/java/org/dependencytrack/event/kafka/KafkaEventConverter.java b/src/main/java/org/dependencytrack/event/kafka/KafkaEventConverter.java
@@ -3,11 +3,11 @@
 import org.dependencytrack.event.ComponentRepositoryMetaAnalysisEvent;
 import org.dependencytrack.event.ComponentVulnerabilityAnalysisEvent;
 import org.dependencytrack.event.kafka.KafkaTopics.Topic;
-import org.dependencytrack.parser.hyades.NotificationModelConverter;
-import org.hyades.proto.notification.v1.Notification;
-import org.hyades.proto.repometaanalysis.v1.AnalysisCommand;
-import org.hyades.proto.vulnanalysis.v1.ScanCommand;
-import org.hyades.proto.vulnanalysis.v1.ScanKey;
+import org.dependencytrack.parser.dependencytrack.NotificationModelConverter;
+import org.dependencytrack.proto.notification.v1.Notification;
+import org.dependencytrack.proto.repometaanalysis.v1.AnalysisCommand;
+import org.dependencytrack.proto.vulnanalysis.v1.ScanCommand;
+import org.dependencytrack.proto.vulnanalysis.v1.ScanKey;
 
 import java.util.Map;
 import java.util.Optional;
@@ -23,7 +23,7 @@ private KafkaEventConverter() {
     }
 
     static KafkaEvent<ScanKey, ScanCommand> convert(final ComponentVulnerabilityAnalysisEvent event) {
-        final var componentBuilder = org.hyades.proto.vulnanalysis.v1.Component.newBuilder()
+        final var componentBuilder = org.dependencytrack.proto.vulnanalysis.v1.Component.newBuilder()
                 .setUuid(event.uuid().toString());
         Optional.ofNullable(event.cpe()).ifPresent(componentBuilder::setCpe);
         Optional.ofNullable(event.purl()).ifPresent(componentBuilder::setPurl);
@@ -52,7 +52,7 @@ static KafkaEvent<String, AnalysisCommand> convert(final ComponentRepositoryMeta
             return null;
         }
 
-        final var componentBuilder = org.hyades.proto.repometaanalysis.v1.Component.newBuilder()
+        final var componentBuilder = org.dependencytrack.proto.repometaanalysis.v1.Component.newBuilder()
                 .setPurl(event.purlCoordinates());
         Optional.ofNullable(event.internal()).ifPresent(componentBuilder::setInternal);
         Optional.ofNullable(event.componentUuid()).map(uuid -> uuid.toString()).ifPresent(componentBuilder::setUuid);

diff --git a/src/main/java/org/dependencytrack/event/kafka/KafkaEventHeaders.java b/src/main/java/org/dependencytrack/event/kafka/KafkaEventHeaders.java
@@ -1,7 +1,7 @@
 package org.dependencytrack.event.kafka;
 
 import org.dependencytrack.model.VulnerabilityAnalysisLevel;
-import org.hyades.proto.vulnanalysis.v1.ScanCommand;
+import org.dependencytrack.proto.vulnanalysis.v1.ScanCommand;
 
 /**
  * Well-known headers for Kafka events published and / or consumed by Dependency-Track.

diff --git a/src/main/java/org/dependencytrack/event/kafka/KafkaStreamsTopologyFactory.java b/src/main/java/org/dependencytrack/event/kafka/KafkaStreamsTopologyFactory.java
@@ -31,16 +31,16 @@
 import org.dependencytrack.model.WorkflowStep;
 import org.dependencytrack.notification.NotificationGroup;
 import org.dependencytrack.persistence.QueryManager;
-import org.hyades.proto.notification.v1.ProjectVulnAnalysisStatus;
-import org.hyades.proto.vulnanalysis.v1.ScanKey;
-import org.hyades.proto.vulnanalysis.v1.ScanResult;
+import org.dependencytrack.proto.notification.v1.ProjectVulnAnalysisStatus;
+import org.dependencytrack.proto.vulnanalysis.v1.ScanKey;
+import org.dependencytrack.proto.vulnanalysis.v1.ScanResult;
 
 import java.time.Instant;
 import java.util.Date;
 import java.util.Properties;
 import java.util.UUID;
 
-import static org.dependencytrack.parser.hyades.NotificationModelConverter.convert;
+import static org.dependencytrack.parser.dependencytrack.NotificationModelConverter.convert;
 import static org.dependencytrack.util.NotificationUtil.createProjectVulnerabilityAnalysisCompleteNotification;
 
 class KafkaStreamsTopologyFactory {

diff --git a/src/main/java/org/dependencytrack/event/kafka/KafkaTopics.java b/src/main/java/org/dependencytrack/event/kafka/KafkaTopics.java
@@ -6,12 +6,12 @@
 import org.cyclonedx.proto.v1_4.Bom;
 import org.dependencytrack.common.ConfigKey;
 import org.dependencytrack.event.kafka.serialization.KafkaProtobufSerde;
-import org.hyades.proto.notification.v1.Notification;
-import org.hyades.proto.repometaanalysis.v1.AnalysisCommand;
-import org.hyades.proto.repometaanalysis.v1.AnalysisResult;
-import org.hyades.proto.vulnanalysis.v1.ScanCommand;
-import org.hyades.proto.vulnanalysis.v1.ScanKey;
-import org.hyades.proto.vulnanalysis.v1.ScanResult;
+import org.dependencytrack.proto.notification.v1.Notification;
+import org.dependencytrack.proto.repometaanalysis.v1.AnalysisCommand;
+import org.dependencytrack.proto.repometaanalysis.v1.AnalysisResult;
+import org.dependencytrack.proto.vulnanalysis.v1.ScanCommand;
+import org.dependencytrack.proto.vulnanalysis.v1.ScanKey;
+import org.dependencytrack.proto.vulnanalysis.v1.ScanResult;
 
 public final class KafkaTopics {
 

diff --git a/src/main/java/org/dependencytrack/event/kafka/componentmeta/AbstractMetaHandler.java b/src/main/java/org/dependencytrack/event/kafka/componentmeta/AbstractMetaHandler.java
@@ -4,7 +4,7 @@
 import org.dependencytrack.model.FetchStatus;
 import org.dependencytrack.model.IntegrityMetaComponent;
 import org.dependencytrack.persistence.QueryManager;
-import org.hyades.proto.repometaanalysis.v1.FetchMeta;
+import org.dependencytrack.proto.repometaanalysis.v1.FetchMeta;
 
 import java.time.Instant;
 import java.util.Date;

diff --git a/src/main/java/org/dependencytrack/event/kafka/componentmeta/HandlerFactory.java b/src/main/java/org/dependencytrack/event/kafka/componentmeta/HandlerFactory.java
@@ -3,7 +3,7 @@
 import com.github.packageurl.MalformedPackageURLException;
 import org.dependencytrack.event.kafka.KafkaEventDispatcher;
 import org.dependencytrack.persistence.QueryManager;
-import org.hyades.proto.repometaanalysis.v1.FetchMeta;
+import org.dependencytrack.proto.repometaanalysis.v1.FetchMeta;
 
 public class HandlerFactory {
 

diff --git a/src/main/java/org/dependencytrack/event/kafka/componentmeta/IntegrityCheck.java b/src/main/java/org/dependencytrack/event/kafka/componentmeta/IntegrityCheck.java
@@ -9,7 +9,7 @@
 import org.dependencytrack.model.IntegrityMatchStatus;
 import org.dependencytrack.model.IntegrityMetaComponent;
 import org.dependencytrack.persistence.QueryManager;
-import org.hyades.proto.repometaanalysis.v1.AnalysisResult;
+import org.dependencytrack.proto.repometaanalysis.v1.AnalysisResult;
 
 import java.util.Date;
 import java.util.List;
@@ -107,8 +107,7 @@ private static IntegrityMatchStatus calculateIntegrityCheckStatus(IntegrityMatch
                 && (sha256Status == HASH_MATCH_UNKNOWN || sha256Status == COMPONENT_MISSING_HASH_AND_MATCH_UNKNOWN)
                 && (sha512Status == HASH_MATCH_UNKNOWN || sha512Status == COMPONENT_MISSING_HASH_AND_MATCH_UNKNOWN)) {
             return HASH_MATCH_UNKNOWN;
-        }
-        else if (md5Status == HASH_MATCH_FAILED || sha1Status == HASH_MATCH_FAILED || sha256Status == HASH_MATCH_FAILED || sha512Status == HASH_MATCH_FAILED) {
+        } else if (md5Status == HASH_MATCH_FAILED || sha1Status == HASH_MATCH_FAILED || sha256Status == HASH_MATCH_FAILED || sha512Status == HASH_MATCH_FAILED) {
             return HASH_MATCH_FAILED;
         } else {
             return HASH_MATCH_PASSED;

diff --git a/src/main/java/org/dependencytrack/event/kafka/componentmeta/SupportedMetaHandler.java b/src/main/java/org/dependencytrack/event/kafka/componentmeta/SupportedMetaHandler.java
@@ -6,7 +6,7 @@
 import org.dependencytrack.model.FetchStatus;
 import org.dependencytrack.model.IntegrityMetaComponent;
 import org.dependencytrack.persistence.QueryManager;
-import org.hyades.proto.repometaanalysis.v1.FetchMeta;
+import org.dependencytrack.proto.repometaanalysis.v1.FetchMeta;
 
 import java.time.Instant;
 import java.util.Date;
@@ -29,10 +29,10 @@ public IntegrityMetaComponent handle() throws MalformedPackageURLException {
         IntegrityMetaComponent persistentIntegrityMetaComponent = queryManager.getIntegrityMetaComponent(componentProjection.purl().toString());
         if (persistentIntegrityMetaComponent == null) {
             IntegrityMetaComponent integrityMetaComponent = queryManager.createIntegrityMetaComponent(createIntegrityMetaComponent(componentProjection.purl().toString()));
-            kafkaEventDispatcher.dispatchAsync(new ComponentRepositoryMetaAnalysisEvent(componentProjection.componentUuid(),componentProjection.purl().canonicalize(), componentProjection.internal(), fetchMeta));
+            kafkaEventDispatcher.dispatchAsync(new ComponentRepositoryMetaAnalysisEvent(componentProjection.componentUuid(), componentProjection.purl().canonicalize(), componentProjection.internal(), fetchMeta));
             return integrityMetaComponent;
         }
-        if(persistentIntegrityMetaComponent.getStatus() == PROCESSED || persistentIntegrityMetaComponent.getStatus() == NOT_AVAILABLE) {
+        if (persistentIntegrityMetaComponent.getStatus() == PROCESSED || persistentIntegrityMetaComponent.getStatus() == NOT_AVAILABLE) {
             //only fetch the latest version because integrity data (hashes) is present
             kafkaEventDispatcher.dispatchAsync(new ComponentRepositoryMetaAnalysisEvent(componentProjection.componentUuid(), componentProjection.purl().canonicalize(), componentProjection.internal(), FetchMeta.FETCH_META_LATEST_VERSION));
             return persistentIntegrityMetaComponent;

diff --git a/src/main/java/org/dependencytrack/event/kafka/componentmeta/UnSupportedMetaHandler.java b/src/main/java/org/dependencytrack/event/kafka/componentmeta/UnSupportedMetaHandler.java
@@ -6,7 +6,7 @@
 import org.dependencytrack.event.kafka.KafkaEventDispatcher;
 import org.dependencytrack.model.IntegrityMetaComponent;
 import org.dependencytrack.persistence.QueryManager;
-import org.hyades.proto.repometaanalysis.v1.FetchMeta;
+import org.dependencytrack.proto.repometaanalysis.v1.FetchMeta;
 
 public class UnSupportedMetaHandler extends AbstractMetaHandler {
 

diff --git a/...a/org/dependencytrack/event/kafka/processor/DelayedBomProcessedNotificationProcessor.java b/...a/org/dependencytrack/event/kafka/processor/DelayedBomProcessedNotificationProcessor.java
@@ -15,12 +15,12 @@
 import org.dependencytrack.notification.NotificationScope;
 import org.dependencytrack.notification.vo.BomConsumedOrProcessed;
 import org.dependencytrack.persistence.QueryManager;
-import org.hyades.proto.notification.v1.Notification;
+import org.dependencytrack.proto.notification.v1.Notification;
 
 import javax.jdo.Query;
 import java.util.UUID;
 
-import static org.dependencytrack.parser.hyades.NotificationModelConverter.convert;
+import static org.dependencytrack.parser.dependencytrack.NotificationModelConverter.convert;
 
 /**
  * A {@link Processor} responsible for dispatching {@link NotificationGroup#BOM_PROCESSED} notifications

diff --git a/src/main/java/org/dependencytrack/event/kafka/processor/MirrorVulnerabilityProcessor.java b/src/main/java/org/dependencytrack/event/kafka/processor/MirrorVulnerabilityProcessor.java
@@ -13,7 +13,7 @@
 import org.cyclonedx.proto.v1_4.VulnerabilityAffects;
 import org.dependencytrack.model.Vulnerability;
 import org.dependencytrack.model.VulnerableSoftware;
-import org.dependencytrack.parser.hyades.ModelConverterCdxToVuln;
+import org.dependencytrack.parser.dependencytrack.ModelConverterCdxToVuln;
 import org.dependencytrack.parser.nvd.ModelConverter;
 import org.dependencytrack.parser.vers.Comparator;
 import org.dependencytrack.parser.vers.Constraint;

diff --git a/src/main/java/org/dependencytrack/event/kafka/processor/RepositoryMetaResultProcessor.java b/src/main/java/org/dependencytrack/event/kafka/processor/RepositoryMetaResultProcessor.java
@@ -13,7 +13,7 @@
 import org.dependencytrack.model.RepositoryMetaComponent;
 import org.dependencytrack.model.RepositoryType;
 import org.dependencytrack.persistence.QueryManager;
-import org.hyades.proto.repometaanalysis.v1.AnalysisResult;
+import org.dependencytrack.proto.repometaanalysis.v1.AnalysisResult;
 import org.postgresql.util.PSQLState;
 
 import javax.jdo.JDODataStoreException;
@@ -39,13 +39,13 @@ public class RepositoryMetaResultProcessor implements Processor<String, Analysis
     @Override
     public void process(final Record<String, AnalysisResult> record) {
         final Timer.Sample timerSample = Timer.start();
-        if(!isRecordValid(record)) {
+        if (!isRecordValid(record)) {
             return;
         }
         try (final var qm = new QueryManager()) {
             synchronizeRepositoryMetadata(qm, record);
             IntegrityMetaComponent integrityMetaComponent = synchronizeIntegrityMetadata(qm, record);
-            if(integrityMetaComponent != null) {
+            if (integrityMetaComponent != null) {
                 performIntegrityCheck(integrityMetaComponent, record.value(), qm);
             }
         } catch (Exception e) {

diff --git a/...main/java/org/dependencytrack/event/kafka/processor/VulnerabilityScanResultProcessor.java b/...main/java/org/dependencytrack/event/kafka/processor/VulnerabilityScanResultProcessor.java
@@ -22,15 +22,15 @@
 import org.dependencytrack.notification.NotificationScope;
 import org.dependencytrack.notification.vo.NewVulnerabilityIdentified;
 import org.dependencytrack.notification.vo.NewVulnerableDependency;
-import org.dependencytrack.parser.hyades.ModelConverterCdxToVuln;
+import org.dependencytrack.parser.dependencytrack.ModelConverterCdxToVuln;
 import org.dependencytrack.persistence.QueryManager;
+import org.dependencytrack.proto.vulnanalysis.v1.ScanKey;
+import org.dependencytrack.proto.vulnanalysis.v1.ScanResult;
+import org.dependencytrack.proto.vulnanalysis.v1.ScanStatus;
+import org.dependencytrack.proto.vulnanalysis.v1.Scanner;
+import org.dependencytrack.proto.vulnanalysis.v1.ScannerResult;
 import org.dependencytrack.util.PersistenceUtil;
 import org.dependencytrack.util.PersistenceUtil.Differ;
-import org.hyades.proto.vulnanalysis.v1.ScanKey;
-import org.hyades.proto.vulnanalysis.v1.ScanResult;
-import org.hyades.proto.vulnanalysis.v1.ScanStatus;
-import org.hyades.proto.vulnanalysis.v1.Scanner;
-import org.hyades.proto.vulnanalysis.v1.ScannerResult;
 
 import javax.jdo.Query;
 import java.util.Collection;
@@ -40,14 +40,14 @@
 import java.util.Set;
 import java.util.UUID;
 
-import static org.dependencytrack.parser.hyades.ModelConverterCdxToVuln.convert;
+import static org.dependencytrack.parser.dependencytrack.ModelConverterCdxToVuln.convert;
+import static org.dependencytrack.proto.vulnanalysis.v1.ScanStatus.SCAN_STATUS_FAILED;
+import static org.dependencytrack.proto.vulnanalysis.v1.Scanner.SCANNER_INTERNAL;
 import static org.dependencytrack.util.NotificationUtil.generateNotificationContent;
 import static org.dependencytrack.util.NotificationUtil.generateNotificationTitle;
 import static org.dependencytrack.util.VulnerabilityUtil.canBeMirrored;
 import static org.dependencytrack.util.VulnerabilityUtil.isAuthoritativeSource;
 import static org.dependencytrack.util.VulnerabilityUtil.isMirroringEnabled;
-import static org.hyades.proto.vulnanalysis.v1.ScanStatus.SCAN_STATUS_FAILED;
-import static org.hyades.proto.vulnanalysis.v1.Scanner.SCANNER_INTERNAL;
 
 /**
  * A {@link ContextualProcessor} responsible for processing {@link ScanResult}s.
@@ -76,7 +76,7 @@ public void process(final FixedKeyRecord<ScanKey, ScanResult> record) {
                         .formatted(componentUuid, prettyPrint(scanKey)));
                 return;
             }
-            
+
             for (final ScannerResult scannerResult : result.getScannerResultsList()) {
                 processScannerResult(qm, component, scanKey, scannerResult, analysisLevel, isNewComponent);
             }
@@ -115,7 +115,7 @@ private void processScannerResult(final QueryManager qm, final Component compone
                 .formatted(syncedVulns.size(), scannerResult.getScanner(), scanKey.getComponentUuid(), prettyPrint(scanKey)));
 
         //send notification if there is a new vulnerable component
-        if(isNewComponent && !syncedVulns.isEmpty()) {
+        if (isNewComponent && !syncedVulns.isEmpty()) {
             final Component detachedComponent = qm.getPersistenceManager().detachCopy(component);
             eventDispatcher.dispatchAsync(component.getProject().getUuid(), new Notification()
                     .scope(NotificationScope.PORTFOLIO)

diff --git a/src/main/java/org/dependencytrack/model/VulnerabilityScan.java b/src/main/java/org/dependencytrack/model/VulnerabilityScan.java
@@ -1,7 +1,5 @@
 package org.dependencytrack.model;
 
-import org.hyades.proto.vulnanalysis.v1.ScanStatus;
-
 import javax.jdo.annotations.Column;
 import javax.jdo.annotations.IdGeneratorStrategy;
 import javax.jdo.annotations.PersistenceCapable;
@@ -63,14 +61,18 @@ public enum TargetType {
     private Status status;
 
     /**
-     * The number of expected {@link ScanStatus#SCAN_STATUS_COMPLETE} events for this scan.
+     * The number of expected {
+     *
+     * @link ScanStatus#SCAN_STATUS_COMPLETE} events for this scan.
      */
     @Persistent
     @Column(name = "EXPECTED_RESULTS")
     private int expectedResults;
 
     /**
-     * The number of received {@link ScanStatus#SCAN_STATUS_COMPLETE} events for this scan.
+     * The number of received {
+     *
+     * @link ScanStatus#SCAN_STATUS_COMPLETE} events for this scan.
      */
     @Persistent
     @Column(name = "RECEIVED_RESULTS")

diff --git a/src/main/java/org/dependencytrack/notification/vo/ProjectVulnAnalysisComplete.java b/src/main/java/org/dependencytrack/notification/vo/ProjectVulnAnalysisComplete.java
@@ -1,7 +1,7 @@
 package org.dependencytrack.notification.vo;
 
 import org.dependencytrack.model.Project;
-import org.hyades.proto.notification.v1.ProjectVulnAnalysisStatus;
+import org.dependencytrack.proto.notification.v1.ProjectVulnAnalysisStatus;
 
 import java.util.List;
 import java.util.UUID;
@@ -28,7 +28,7 @@ public List<ComponentVulnAnalysisComplete> getComponentAnalysisCompleteList() {
         return findingsList;
     }
 
-    public Project getProject(){
+    public Project getProject() {
         return this.project;
     }
 

diff --git a/...arser/hyades/ModelConverterCdxToVuln.java → ...endencytrack/ModelConverterCdxToVuln.java b/...arser/hyades/ModelConverterCdxToVuln.java → ...endencytrack/ModelConverterCdxToVuln.java
@@ -1,4 +1,4 @@
-package org.dependencytrack.parser.hyades;
+package org.dependencytrack.parser.dependencytrack;
 
 import org.apache.commons.lang3.StringUtils;
 import org.cyclonedx.proto.v1_4.Bom;
@@ -11,7 +11,7 @@
 import org.dependencytrack.model.Vulnerability;
 import org.dependencytrack.model.VulnerabilityAlias;
 import org.dependencytrack.persistence.QueryManager;
-import org.hyades.proto.vulnanalysis.v1.Scanner;
+import org.dependencytrack.proto.vulnanalysis.v1.Scanner;
 import us.springett.cvss.Cvss;
 import us.springett.cvss.Score;
 import us.springett.owasp.riskrating.MissingFactorException;