popular: 1.0.0 - Renamed packages and classes -- ALIGN

diff --git a/src/main/java/de/juplo/kafka/wordcount/popular/Entry.java b/src/main/java/de/juplo/kafka/wordcount/popular/Entry.java
index b25fc079213405c926b9a1a9a5d091d6e4513b21..d732281e9dd3e93aa514971467c3605bc0b7247f 100644 (file)
--- a/src/main/java/de/juplo/kafka/wordcount/popular/Entry.java
+++ b/src/main/java/de/juplo/kafka/wordcount/popular/Entry.java
@@ -1,4 +1,4 @@
-package de.juplo.kafka.wordcount.top10;
+package de.juplo.kafka.wordcount.popular;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.AccessLevel;

diff --git a/src/main/java/de/juplo/kafka/wordcount/popular/Key.java b/src/main/java/de/juplo/kafka/wordcount/popular/Key.java
index ffac8ea1fc10f97c0108ba60322e9f0ba539567e..8307f696d86f5cd272476745bf87b6121b1ea8d8 100644 (file)
--- a/src/main/java/de/juplo/kafka/wordcount/popular/Key.java
+++ b/src/main/java/de/juplo/kafka/wordcount/popular/Key.java
@@ -1,4 +1,4 @@
-package de.juplo.kafka.wordcount.top10;
+package de.juplo.kafka.wordcount.popular;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.*;

diff --git a/src/main/java/de/juplo/kafka/wordcount/popular/PopularApplication.java b/src/main/java/de/juplo/kafka/wordcount/popular/PopularApplication.java
index 5c14ae7c69d9dd51018f172f6a65d92f867f6272..602f3f6d884da2bc42c685647c5b4408d7576363 100644 (file)
--- a/src/main/java/de/juplo/kafka/wordcount/popular/PopularApplication.java
+++ b/src/main/java/de/juplo/kafka/wordcount/popular/PopularApplication.java
@@ -1,14 +1,14 @@
-package de.juplo.kafka.wordcount.top10;
+package de.juplo.kafka.wordcount.popular;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 
 @SpringBootApplication
-public class Top10Application
+public class PopularApplication
 {
        public static void main(String[] args)
        {
-               SpringApplication.run(Top10Application.class, args);
+               SpringApplication.run(PopularApplication.class, args);
        }
 }

diff --git a/src/main/java/de/juplo/kafka/wordcount/popular/PopularApplicationConfiguration.java b/src/main/java/de/juplo/kafka/wordcount/popular/PopularApplicationConfiguration.java
index 255f0e4b559d14a16f60d8b4e269fd64d7fa0594..ca312f598c53618559fad16a51dc78b913296426 100644 (file)
--- a/src/main/java/de/juplo/kafka/wordcount/popular/PopularApplicationConfiguration.java
+++ b/src/main/java/de/juplo/kafka/wordcount/popular/PopularApplicationConfiguration.java
@@ -1,4 +1,4 @@
-package de.juplo.kafka.wordcount.top10;
+package de.juplo.kafka.wordcount.popular;
 
 import lombok.extern.slf4j.Slf4j;
 import org.apache.kafka.clients.consumer.ConsumerConfig;
@@ -16,17 +16,17 @@ import org.springframework.kafka.support.serializer.JsonSerde;
 import java.util.Properties;
 import java.util.concurrent.CompletableFuture;
 
-import static de.juplo.kafka.wordcount.top10.Top10StreamProcessor.STORE_NAME;
+import static de.juplo.kafka.wordcount.popular.PopularStreamProcessor.STORE_NAME;
 import static org.apache.kafka.streams.errors.StreamsUncaughtExceptionHandler.StreamThreadExceptionResponse.SHUTDOWN_CLIENT;
 
 
 @Configuration
-@EnableConfigurationProperties(Top10ApplicationProperties.class)
+@EnableConfigurationProperties(PopularApplicationProperties.class)
 @Slf4j
-public class Top10ApplicationConfiguration
+public class PopularApplicationConfiguration
 {
        @Bean
-       public Properties streamProcessorProperties(Top10ApplicationProperties properties)
+       public Properties streamProcessorProperties(PopularApplicationProperties properties)
        {
                Properties props = new Properties();
 
@@ -64,13 +64,13 @@ public class Top10ApplicationConfiguration
        }
 
        @Bean(initMethod = "start", destroyMethod = "stop")
-       public Top10StreamProcessor streamProcessor(
-                       Top10ApplicationProperties applicationProperties,
+       public PopularStreamProcessor streamProcessor(
+                       PopularApplicationProperties applicationProperties,
                        Properties streamProcessorProperties,
                        KeyValueBytesStoreSupplier storeSupplier,
                        ConfigurableApplicationContext context)
        {
-               Top10StreamProcessor streamProcessor = new Top10StreamProcessor(
+               PopularStreamProcessor streamProcessor = new PopularStreamProcessor(
                                applicationProperties.getInputTopic(),
                                applicationProperties.getOutputTopic(),
                                streamProcessorProperties,

diff --git a/src/main/java/de/juplo/kafka/wordcount/popular/PopularApplicationProperties.java b/src/main/java/de/juplo/kafka/wordcount/popular/PopularApplicationProperties.java
index d3bb23639e33340632b5bae100372746d794c2ff..26c6240d451baabb525ed7cf42f07790aa6f260c 100644 (file)
--- a/src/main/java/de/juplo/kafka/wordcount/popular/PopularApplicationProperties.java
+++ b/src/main/java/de/juplo/kafka/wordcount/popular/PopularApplicationProperties.java
@@ -1,4 +1,4 @@
-package de.juplo.kafka.wordcount.top10;
+package de.juplo.kafka.wordcount.popular;
 
 
 import lombok.Getter;
@@ -11,7 +11,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 @Getter
 @Setter
 @ToString
-public class Top10ApplicationProperties
+public class PopularApplicationProperties
 {
   private String bootstrapServer = "localhost:9092";
   private String applicationId = "top10";

diff --git a/src/main/java/de/juplo/kafka/wordcount/popular/PopularStreamProcessor.java b/src/main/java/de/juplo/kafka/wordcount/popular/PopularStreamProcessor.java
index 70ead8796c49617037fa39a176aa44390417a272..4320d35738c18ebb0d0f66d78085aaa2a5f2cee4 100644 (file)
--- a/src/main/java/de/juplo/kafka/wordcount/popular/PopularStreamProcessor.java
+++ b/src/main/java/de/juplo/kafka/wordcount/popular/PopularStreamProcessor.java
@@ -1,4 +1,4 @@
-package de.juplo.kafka.wordcount.top10;
+package de.juplo.kafka.wordcount.popular;
 
 import lombok.extern.slf4j.Slf4j;
 import org.apache.kafka.streams.*;
@@ -11,20 +11,20 @@ import java.util.Properties;
 
 
 @Slf4j
-public class Top10StreamProcessor
+public class PopularStreamProcessor
 {
        public static final String STORE_NAME= "top10";
 
        public final KafkaStreams streams;
 
 
-       public Top10StreamProcessor(
+       public PopularStreamProcessor(
                        String inputTopic,
                        String outputTopic,
                        Properties props,
                        KeyValueBytesStoreSupplier storeSupplier)
        {
-               Topology topology = Top10StreamProcessor.buildTopology(
+               Topology topology = PopularStreamProcessor.buildTopology(
                                inputTopic,
                                outputTopic,
                                storeSupplier);

diff --git a/src/main/java/de/juplo/kafka/wordcount/popular/Ranking.java b/src/main/java/de/juplo/kafka/wordcount/popular/Ranking.java
index 4f56c18888622028f7c88d8b3c9b12c41b692f44..2fa85d431075a8d20c14811bb2131e2dd0d64365 100644 (file)
--- a/src/main/java/de/juplo/kafka/wordcount/popular/Ranking.java
+++ b/src/main/java/de/juplo/kafka/wordcount/popular/Ranking.java
@@ -1,4 +1,4 @@
-package de.juplo.kafka.wordcount.top10;
+package de.juplo.kafka.wordcount.popular;
 
 import lombok.*;
 

diff --git a/src/main/java/de/juplo/kafka/wordcount/popular/User.java b/src/main/java/de/juplo/kafka/wordcount/popular/User.java
index 53c258d9322ab937116dc5bfe0ad300b31cd2b76..1ebea2355d3225aa893b46731c6121c2441ee6d4 100644 (file)
--- a/src/main/java/de/juplo/kafka/wordcount/popular/User.java
+++ b/src/main/java/de/juplo/kafka/wordcount/popular/User.java
@@ -1,4 +1,4 @@
-package de.juplo.kafka.wordcount.top10;
+package de.juplo.kafka.wordcount.popular;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

diff --git a/src/test/java/de/juplo/kafka/wordcount/popular/PopularApplicationIT.java b/src/test/java/de/juplo/kafka/wordcount/popular/PopularApplicationIT.java
index f5ef236c19a26095b1a118262fb860314229b28d..63f79558fb0075c9eb010cc22bb65b7e522b1d14 100644 (file)
--- a/src/test/java/de/juplo/kafka/wordcount/popular/PopularApplicationIT.java
+++ b/src/test/java/de/juplo/kafka/wordcount/popular/PopularApplicationIT.java
@@ -1,4 +1,4 @@
-package de.juplo.kafka.wordcount.top10;
+package de.juplo.kafka.wordcount.popular;
 
 import de.juplo.kafka.wordcount.counter.TestCounter;
 import de.juplo.kafka.wordcount.counter.TestWord;
@@ -28,7 +28,7 @@ import org.springframework.util.MultiValueMap;
 
 import java.time.Duration;
 
-import static de.juplo.kafka.wordcount.top10.Top10StreamProcessor.STORE_NAME;
+import static de.juplo.kafka.wordcount.popular.PopularStreamProcessor.STORE_NAME;
 import static org.awaitility.Awaitility.await;
 
 
@@ -48,11 +48,11 @@ import static org.awaitility.Awaitility.await;
                                "juplo.wordcount.top10.bootstrap-server=${spring.embedded.kafka.brokers}",
                                "juplo.wordcount.top10.commit-interval=100",
                                "juplo.wordcount.top10.cacheMaxBytes=0",
-                               "juplo.wordcount.top10.input-topic=" + Top10ApplicationIT.TOPIC_IN,
-                               "juplo.wordcount.top10.output-topic=" + Top10ApplicationIT.TOPIC_OUT })
-@EmbeddedKafka(topics = { Top10ApplicationIT.TOPIC_IN, Top10ApplicationIT.TOPIC_OUT })
+                               "juplo.wordcount.top10.input-topic=" + PopularApplicationIT.TOPIC_IN,
+                               "juplo.wordcount.top10.output-topic=" + PopularApplicationIT.TOPIC_OUT })
+@EmbeddedKafka(topics = { PopularApplicationIT.TOPIC_IN, PopularApplicationIT.TOPIC_OUT })
 @Slf4j
-public class Top10ApplicationIT
+public class PopularApplicationIT
 {
        public static final String TOPIC_IN = "in";
        public static final String TOPIC_OUT = "out";
@@ -60,7 +60,7 @@ public class Top10ApplicationIT
        @Autowired
        Consumer consumer;
        @Autowired
-       Top10StreamProcessor streamProcessor;
+       PopularStreamProcessor streamProcessor;
 
 
        @BeforeAll

diff --git a/src/test/java/de/juplo/kafka/wordcount/popular/PopularStreamProcessorTopologyTest.java b/src/test/java/de/juplo/kafka/wordcount/popular/PopularStreamProcessorTopologyTest.java
index 90d8e4cb90987d0455c84f67252b6080e5d9bed1..0588b00d9a292f2d8236fba771abe009fc5e420d 100644 (file)
--- a/src/test/java/de/juplo/kafka/wordcount/popular/PopularStreamProcessorTopologyTest.java
+++ b/src/test/java/de/juplo/kafka/wordcount/popular/PopularStreamProcessorTopologyTest.java
@@ -1,4 +1,4 @@
-package de.juplo.kafka.wordcount.top10;
+package de.juplo.kafka.wordcount.popular;
 
 import de.juplo.kafka.wordcount.counter.TestCounter;
 import de.juplo.kafka.wordcount.counter.TestWord;
@@ -21,11 +21,11 @@ import org.springframework.util.MultiValueMap;
 
 import java.util.Map;
 
-import static de.juplo.kafka.wordcount.top10.Top10ApplicationConfiguration.serializationConfig;
+import static de.juplo.kafka.wordcount.popular.PopularApplicationConfiguration.serializationConfig;
 
 
 @Slf4j
-public class Top10StreamProcessorTopologyTest
+public class PopularStreamProcessorTopologyTest
 {
   public static final String IN = "TEST-IN";
   public static final String OUT = "TEST-OUT";
@@ -40,7 +40,7 @@ public class Top10StreamProcessorTopologyTest
   @BeforeEach
   public void setUp()
   {
-    Topology topology = Top10StreamProcessor.buildTopology(
+    Topology topology = PopularStreamProcessor.buildTopology(
         IN,
         OUT,
         Stores.inMemoryKeyValueStore(STORE_NAME));

diff --git a/src/test/java/de/juplo/kafka/wordcount/popular/RankingTest.java b/src/test/java/de/juplo/kafka/wordcount/popular/RankingTest.java
index 26749e9440783822e03181b9709fdd0517cc4a27..d8c6a0e9b610c7b402a7259d2a8720020a068798 100644 (file)
--- a/src/test/java/de/juplo/kafka/wordcount/popular/RankingTest.java
+++ b/src/test/java/de/juplo/kafka/wordcount/popular/RankingTest.java
@@ -1,4 +1,4 @@
-package de.juplo.kafka.wordcount.top10;
+package de.juplo.kafka.wordcount.popular;
 
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;

diff --git a/src/test/java/de/juplo/kafka/wordcount/popular/TestData.java b/src/test/java/de/juplo/kafka/wordcount/popular/TestData.java
index 7a3a27edddb2722dae8dbf4f53d59c9ebcddd58f..8fa05123b97460b7a45abbd41ea9e26a09203395 100644 (file)
--- a/src/test/java/de/juplo/kafka/wordcount/popular/TestData.java
+++ b/src/test/java/de/juplo/kafka/wordcount/popular/TestData.java
@@ -1,4 +1,4 @@
-package de.juplo.kafka.wordcount.top10;
+package de.juplo.kafka.wordcount.popular;
 
 import de.juplo.kafka.wordcount.counter.TestCounter;
 import de.juplo.kafka.wordcount.counter.TestWord;