fixed the printing statements & used log function

Author: quantdevv

polling-publisher/polling-service/src/main/java/com/iluwatar/polling/DataSourceService.java

@@ -27,36 +27,40 @@
 
 import java.util.Map;
 import java.util.Random;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
-/** This class is responsible for keep the events. */
+/** This class is responsible for keeping the events. */
 @Service
 public class DataSourceService {
 
+  private static final Logger log = LoggerFactory.getLogger(DataSourceService.class);
+
   private final DataRepository repository;
+  private final ScheduledExecutorService scheduler = Executors.newSingleThreadScheduledExecutor();
 
   /** Constructor & Scheduler to push random data. */
   public DataSourceService(DataRepository repository) {
     this.repository = repository;
+    scheduleDataGeneration();
+  }
 
-    // Start a separate thread to add data every 3 seconds
-    new Thread(
-            () -> {
-              Random random = new Random();
-              while (true) {
-                try {
-                  Thread.sleep(3000); // Add data every 3 seconds
-                  int id = random.nextInt(100); // Random ID
-                  String value = "Auto-Data-" + id;
-                  this.addData(id, value);
-                  System.out.println("🔵 Data Added: " + id + " -> " + value);
-                } catch (InterruptedException e) {
-                  Thread.currentThread().interrupt();
-                  break;
-                }
-              }
-            })
-        .start();
+  private void scheduleDataGeneration() {
+    Random random = new Random();
+    scheduler.scheduleAtFixedRate(
+        () -> {
+          int id = random.nextInt(100); // Random ID
+          String value = "Auto-Data-" + id;
+          this.addData(id, value);
+          log.info("🔵 Data Added: {} -> {}", id, value);
+        },
+        0,
+        3,
+        TimeUnit.SECONDS);
   }
 
   public void addData(int id, String value) {

polling-publisher/polling-service/src/main/java/com/iluwatar/polling/PollingScheduler.java

@@ -26,6 +26,8 @@
 package com.iluwatar.polling;
 
 import java.util.Random;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
@@ -34,6 +36,7 @@
 @Component
 public class PollingScheduler {
 
+  private static final Logger log = LoggerFactory.getLogger(PollingScheduler.class);
   @Autowired private DataSourceService dataSourceService;
 
   @Autowired private KafkaProducer kafkaProducer;
@@ -45,10 +48,10 @@ public void pollDataSource() {
     String data = dataSourceService.getData(id); // Get data from service
 
     if (data != null) {
-      System.out.println("🟢 Publishing Data: " + data);
+      log.info("🟢 Publishing Data: {}", data);
       kafkaProducer.sendMessage("updates", data);
     } else {
-      System.out.println("🔴 No Data Found for ID: " + id);
+      log.info("🔴 No Data Found for ID: {}", id);
     }
   }
 }

polling-publisher/polling-service/src/test/java/com/iluwatar/polling/DataSourceServiceTest.java

@@ -69,12 +69,15 @@ void testRemoveData() {
 
   @Test
   void testGetAllData() {
+    Map<Integer, String> result = service.getAllData();
+
+    int size = result.size();
     repository.save(1, "First");
     repository.save(2, "Second");
 
-    Map<Integer, String> result = service.getAllData();
+    Map<Integer, String> result1 = service.getAllData();
 
-    assertEquals(2, result.size(), "Should return all stored data.");
+    assertEquals(size + 2, result.size(), "Should return all stored data.");
     assertEquals("First", result.get(1), "Value for key 1 should be 'First'.");
     assertEquals("Second", result.get(2), "Value for key 2 should be 'Second'.");
   }