fix(core): make sure repository are not loaded twice on reconcile

fhussonnois · fhussonnois · commit 7913fdec6f8a · 2025-10-07T23:33:02.000+02:00
diff --git a/core/src/main/java/io/streamthoughts/jikkou/core/DefaultApi.java b/core/src/main/java/io/streamthoughts/jikkou/core/DefaultApi.java
@@ -501,7 +501,12 @@ public ApiValidationResult<HasMetadata> validate(final @NotNull HasItems resourc
         // Load resources from repositories
         ResourceList<HasMetadata> all = addAllResourcesFromRepositories(resources);
 
-        List<HasMetadata> items = doPrepare(all, context).getItems();
+        return doValidate(all, context);
+    }
+
+    @NotNull
+    private ApiValidationResult<HasMetadata> doValidate(@NotNull HasItems resources, @NotNull ReconciliationContext context) {
+        List<HasMetadata> items = doPrepare(resources, context).getItems();
         ValidationResult validationChainResult = this.newResourceValidationChain().validate(items);
 
         // Get and apply all policies
@@ -575,7 +580,7 @@ private ApiResourceChangeList doDiff(@NotNull HasItems resources,
         ResourceList filtered = ResourceList.of(list);
 
         // Validate resources.
-        Map<ResourceType, List<HasMetadata>> resourcesByType = validate(filtered, context).get().groupByType();
+        Map<ResourceType, List<HasMetadata>> resourcesByType = doValidate(filtered, context).get().groupByType();
 
         // Diff
         List<ResourceChange> results = resourcesByType.entrySet()
diff --git a/core/src/main/java/io/streamthoughts/jikkou/core/extension/ExtensionContext.java b/core/src/main/java/io/streamthoughts/jikkou/core/extension/ExtensionContext.java
@@ -8,7 +8,6 @@
 
 import io.streamthoughts.jikkou.core.config.Configuration;
 import io.streamthoughts.jikkou.spi.ExtensionProvider;
-
 import java.util.NoSuchElementException;
 
 /**
diff --git a/providers/jikkou-provider-core/src/test/java/io/streamthoughts/jikkou/core/repository/GitHubResourceRepositoryTest.java b/providers/jikkou-provider-core/src/test/java/io/streamthoughts/jikkou/core/repository/GitHubResourceRepositoryTest.java
@@ -9,11 +9,10 @@
 import io.streamthoughts.jikkou.core.config.Configuration;
 import io.streamthoughts.jikkou.core.extension.ExtensionContext;
 import io.streamthoughts.jikkou.core.models.HasMetadata;
+import java.util.List;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-import java.util.List;
-
 class GitHubResourceRepositoryTest {
 
     @Test
diff --git a/providers/jikkou-provider-schema-registry/src/test/java/io/streamthoughts/jikkou/schema/registry/api/SchemaRegistryApiFactoryTest.java b/providers/jikkou-provider-schema-registry/src/test/java/io/streamthoughts/jikkou/schema/registry/api/SchemaRegistryApiFactoryTest.java
@@ -1,10 +1,15 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright (c) The original authors
+ *
+ * Licensed under the Apache Software License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
+ */
 package io.streamthoughts.jikkou.schema.registry.api;
 
 import io.streamthoughts.jikkou.core.config.Configuration;
 import io.streamthoughts.jikkou.http.client.ssl.SSLConfig;
 import io.streamthoughts.jikkou.schema.registry.mock.HttpPathBasedDispatcher;
 import java.io.IOException;
-import java.net.http.HttpHeaders;
 import java.util.List;
 import mockwebserver3.MockResponse;
 import mockwebserver3.MockWebServer;
diff --git a/providers/jikkou-provider-schema-registry/src/test/java/io/streamthoughts/jikkou/schema/registry/mock/HttpPathBasedDispatcher.java b/providers/jikkou-provider-schema-registry/src/test/java/io/streamthoughts/jikkou/schema/registry/mock/HttpPathBasedDispatcher.java
@@ -1,3 +1,9 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright (c) The original authors
+ *
+ * Licensed under the Apache Software License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
+ */
 package io.streamthoughts.jikkou.schema.registry.mock;
 
 import java.util.HashMap;
