NO-ISSUE fix test

Author: Yang-33

centraldogma/.DS_Store

@@ -47,6 +47,8 @@
 import com.linecorp.decaton.processor.runtime.PropertyDefinition;
 import com.linecorp.decaton.processor.runtime.PropertySupplier;
 
+import static com.linecorp.decaton.processor.runtime.ProcessorProperties.PROPERTY_DEFINITIONS;
+
 /**
  * A {@link PropertySupplier} implementation with Central Dogma backend.
  * <p>
@@ -119,18 +121,18 @@ public CentralDogmaPropertySupplier(CentralDogmaRepository centralDogmaRepositor
         }
 
         rootWatcher.watch(node -> {
-            node.fields().forEachRemaining(entry -> {
-                DynamicProperty<?> p = cachedProperties.get(entry.getKey());
-                if (p != null) {
+            for (PropertyDefinition<?> definition : PROPERTY_DEFINITIONS) {
+                DynamicProperty<?> p = cachedProperties.get(definition.name());
+                if (p != null && node.has(definition.name())) {
                     try {
-                        setValue(p, entry.getValue());
+                        setValue(p, node.get(definition.name()));
                     } catch (Exception e) {
                         // Catching Exception instead of RuntimeException, since
                         // Kotlin-implemented DynamicProperty would throw checked exceptions
-                        logger.warn("Failed to set initial value from CentralDogma for {}", entry.getKey(), e);
+                        logger.warn("Failed to set value from CentralDogma for {}", definition.name(), e);
                     }
                 }
-            });
+            }
         });
     }
 
@@ -163,7 +165,7 @@ public <T> Optional<Property<T>> getProperty(PropertyDefinition<T> definition) {
             } catch (Exception e) {
                 // Catching Exception instead of RuntimeException, since
                 // Kotlin-implemented DynamicProperty would throw checked exceptions
-                logger.warn("Failed to set initial value from CentralDogma for {}", definition.name(), e);
+                logger.warn("Failed to set value from CentralDogma for {}", definition.name(), e);
             }
             return prop;
         });
@@ -247,13 +249,6 @@ public static CentralDogmaPropertySupplier register(CentralDogmaRepository centr
 
     private static void createPropertyFile(CentralDogmaRepository centralDogmaRepository, String fileName,
                                            List<Property<?>> properties) {
-        // show given properties
-        logger.info("Creating CentralDogma property file: {} with properties: {}",
-                    fileName,
-                    properties.stream()
-                              .map(p -> String.format("%s=%s", p.definition().name(), p.value()))
-                              .collect(Collectors.joining(", ")));
-
         Revision baseRevision = normalizeRevision(centralDogmaRepository, Revision.HEAD);
         boolean fileExists = fileExists(centralDogmaRepository, fileName, baseRevision);
         long startedTime = System.currentTimeMillis();

centraldogma/src/main/java/com/linecorp/decaton/centraldogma/CentralDogmaPropertySupplier.java

@@ -18,7 +18,12 @@
 
 import static com.fasterxml.jackson.dataformat.yaml.YAMLGenerator.Feature.WRITE_DOC_START_MARKER;
 import static com.linecorp.decaton.processor.runtime.ProcessorProperties.CONFIG_PARTITION_CONCURRENCY;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doAnswer;
@@ -36,8 +41,6 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
-import lombok.extern.slf4j.Slf4j;
-import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Timeout;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -60,7 +63,6 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
-@Slf4j
 public class CentralDogmaPropertySupplierIntegrationTest {
     @RegisterExtension
     final CentralDogmaExtension extension = new CentralDogmaExtension() {
@@ -210,16 +212,14 @@ void testCDIntegrationYaml() throws Exception {
         assertEquals(20, concurrency.value());
         assertEquals(java.util.Arrays.asList("123456", "79797979"), ignoreKeys.value());
 
-        assertEquals(20,
-                IntStream.range(0, 10_000)
-                        .mapToObj(i -> CONFIG_PARTITION_CONCURRENCY)
-                        .map(supplier::getProperty)
-                        .reduce((l, r) -> {
-                            assertSame(l.get(), r.get());
-                            return l;
-                        })
-                        .orElseThrow()
-                        .get().value().intValue());
+        assertEquals(20, IntStream
+                .range(0, 10_000)
+                .mapToObj(i -> CONFIG_PARTITION_CONCURRENCY)
+                .map(supplier::getProperty)
+                .reduce((l, r) -> {
+                    assertSame(l.get(), r.get());
+                    return l;
+                }).get().get().value().intValue());
     }
 
     @Test
@@ -242,32 +242,26 @@ public void testCDRegisterSuccessJson() {
 
     @Test
     @Timeout(10)
-    public void testCDRegisterSuccessYaml() {
+    public void testCDRegisterSuccessYaml() throws Exception {
         String yamlFile = "/subscription.yaml";
         CentralDogma client = extension.client();
         client.createProject(PROJECT_NAME).join();
         CentralDogmaRepository centralDogmaRepository = client.createRepository(PROJECT_NAME, REPOSITORY_NAME).join();
 
         CentralDogmaPropertySupplier.register(centralDogmaRepository, yamlFile);
 
-        String expectedYaml = "decaton.ignore.keys: []\n"
-                + "decaton.processing.rate.per.partition: -1\n"
-                + "decaton.partition.concurrency: 1\n"
-                + "decaton.max.pending.records: 10000\n"
-                + "decaton.commit.interval.ms: 1000\n"
-                + "decaton.group.rebalance.timeout.ms: 1000\n"
-                + "decaton.processing.shutdown.timeout.ms: 0\n"
-                + "decaton.logging.mdc.enabled: true\n"
-                + "decaton.client.metrics.micrometer.bound: false\n"
-                + "decaton.deferred.complete.timeout.ms: -1\n"
-                + "decaton.processor.threads.termination.timeout.ms: 9223372036854775807\n"
-                + "decaton.per.key.quota.processing.rate: -1\n"
-                + "decaton.retry.task.in.legacy.format: false\n"
-                + "decaton.legacy.parse.fallback.enabled: false\n";
-
         String actualText = centralDogmaRepository.file(Query.ofText(yamlFile)).get().join().content();
-        assertEquals(expectedYaml, actualText);
-        log.info("Content of {}: {}", yamlFile, actualText);
+
+        ObjectMapper yaml = new ObjectMapper(new YAMLFactory());
+        JsonNode actual = yaml.readTree(actualText);
+        JsonNode expected = defaultProperties();
+
+        assertEquals(expected.toString(), actual.toString(),
+                () -> "\nexpected: " + expected.toPrettyString()
+                        + "\nactual: " + actual.toPrettyString());
+
+        assertFalse(actualText.startsWith("---"), "YAML should not include doc start marker");
+        assertFalse(actualText.trim().startsWith("{"), "YAML should not be JSON text");
     }
 
     @Test
@@ -331,7 +325,7 @@ void testCDRegisterConflictYaml() throws Exception {
                 "# pushed by user‑B (should win the race)\n"
                         + "foo: bar\n";
 
-        JsonNode userBPush = Jackson.readTree("{\"foo\":\"bar\"}");
+        JsonNode userBYamlAsJsonNode = Jackson.readTree("{\"foo\":\"bar\"}");
 
         String defaultYaml = new ObjectMapper(new YAMLFactory().disable(WRITE_DOC_START_MARKER))
                 .writeValueAsString(defaultProperties());
@@ -344,9 +338,7 @@ void testCDRegisterConflictYaml() throws Exception {
                 .commit(any(), eq(Change.ofTextUpsert(FILE, defaultYaml)));
 
         ExecutorService svc = Executors.newFixedThreadPool(2);
-
         svc.submit(() -> CentralDogmaPropertySupplier.register(userA, FILE));
-
         svc.submit(() -> {
             try {
                 userAIsRunning.await();
@@ -368,7 +360,7 @@ void testCDRegisterConflictYaml() throws Exception {
 
         JsonNode actual = new ObjectMapper(new YAMLFactory())
                 .readTree(entry.content());
-        assertEquals(userBPush, actual);
+        assertEquals(userBYamlAsJsonNode, actual);
     }
 
 

centraldogma/src/test/java/com/linecorp/decaton/centraldogma/CentralDogmaPropertySupplierIntegrationTest.java

@@ -114,7 +114,7 @@ private CentralDogmaPropertySupplier setup(String fileName) {
         return new CentralDogmaPropertySupplier(centralDogmaRepository, fileName);
     }
 
-    @ParameterizedTest(name = "watcherSetup[{index}] → {0}")
+    @ParameterizedTest()
     @MethodSource("fileParams")
     public void testWatcherSetup(String fileName) {
         CentralDogmaPropertySupplier supplier = setup(fileName);
@@ -125,7 +125,7 @@ public void testWatcherSetup(String fileName) {
         assertTrue(supplier.getProperty(LONG_PROPERTY).isPresent());
     }
 
-    @ParameterizedTest(name = "watcherSetup[{index}] → {0}")
+    @ParameterizedTest()
     @MethodSource("fileParams")
     public void testConvertValue(String fileName) {
         CentralDogmaPropertySupplier supplier = setup(fileName);
@@ -143,7 +143,7 @@ public void testConvertValue(String fileName) {
         assertEquals(Arrays.asList("foo", "bar"), convertedList);
     }
 
-    @ParameterizedTest(name = "watcherSetup[{index}] → {0}")
+    @ParameterizedTest()
     @MethodSource("fileParams")
     public void testSetValue(String fileName) {
         CentralDogmaPropertySupplier supplier = setup(fileName);
@@ -155,7 +155,18 @@ public void testSetValue(String fileName) {
         verify(prop).checkingSet(10L);
     }
 
-    @ParameterizedTest(name = "watcherSetup[{index}] → {0}")
+    @ParameterizedTest()
+    @MethodSource("fileParams")
+    public void testSetNullValue(String fileName) {
+        CentralDogmaPropertySupplier supplier = setup(fileName);
+        JsonNodeFactory factory = objectMapper.getNodeFactory();
+
+        DynamicProperty<Long> prop = spy(new DynamicProperty<>(LONG_PROPERTY));
+        supplier.setValue(prop, factory.nullNode());
+        verify(prop).checkingSet(LONG_PROPERTY.defaultValue());
+    }
+
+    @ParameterizedTest()
     @MethodSource("fileParams")
     public void testGetPropertyAbsentName(String fileName) {
         CentralDogmaPropertySupplier supplier = setup(fileName);
@@ -166,16 +177,6 @@ public void testGetPropertyAbsentName(String fileName) {
         assertFalse(supplier.getProperty(missingProperty).isPresent());
     }
 
-//    @Test
-//    public void testSetNullValue() {
-//        JsonNodeFactory factory = objectMapper.getNodeFactory();
-//
-//        DynamicProperty<Long> prop = spy(new DynamicProperty<>(LONG_PROPERTY));
-//        supplier.setValue(prop, factory.nullNode());
-//        verify(prop).checkingSet(LONG_PROPERTY.defaultValue());
-//    }
-
-
     private Change<?> expectedChange(String fileName, JsonNode node) throws Exception {
         if (fileName.endsWith(".yaml") || fileName.endsWith(".yml")) {
             return Change.ofTextUpsert(fileName, YAML_MAPPER.writeValueAsString(node));
@@ -184,7 +185,7 @@ private Change<?> expectedChange(String fileName, JsonNode node) throws Exceptio
         }
     }
 
-    @ParameterizedTest(name = "watcherSetup[{index}] → {0}")
+    @ParameterizedTest()
     @MethodSource("fileParams")
     public void testRegisterWithDefaultSettings(String fileName) throws Exception {
         setup(fileName);
@@ -209,7 +210,7 @@ public void testRegisterWithDefaultSettings(String fileName) throws Exception {
         );
     }
 
-    @ParameterizedTest(name = "watcherSetup[{index}] → {0}")
+    @ParameterizedTest()
     @MethodSource("fileParams")
     public void testRegisterWithCustomizedSettings(String fileName) throws Exception {
         setup(fileName);