Move Kafka Streams classes to dedicated streams package

Signed-off-by: nscuro <[email protected]>
DependencyTrack · Feb 2, 2024 · f906f65 · f906f65
1 parent bfcae07
commit f906f65
Show file tree

Hide file tree

Showing 23 changed files with 35 additions and 35 deletions.
diff --git a/.../event/kafka/KafkaStreamsInitializer.java → ...afka/streams/KafkaStreamsInitializer.java b/.../event/kafka/KafkaStreamsInitializer.java → ...afka/streams/KafkaStreamsInitializer.java
@@ -1,4 +1,4 @@
-package org.dependencytrack.event.kafka;
+package org.dependencytrack.event.kafka.streams;
 
 import alpine.Config;
 import alpine.common.logging.Logger;
@@ -11,9 +11,9 @@
 import org.apache.kafka.streams.KafkaStreams;
 import org.apache.kafka.streams.StreamsConfig;
 import org.dependencytrack.common.ConfigKey;
-import org.dependencytrack.event.kafka.exception.KafkaStreamsDeserializationExceptionHandler;
-import org.dependencytrack.event.kafka.exception.KafkaStreamsProductionExceptionHandler;
-import org.dependencytrack.event.kafka.exception.KafkaStreamsUncaughtExceptionHandler;
+import org.dependencytrack.event.kafka.streams.exception.KafkaStreamsDeserializationExceptionHandler;
+import org.dependencytrack.event.kafka.streams.exception.KafkaStreamsProductionExceptionHandler;
+import org.dependencytrack.event.kafka.streams.exception.KafkaStreamsUncaughtExceptionHandler;
 
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;

diff --git a/...nt/kafka/KafkaStreamsTopologyFactory.java → .../streams/KafkaStreamsTopologyFactory.java b/...nt/kafka/KafkaStreamsTopologyFactory.java → .../streams/KafkaStreamsTopologyFactory.java
@@ -1,4 +1,4 @@
-package org.dependencytrack.event.kafka;
+package org.dependencytrack.event.kafka.streams;
 
 import alpine.Config;
 import alpine.common.logging.Logger;
@@ -21,10 +21,11 @@
 import org.dependencytrack.event.PortfolioVulnerabilityAnalysisEvent;
 import org.dependencytrack.event.ProjectMetricsUpdateEvent;
 import org.dependencytrack.event.ProjectPolicyEvaluationEvent;
-import org.dependencytrack.event.kafka.processor.DelayedBomProcessedNotificationProcessor;
-import org.dependencytrack.event.kafka.processor.MirrorVulnerabilityProcessor;
-import org.dependencytrack.event.kafka.processor.RepositoryMetaResultProcessor;
-import org.dependencytrack.event.kafka.processor.VulnerabilityScanResultProcessor;
+import org.dependencytrack.event.kafka.KafkaTopics;
+import org.dependencytrack.event.kafka.streams.processor.DelayedBomProcessedNotificationProcessor;
+import org.dependencytrack.event.kafka.streams.processor.MirrorVulnerabilityProcessor;
+import org.dependencytrack.event.kafka.streams.processor.RepositoryMetaResultProcessor;
+import org.dependencytrack.event.kafka.streams.processor.VulnerabilityScanResultProcessor;
 import org.dependencytrack.model.VulnerabilityScan;
 import org.dependencytrack.model.WorkflowState;
 import org.dependencytrack.model.WorkflowStatus;

diff --git a/...stractThresholdBasedExceptionHandler.java → ...stractThresholdBasedExceptionHandler.java b/...stractThresholdBasedExceptionHandler.java → ...stractThresholdBasedExceptionHandler.java
@@ -1,4 +1,4 @@
-package org.dependencytrack.event.kafka.exception;
+package org.dependencytrack.event.kafka.streams.exception;
 
 import java.time.Clock;
 import java.time.Duration;

diff --git a/...reamsDeserializationExceptionHandler.java → ...reamsDeserializationExceptionHandler.java b/...reamsDeserializationExceptionHandler.java → ...reamsDeserializationExceptionHandler.java
@@ -1,4 +1,4 @@
-package org.dependencytrack.event.kafka.exception;
+package org.dependencytrack.event.kafka.streams.exception;
 
 import alpine.Config;
 import alpine.common.logging.Logger;

diff --git a/...fkaStreamsProductionExceptionHandler.java → ...fkaStreamsProductionExceptionHandler.java b/...fkaStreamsProductionExceptionHandler.java → ...fkaStreamsProductionExceptionHandler.java
@@ -1,4 +1,4 @@
-package org.dependencytrack.event.kafka.exception;
+package org.dependencytrack.event.kafka.streams.exception;
 
 import alpine.Config;
 import alpine.common.logging.Logger;

diff --git a/...KafkaStreamsUncaughtExceptionHandler.java → ...KafkaStreamsUncaughtExceptionHandler.java b/...KafkaStreamsUncaughtExceptionHandler.java → ...KafkaStreamsUncaughtExceptionHandler.java
@@ -1,4 +1,4 @@
-package org.dependencytrack.event.kafka.exception;
+package org.dependencytrack.event.kafka.streams.exception;
 
 import alpine.Config;
 import alpine.common.logging.Logger;

diff --git a/...yedBomProcessedNotificationProcessor.java → ...yedBomProcessedNotificationProcessor.java b/...yedBomProcessedNotificationProcessor.java → ...yedBomProcessedNotificationProcessor.java
@@ -1,4 +1,4 @@
-package org.dependencytrack.event.kafka.processor;
+package org.dependencytrack.event.kafka.streams.processor;
 
 import alpine.common.logging.Logger;
 import alpine.notification.NotificationLevel;

diff --git a/...ocessor/MirrorVulnerabilityProcessor.java → ...ocessor/MirrorVulnerabilityProcessor.java b/...ocessor/MirrorVulnerabilityProcessor.java → ...ocessor/MirrorVulnerabilityProcessor.java
@@ -1,4 +1,4 @@
-package org.dependencytrack.event.kafka.processor;
+package org.dependencytrack.event.kafka.streams.processor;
 
 import alpine.common.logging.Logger;
 import alpine.common.metrics.Metrics;

diff --git a/...cessor/RepositoryMetaResultProcessor.java → ...cessor/RepositoryMetaResultProcessor.java b/...cessor/RepositoryMetaResultProcessor.java → ...cessor/RepositoryMetaResultProcessor.java
@@ -1,4 +1,4 @@
-package org.dependencytrack.event.kafka.processor;
+package org.dependencytrack.event.kafka.streams.processor;
 
 import alpine.common.logging.Logger;
 import alpine.common.metrics.Metrics;

diff --git a/...sor/VulnerabilityScanResultProcessor.java → ...sor/VulnerabilityScanResultProcessor.java b/...sor/VulnerabilityScanResultProcessor.java → ...sor/VulnerabilityScanResultProcessor.java
@@ -1,4 +1,4 @@
-package org.dependencytrack.event.kafka.processor;
+package org.dependencytrack.event.kafka.streams.processor;
 
 import alpine.Config;
 import alpine.common.logging.Logger;
@@ -625,7 +625,7 @@ private org.dependencytrack.proto.notification.v1.Notification createProjectAudi
                         .setLevel(LEVEL_INFORMATIONAL)
                         .setTimestamp(Timestamps.now())
                         .setTitle(generateTitle(policyAnalysis.getState(), policyAnalysis.getSuppressed(), analysisStateChange, suppressionChange))
-                        .setContent(generateNotificationContent(policyAnalysis))
+                        .setContent("An analysis decision was made to a finding affecting a project")
                         .setSubject(Any.pack(subject))
                         .build())
                 .orElse(null);

diff --git a/src/main/java/org/dependencytrack/health/KafkaStreamsHealthCheck.java b/src/main/java/org/dependencytrack/health/KafkaStreamsHealthCheck.java
@@ -1,7 +1,7 @@
 package org.dependencytrack.health;
 
 import org.apache.kafka.streams.KafkaStreams;
-import org.dependencytrack.event.kafka.KafkaStreamsInitializer;
+import org.dependencytrack.event.kafka.streams.KafkaStreamsInitializer;
 import org.eclipse.microprofile.health.HealthCheck;
 import org.eclipse.microprofile.health.HealthCheckResponse;
 import org.eclipse.microprofile.health.Liveness;

diff --git a/src/main/java/org/dependencytrack/util/NotificationUtil.java b/src/main/java/org/dependencytrack/util/NotificationUtil.java
@@ -24,7 +24,6 @@
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.dependencytrack.event.kafka.KafkaEventDispatcher;
-import org.dependencytrack.event.kafka.processor.VulnerabilityScanResultProcessor;
 import org.dependencytrack.model.Analysis;
 import org.dependencytrack.model.AnalysisState;
 import org.dependencytrack.model.Component;
@@ -429,10 +428,6 @@ public static String generateNotificationTitle(String messageType, Project proje
         return messageType;
     }
 
-    public static String generateNotificationContent(final VulnerabilityScanResultProcessor.Analysis analysis) {
-        return "An analysis decision was made to a finding affecting a project";
-    }
-
     public static String generateNotificationTitle(final String messageType, final org.dependencytrack.proto.notification.v1.Project project) {
         if (project == null) {
             return messageType;

diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
@@ -48,7 +48,7 @@
         <listener-class>org.dependencytrack.event.EventSubsystemInitializer</listener-class>
     </listener>
     <listener>
-        <listener-class>org.dependencytrack.event.kafka.KafkaStreamsInitializer</listener-class>
+        <listener-class>org.dependencytrack.event.kafka.streams.KafkaStreamsInitializer</listener-class>
     </listener>
     <listener>
         <listener-class>org.dependencytrack.event.PurlMigrator</listener-class>

diff --git a/...sDelayedBomProcessedNotificationTest.java → ...sDelayedBomProcessedNotificationTest.java b/...sDelayedBomProcessedNotificationTest.java → ...sDelayedBomProcessedNotificationTest.java
@@ -1,11 +1,12 @@
-package org.dependencytrack.event.kafka;
+package org.dependencytrack.event.kafka.streams;
 
 import net.mguenther.kafka.junit.KeyValue;
 import net.mguenther.kafka.junit.ReadKeyValues;
 import net.mguenther.kafka.junit.SendKeyValues;
 import org.apache.kafka.clients.consumer.ConsumerConfig;
 import org.apache.kafka.clients.producer.ProducerConfig;
 import org.apache.kafka.common.serialization.StringDeserializer;
+import org.dependencytrack.event.kafka.KafkaTopics;
 import org.dependencytrack.event.kafka.serialization.KafkaProtobufSerializer;
 import org.dependencytrack.model.Project;
 import org.dependencytrack.model.VulnerabilityScan;

diff --git a/...event/kafka/KafkaStreamsPostgresTest.java → ...fka/streams/KafkaStreamsPostgresTest.java b/...event/kafka/KafkaStreamsPostgresTest.java → ...fka/streams/KafkaStreamsPostgresTest.java
@@ -1,11 +1,12 @@
-package org.dependencytrack.event.kafka;
+package org.dependencytrack.event.kafka.streams;
 
 import net.mguenther.kafka.junit.ExternalKafkaCluster;
 import net.mguenther.kafka.junit.TopicConfig;
 import org.apache.kafka.streams.KafkaStreams;
 import org.apache.kafka.streams.StreamsConfig;
 import org.apache.kafka.streams.Topology;
 import org.dependencytrack.AbstractPostgresEnabledTest;
+import org.dependencytrack.event.kafka.KafkaTopics;
 import org.dependencytrack.event.kafka.serialization.KafkaProtobufDeserializer;
 import org.dependencytrack.proto.notification.v1.Notification;
 import org.junit.After;

diff --git a/...cytrack/event/kafka/KafkaStreamsTest.java → ...event/kafka/streams/KafkaStreamsTest.java b/...cytrack/event/kafka/KafkaStreamsTest.java → ...event/kafka/streams/KafkaStreamsTest.java
@@ -1,10 +1,11 @@
-package org.dependencytrack.event.kafka;
+package org.dependencytrack.event.kafka.streams;
 
 import net.mguenther.kafka.junit.ExternalKafkaCluster;
 import net.mguenther.kafka.junit.TopicConfig;
 import org.apache.kafka.streams.KafkaStreams;
 import org.apache.kafka.streams.StreamsConfig;
 import org.dependencytrack.PersistenceCapableTest;
+import org.dependencytrack.event.kafka.KafkaTopics;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;

diff --git a/...event/kafka/KafkaStreamsTopologyTest.java → ...fka/streams/KafkaStreamsTopologyTest.java b/...event/kafka/KafkaStreamsTopologyTest.java → ...fka/streams/KafkaStreamsTopologyTest.java
@@ -1,4 +1,4 @@
-package org.dependencytrack.event.kafka;
+package org.dependencytrack.event.kafka.streams;
 
 import alpine.event.framework.Event;
 import alpine.event.framework.EventService;
@@ -19,6 +19,7 @@
 import org.dependencytrack.event.PortfolioVulnerabilityAnalysisEvent;
 import org.dependencytrack.event.ProjectMetricsUpdateEvent;
 import org.dependencytrack.event.ProjectPolicyEvaluationEvent;
+import org.dependencytrack.event.kafka.KafkaTopics;
 import org.dependencytrack.event.kafka.serialization.KafkaProtobufSerializer;
 import org.dependencytrack.model.Policy;
 import org.dependencytrack.model.PolicyCondition;

diff --git a/...sDeserializationExceptionHandlerTest.java → ...sDeserializationExceptionHandlerTest.java b/...sDeserializationExceptionHandlerTest.java → ...sDeserializationExceptionHandlerTest.java
@@ -1,4 +1,4 @@
-package org.dependencytrack.event.kafka.exception;
+package org.dependencytrack.event.kafka.streams.exception;
 
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 import org.apache.kafka.common.errors.SerializationException;

diff --git a/...treamsProductionExceptionHandlerTest.java → ...treamsProductionExceptionHandlerTest.java b/...treamsProductionExceptionHandlerTest.java → ...treamsProductionExceptionHandlerTest.java
@@ -1,4 +1,4 @@
-package org.dependencytrack.event.kafka.exception;
+package org.dependencytrack.event.kafka.streams.exception;
 
 import org.apache.kafka.clients.producer.ProducerRecord;
 import org.apache.kafka.common.errors.RecordTooLargeException;

diff --git a/...aStreamsUncaughtExceptionHandlerTest.java → ...aStreamsUncaughtExceptionHandlerTest.java b/...aStreamsUncaughtExceptionHandlerTest.java → ...aStreamsUncaughtExceptionHandlerTest.java
@@ -1,4 +1,4 @@
-package org.dependencytrack.event.kafka.exception;
+package org.dependencytrack.event.kafka.streams.exception;
 
 import org.apache.kafka.streams.errors.StreamsUncaughtExceptionHandler.StreamThreadExceptionResponse;
 import org.junit.Test;

diff --git a/...sor/MirrorVulnerabilityProcessorTest.java → ...sor/MirrorVulnerabilityProcessorTest.java b/...sor/MirrorVulnerabilityProcessorTest.java → ...sor/MirrorVulnerabilityProcessorTest.java
@@ -1,4 +1,4 @@
-package org.dependencytrack.event.kafka.processor;
+package org.dependencytrack.event.kafka.streams.processor;
 
 import org.apache.kafka.common.serialization.Serdes;
 import org.apache.kafka.common.serialization.StringSerializer;

diff --git a/...or/RepositoryMetaResultProcessorTest.java → ...or/RepositoryMetaResultProcessorTest.java b/...or/RepositoryMetaResultProcessorTest.java → ...or/RepositoryMetaResultProcessorTest.java
@@ -1,4 +1,4 @@
-package org.dependencytrack.event.kafka.processor;
+package org.dependencytrack.event.kafka.streams.processor;
 
 import com.google.protobuf.Timestamp;
 import org.apache.kafka.common.serialization.StringDeserializer;

diff --git a/...VulnerabilityScanResultProcessorTest.java → ...VulnerabilityScanResultProcessorTest.java b/...VulnerabilityScanResultProcessorTest.java → ...VulnerabilityScanResultProcessorTest.java
@@ -1,4 +1,4 @@
-package org.dependencytrack.event.kafka.processor;
+package org.dependencytrack.event.kafka.streams.processor;
 
 import com.google.protobuf.Timestamp;
 import junitparams.JUnitParamsRunner;