Don't print empty operations (#517)

kafka-ops · Aug 3, 2022 · 3765517 · 3765517
1 parent 61fee75
commit 3765517
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 55 deletions.
diff --git a/src/main/java/com/purbon/kafka/topology/ExecutionPlan.java b/src/main/java/com/purbon/kafka/topology/ExecutionPlan.java
@@ -119,7 +119,9 @@ public void run(boolean dryRun) throws IOException {
 
   private void execute(Action action, boolean dryRun) throws IOException {
     LOGGER.debug(String.format("Execution action %s (dryRun=%s)", action, dryRun));
-    outputStream.println(action);
+    if (!action.toString().isEmpty()) {
+      outputStream.println(action);
+    }
     if (!dryRun) {
       action.run();
       auditor.log(action);

diff --git a/src/main/java/com/purbon/kafka/topology/validation/topic/MinInSyncReplicasValidation.java b/src/main/java/com/purbon/kafka/topology/validation/topic/MinInSyncReplicasValidation.java
@@ -10,8 +10,7 @@ public class MinInSyncReplicasValidation implements TopicValidation {
 
   @Override
   public void valid(Topic topic) throws ValidationException {
-    if (topic.replicationFactor().isPresent()
-        && !validateMinInsyncReplicas(topic)) {
+    if (topic.replicationFactor().isPresent() && !validateMinInsyncReplicas(topic)) {
       String msg =
           String.format(
               "Topic %s has an unexpected min.insync.replicas config vs it's replication factor: %s value",
@@ -21,9 +20,9 @@ public void valid(Topic topic) throws ValidationException {
   }
 
   private boolean validateMinInsyncReplicas(Topic topic) {
-    short replicationFactor = topic.replicationFactor().orElse((short)-1);
+    short replicationFactor = topic.replicationFactor().orElse((short) -1);
     String minInSyncReplicas = topic.getConfig().get(MIN_INSYNC_REPLICAS);
-    return minInSyncReplicas == null || (Integer.parseInt(minInSyncReplicas) <= replicationFactor - 1);
+    return minInSyncReplicas == null
+        || (Integer.parseInt(minInSyncReplicas) <= replicationFactor - 1);
   }
-
 }
diff --git a/src/test/java/com/purbon/kafka/topology/TopicManagerTest.java b/src/test/java/com/purbon/kafka/topology/TopicManagerTest.java
@@ -336,7 +336,7 @@ public void dryRunTest() throws IOException {
     topicManager.updatePlan(topology, plan);
     plan.run(true);
 
-    verify(outputStream, times(4)).println(any(Action.class));
+    verify(outputStream, times(2)).println(any(Action.class));
   }
 
   @Test

diff --git a/...test/java/com/purbon/kafka/topology/validation/topic/MinInSyncReplicasValidationTest.java b/...test/java/com/purbon/kafka/topology/validation/topic/MinInSyncReplicasValidationTest.java
@@ -3,57 +3,54 @@
 import com.purbon.kafka.topology.exceptions.ConfigurationException;
 import com.purbon.kafka.topology.exceptions.ValidationException;
 import com.purbon.kafka.topology.model.Topic;
-import org.junit.Test;
-
 import java.util.HashMap;
 import java.util.Map;
+import org.junit.Test;
 
 public class MinInSyncReplicasValidationTest {
 
-    @Test(expected = ValidationException.class)
-    public void shouldCheckKoValuesSuccessfully()
-            throws ValidationException, ConfigurationException {
-        Map<String, String> config = new HashMap<>();
-        config.put("replication.factor", "3");
-        config.put("min.insync.replicas", "3");
-
-        Topic topic = new Topic("topic", config);
-        MinInSyncReplicasValidation validation = new MinInSyncReplicasValidation();
-        validation.valid(topic);
-    }
-
-    @Test
-    public void shouldCheckMinimalValuesSuccessfully()
-            throws ValidationException, ConfigurationException {
-        Map<String, String> config = new HashMap<>();
-        config.put("replication.factor", "3");
-        config.put("min.insync.replicas", "1");
-
-        Topic topic = new Topic("topic", config);
-        MinInSyncReplicasValidation validation = new MinInSyncReplicasValidation();
-        validation.valid(topic);
-    }
-
-    @Test
-    public void shouldCheckOkValuesSuccessfully()
-            throws ValidationException, ConfigurationException {
-        Map<String, String> config = new HashMap<>();
-        config.put("replication.factor", "3");
-        config.put("min.insync.replicas", "2");
-
-        Topic topic = new Topic("topic", config);
-        MinInSyncReplicasValidation validation = new MinInSyncReplicasValidation();
-        validation.valid(topic);
-    }
-
-    @Test
-    public void shouldCheckMissingMinInSyncValuesSuccessfully()
-            throws ValidationException, ConfigurationException {
-        Map<String, String> config = new HashMap<>();
-        config.put("replication.factor", "3");
-
-        Topic topic = new Topic("topic", config);
-        MinInSyncReplicasValidation validation = new MinInSyncReplicasValidation();
-        validation.valid(topic);
-    }
+  @Test(expected = ValidationException.class)
+  public void shouldCheckKoValuesSuccessfully() throws ValidationException, ConfigurationException {
+    Map<String, String> config = new HashMap<>();
+    config.put("replication.factor", "3");
+    config.put("min.insync.replicas", "3");
+
+    Topic topic = new Topic("topic", config);
+    MinInSyncReplicasValidation validation = new MinInSyncReplicasValidation();
+    validation.valid(topic);
+  }
+
+  @Test
+  public void shouldCheckMinimalValuesSuccessfully()
+      throws ValidationException, ConfigurationException {
+    Map<String, String> config = new HashMap<>();
+    config.put("replication.factor", "3");
+    config.put("min.insync.replicas", "1");
+
+    Topic topic = new Topic("topic", config);
+    MinInSyncReplicasValidation validation = new MinInSyncReplicasValidation();
+    validation.valid(topic);
+  }
+
+  @Test
+  public void shouldCheckOkValuesSuccessfully() throws ValidationException, ConfigurationException {
+    Map<String, String> config = new HashMap<>();
+    config.put("replication.factor", "3");
+    config.put("min.insync.replicas", "2");
+
+    Topic topic = new Topic("topic", config);
+    MinInSyncReplicasValidation validation = new MinInSyncReplicasValidation();
+    validation.valid(topic);
+  }
+
+  @Test
+  public void shouldCheckMissingMinInSyncValuesSuccessfully()
+      throws ValidationException, ConfigurationException {
+    Map<String, String> config = new HashMap<>();
+    config.put("replication.factor", "3");
+
+    Topic topic = new Topic("topic", config);
+    MinInSyncReplicasValidation validation = new MinInSyncReplicasValidation();
+    validation.valid(topic);
+  }
 }