Revert "Update the format and tests related to using NO_DEFAULT_FORMAT (#3)" (#4)

This reverts commit 5a465b0.

Author: aindriu-aiven

src/main/java/io/aiven/commons/kafka/config/ConfigKeyBuilder.java

@@ -19,8 +19,6 @@
 
 package io.aiven.commons.kafka.config;
 
-import static org.apache.kafka.common.config.ConfigDef.NO_DEFAULT_VALUE;
-
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
@@ -42,8 +40,8 @@ public class ConfigKeyBuilder<T extends ConfigKeyBuilder<?>> {
   /** The type of the key. Defaults to {@link ConfigDef.Type#STRING}. */
   protected ConfigDef.Type type = ConfigDef.Type.STRING;
 
-  /** The default value for the config key. Defaults to {@code NO_DEFAULT_VALUE}. */
-  protected Object defaultValue = NO_DEFAULT_VALUE;
+  /** The default value for the config key. Defaults to {@code null}. */
+  protected Object defaultValue = null;
 
   /** The validator (if any) for this key. May be {@code null}. */
   protected ConfigDef.Validator validator;

src/test/java/io/aiven/commons/kafka/config/ConfigKeyBuilderTest.java

@@ -18,7 +18,6 @@
 
        SPDX-License-Identifier: Apache-2
 */
-import static org.apache.kafka.common.config.ConfigDef.NO_DEFAULT_VALUE;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.Arrays;
@@ -41,7 +40,7 @@ private void assertStandardValues(ConfigDef.ConfigKey key, String name) {
     assertThat(key.orderInGroup).isEqualTo(-1);
     assertThat(key.recommender).isNull();
     assertThat(key.type).isEqualTo(ConfigDef.Type.STRING);
-    assertThat(key.defaultValue).isEqualTo(NO_DEFAULT_VALUE);
+    assertThat(key.defaultValue).isNull();
     assertThat(key.validator).isNull();
   }
 
@@ -60,7 +59,7 @@ void testDefault() {
     assertThat(key.orderInGroup).isEqualTo(-1);
     assertThat(key.recommender).isNull();
     assertThat(key.type).isEqualTo(ConfigDef.Type.STRING);
-    assertThat(key.defaultValue).isEqualTo(NO_DEFAULT_VALUE);
+    assertThat(key.defaultValue).isNull();
     assertThat(key.validator).isNull();
   }
 
@@ -79,7 +78,7 @@ void testDisplayName() {
     assertThat(key.orderInGroup).isEqualTo(-1);
     assertThat(key.recommender).isNull();
     assertThat(key.type).isEqualTo(ConfigDef.Type.STRING);
-    assertThat(key.defaultValue).isEqualTo(NO_DEFAULT_VALUE);
+    assertThat(key.defaultValue).isNull();
     assertThat(key.validator).isNull();
   }
 
@@ -98,7 +97,7 @@ void testDocumentation() {
     assertThat(key.orderInGroup).isEqualTo(-1);
     assertThat(key.recommender).isNull();
     assertThat(key.type).isEqualTo(ConfigDef.Type.STRING);
-    assertThat(key.defaultValue).isEqualTo(NO_DEFAULT_VALUE);
+    assertThat(key.defaultValue).isNull();
     assertThat(key.validator).isNull();
   }
 
@@ -117,7 +116,7 @@ void testGroup() {
     assertThat(key.orderInGroup).isEqualTo(-1);
     assertThat(key.recommender).isNull();
     assertThat(key.type).isEqualTo(ConfigDef.Type.STRING);
-    assertThat(key.defaultValue).isEqualTo(NO_DEFAULT_VALUE);
+    assertThat(key.defaultValue).isNull();
     assertThat(key.validator).isNull();
   }
 
@@ -136,7 +135,7 @@ void testDependents() {
     assertThat(key.orderInGroup).isEqualTo(-1);
     assertThat(key.recommender).isNull();
     assertThat(key.type).isEqualTo(ConfigDef.Type.STRING);
-    assertThat(key.defaultValue).isEqualTo(NO_DEFAULT_VALUE);
+    assertThat(key.defaultValue).isNull();
     assertThat(key.validator).isNull();
 
     key = new ConfigKeyBuilder<>(name).dependent("one").dependent("two").build();
@@ -151,7 +150,7 @@ void testDependents() {
     assertThat(key.orderInGroup).isEqualTo(-1);
     assertThat(key.recommender).isNull();
     assertThat(key.type).isEqualTo(ConfigDef.Type.STRING);
-    assertThat(key.defaultValue).isEqualTo(NO_DEFAULT_VALUE);
+    assertThat(key.defaultValue).isNull();
     assertThat(key.validator).isNull();
 
     key = new ConfigKeyBuilder<>(name).dependents(Arrays.asList("one", "two")).build();
@@ -166,7 +165,7 @@ void testDependents() {
     assertThat(key.orderInGroup).isEqualTo(-1);
     assertThat(key.recommender).isNull();
     assertThat(key.type).isEqualTo(ConfigDef.Type.STRING);
-    assertThat(key.defaultValue).isEqualTo(NO_DEFAULT_VALUE);
+    assertThat(key.defaultValue).isNull();
     assertThat(key.validator).isNull();
   }
 
@@ -186,7 +185,7 @@ void testImportance() {
     assertThat(key.orderInGroup).isEqualTo(-1);
     assertThat(key.recommender).isNull();
     assertThat(key.type).isEqualTo(ConfigDef.Type.STRING);
-    assertThat(key.defaultValue).isEqualTo(NO_DEFAULT_VALUE);
+    assertThat(key.defaultValue).isNull();
     assertThat(key.validator).isNull();
   }
 
@@ -205,7 +204,7 @@ void testInternalConfig() {
     assertThat(key.orderInGroup).isEqualTo(-1);
     assertThat(key.recommender).isNull();
     assertThat(key.type).isEqualTo(ConfigDef.Type.STRING);
-    assertThat(key.defaultValue).isEqualTo(NO_DEFAULT_VALUE);
+    assertThat(key.defaultValue).isNull();
     assertThat(key.validator).isNull();
 
     key = new ConfigKeyBuilder<>(name).internalConfig(false).build();
@@ -220,7 +219,7 @@ void testInternalConfig() {
     assertThat(key.orderInGroup).isEqualTo(-1);
     assertThat(key.recommender).isNull();
     assertThat(key.type).isEqualTo(ConfigDef.Type.STRING);
-    assertThat(key.defaultValue).isEqualTo(NO_DEFAULT_VALUE);
+    assertThat(key.defaultValue).isNull();
     assertThat(key.validator).isNull();
   }
 
@@ -239,7 +238,7 @@ void testOrderInGroup() {
     assertThat(key.orderInGroup).isEqualTo(5);
     assertThat(key.recommender).isNull();
     assertThat(key.type).isEqualTo(ConfigDef.Type.STRING);
-    assertThat(key.defaultValue).isEqualTo(NO_DEFAULT_VALUE);
+    assertThat(key.defaultValue).isNull();
     assertThat(key.validator).isNull();
   }
 
@@ -271,7 +270,7 @@ public boolean visible(String s, Map<String, Object> map) {
     assertThat(key.orderInGroup).isEqualTo(-1);
     assertThat(key.recommender).isEqualTo(recommender);
     assertThat(key.type).isEqualTo(ConfigDef.Type.STRING);
-    assertThat(key.defaultValue).isEqualTo(NO_DEFAULT_VALUE);
+    assertThat(key.defaultValue).isNull();
     assertThat(key.validator).isNull();
   }
 
@@ -290,7 +289,7 @@ void testType() {
     assertThat(key.orderInGroup).isEqualTo(-1);
     assertThat(key.recommender).isNull();
     assertThat(key.type).isEqualTo(ConfigDef.Type.BOOLEAN);
-    assertThat(key.defaultValue).isEqualTo(NO_DEFAULT_VALUE);
+    assertThat(key.defaultValue).isNull();
     assertThat(key.validator).isNull();
   }
 

src/test/java/io/aiven/commons/kafka/config/DeprecationReporterTest.java

@@ -50,7 +50,6 @@ public class DeprecationReporterTest {
                   .build())
           .define(
               ExtendedConfigKey.builder("roads")
-                  .defaultValue("Made of asphalt")
                   .deprecatedInfo(
                       DeprecatedInfo.builder()
                           .description("Where we're going we don't need roads")
@@ -65,7 +64,6 @@ public class DeprecationReporterTest {
                   .build())
           .define(
               ExtendedConfigKey.builder("shangrila")
-                  .defaultValue("Not a cup")
                   .documentation("not deprecated no-default")
                   .build())
           .define(

src/test/java/io/aiven/commons/kafka/config/ExtendedConfigKeyBuilderTest.java

@@ -18,7 +18,6 @@
 
        SPDX-License-Identifier: Apache-2
 */
-import static org.apache.kafka.common.config.ConfigDef.NO_DEFAULT_VALUE;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.apache.kafka.common.config.ConfigDef;
@@ -37,7 +36,7 @@ private void assertStandardValues(ConfigDef.ConfigKey key, String name) {
     assertThat(key.orderInGroup).isEqualTo(-1);
     assertThat(key.recommender).isNull();
     assertThat(key.type).isEqualTo(ConfigDef.Type.STRING);
-    assertThat(key.defaultValue).isEqualTo(NO_DEFAULT_VALUE);
+    assertThat(key.defaultValue).isNull();
     assertThat(key.validator).isNull();
   }