From 783d6a317f9273762b780d2b5b2086502707fcdd Mon Sep 17 00:00:00 2001 From: meha Date: Sat, 25 Nov 2023 17:50:52 +0000 Subject: [PATCH] Rename package `org.hyades` to `org.dependencytrack` (#454) * renamed org.hyades to org.dependencytrack Signed-off-by: mehab * reverting application.properties Signed-off-by: mehab --------- Signed-off-by: mehab --- .../ComponentRepositoryMetaAnalysisEvent.java | 2 +- .../event/kafka/KafkaEventConverter.java | 14 +-- .../event/kafka/KafkaEventHeaders.java | 2 +- .../kafka/KafkaStreamsTopologyFactory.java | 8 +- .../event/kafka/KafkaTopics.java | 12 +-- .../componentmeta/AbstractMetaHandler.java | 2 +- .../kafka/componentmeta/HandlerFactory.java | 2 +- .../kafka/componentmeta/IntegrityCheck.java | 5 +- .../componentmeta/SupportedMetaHandler.java | 6 +- .../componentmeta/UnSupportedMetaHandler.java | 2 +- ...ayedBomProcessedNotificationProcessor.java | 4 +- .../MirrorVulnerabilityProcessor.java | 2 +- .../RepositoryMetaResultProcessor.java | 6 +- .../VulnerabilityScanResultProcessor.java | 22 ++-- .../model/VulnerabilityScan.java | 10 +- .../vo/ProjectVulnAnalysisComplete.java | 4 +- .../ModelConverterCdxToVuln.java | 4 +- .../NotificationModelConverter.java | 100 +++++++++--------- .../persistence/QueryManager.java | 16 +-- .../policy/cel/CelPolicyLibrary.java | 6 +- .../resources/v1/ComponentResource.java | 6 +- .../tasks/BomUploadProcessingTask.java | 2 +- .../tasks/IntegrityMetaInitializerTask.java | 6 +- .../tasks/RepositoryMetaAnalyzerTask.java | 2 +- .../util/NotificationUtil.java | 2 +- .../notification/v1/notification.proto | 4 +- .../v1/repo_meta_analysis.proto | 6 +- .../vulnanalysis/v1/vuln_analysis.proto | 8 +- src/main/resources/application.properties | 6 +- ...msDelayedBomProcessedNotificationTest.java | 18 ++-- .../event/kafka/KafkaStreamsPostgresTest.java | 2 +- .../event/kafka/KafkaStreamsTopologyTest.java | 28 ++--- .../componentmeta/HandlerFactoryTest.java | 2 +- .../SupportedMetaHandlerTest.java | 2 +- .../UnSupportedMetaHandlerTest.java | 4 +- .../RepositoryMetaResultProcessorTest.java | 40 +++---- .../VulnerabilityScanResultProcessorTest.java | 42 ++++---- .../serialization/KafkaProtobufSerdeTest.java | 2 +- .../ModelConverterCdxToVulnTest.java | 2 +- .../NotificationModelConverterTest.java | 84 +++++++-------- .../policy/PolicyEngineTest.java | 12 +-- .../resources/v1/AnalysisResourceTest.java | 10 +- .../resources/v1/ProjectResourceTest.java | 12 +-- .../v1/ViolationAnalysisResourceTest.java | 10 +- .../tasks/BomUploadProcessingTaskTest.java | 12 +-- 45 files changed, 276 insertions(+), 277 deletions(-) rename src/main/java/org/dependencytrack/parser/{hyades => dependencytrack}/ModelConverterCdxToVuln.java (99%) rename src/main/java/org/dependencytrack/parser/{hyades => dependencytrack}/NotificationModelConverter.java (82%) rename src/main/proto/org/{hyades => dependencytrack}/notification/v1/notification.proto (98%) rename src/main/proto/org/{hyades => dependencytrack}/repometaanalysis/v1/repo_meta_analysis.proto (88%) rename src/main/proto/org/{hyades => dependencytrack}/vulnanalysis/v1/vuln_analysis.proto (88%) rename src/test/java/org/dependencytrack/parser/{hyades => dependencytrack}/ModelConverterCdxToVulnTest.java (99%) rename src/test/java/org/dependencytrack/parser/{hyades => dependencytrack}/NotificationModelConverterTest.java (92%) diff --git a/src/main/java/org/dependencytrack/event/ComponentRepositoryMetaAnalysisEvent.java b/src/main/java/org/dependencytrack/event/ComponentRepositoryMetaAnalysisEvent.java index da26aaf6e..0af1540af 100644 --- 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 index 0d1e19666..7442ca112 100644 --- 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 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 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 index 8e8bd9f68..931d57710 100644 --- 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 index 63961d49f..2b6cb2e38 100644 --- 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 index 0d1a96b1e..fc21ed444 100644 --- 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 index 754b9737b..8cfb8e09c 100644 --- 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 index aec75f7b0..b41a54482 100644 --- 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 index 65d405338..09d3f2b74 100644 --- 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 index b3fd52b33..3612c89db 100644 --- 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 index 41a3a80d1..c91f7429d 100644 --- 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/src/main/java/org/dependencytrack/event/kafka/processor/DelayedBomProcessedNotificationProcessor.java b/src/main/java/org/dependencytrack/event/kafka/processor/DelayedBomProcessedNotificationProcessor.java index f99e49f58..cddc5b692 100644 --- a/src/main/java/org/dependencytrack/event/kafka/processor/DelayedBomProcessedNotificationProcessor.java +++ b/src/main/java/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 index 741a74c8c..123f8e739 100644 --- 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 index d680826b5..8a4eb6f5a 100644 --- 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 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/src/main/java/org/dependencytrack/event/kafka/processor/VulnerabilityScanResultProcessor.java b/src/main/java/org/dependencytrack/event/kafka/processor/VulnerabilityScanResultProcessor.java index 113606c64..02723762c 100644 --- a/src/main/java/org/dependencytrack/event/kafka/processor/VulnerabilityScanResultProcessor.java +++ b/src/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 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 index f460df963..40c827d6e 100644 --- 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 index dbadf5dd7..7a8193655 100644 --- 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 getComponentAnalysisCompleteList() { return findingsList; } - public Project getProject(){ + public Project getProject() { return this.project; } diff --git a/src/main/java/org/dependencytrack/parser/hyades/ModelConverterCdxToVuln.java b/src/main/java/org/dependencytrack/parser/dependencytrack/ModelConverterCdxToVuln.java similarity index 99% rename from src/main/java/org/dependencytrack/parser/hyades/ModelConverterCdxToVuln.java rename to src/main/java/org/dependencytrack/parser/dependencytrack/ModelConverterCdxToVuln.java index 4f28a4064..dae4eece0 100644 --- a/src/main/java/org/dependencytrack/parser/hyades/ModelConverterCdxToVuln.java +++ b/src/main/java/org/dependencytrack/parser/dependencytrack/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; diff --git a/src/main/java/org/dependencytrack/parser/hyades/NotificationModelConverter.java b/src/main/java/org/dependencytrack/parser/dependencytrack/NotificationModelConverter.java similarity index 82% rename from src/main/java/org/dependencytrack/parser/hyades/NotificationModelConverter.java rename to src/main/java/org/dependencytrack/parser/dependencytrack/NotificationModelConverter.java index 820138536..03dfb306c 100644 --- a/src/main/java/org/dependencytrack/parser/hyades/NotificationModelConverter.java +++ b/src/main/java/org/dependencytrack/parser/dependencytrack/NotificationModelConverter.java @@ -1,4 +1,4 @@ -package org.dependencytrack.parser.hyades; +package org.dependencytrack.parser.dependencytrack; import alpine.notification.NotificationLevel; import com.github.packageurl.PackageURL; @@ -20,30 +20,30 @@ import org.dependencytrack.notification.vo.VexConsumedOrProcessed; import org.dependencytrack.notification.vo.ViolationAnalysisDecisionChange; import org.dependencytrack.parser.common.resolver.CweResolver; +import org.dependencytrack.proto.notification.v1.BackReference; +import org.dependencytrack.proto.notification.v1.BomConsumedOrProcessedSubject; +import org.dependencytrack.proto.notification.v1.BomProcessingFailedSubject; +import org.dependencytrack.proto.notification.v1.Component; +import org.dependencytrack.proto.notification.v1.ComponentVulnAnalysisCompleteSubject; +import org.dependencytrack.proto.notification.v1.Group; +import org.dependencytrack.proto.notification.v1.Level; +import org.dependencytrack.proto.notification.v1.NewVulnerabilitySubject; +import org.dependencytrack.proto.notification.v1.NewVulnerableDependencySubject; +import org.dependencytrack.proto.notification.v1.Notification; +import org.dependencytrack.proto.notification.v1.Policy; +import org.dependencytrack.proto.notification.v1.PolicyCondition; +import org.dependencytrack.proto.notification.v1.PolicyViolation; +import org.dependencytrack.proto.notification.v1.PolicyViolationAnalysis; +import org.dependencytrack.proto.notification.v1.PolicyViolationAnalysisDecisionChangeSubject; +import org.dependencytrack.proto.notification.v1.PolicyViolationSubject; +import org.dependencytrack.proto.notification.v1.Project; +import org.dependencytrack.proto.notification.v1.ProjectVulnAnalysisCompleteSubject; +import org.dependencytrack.proto.notification.v1.Scope; +import org.dependencytrack.proto.notification.v1.VexConsumedOrProcessedSubject; +import org.dependencytrack.proto.notification.v1.Vulnerability; +import org.dependencytrack.proto.notification.v1.VulnerabilityAnalysis; +import org.dependencytrack.proto.notification.v1.VulnerabilityAnalysisDecisionChangeSubject; import org.dependencytrack.util.VulnerabilityUtil; -import org.hyades.proto.notification.v1.BackReference; -import org.hyades.proto.notification.v1.BomConsumedOrProcessedSubject; -import org.hyades.proto.notification.v1.BomProcessingFailedSubject; -import org.hyades.proto.notification.v1.Component; -import org.hyades.proto.notification.v1.ComponentVulnAnalysisCompleteSubject; -import org.hyades.proto.notification.v1.Group; -import org.hyades.proto.notification.v1.Level; -import org.hyades.proto.notification.v1.NewVulnerabilitySubject; -import org.hyades.proto.notification.v1.NewVulnerableDependencySubject; -import org.hyades.proto.notification.v1.Notification; -import org.hyades.proto.notification.v1.Policy; -import org.hyades.proto.notification.v1.PolicyCondition; -import org.hyades.proto.notification.v1.PolicyViolation; -import org.hyades.proto.notification.v1.PolicyViolationAnalysis; -import org.hyades.proto.notification.v1.PolicyViolationAnalysisDecisionChangeSubject; -import org.hyades.proto.notification.v1.PolicyViolationSubject; -import org.hyades.proto.notification.v1.Project; -import org.hyades.proto.notification.v1.ProjectVulnAnalysisCompleteSubject; -import org.hyades.proto.notification.v1.Scope; -import org.hyades.proto.notification.v1.VexConsumedOrProcessedSubject; -import org.hyades.proto.notification.v1.Vulnerability; -import org.hyades.proto.notification.v1.VulnerabilityAnalysis; -import org.hyades.proto.notification.v1.VulnerabilityAnalysisDecisionChangeSubject; import java.math.BigDecimal; import java.time.ZoneOffset; @@ -52,30 +52,30 @@ import java.util.Objects; import java.util.Optional; -import static org.hyades.proto.notification.v1.Group.GROUP_ANALYZER; -import static org.hyades.proto.notification.v1.Group.GROUP_BOM_CONSUMED; -import static org.hyades.proto.notification.v1.Group.GROUP_BOM_PROCESSED; -import static org.hyades.proto.notification.v1.Group.GROUP_BOM_PROCESSING_FAILED; -import static org.hyades.proto.notification.v1.Group.GROUP_CONFIGURATION; -import static org.hyades.proto.notification.v1.Group.GROUP_DATASOURCE_MIRRORING; -import static org.hyades.proto.notification.v1.Group.GROUP_FILE_SYSTEM; -import static org.hyades.proto.notification.v1.Group.GROUP_INTEGRATION; -import static org.hyades.proto.notification.v1.Group.GROUP_NEW_VULNERABILITY; -import static org.hyades.proto.notification.v1.Group.GROUP_NEW_VULNERABLE_DEPENDENCY; -import static org.hyades.proto.notification.v1.Group.GROUP_POLICY_VIOLATION; -import static org.hyades.proto.notification.v1.Group.GROUP_PROJECT_AUDIT_CHANGE; -import static org.hyades.proto.notification.v1.Group.GROUP_PROJECT_CREATED; -import static org.hyades.proto.notification.v1.Group.GROUP_PROJECT_VULN_ANALYSIS_COMPLETE; -import static org.hyades.proto.notification.v1.Group.GROUP_REPOSITORY; -import static org.hyades.proto.notification.v1.Group.GROUP_UNSPECIFIED; -import static org.hyades.proto.notification.v1.Group.GROUP_VEX_CONSUMED; -import static org.hyades.proto.notification.v1.Group.GROUP_VEX_PROCESSED; -import static org.hyades.proto.notification.v1.Level.LEVEL_ERROR; -import static org.hyades.proto.notification.v1.Level.LEVEL_INFORMATIONAL; -import static org.hyades.proto.notification.v1.Level.LEVEL_WARNING; -import static org.hyades.proto.notification.v1.Scope.SCOPE_PORTFOLIO; -import static org.hyades.proto.notification.v1.Scope.SCOPE_SYSTEM; -import static org.hyades.proto.notification.v1.Scope.SCOPE_UNSPECIFIED; +import static org.dependencytrack.proto.notification.v1.Group.GROUP_ANALYZER; +import static org.dependencytrack.proto.notification.v1.Group.GROUP_BOM_CONSUMED; +import static org.dependencytrack.proto.notification.v1.Group.GROUP_BOM_PROCESSED; +import static org.dependencytrack.proto.notification.v1.Group.GROUP_BOM_PROCESSING_FAILED; +import static org.dependencytrack.proto.notification.v1.Group.GROUP_CONFIGURATION; +import static org.dependencytrack.proto.notification.v1.Group.GROUP_DATASOURCE_MIRRORING; +import static org.dependencytrack.proto.notification.v1.Group.GROUP_FILE_SYSTEM; +import static org.dependencytrack.proto.notification.v1.Group.GROUP_INTEGRATION; +import static org.dependencytrack.proto.notification.v1.Group.GROUP_NEW_VULNERABILITY; +import static org.dependencytrack.proto.notification.v1.Group.GROUP_NEW_VULNERABLE_DEPENDENCY; +import static org.dependencytrack.proto.notification.v1.Group.GROUP_POLICY_VIOLATION; +import static org.dependencytrack.proto.notification.v1.Group.GROUP_PROJECT_AUDIT_CHANGE; +import static org.dependencytrack.proto.notification.v1.Group.GROUP_PROJECT_CREATED; +import static org.dependencytrack.proto.notification.v1.Group.GROUP_PROJECT_VULN_ANALYSIS_COMPLETE; +import static org.dependencytrack.proto.notification.v1.Group.GROUP_REPOSITORY; +import static org.dependencytrack.proto.notification.v1.Group.GROUP_UNSPECIFIED; +import static org.dependencytrack.proto.notification.v1.Group.GROUP_VEX_CONSUMED; +import static org.dependencytrack.proto.notification.v1.Group.GROUP_VEX_PROCESSED; +import static org.dependencytrack.proto.notification.v1.Level.LEVEL_ERROR; +import static org.dependencytrack.proto.notification.v1.Level.LEVEL_INFORMATIONAL; +import static org.dependencytrack.proto.notification.v1.Level.LEVEL_WARNING; +import static org.dependencytrack.proto.notification.v1.Scope.SCOPE_PORTFOLIO; +import static org.dependencytrack.proto.notification.v1.Scope.SCOPE_SYSTEM; +import static org.dependencytrack.proto.notification.v1.Scope.SCOPE_UNSPECIFIED; public final class NotificationModelConverter { @@ -228,7 +228,7 @@ private static PolicyViolationAnalysisDecisionChangeSubject convert(final Violat private static BomConsumedOrProcessedSubject convert(final BomConsumedOrProcessed subject) { - org.hyades.proto.notification.v1.Bom bom = org.hyades.proto.notification.v1.Bom.newBuilder() + org.dependencytrack.proto.notification.v1.Bom bom = org.dependencytrack.proto.notification.v1.Bom.newBuilder() .setSpecVersion(subject.getSpecVersion()) .setFormat(subject.getFormat().getFormatShortName()) .setContent(subject.getBom()) @@ -243,7 +243,7 @@ private static BomConsumedOrProcessedSubject convert(final BomConsumedOrProcesse private static BomProcessingFailedSubject convert(final BomProcessingFailed subject) { - org.hyades.proto.notification.v1.Bom.Builder bomBuilder = org.hyades.proto.notification.v1.Bom.newBuilder(); + org.dependencytrack.proto.notification.v1.Bom.Builder bomBuilder = org.dependencytrack.proto.notification.v1.Bom.newBuilder(); Optional.ofNullable(subject.getBom()).ifPresent(bomBuilder::setContent); Optional.ofNullable(subject.getFormat()).map(Bom.Format::getFormatShortName).ifPresent(bomBuilder::setFormat); Optional.ofNullable(subject.getSpecVersion()).ifPresent(bomBuilder::setSpecVersion); diff --git a/src/main/java/org/dependencytrack/persistence/QueryManager.java b/src/main/java/org/dependencytrack/persistence/QueryManager.java index ef1506928..7a1007529 100644 --- a/src/main/java/org/dependencytrack/persistence/QueryManager.java +++ b/src/main/java/org/dependencytrack/persistence/QueryManager.java @@ -89,11 +89,11 @@ import org.dependencytrack.model.WorkflowStep; import org.dependencytrack.notification.NotificationScope; import org.dependencytrack.notification.publisher.PublisherClass; +import org.dependencytrack.proto.vulnanalysis.v1.ScanResult; +import org.dependencytrack.proto.vulnanalysis.v1.ScanStatus; +import org.dependencytrack.proto.vulnanalysis.v1.ScannerResult; import org.dependencytrack.resources.v1.vo.DependencyGraphResponse; import org.dependencytrack.tasks.IntegrityMetaInitializerTask; -import org.hyades.proto.vulnanalysis.v1.ScanResult; -import org.hyades.proto.vulnanalysis.v1.ScanStatus; -import org.hyades.proto.vulnanalysis.v1.ScannerResult; import javax.jdo.FetchPlan; import javax.jdo.PersistenceManager; @@ -117,7 +117,7 @@ import java.util.function.Predicate; import java.util.function.Supplier; -import static org.hyades.proto.vulnanalysis.v1.ScanStatus.SCAN_STATUS_FAILED; +import static org.dependencytrack.proto.vulnanalysis.v1.ScanStatus.SCAN_STATUS_FAILED; /** * This QueryManager provides a concrete extension of {@link AlpineQueryManager} by @@ -206,7 +206,7 @@ public Query decorate(final Query query) { boolean found = false; final org.datanucleus.store.query.Query iq = ((JDOQuery) query).getInternalQuery(); final String candidateField = orderBy.contains(".") ? orderBy.substring(0, orderBy.indexOf('.')) : orderBy; - for (final Field field: iq.getCandidateClass().getDeclaredFields()) { + for (final Field field : iq.getCandidateClass().getDeclaredFields()) { if (candidateField.equals(field.getName())) { found = true; break; @@ -1895,13 +1895,13 @@ public ComponentMetaInformation getMetaInformation(UUID uuid) { Date publishedDate = null; Date lastFetch = null; IntegrityMatchStatus integrityMatchStatus = null; - if(resultSet.getTimestamp("PUBLISHED_AT") != null) { + if (resultSet.getTimestamp("PUBLISHED_AT") != null) { publishedDate = Date.from(resultSet.getTimestamp("PUBLISHED_AT").toInstant()); } - if(resultSet.getTimestamp("LAST_FETCH") != null) { + if (resultSet.getTimestamp("LAST_FETCH") != null) { lastFetch = Date.from(resultSet.getTimestamp("LAST_FETCH").toInstant()); } - if(resultSet.getString("INTEGRITY_CHECK_STATUS") != null) { + if (resultSet.getString("INTEGRITY_CHECK_STATUS") != null) { integrityMatchStatus = IntegrityMatchStatus.valueOf(resultSet.getString("INTEGRITY_CHECK_STATUS")); } return new ComponentMetaInformation(publishedDate, integrityMatchStatus, lastFetch); diff --git a/src/main/java/org/dependencytrack/policy/cel/CelPolicyLibrary.java b/src/main/java/org/dependencytrack/policy/cel/CelPolicyLibrary.java index 52fa82b06..b67d3b8f2 100644 --- a/src/main/java/org/dependencytrack/policy/cel/CelPolicyLibrary.java +++ b/src/main/java/org/dependencytrack/policy/cel/CelPolicyLibrary.java @@ -87,7 +87,7 @@ public List getCompileOptions() { ), Decls.newFunction( FUNC_DEPENDS_ON, - // project.depends_on(org.hyades.policy.v1.Component{name: "foo"}) + // project.depends_on(org.dependencytrack.policy.v1.Component{name: "foo"}) Decls.newInstanceOverload( "project_depends_on_component_bool", List.of(TYPE_PROJECT, TYPE_COMPONENT), @@ -96,7 +96,7 @@ public List getCompileOptions() { ), Decls.newFunction( FUNC_IS_DEPENDENCY_OF, - // component.is_dependency_of(org.hyades.policy.v1.Component{name: "foo"}) + // component.is_dependency_of(org.dependencytrack.policy.v1.Component{name: "foo"}) Decls.newInstanceOverload( "component_is_dependency_of_component_bool", List.of(TYPE_COMPONENT, TYPE_COMPONENT), @@ -228,7 +228,7 @@ private static Val dependsOnFunc(final Val lhs, final Val rhs) { } if (lhs.value() instanceof final Project project) { - // project.depends_on(org.hyades.policy.v1.Component{name: "foo"}) + // project.depends_on(org.dependencytrack.policy.v1.Component{name: "foo"}) return Types.boolOf(dependsOn(project, leafComponent)); } diff --git a/src/main/java/org/dependencytrack/resources/v1/ComponentResource.java b/src/main/java/org/dependencytrack/resources/v1/ComponentResource.java index e57fdef11..9737b9bd9 100644 --- a/src/main/java/org/dependencytrack/resources/v1/ComponentResource.java +++ b/src/main/java/org/dependencytrack/resources/v1/ComponentResource.java @@ -51,9 +51,9 @@ import org.dependencytrack.model.VulnerabilityAnalysisLevel; import org.dependencytrack.model.VulnerabilityScan; import org.dependencytrack.persistence.QueryManager; +import org.dependencytrack.proto.repometaanalysis.v1.FetchMeta; import org.dependencytrack.util.InternalComponentIdentificationUtil; import org.dependencytrack.util.PurlUtil; -import org.hyades.proto.repometaanalysis.v1.FetchMeta; import javax.validation.Validator; import javax.ws.rs.Consumes; @@ -418,7 +418,7 @@ public Response createComponent(@PathParam("uuid") String uuid, Component jsonCo try { Handler repoMetaHandler = HandlerFactory.createHandler(componentProjection, qm, kafkaEventDispatcher, FetchMeta.FETCH_META_INTEGRITY_DATA_AND_LATEST_VERSION); IntegrityMetaComponent integrityMetaComponent = repoMetaHandler.handle(); - if(integrityMetaComponent != null && (integrityMetaComponent.getStatus() == PROCESSED || integrityMetaComponent.getStatus() == NOT_AVAILABLE)) { + if (integrityMetaComponent != null && (integrityMetaComponent.getStatus() == PROCESSED || integrityMetaComponent.getStatus() == NOT_AVAILABLE)) { calculateIntegrityResult(integrityMetaComponent, component, qm); } } catch (MalformedPackageURLException ex) { @@ -532,7 +532,7 @@ public Response updateComponent(Component jsonComponent) { Handler repoMetaHandler = HandlerFactory.createHandler(componentProjection, qm, kafkaEventDispatcher, FetchMeta.FETCH_META_INTEGRITY_DATA_AND_LATEST_VERSION); IntegrityMetaComponent integrityMetaComponent = repoMetaHandler.handle(); - if(integrityMetaComponent != null && (integrityMetaComponent.getStatus() == PROCESSED || integrityMetaComponent.getStatus() == NOT_AVAILABLE)) { + if (integrityMetaComponent != null && (integrityMetaComponent.getStatus() == PROCESSED || integrityMetaComponent.getStatus() == NOT_AVAILABLE)) { calculateIntegrityResult(integrityMetaComponent, component, qm); } } catch (MalformedPackageURLException ex) { diff --git a/src/main/java/org/dependencytrack/tasks/BomUploadProcessingTask.java b/src/main/java/org/dependencytrack/tasks/BomUploadProcessingTask.java index 5991df933..8b42e42e0 100644 --- a/src/main/java/org/dependencytrack/tasks/BomUploadProcessingTask.java +++ b/src/main/java/org/dependencytrack/tasks/BomUploadProcessingTask.java @@ -63,7 +63,7 @@ import org.dependencytrack.notification.vo.BomProcessingFailed; import org.dependencytrack.persistence.FlushHelper; import org.dependencytrack.persistence.QueryManager; -import org.hyades.proto.repometaanalysis.v1.FetchMeta; +import org.dependencytrack.proto.repometaanalysis.v1.FetchMeta; import org.json.JSONArray; import javax.jdo.PersistenceManager; diff --git a/src/main/java/org/dependencytrack/tasks/IntegrityMetaInitializerTask.java b/src/main/java/org/dependencytrack/tasks/IntegrityMetaInitializerTask.java index 4da957875..7bab8789f 100644 --- a/src/main/java/org/dependencytrack/tasks/IntegrityMetaInitializerTask.java +++ b/src/main/java/org/dependencytrack/tasks/IntegrityMetaInitializerTask.java @@ -16,7 +16,7 @@ import java.util.List; import static org.dependencytrack.event.kafka.componentmeta.RepoMetaConstants.SUPPORTED_PACKAGE_URLS_FOR_INTEGRITY_CHECK; -import static org.hyades.proto.repometaanalysis.v1.FetchMeta.FETCH_META_INTEGRITY_DATA; +import static org.dependencytrack.proto.repometaanalysis.v1.FetchMeta.FETCH_META_INTEGRITY_DATA; public class IntegrityMetaInitializerTask implements Subscriber { @@ -52,14 +52,14 @@ private void dispatchPurls(QueryManager qm, List integri try { PackageURL purl = new PackageURL(integrityMetaPurl.getPurl()); //dispatch for integrity metadata only if purl type is supported - if(SUPPORTED_PACKAGE_URLS_FOR_INTEGRITY_CHECK.contains(purl.getType())) { + if (SUPPORTED_PACKAGE_URLS_FOR_INTEGRITY_CHECK.contains(purl.getType())) { IntegrityMetaInitializerTask.ComponentProjection componentProjection = qm.getComponentByPurl(integrityMetaPurl.getPurl()); LOGGER.debug("Dispatching purl for integrity metadata: " + integrityMetaPurl.getPurl()); //Initializer will not trigger Integrity Check on component so component uuid is not required kafkaEventDispatcher.dispatchAsync(new ComponentRepositoryMetaAnalysisEvent(null, integrityMetaPurl.getPurl(), componentProjection.internal(), FETCH_META_INTEGRITY_DATA)); } } catch (MalformedPackageURLException packageURLException) { - LOGGER.warn("Initializer cannot dispatch for integrity because purl cannot be parse: "+ integrityMetaPurl.getPurl()); + LOGGER.warn("Initializer cannot dispatch for integrity because purl cannot be parse: " + integrityMetaPurl.getPurl()); //skip malformed url } } diff --git a/src/main/java/org/dependencytrack/tasks/RepositoryMetaAnalyzerTask.java b/src/main/java/org/dependencytrack/tasks/RepositoryMetaAnalyzerTask.java index 9be8758aa..75ee40e20 100644 --- a/src/main/java/org/dependencytrack/tasks/RepositoryMetaAnalyzerTask.java +++ b/src/main/java/org/dependencytrack/tasks/RepositoryMetaAnalyzerTask.java @@ -31,8 +31,8 @@ import org.dependencytrack.model.Component; import org.dependencytrack.model.Project; import org.dependencytrack.persistence.QueryManager; +import org.dependencytrack.proto.repometaanalysis.v1.FetchMeta; import org.dependencytrack.util.LockProvider; -import org.hyades.proto.repometaanalysis.v1.FetchMeta; import javax.jdo.PersistenceManager; import javax.jdo.Query; diff --git a/src/main/java/org/dependencytrack/util/NotificationUtil.java b/src/main/java/org/dependencytrack/util/NotificationUtil.java index 580c9a6db..3f5063e00 100644 --- a/src/main/java/org/dependencytrack/util/NotificationUtil.java +++ b/src/main/java/org/dependencytrack/util/NotificationUtil.java @@ -49,7 +49,7 @@ import org.dependencytrack.notification.vo.ProjectVulnAnalysisComplete; import org.dependencytrack.notification.vo.ViolationAnalysisDecisionChange; import org.dependencytrack.persistence.QueryManager; -import org.hyades.proto.notification.v1.ProjectVulnAnalysisStatus; +import org.dependencytrack.proto.notification.v1.ProjectVulnAnalysisStatus; import javax.jdo.FetchPlan; import javax.jdo.Query; diff --git a/src/main/proto/org/hyades/notification/v1/notification.proto b/src/main/proto/org/dependencytrack/notification/v1/notification.proto similarity index 98% rename from src/main/proto/org/hyades/notification/v1/notification.proto rename to src/main/proto/org/dependencytrack/notification/v1/notification.proto index 56479548a..a03e2881a 100644 --- a/src/main/proto/org/hyades/notification/v1/notification.proto +++ b/src/main/proto/org/dependencytrack/notification/v1/notification.proto @@ -1,12 +1,12 @@ syntax = "proto3"; -package org.hyades.notification.v1; +package org.dependencytrack.notification.v1; import "google/protobuf/any.proto"; import "google/protobuf/timestamp.proto"; option java_multiple_files = true; -option java_package = "org.hyades.proto.notification.v1"; +option java_package = "org.dependencytrack.proto.notification.v1"; message Notification { Level level = 1; diff --git a/src/main/proto/org/hyades/repometaanalysis/v1/repo_meta_analysis.proto b/src/main/proto/org/dependencytrack/repometaanalysis/v1/repo_meta_analysis.proto similarity index 88% rename from src/main/proto/org/hyades/repometaanalysis/v1/repo_meta_analysis.proto rename to src/main/proto/org/dependencytrack/repometaanalysis/v1/repo_meta_analysis.proto index 8eb2d0347..111dab876 100644 --- a/src/main/proto/org/hyades/repometaanalysis/v1/repo_meta_analysis.proto +++ b/src/main/proto/org/dependencytrack/repometaanalysis/v1/repo_meta_analysis.proto @@ -1,12 +1,12 @@ syntax = "proto3"; -// Public API for Hyades repository meta analysis. -package org.hyades.repometaanalysis.v1; +// Public API for DependencyTrack repository meta analysis. +package org.dependencytrack.repometaanalysis.v1; import "google/protobuf/timestamp.proto"; option java_multiple_files = true; -option java_package = "org.hyades.proto.repometaanalysis.v1"; +option java_package = "org.dependencytrack.proto.repometaanalysis.v1"; message AnalysisCommand { // The component that shall be analyzed. diff --git a/src/main/proto/org/hyades/vulnanalysis/v1/vuln_analysis.proto b/src/main/proto/org/dependencytrack/vulnanalysis/v1/vuln_analysis.proto similarity index 88% rename from src/main/proto/org/hyades/vulnanalysis/v1/vuln_analysis.proto rename to src/main/proto/org/dependencytrack/vulnanalysis/v1/vuln_analysis.proto index db94b29e1..218bbf01c 100644 --- a/src/main/proto/org/hyades/vulnanalysis/v1/vuln_analysis.proto +++ b/src/main/proto/org/dependencytrack/vulnanalysis/v1/vuln_analysis.proto @@ -1,12 +1,12 @@ syntax = "proto3"; -// Public API for Hyades vulnerability analysis. -package org.hyades.vulnanalysis.v1; +// Public API for DependencyTrack vulnerability analysis. +package org.dependencytrack.vulnanalysis.v1; import "org/cyclonedx/v1_4/cyclonedx.proto"; option java_multiple_files = true; -option java_package = "org.hyades.proto.vulnanalysis.v1"; +option java_package = "org.dependencytrack.proto.vulnanalysis.v1"; message Component { // UUID of the component in the Dependency-Track database. @@ -59,7 +59,7 @@ message ScannerResult { ScanStatus status = 2; // Vulnerabilities identified in the scan. - // repeated org.hyades.vuln.v1.Vulnerability vulnerabilities = 3; + // repeated org.dependencytrack.vuln.v1.Vulnerability vulnerabilities = 3; // Reason for scan failure. optional string failure_reason = 4; diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 2cccb1b1e..8540821b9 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -75,11 +75,11 @@ alpine.database.driver=org.postgresql.Driver # Optional # Specifies the username to use when authenticating to the database. -alpine.database.username= +#alpine.database.username=dtrack # Optional # Specifies the password to use when authenticating to the database. -alpine.database.password= +#alpine.database.password=dtrack # Optional # Specifies if the database connection pool is enabled. @@ -525,4 +525,4 @@ cel.policy.engine.enabled=false # Optional # Specifies whether the Integrity Initializer shall be enabled. integrity.initializer.enabled=false -integrity.check.enabled=false \ No newline at end of file +integrity.check.enabled=false diff --git a/src/test/java/org/dependencytrack/event/kafka/KafkaStreamsDelayedBomProcessedNotificationTest.java b/src/test/java/org/dependencytrack/event/kafka/KafkaStreamsDelayedBomProcessedNotificationTest.java index dfa150cbc..758e4b47d 100644 --- a/src/test/java/org/dependencytrack/event/kafka/KafkaStreamsDelayedBomProcessedNotificationTest.java +++ b/src/test/java/org/dependencytrack/event/kafka/KafkaStreamsDelayedBomProcessedNotificationTest.java @@ -12,12 +12,12 @@ import org.dependencytrack.model.WorkflowState; import org.dependencytrack.model.WorkflowStatus; import org.dependencytrack.model.WorkflowStep; -import org.hyades.proto.notification.v1.BomConsumedOrProcessedSubject; -import org.hyades.proto.notification.v1.Notification; -import org.hyades.proto.notification.v1.ProjectVulnAnalysisCompleteSubject; -import org.hyades.proto.vulnanalysis.v1.ScanKey; -import org.hyades.proto.vulnanalysis.v1.ScanResult; -import org.hyades.proto.vulnanalysis.v1.ScannerResult; +import org.dependencytrack.proto.notification.v1.BomConsumedOrProcessedSubject; +import org.dependencytrack.proto.notification.v1.Notification; +import org.dependencytrack.proto.notification.v1.ProjectVulnAnalysisCompleteSubject; +import org.dependencytrack.proto.vulnanalysis.v1.ScanKey; +import org.dependencytrack.proto.vulnanalysis.v1.ScanResult; +import org.dependencytrack.proto.vulnanalysis.v1.ScannerResult; import org.junit.Test; import java.time.Duration; @@ -27,9 +27,9 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; -import static org.hyades.proto.notification.v1.ProjectVulnAnalysisStatus.PROJECT_VULN_ANALYSIS_STATUS_COMPLETED; -import static org.hyades.proto.vulnanalysis.v1.ScanStatus.SCAN_STATUS_SUCCESSFUL; -import static org.hyades.proto.vulnanalysis.v1.Scanner.SCANNER_INTERNAL; +import static org.dependencytrack.proto.notification.v1.ProjectVulnAnalysisStatus.PROJECT_VULN_ANALYSIS_STATUS_COMPLETED; +import static org.dependencytrack.proto.vulnanalysis.v1.ScanStatus.SCAN_STATUS_SUCCESSFUL; +import static org.dependencytrack.proto.vulnanalysis.v1.Scanner.SCANNER_INTERNAL; public class KafkaStreamsDelayedBomProcessedNotificationTest extends KafkaStreamsPostgresTest { diff --git a/src/test/java/org/dependencytrack/event/kafka/KafkaStreamsPostgresTest.java b/src/test/java/org/dependencytrack/event/kafka/KafkaStreamsPostgresTest.java index aa6c741da..1122a3325 100644 --- a/src/test/java/org/dependencytrack/event/kafka/KafkaStreamsPostgresTest.java +++ b/src/test/java/org/dependencytrack/event/kafka/KafkaStreamsPostgresTest.java @@ -7,7 +7,7 @@ import org.apache.kafka.streams.Topology; import org.dependencytrack.AbstractPostgresEnabledTest; import org.dependencytrack.event.kafka.serialization.KafkaProtobufDeserializer; -import org.hyades.proto.notification.v1.Notification; +import org.dependencytrack.proto.notification.v1.Notification; import org.junit.After; import org.junit.Before; import org.junit.Rule; diff --git a/src/test/java/org/dependencytrack/event/kafka/KafkaStreamsTopologyTest.java b/src/test/java/org/dependencytrack/event/kafka/KafkaStreamsTopologyTest.java index 71b3a5856..79bccb001 100644 --- a/src/test/java/org/dependencytrack/event/kafka/KafkaStreamsTopologyTest.java +++ b/src/test/java/org/dependencytrack/event/kafka/KafkaStreamsTopologyTest.java @@ -29,13 +29,13 @@ import org.dependencytrack.model.VulnerabilityScan.TargetType; import org.dependencytrack.model.WorkflowStatus; import org.dependencytrack.model.WorkflowStep; +import org.dependencytrack.proto.notification.v1.Notification; +import org.dependencytrack.proto.notification.v1.ProjectVulnAnalysisCompleteSubject; +import org.dependencytrack.proto.repometaanalysis.v1.AnalysisResult; +import org.dependencytrack.proto.vulnanalysis.v1.ScanKey; +import org.dependencytrack.proto.vulnanalysis.v1.ScanResult; +import org.dependencytrack.proto.vulnanalysis.v1.ScannerResult; import org.dependencytrack.tasks.PolicyEvaluationTask; -import org.hyades.proto.notification.v1.Notification; -import org.hyades.proto.notification.v1.ProjectVulnAnalysisCompleteSubject; -import org.hyades.proto.repometaanalysis.v1.AnalysisResult; -import org.hyades.proto.vulnanalysis.v1.ScanKey; -import org.hyades.proto.vulnanalysis.v1.ScanResult; -import org.hyades.proto.vulnanalysis.v1.ScannerResult; import org.junit.After; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -56,13 +56,13 @@ import static org.awaitility.Awaitility.await; import static org.cyclonedx.proto.v1_4.ScoreMethod.SCORE_METHOD_CVSSV3; import static org.dependencytrack.assertion.Assertions.assertConditionWithTimeout; -import static org.hyades.proto.notification.v1.ProjectVulnAnalysisStatus.PROJECT_VULN_ANALYSIS_STATUS_COMPLETED; -import static org.hyades.proto.notification.v1.ProjectVulnAnalysisStatus.PROJECT_VULN_ANALYSIS_STATUS_FAILED; -import static org.hyades.proto.vulnanalysis.v1.ScanStatus.SCAN_STATUS_FAILED; -import static org.hyades.proto.vulnanalysis.v1.ScanStatus.SCAN_STATUS_SUCCESSFUL; -import static org.hyades.proto.vulnanalysis.v1.Scanner.SCANNER_INTERNAL; -import static org.hyades.proto.vulnanalysis.v1.Scanner.SCANNER_OSSINDEX; -import static org.hyades.proto.vulnanalysis.v1.Scanner.SCANNER_SNYK; +import static org.dependencytrack.proto.notification.v1.ProjectVulnAnalysisStatus.PROJECT_VULN_ANALYSIS_STATUS_COMPLETED; +import static org.dependencytrack.proto.notification.v1.ProjectVulnAnalysisStatus.PROJECT_VULN_ANALYSIS_STATUS_FAILED; +import static org.dependencytrack.proto.vulnanalysis.v1.ScanStatus.SCAN_STATUS_FAILED; +import static org.dependencytrack.proto.vulnanalysis.v1.ScanStatus.SCAN_STATUS_SUCCESSFUL; +import static org.dependencytrack.proto.vulnanalysis.v1.Scanner.SCANNER_INTERNAL; +import static org.dependencytrack.proto.vulnanalysis.v1.Scanner.SCANNER_OSSINDEX; +import static org.dependencytrack.proto.vulnanalysis.v1.Scanner.SCANNER_SNYK; public class KafkaStreamsTopologyTest extends KafkaStreamsPostgresTest { @@ -127,7 +127,7 @@ public void repoMetaAnalysisResultProcessingTest() throws Exception { final Date beforeTestTimestamp = Date.from(Instant.now()); final var result = AnalysisResult.newBuilder() - .setComponent(org.hyades.proto.repometaanalysis.v1.Component.newBuilder() + .setComponent(org.dependencytrack.proto.repometaanalysis.v1.Component.newBuilder() .setPurl("pkg:golang/github.com/foo/bar@1.2.3")) .setLatestVersion("1.2.4") .build(); diff --git a/src/test/java/org/dependencytrack/event/kafka/componentmeta/HandlerFactoryTest.java b/src/test/java/org/dependencytrack/event/kafka/componentmeta/HandlerFactoryTest.java index d64aeaa8d..6605bd194 100644 --- a/src/test/java/org/dependencytrack/event/kafka/componentmeta/HandlerFactoryTest.java +++ b/src/test/java/org/dependencytrack/event/kafka/componentmeta/HandlerFactoryTest.java @@ -5,8 +5,8 @@ import com.github.packageurl.PackageURL; import org.dependencytrack.PersistenceCapableTest; import org.dependencytrack.event.kafka.KafkaEventDispatcher; +import org.dependencytrack.proto.repometaanalysis.v1.FetchMeta; import org.dependencytrack.util.PurlUtil; -import org.hyades.proto.repometaanalysis.v1.FetchMeta; import org.junit.Test; import java.util.UUID; diff --git a/src/test/java/org/dependencytrack/event/kafka/componentmeta/SupportedMetaHandlerTest.java b/src/test/java/org/dependencytrack/event/kafka/componentmeta/SupportedMetaHandlerTest.java index 4f4f60531..8bfb5312d 100644 --- a/src/test/java/org/dependencytrack/event/kafka/componentmeta/SupportedMetaHandlerTest.java +++ b/src/test/java/org/dependencytrack/event/kafka/componentmeta/SupportedMetaHandlerTest.java @@ -7,8 +7,8 @@ import org.dependencytrack.event.kafka.KafkaTopics; import org.dependencytrack.model.FetchStatus; import org.dependencytrack.model.IntegrityMetaComponent; +import org.dependencytrack.proto.repometaanalysis.v1.FetchMeta; import org.dependencytrack.util.PurlUtil; -import org.hyades.proto.repometaanalysis.v1.FetchMeta; import org.junit.Test; import org.junit.jupiter.api.Assertions; diff --git a/src/test/java/org/dependencytrack/event/kafka/componentmeta/UnSupportedMetaHandlerTest.java b/src/test/java/org/dependencytrack/event/kafka/componentmeta/UnSupportedMetaHandlerTest.java index dc41dbf74..1c2596857 100644 --- a/src/test/java/org/dependencytrack/event/kafka/componentmeta/UnSupportedMetaHandlerTest.java +++ b/src/test/java/org/dependencytrack/event/kafka/componentmeta/UnSupportedMetaHandlerTest.java @@ -6,13 +6,11 @@ import org.dependencytrack.event.kafka.KafkaEventDispatcher; import org.dependencytrack.event.kafka.KafkaTopics; import org.dependencytrack.model.IntegrityMetaComponent; +import org.dependencytrack.proto.repometaanalysis.v1.FetchMeta; import org.dependencytrack.util.PurlUtil; -import org.hyades.proto.repometaanalysis.v1.FetchMeta; import org.junit.Test; import org.junit.jupiter.api.Assertions; -import java.util.UUID; - import static org.assertj.core.api.Assertions.assertThat; import static org.dependencytrack.util.KafkaTestUtil.deserializeValue; diff --git a/src/test/java/org/dependencytrack/event/kafka/processor/RepositoryMetaResultProcessorTest.java b/src/test/java/org/dependencytrack/event/kafka/processor/RepositoryMetaResultProcessorTest.java index 49ecb70d8..16506299a 100644 --- a/src/test/java/org/dependencytrack/event/kafka/processor/RepositoryMetaResultProcessorTest.java +++ b/src/test/java/org/dependencytrack/event/kafka/processor/RepositoryMetaResultProcessorTest.java @@ -17,8 +17,8 @@ import org.dependencytrack.model.IntegrityMetaComponent; import org.dependencytrack.model.RepositoryMetaComponent; import org.dependencytrack.model.RepositoryType; -import org.hyades.proto.repometaanalysis.v1.AnalysisResult; -import org.hyades.proto.repometaanalysis.v1.IntegrityMeta; +import org.dependencytrack.proto.repometaanalysis.v1.AnalysisResult; +import org.dependencytrack.proto.repometaanalysis.v1.IntegrityMeta; import org.junit.After; import org.junit.Before; import org.junit.Rule; @@ -68,7 +68,7 @@ public void processNewMetaModelTest() { final var published = Instant.now().minus(5, ChronoUnit.MINUTES); final var result = AnalysisResult.newBuilder() - .setComponent(org.hyades.proto.repometaanalysis.v1.Component.newBuilder() + .setComponent(org.dependencytrack.proto.repometaanalysis.v1.Component.newBuilder() .setPurl("pkg:maven/foo/bar@1.2.3")) .setLatestVersion("1.2.4") .setPublished(Timestamp.newBuilder() @@ -117,7 +117,7 @@ public void processUpdateExistingMetaModelTest() { final var published = Instant.now(); final var result = AnalysisResult.newBuilder() - .setComponent(org.hyades.proto.repometaanalysis.v1.Component.newBuilder() + .setComponent(org.dependencytrack.proto.repometaanalysis.v1.Component.newBuilder() .setPurl("pkg:maven/foo/bar@1.2.3")) .setLatestVersion("1.2.4") .setPublished(Timestamp.newBuilder() @@ -151,7 +151,7 @@ public void processUpdateOutOfOrderMetaModelTest() { final var published = Instant.now(); final var result = AnalysisResult.newBuilder() - .setComponent(org.hyades.proto.repometaanalysis.v1.Component.newBuilder() + .setComponent(org.dependencytrack.proto.repometaanalysis.v1.Component.newBuilder() .setPurl("pkg:maven/foo/bar@1.2.3")) .setLatestVersion("1.2.4") .setPublished(Timestamp.newBuilder() @@ -196,7 +196,7 @@ public void processUpdateIntegrityResultTest() { qm.persist(integrityMetaComponent); final var result = AnalysisResult.newBuilder() - .setComponent(org.hyades.proto.repometaanalysis.v1.Component.newBuilder() + .setComponent(org.dependencytrack.proto.repometaanalysis.v1.Component.newBuilder() .setUuid(c.getUuid().toString()) .setPurl("pkg:maven/foo/bar@1.2.3")) .setIntegrityMeta(IntegrityMeta.newBuilder().setMd5("098f6bcd4621d373cade4e832627b4f6") @@ -249,7 +249,7 @@ public void testIntegrityCheckWhenComponentHashIsMissing() { qm.persist(integrityMetaComponent); final var result = AnalysisResult.newBuilder() - .setComponent(org.hyades.proto.repometaanalysis.v1.Component.newBuilder() + .setComponent(org.dependencytrack.proto.repometaanalysis.v1.Component.newBuilder() .setUuid(c.getUuid().toString()) .setPurl("pkg:maven/foo/bar@1.2.3")) .setIntegrityMeta(IntegrityMeta.newBuilder() @@ -301,7 +301,7 @@ public void testIntegrityAnalysisWillNotBePerformedIfNoIntegrityDataInResult() { qm.persist(integrityMetaComponent); final var result = AnalysisResult.newBuilder() - .setComponent(org.hyades.proto.repometaanalysis.v1.Component.newBuilder() + .setComponent(org.dependencytrack.proto.repometaanalysis.v1.Component.newBuilder() .setUuid(c.getUuid().toString()) .setPurl("pkg:maven/foo/bar@1.2.3")) .build(); @@ -339,7 +339,7 @@ public void testIntegrityCheckWillNotBeDoneIfComponentUuidAndIntegrityDataIsMiss qm.persist(integrityMetaComponent); final var result = AnalysisResult.newBuilder() - .setComponent(org.hyades.proto.repometaanalysis.v1.Component.newBuilder() + .setComponent(org.dependencytrack.proto.repometaanalysis.v1.Component.newBuilder() .setPurl("pkg:maven/foo/bar@1.2.3")) //component uuid has not been set .build(); @@ -374,12 +374,12 @@ public void testIntegrityIfResultHasIntegrityDataAndComponentUuidIsMissing() { qm.persist(integrityMetaComponent); final var result = AnalysisResult.newBuilder() - .setComponent(org.hyades.proto.repometaanalysis.v1.Component.newBuilder() + .setComponent(org.dependencytrack.proto.repometaanalysis.v1.Component.newBuilder() .setPurl("pkg:maven/foo/bar@1.2.3")) .setIntegrityMeta(IntegrityMeta.newBuilder() .setMd5("098f6bcd4621d373cade4e832627b4f6") - .setSha1("a94a8fe5ccb19ba61c4c0873d391e987982fbbd3") - .build()) + .setSha1("a94a8fe5ccb19ba61c4c0873d391e987982fbbd3") + .build()) //component uuid has not been set .build(); @@ -407,7 +407,7 @@ public void testIntegrityCheckWillNotBeDoneIfComponentIsNotInDb() { qm.persist(integrityMetaComponent); final var result = AnalysisResult.newBuilder() - .setComponent(org.hyades.proto.repometaanalysis.v1.Component.newBuilder() + .setComponent(org.dependencytrack.proto.repometaanalysis.v1.Component.newBuilder() .setUuid(uuid.toString()) .setPurl("pkg:maven/foo/bar@1.2.3")) @@ -442,7 +442,7 @@ public void testIntegrityCheckShouldReturnComponentHashMissing() { qm.persist(integrityMetaComponent); final var result = AnalysisResult.newBuilder() - .setComponent(org.hyades.proto.repometaanalysis.v1.Component.newBuilder() + .setComponent(org.dependencytrack.proto.repometaanalysis.v1.Component.newBuilder() .setUuid(c.getUuid().toString()) .setPurl("pkg:maven/foo/bar@1.2.3")) .setIntegrityMeta(IntegrityMeta.newBuilder().setMd5("098f6bcd4621d373cade4e832627b4f6") @@ -491,7 +491,7 @@ public void testIntegrityCheckShouldReturnComponentHashMissingAndMatchUnknown() qm.persist(integrityMetaComponent); final var result = AnalysisResult.newBuilder() - .setComponent(org.hyades.proto.repometaanalysis.v1.Component.newBuilder() + .setComponent(org.dependencytrack.proto.repometaanalysis.v1.Component.newBuilder() .setUuid(c.getUuid().toString()) .setPurl("pkg:maven/foo/bar@1.2.3")) .setIntegrityMeta(IntegrityMeta.newBuilder() @@ -539,7 +539,7 @@ public void testIntegrityCheckShouldFailIfNoHashMatch() { qm.persist(integrityMetaComponent); final var result = AnalysisResult.newBuilder() - .setComponent(org.hyades.proto.repometaanalysis.v1.Component.newBuilder() + .setComponent(org.dependencytrack.proto.repometaanalysis.v1.Component.newBuilder() .setUuid(c.getUuid().toString()) .setPurl("pkg:maven/foo/bar@1.2.3")) .setIntegrityMeta(IntegrityMeta.newBuilder() @@ -577,7 +577,7 @@ public void processUpdateIntegrityResultNotAvailableTest() { final var result = AnalysisResult.newBuilder() - .setComponent(org.hyades.proto.repometaanalysis.v1.Component.newBuilder() + .setComponent(org.dependencytrack.proto.repometaanalysis.v1.Component.newBuilder() .setPurl("pkg:maven/foo/bar@1.2.3")) .setIntegrityMeta(IntegrityMeta.newBuilder().setMetaSourceUrl("test").build()) .build(); @@ -607,7 +607,7 @@ public void processUpdateOldIntegrityResultSent() { qm.persist(integrityMetaComponent); final var result = AnalysisResult.newBuilder() - .setComponent(org.hyades.proto.repometaanalysis.v1.Component.newBuilder() + .setComponent(org.dependencytrack.proto.repometaanalysis.v1.Component.newBuilder() .setPurl("pkg:maven/foo/bar@1.2.3")) .setIntegrityMeta(IntegrityMeta.newBuilder().setMd5("098f6bcd4621d373cade4e832627b4f6") .setSha1("a94a8fe5ccb19ba61c4c0873d391e587982fbbd3").setMetaSourceUrl("test2").build()) @@ -636,7 +636,7 @@ public void processBothMetaModelAndIntegrityMeta() { qm.persist(integrityMetaComponent); final var result = AnalysisResult.newBuilder() - .setComponent(org.hyades.proto.repometaanalysis.v1.Component.newBuilder() + .setComponent(org.dependencytrack.proto.repometaanalysis.v1.Component.newBuilder() .setPurl("pkg:maven/foo/bar@1.2.3")) .setLatestVersion("1.2.4") .setPublished(Timestamp.newBuilder() @@ -676,7 +676,7 @@ public void processUpdateIntegrityResultNotSentTest() { final var result = AnalysisResult.newBuilder() - .setComponent(org.hyades.proto.repometaanalysis.v1.Component.newBuilder() + .setComponent(org.dependencytrack.proto.repometaanalysis.v1.Component.newBuilder() .setPurl("pkg:maven/foo/bar@1.2.3")) .build(); diff --git a/src/test/java/org/dependencytrack/event/kafka/processor/VulnerabilityScanResultProcessorTest.java b/src/test/java/org/dependencytrack/event/kafka/processor/VulnerabilityScanResultProcessorTest.java index 1c5851eb8..bc3781fdb 100644 --- a/src/test/java/org/dependencytrack/event/kafka/processor/VulnerabilityScanResultProcessorTest.java +++ b/src/test/java/org/dependencytrack/event/kafka/processor/VulnerabilityScanResultProcessorTest.java @@ -34,13 +34,13 @@ import org.dependencytrack.model.VulnerabilityAnalysisLevel; import org.dependencytrack.notification.NotificationConstants; import org.dependencytrack.persistence.CweImporter; -import org.hyades.proto.notification.v1.NewVulnerabilitySubject; -import org.hyades.proto.notification.v1.NewVulnerableDependencySubject; -import org.hyades.proto.notification.v1.Notification; -import org.hyades.proto.vulnanalysis.v1.ScanKey; -import org.hyades.proto.vulnanalysis.v1.ScanResult; -import org.hyades.proto.vulnanalysis.v1.Scanner; -import org.hyades.proto.vulnanalysis.v1.ScannerResult; +import org.dependencytrack.proto.notification.v1.NewVulnerabilitySubject; +import org.dependencytrack.proto.notification.v1.NewVulnerableDependencySubject; +import org.dependencytrack.proto.notification.v1.Notification; +import org.dependencytrack.proto.vulnanalysis.v1.ScanKey; +import org.dependencytrack.proto.vulnanalysis.v1.ScanResult; +import org.dependencytrack.proto.vulnanalysis.v1.Scanner; +import org.dependencytrack.proto.vulnanalysis.v1.ScannerResult; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -56,20 +56,20 @@ import static org.cyclonedx.proto.v1_4.ScoreMethod.SCORE_METHOD_CVSSV2; import static org.cyclonedx.proto.v1_4.ScoreMethod.SCORE_METHOD_CVSSV3; import static org.cyclonedx.proto.v1_4.ScoreMethod.SCORE_METHOD_OWASP; +import static org.dependencytrack.proto.notification.v1.Group.GROUP_ANALYZER; +import static org.dependencytrack.proto.notification.v1.Group.GROUP_NEW_VULNERABILITY; +import static org.dependencytrack.proto.notification.v1.Group.GROUP_NEW_VULNERABLE_DEPENDENCY; +import static org.dependencytrack.proto.notification.v1.Level.LEVEL_ERROR; +import static org.dependencytrack.proto.notification.v1.Level.LEVEL_INFORMATIONAL; +import static org.dependencytrack.proto.notification.v1.Scope.SCOPE_PORTFOLIO; +import static org.dependencytrack.proto.notification.v1.Scope.SCOPE_SYSTEM; +import static org.dependencytrack.proto.vulnanalysis.v1.ScanStatus.SCAN_STATUS_FAILED; +import static org.dependencytrack.proto.vulnanalysis.v1.ScanStatus.SCAN_STATUS_PENDING; +import static org.dependencytrack.proto.vulnanalysis.v1.ScanStatus.SCAN_STATUS_SUCCESSFUL; +import static org.dependencytrack.proto.vulnanalysis.v1.Scanner.SCANNER_INTERNAL; +import static org.dependencytrack.proto.vulnanalysis.v1.Scanner.SCANNER_OSSINDEX; +import static org.dependencytrack.proto.vulnanalysis.v1.Scanner.SCANNER_SNYK; import static org.dependencytrack.util.KafkaTestUtil.deserializeValue; -import static org.hyades.proto.notification.v1.Group.GROUP_ANALYZER; -import static org.hyades.proto.notification.v1.Group.GROUP_NEW_VULNERABILITY; -import static org.hyades.proto.notification.v1.Group.GROUP_NEW_VULNERABLE_DEPENDENCY; -import static org.hyades.proto.notification.v1.Level.LEVEL_ERROR; -import static org.hyades.proto.notification.v1.Level.LEVEL_INFORMATIONAL; -import static org.hyades.proto.notification.v1.Scope.SCOPE_PORTFOLIO; -import static org.hyades.proto.notification.v1.Scope.SCOPE_SYSTEM; -import static org.hyades.proto.vulnanalysis.v1.ScanStatus.SCAN_STATUS_FAILED; -import static org.hyades.proto.vulnanalysis.v1.ScanStatus.SCAN_STATUS_PENDING; -import static org.hyades.proto.vulnanalysis.v1.ScanStatus.SCAN_STATUS_SUCCESSFUL; -import static org.hyades.proto.vulnanalysis.v1.Scanner.SCANNER_INTERNAL; -import static org.hyades.proto.vulnanalysis.v1.Scanner.SCANNER_OSSINDEX; -import static org.hyades.proto.vulnanalysis.v1.Scanner.SCANNER_SNYK; @RunWith(JUnitParamsRunner.class) public class VulnerabilityScanResultProcessorTest extends PersistenceCapableTest { @@ -233,7 +233,7 @@ public void processSuccessfulScanResult() { createVuln(vulnA.getVulnId(), "INTERNAL"), createVuln(vulnB.getVulnId(), "OSSINDEX"), createVuln(vulnC.getVulnId(), "INTERNAL") - )))) + )))) .build(); final Headers headers = new RecordHeaders(); headers.add(KafkaEventHeaders.VULN_ANALYSIS_LEVEL, VulnerabilityAnalysisLevel.BOM_UPLOAD_ANALYSIS.name().getBytes()); diff --git a/src/test/java/org/dependencytrack/event/kafka/serialization/KafkaProtobufSerdeTest.java b/src/test/java/org/dependencytrack/event/kafka/serialization/KafkaProtobufSerdeTest.java index fd0611cc9..28ea6447d 100644 --- a/src/test/java/org/dependencytrack/event/kafka/serialization/KafkaProtobufSerdeTest.java +++ b/src/test/java/org/dependencytrack/event/kafka/serialization/KafkaProtobufSerdeTest.java @@ -2,7 +2,7 @@ import com.google.protobuf.AbstractMessageLite; import org.apache.kafka.common.errors.SerializationException; -import org.hyades.proto.vulnanalysis.v1.Component; +import org.dependencytrack.proto.vulnanalysis.v1.Component; import org.junit.Test; import java.nio.charset.StandardCharsets; diff --git a/src/test/java/org/dependencytrack/parser/hyades/ModelConverterCdxToVulnTest.java b/src/test/java/org/dependencytrack/parser/dependencytrack/ModelConverterCdxToVulnTest.java similarity index 99% rename from src/test/java/org/dependencytrack/parser/hyades/ModelConverterCdxToVulnTest.java rename to src/test/java/org/dependencytrack/parser/dependencytrack/ModelConverterCdxToVulnTest.java index 238917be1..5b16bf60d 100644 --- a/src/test/java/org/dependencytrack/parser/hyades/ModelConverterCdxToVulnTest.java +++ b/src/test/java/org/dependencytrack/parser/dependencytrack/ModelConverterCdxToVulnTest.java @@ -1,4 +1,4 @@ -package org.dependencytrack.parser.hyades; +package org.dependencytrack.parser.dependencytrack; import com.google.protobuf.Timestamp; import org.cyclonedx.proto.v1_4.Advisory; diff --git a/src/test/java/org/dependencytrack/parser/hyades/NotificationModelConverterTest.java b/src/test/java/org/dependencytrack/parser/dependencytrack/NotificationModelConverterTest.java similarity index 92% rename from src/test/java/org/dependencytrack/parser/hyades/NotificationModelConverterTest.java rename to src/test/java/org/dependencytrack/parser/dependencytrack/NotificationModelConverterTest.java index 5ff13b8e5..21b6d4794 100644 --- a/src/test/java/org/dependencytrack/parser/hyades/NotificationModelConverterTest.java +++ b/src/test/java/org/dependencytrack/parser/dependencytrack/NotificationModelConverterTest.java @@ -1,4 +1,4 @@ -package org.dependencytrack.parser.hyades; +package org.dependencytrack.parser.dependencytrack; import alpine.notification.NotificationLevel; import org.dependencytrack.PersistenceCapableTest; @@ -23,25 +23,25 @@ import org.dependencytrack.notification.vo.VexConsumedOrProcessed; import org.dependencytrack.notification.vo.ViolationAnalysisDecisionChange; import org.dependencytrack.persistence.CweImporter; -import org.hyades.proto.notification.v1.BomConsumedOrProcessedSubject; -import org.hyades.proto.notification.v1.BomProcessingFailedSubject; -import org.hyades.proto.notification.v1.Component; -import org.hyades.proto.notification.v1.NewVulnerabilitySubject; -import org.hyades.proto.notification.v1.NewVulnerableDependencySubject; -import org.hyades.proto.notification.v1.Notification; -import org.hyades.proto.notification.v1.Policy; -import org.hyades.proto.notification.v1.PolicyCondition; -import org.hyades.proto.notification.v1.PolicyViolation; -import org.hyades.proto.notification.v1.PolicyViolationAnalysis; -import org.hyades.proto.notification.v1.PolicyViolationAnalysisDecisionChangeSubject; -import org.hyades.proto.notification.v1.PolicyViolationSubject; -import org.hyades.proto.notification.v1.Project; -import org.hyades.proto.notification.v1.ProjectVulnAnalysisCompleteSubject; -import org.hyades.proto.notification.v1.ProjectVulnAnalysisStatus; -import org.hyades.proto.notification.v1.VexConsumedOrProcessedSubject; -import org.hyades.proto.notification.v1.Vulnerability; -import org.hyades.proto.notification.v1.VulnerabilityAnalysis; -import org.hyades.proto.notification.v1.VulnerabilityAnalysisDecisionChangeSubject; +import org.dependencytrack.proto.notification.v1.BomConsumedOrProcessedSubject; +import org.dependencytrack.proto.notification.v1.BomProcessingFailedSubject; +import org.dependencytrack.proto.notification.v1.Component; +import org.dependencytrack.proto.notification.v1.NewVulnerabilitySubject; +import org.dependencytrack.proto.notification.v1.NewVulnerableDependencySubject; +import org.dependencytrack.proto.notification.v1.Notification; +import org.dependencytrack.proto.notification.v1.Policy; +import org.dependencytrack.proto.notification.v1.PolicyCondition; +import org.dependencytrack.proto.notification.v1.PolicyViolation; +import org.dependencytrack.proto.notification.v1.PolicyViolationAnalysis; +import org.dependencytrack.proto.notification.v1.PolicyViolationAnalysisDecisionChangeSubject; +import org.dependencytrack.proto.notification.v1.PolicyViolationSubject; +import org.dependencytrack.proto.notification.v1.Project; +import org.dependencytrack.proto.notification.v1.ProjectVulnAnalysisCompleteSubject; +import org.dependencytrack.proto.notification.v1.ProjectVulnAnalysisStatus; +import org.dependencytrack.proto.notification.v1.VexConsumedOrProcessedSubject; +import org.dependencytrack.proto.notification.v1.Vulnerability; +import org.dependencytrack.proto.notification.v1.VulnerabilityAnalysis; +import org.dependencytrack.proto.notification.v1.VulnerabilityAnalysisDecisionChangeSubject; import org.junit.Test; import java.math.BigDecimal; @@ -52,28 +52,28 @@ import java.util.UUID; import static org.assertj.core.api.Assertions.assertThat; -import static org.hyades.proto.notification.v1.Group.GROUP_ANALYZER; -import static org.hyades.proto.notification.v1.Group.GROUP_BOM_CONSUMED; -import static org.hyades.proto.notification.v1.Group.GROUP_BOM_PROCESSED; -import static org.hyades.proto.notification.v1.Group.GROUP_BOM_PROCESSING_FAILED; -import static org.hyades.proto.notification.v1.Group.GROUP_CONFIGURATION; -import static org.hyades.proto.notification.v1.Group.GROUP_DATASOURCE_MIRRORING; -import static org.hyades.proto.notification.v1.Group.GROUP_FILE_SYSTEM; -import static org.hyades.proto.notification.v1.Group.GROUP_INTEGRATION; -import static org.hyades.proto.notification.v1.Group.GROUP_NEW_VULNERABILITY; -import static org.hyades.proto.notification.v1.Group.GROUP_NEW_VULNERABLE_DEPENDENCY; -import static org.hyades.proto.notification.v1.Group.GROUP_POLICY_VIOLATION; -import static org.hyades.proto.notification.v1.Group.GROUP_PROJECT_AUDIT_CHANGE; -import static org.hyades.proto.notification.v1.Group.GROUP_PROJECT_CREATED; -import static org.hyades.proto.notification.v1.Group.GROUP_PROJECT_VULN_ANALYSIS_COMPLETE; -import static org.hyades.proto.notification.v1.Group.GROUP_REPOSITORY; -import static org.hyades.proto.notification.v1.Group.GROUP_VEX_CONSUMED; -import static org.hyades.proto.notification.v1.Group.GROUP_VEX_PROCESSED; -import static org.hyades.proto.notification.v1.Level.LEVEL_ERROR; -import static org.hyades.proto.notification.v1.Level.LEVEL_INFORMATIONAL; -import static org.hyades.proto.notification.v1.Level.LEVEL_WARNING; -import static org.hyades.proto.notification.v1.Scope.SCOPE_PORTFOLIO; -import static org.hyades.proto.notification.v1.Scope.SCOPE_SYSTEM; +import static org.dependencytrack.proto.notification.v1.Group.GROUP_ANALYZER; +import static org.dependencytrack.proto.notification.v1.Group.GROUP_BOM_CONSUMED; +import static org.dependencytrack.proto.notification.v1.Group.GROUP_BOM_PROCESSED; +import static org.dependencytrack.proto.notification.v1.Group.GROUP_BOM_PROCESSING_FAILED; +import static org.dependencytrack.proto.notification.v1.Group.GROUP_CONFIGURATION; +import static org.dependencytrack.proto.notification.v1.Group.GROUP_DATASOURCE_MIRRORING; +import static org.dependencytrack.proto.notification.v1.Group.GROUP_FILE_SYSTEM; +import static org.dependencytrack.proto.notification.v1.Group.GROUP_INTEGRATION; +import static org.dependencytrack.proto.notification.v1.Group.GROUP_NEW_VULNERABILITY; +import static org.dependencytrack.proto.notification.v1.Group.GROUP_NEW_VULNERABLE_DEPENDENCY; +import static org.dependencytrack.proto.notification.v1.Group.GROUP_POLICY_VIOLATION; +import static org.dependencytrack.proto.notification.v1.Group.GROUP_PROJECT_AUDIT_CHANGE; +import static org.dependencytrack.proto.notification.v1.Group.GROUP_PROJECT_CREATED; +import static org.dependencytrack.proto.notification.v1.Group.GROUP_PROJECT_VULN_ANALYSIS_COMPLETE; +import static org.dependencytrack.proto.notification.v1.Group.GROUP_REPOSITORY; +import static org.dependencytrack.proto.notification.v1.Group.GROUP_VEX_CONSUMED; +import static org.dependencytrack.proto.notification.v1.Group.GROUP_VEX_PROCESSED; +import static org.dependencytrack.proto.notification.v1.Level.LEVEL_ERROR; +import static org.dependencytrack.proto.notification.v1.Level.LEVEL_INFORMATIONAL; +import static org.dependencytrack.proto.notification.v1.Level.LEVEL_WARNING; +import static org.dependencytrack.proto.notification.v1.Scope.SCOPE_PORTFOLIO; +import static org.dependencytrack.proto.notification.v1.Scope.SCOPE_SYSTEM; public class NotificationModelConverterTest extends PersistenceCapableTest { diff --git a/src/test/java/org/dependencytrack/policy/PolicyEngineTest.java b/src/test/java/org/dependencytrack/policy/PolicyEngineTest.java index 8015ba041..bdb123b09 100644 --- a/src/test/java/org/dependencytrack/policy/PolicyEngineTest.java +++ b/src/test/java/org/dependencytrack/policy/PolicyEngineTest.java @@ -53,10 +53,10 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.dependencytrack.assertion.Assertions.assertConditionWithTimeout; +import static org.dependencytrack.proto.notification.v1.Group.GROUP_POLICY_VIOLATION; +import static org.dependencytrack.proto.notification.v1.Level.LEVEL_INFORMATIONAL; +import static org.dependencytrack.proto.notification.v1.Scope.SCOPE_PORTFOLIO; import static org.dependencytrack.util.KafkaTestUtil.deserializeValue; -import static org.hyades.proto.notification.v1.Group.GROUP_POLICY_VIOLATION; -import static org.hyades.proto.notification.v1.Level.LEVEL_INFORMATIONAL; -import static org.hyades.proto.notification.v1.Scope.SCOPE_PORTFOLIO; import static org.junit.Assert.assertNull; public class PolicyEngineTest extends PersistenceCapableTest { @@ -349,7 +349,7 @@ public void notificationTest() throws InterruptedException { assertThat(policyEngine.evaluate(component.getUuid())).hasSize(1); //2 Notifications will be sent, one for project created and another for policy violation assertConditionWithTimeout(() -> kafkaMockProducer.history().size() == 2, Duration.ofSeconds(5)); - final org.hyades.proto.notification.v1.Notification notification = deserializeValue(KafkaTopics.NOTIFICATION_POLICY_VIOLATION, kafkaMockProducer.history().get(1)); + final org.dependencytrack.proto.notification.v1.Notification notification = deserializeValue(KafkaTopics.NOTIFICATION_POLICY_VIOLATION, kafkaMockProducer.history().get(1)); assertThat(notification).isNotNull(); assertThat(notification.getScope()).isEqualTo(SCOPE_PORTFOLIO); assertThat(notification.getGroup()).isEqualTo(GROUP_POLICY_VIOLATION); @@ -363,10 +363,10 @@ public void notificationTest() throws InterruptedException { assertThat(policyEngine.evaluate(component.getUuid())).hasSize(2); assertConditionWithTimeout(() -> kafkaMockProducer.history().size() == 3, Duration.ofSeconds(5)); - final org.hyades.proto.notification.v1.Notification notificationPolicyA = deserializeValue(KafkaTopics.NOTIFICATION_POLICY_VIOLATION, kafkaMockProducer.history().get(0)); + final org.dependencytrack.proto.notification.v1.Notification notificationPolicyA = deserializeValue(KafkaTopics.NOTIFICATION_POLICY_VIOLATION, kafkaMockProducer.history().get(0)); assertThat(notificationPolicyA).isNotNull(); - final org.hyades.proto.notification.v1.Notification notificationPolicyB = deserializeValue(KafkaTopics.NOTIFICATION_POLICY_VIOLATION, kafkaMockProducer.history().get(1)); + final org.dependencytrack.proto.notification.v1.Notification notificationPolicyB = deserializeValue(KafkaTopics.NOTIFICATION_POLICY_VIOLATION, kafkaMockProducer.history().get(1)); assertThat(notificationPolicyB).isNotNull(); assertThat(notification.getScope()).isEqualTo(SCOPE_PORTFOLIO); assertThat(notification.getGroup()).isEqualTo(GROUP_POLICY_VIOLATION); diff --git a/src/test/java/org/dependencytrack/resources/v1/AnalysisResourceTest.java b/src/test/java/org/dependencytrack/resources/v1/AnalysisResourceTest.java index 2e72339d1..c1710bfe6 100644 --- a/src/test/java/org/dependencytrack/resources/v1/AnalysisResourceTest.java +++ b/src/test/java/org/dependencytrack/resources/v1/AnalysisResourceTest.java @@ -35,13 +35,13 @@ import org.dependencytrack.model.Severity; import org.dependencytrack.model.Vulnerability; import org.dependencytrack.notification.NotificationConstants; +import org.dependencytrack.proto.notification.v1.Notification; import org.dependencytrack.resources.v1.vo.AnalysisRequest; import org.dependencytrack.util.NotificationUtil; import org.glassfish.jersey.server.ResourceConfig; import org.glassfish.jersey.servlet.ServletContainer; import org.glassfish.jersey.test.DeploymentContext; import org.glassfish.jersey.test.ServletDeploymentContext; -import org.hyades.proto.notification.v1.Notification; import org.junit.Test; import javax.json.Json; @@ -56,10 +56,10 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.dependencytrack.assertion.Assertions.assertConditionWithTimeout; +import static org.dependencytrack.proto.notification.v1.Group.GROUP_PROJECT_AUDIT_CHANGE; +import static org.dependencytrack.proto.notification.v1.Level.LEVEL_INFORMATIONAL; +import static org.dependencytrack.proto.notification.v1.Scope.SCOPE_PORTFOLIO; import static org.dependencytrack.util.KafkaTestUtil.deserializeValue; -import static org.hyades.proto.notification.v1.Group.GROUP_PROJECT_AUDIT_CHANGE; -import static org.hyades.proto.notification.v1.Level.LEVEL_INFORMATIONAL; -import static org.hyades.proto.notification.v1.Scope.SCOPE_PORTFOLIO; @NotThreadSafe public class AnalysisResourceTest extends ResourceTest { @@ -471,7 +471,7 @@ public void updateAnalysisUpdateExistingTest() throws Exception { } @Test - public void updateAnalysisWithNoChangesTest() throws Exception{ + public void updateAnalysisWithNoChangesTest() throws Exception { initializeWithPermissions(Permissions.VULNERABILITY_ANALYSIS); final Project project = qm.createProject("Acme Example", null, "1.0", null, null, null, true, false); diff --git a/src/test/java/org/dependencytrack/resources/v1/ProjectResourceTest.java b/src/test/java/org/dependencytrack/resources/v1/ProjectResourceTest.java index ed32a69c6..db344f2be 100644 --- a/src/test/java/org/dependencytrack/resources/v1/ProjectResourceTest.java +++ b/src/test/java/org/dependencytrack/resources/v1/ProjectResourceTest.java @@ -67,10 +67,10 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; import static org.dependencytrack.assertion.Assertions.assertConditionWithTimeout; +import static org.dependencytrack.proto.notification.v1.Group.GROUP_PROJECT_CREATED; +import static org.dependencytrack.proto.notification.v1.Level.LEVEL_INFORMATIONAL; +import static org.dependencytrack.proto.notification.v1.Scope.SCOPE_PORTFOLIO; import static org.dependencytrack.util.KafkaTestUtil.deserializeValue; -import static org.hyades.proto.notification.v1.Group.GROUP_PROJECT_CREATED; -import static org.hyades.proto.notification.v1.Level.LEVEL_INFORMATIONAL; -import static org.hyades.proto.notification.v1.Scope.SCOPE_PORTFOLIO; public class ProjectResourceTest extends ResourceTest { @@ -198,10 +198,10 @@ public void getProjectsByNameActiveOnlyRequestTest() { @Test public void getProjectLookupTest() { - for (int i=0; i<500; i++) { + for (int i = 0; i < 500; i++) { qm.createProject("Acme Example", null, String.valueOf(i), null, null, null, false, false); } - Response response = target(V1_PROJECT+"/lookup") + Response response = target(V1_PROJECT + "/lookup") .queryParam("name", "Acme Example") .queryParam("version", "10") .request() @@ -357,7 +357,7 @@ public void createProjectTest() throws Exception { Assert.assertTrue(UuidUtil.isValidUUID(json.getString("uuid"))); assertConditionWithTimeout(() -> kafkaMockProducer.history().size() == 1, Duration.ofSeconds(5)); - final org.hyades.proto.notification.v1.Notification projectNotification = deserializeValue(KafkaTopics.NOTIFICATION_PROJECT_CREATED, kafkaMockProducer.history().get(0)); + final org.dependencytrack.proto.notification.v1.Notification projectNotification = deserializeValue(KafkaTopics.NOTIFICATION_PROJECT_CREATED, kafkaMockProducer.history().get(0)); assertThat(projectNotification).isNotNull(); assertThat(projectNotification.getScope()).isEqualTo(SCOPE_PORTFOLIO); assertThat(projectNotification.getGroup()).isEqualTo(GROUP_PROJECT_CREATED); diff --git a/src/test/java/org/dependencytrack/resources/v1/ViolationAnalysisResourceTest.java b/src/test/java/org/dependencytrack/resources/v1/ViolationAnalysisResourceTest.java index 1e0c02c13..7d8a8dacc 100644 --- a/src/test/java/org/dependencytrack/resources/v1/ViolationAnalysisResourceTest.java +++ b/src/test/java/org/dependencytrack/resources/v1/ViolationAnalysisResourceTest.java @@ -36,13 +36,13 @@ import org.dependencytrack.model.ViolationAnalysis; import org.dependencytrack.model.ViolationAnalysisState; import org.dependencytrack.notification.NotificationConstants; +import org.dependencytrack.proto.notification.v1.Notification; import org.dependencytrack.resources.v1.vo.ViolationAnalysisRequest; import org.dependencytrack.util.NotificationUtil; import org.glassfish.jersey.server.ResourceConfig; import org.glassfish.jersey.servlet.ServletContainer; import org.glassfish.jersey.test.DeploymentContext; import org.glassfish.jersey.test.ServletDeploymentContext; -import org.hyades.proto.notification.v1.Notification; import org.junit.Test; import javax.json.Json; @@ -57,10 +57,10 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.dependencytrack.assertion.Assertions.assertConditionWithTimeout; +import static org.dependencytrack.proto.notification.v1.Group.GROUP_PROJECT_AUDIT_CHANGE; +import static org.dependencytrack.proto.notification.v1.Level.LEVEL_INFORMATIONAL; +import static org.dependencytrack.proto.notification.v1.Scope.SCOPE_PORTFOLIO; import static org.dependencytrack.util.KafkaTestUtil.deserializeValue; -import static org.hyades.proto.notification.v1.Group.GROUP_PROJECT_AUDIT_CHANGE; -import static org.hyades.proto.notification.v1.Level.LEVEL_INFORMATIONAL; -import static org.hyades.proto.notification.v1.Scope.SCOPE_PORTFOLIO; @NotThreadSafe public class ViolationAnalysisResourceTest extends ResourceTest { @@ -349,7 +349,7 @@ public void updateAnalysisUpdateExistingTest() throws Exception { } @Test - public void updateAnalysisUpdateExistingNoChangesTest() throws Exception{ + public void updateAnalysisUpdateExistingNoChangesTest() throws Exception { initializeWithPermissions(Permissions.POLICY_VIOLATION_ANALYSIS); final Project project = qm.createProject("Acme Example", null, "1.0", null, null, null, true, false); diff --git a/src/test/java/org/dependencytrack/tasks/BomUploadProcessingTaskTest.java b/src/test/java/org/dependencytrack/tasks/BomUploadProcessingTaskTest.java index cd35a4821..2db95d049 100644 --- a/src/test/java/org/dependencytrack/tasks/BomUploadProcessingTaskTest.java +++ b/src/test/java/org/dependencytrack/tasks/BomUploadProcessingTaskTest.java @@ -35,9 +35,9 @@ import org.dependencytrack.model.VulnerabilityScan; import org.dependencytrack.model.WorkflowStep; import org.dependencytrack.persistence.DefaultObjectGenerator; -import org.hyades.proto.notification.v1.BomProcessingFailedSubject; -import org.hyades.proto.notification.v1.Group; -import org.hyades.proto.notification.v1.Notification; +import org.dependencytrack.proto.notification.v1.BomProcessingFailedSubject; +import org.dependencytrack.proto.notification.v1.Group; +import org.dependencytrack.proto.notification.v1.Notification; import org.junit.Before; import org.junit.Test; @@ -69,11 +69,11 @@ import static org.dependencytrack.model.WorkflowStep.METRICS_UPDATE; import static org.dependencytrack.model.WorkflowStep.POLICY_EVALUATION; import static org.dependencytrack.model.WorkflowStep.VULN_ANALYSIS; +import static org.dependencytrack.proto.notification.v1.Group.GROUP_BOM_PROCESSING_FAILED; +import static org.dependencytrack.proto.notification.v1.Level.LEVEL_ERROR; +import static org.dependencytrack.proto.notification.v1.Scope.SCOPE_PORTFOLIO; import static org.dependencytrack.util.KafkaTestUtil.deserializeKey; import static org.dependencytrack.util.KafkaTestUtil.deserializeValue; -import static org.hyades.proto.notification.v1.Group.GROUP_BOM_PROCESSING_FAILED; -import static org.hyades.proto.notification.v1.Level.LEVEL_ERROR; -import static org.hyades.proto.notification.v1.Scope.SCOPE_PORTFOLIO; public class BomUploadProcessingTaskTest extends AbstractPostgresEnabledTest {