KOGITO-6685 Replaced CircuitBreakerConfiguration with Map<String, List<String>>

hbelmiro · hbelmiro · commit 9bb57678a9f5 · 2022-03-30T10:30:04.000-03:00
Signed-off-by: Helber Belmiro &lt;helber.belmiro@gmail.com&gt;
diff --git a/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/circuitbreaker/CircuitBreakerConfiguration.java b/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/circuitbreaker/CircuitBreakerConfiguration.java
diff --git a/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/circuitbreaker/CircuitBreakerConfigurationParser.java b/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/circuitbreaker/CircuitBreakerConfigurationParser.java
@@ -2,12 +2,12 @@
 
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
+import java.util.function.Function;
 import java.util.function.UnaryOperator;
 import java.util.stream.Collectors;
 
-import io.quarkiverse.openapi.generator.deployment.circuitbreaker.CircuitBreakerConfiguration.CircuitBreakerClassConfiguration;
-
 public final class CircuitBreakerConfigurationParser {
 
     private final UnaryOperator<String> nameToValuePropertyMapper;
@@ -16,11 +16,12 @@ public CircuitBreakerConfigurationParser(UnaryOperator<String> nameToValueProper
         this.nameToValuePropertyMapper = nameToValuePropertyMapper;
     }
 
-    public CircuitBreakerConfiguration parse(Collection<String> propertyNames) {
-        return new CircuitBreakerConfiguration(readClasses(propertyNames));
-    }
-
-    private List<CircuitBreakerClassConfiguration> readClasses(Collection<String> propertyNames) {
+    /**
+     * Parses the properties and returns a map of class names and their methods that should be configured with circuit breaker.
+     *
+     * @return a map of class names and their methods that should be configured with circuit breaker
+     */
+    public Map<String, List<String>> parse(Collection<String> propertyNames) {
         List<String> filteredPropertyNames = filterPropertyNames(propertyNames).stream()
                 .filter(property -> nameToValuePropertyMapper.apply(property).equals("true"))
                 .collect(Collectors.toList());
@@ -29,10 +30,9 @@ private List<CircuitBreakerClassConfiguration> readClasses(Collection<String> pr
                 .map(this::getClassName)
                 .collect(Collectors.toSet());
 
-        return classNames.stream()
-                .map(className -> new CircuitBreakerClassConfiguration(className,
-                        getMethodNames(className, filteredPropertyNames)))
-                .collect(Collectors.toUnmodifiableList());
+        return classNames.stream().collect(Collectors.toUnmodifiableMap(
+                Function.identity(),
+                className -> getMethodNames(className, filteredPropertyNames)));
     }
 
     private List<String> getMethodNames(String className, List<String> propertyNames) {
diff --git a/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/codegen/OpenApiGeneratorCodeGenBase.java b/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/codegen/OpenApiGeneratorCodeGenBase.java
@@ -6,12 +6,12 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
+import java.util.Map;
 import java.util.function.UnaryOperator;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
-import io.quarkiverse.openapi.generator.deployment.circuitbreaker.CircuitBreakerConfiguration;
 import io.quarkiverse.openapi.generator.deployment.circuitbreaker.CircuitBreakerConfigurationParser;
 import io.quarkiverse.openapi.generator.deployment.wrapper.OpenApiClientGeneratorWrapper;
 import io.quarkus.bootstrap.prebuild.CodeGenException;
@@ -47,7 +47,7 @@ public boolean trigger(CodeGenContext context) throws CodeGenException {
                         .map(Path::toString)
                         .filter(s -> s.endsWith(this.inputExtension()))
                         .map(Path::of).forEach(openApiFilePath -> {
-                            final CircuitBreakerConfiguration circuitBreakerConfiguration = getCircuitBreakerConfiguration(
+                            final Map<String, List<String>> circuitBreakerConfiguration = getCircuitBreakerConfiguration(
                                     context);
 
                             final OpenApiClientGeneratorWrapper generator = new OpenApiClientGeneratorWrapper(
@@ -68,7 +68,7 @@ public boolean trigger(CodeGenContext context) throws CodeGenException {
         return false;
     }
 
-    private CircuitBreakerConfiguration getCircuitBreakerConfiguration(CodeGenContext context) {
+    private Map<String, List<String>> getCircuitBreakerConfiguration(CodeGenContext context) {
         UnaryOperator<String> nameToValuePropertyMapper = propertyName -> context.config().getValue(propertyName,
                 String.class);
 
diff --git a/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/wrapper/OpenApiClientGeneratorWrapper.java b/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/wrapper/OpenApiClientGeneratorWrapper.java
@@ -3,6 +3,7 @@
 import java.io.File;
 import java.nio.file.Path;
 import java.util.List;
+import java.util.Map;
 
 import org.openapitools.codegen.CodegenConstants;
 import org.openapitools.codegen.DefaultGenerator;
@@ -68,7 +69,13 @@ public OpenApiClientGeneratorWrapper withBasePackage(final String pkg) {
         return this;
     }
 
-    public OpenApiClientGeneratorWrapper withCircuitBreakerConfiguration(final CircuitBreakerConfiguration config) {
+    /**
+     * Adds the circuit breaker configuration to the generator.
+     *
+     * @param config a map of class names and their methods that should be configured with circuit breaker
+     * @return this wrapper
+     */
+    public OpenApiClientGeneratorWrapper withCircuitBreakerConfiguration(final Map<String, List<String>> config) {
         configurator.addAdditionalProperty("circuit-breaker", config);
         return this;
     }
diff --git a/deployment/src/main/resources/templates/api.qute b/deployment/src/main/resources/templates/api.qute
@@ -53,8 +53,8 @@ public interface {classname} {
     {#if op.hasProduces}
     @Produces(\{{#for produce in op.produces}"{produce.mediaType}"{#if produce_hasNext}, {/if}{/for}\})
     {/if}
-    {#for cbClassConfig in circuit-breaker.classConfigurations.orEmpty}{#if cbClassConfig.className == package + classname}
-    {#for cbMethod in cbClassConfig.methods.orEmpty}{#if cbMethod == op.nickname}
+    {#for cbClassConfig in circuit-breaker.orEmpty}{#if cbClassConfig.key == package + classname}
+    {#for cbMethod in cbClassConfig.value.orEmpty}{#if cbMethod == op.nickname}
     @org.eclipse.microprofile.faulttolerance.CircuitBreaker
     {/if}{/for}
     {/if}{/for}
diff --git a/deployment/src/test/java/io/quarkiverse/openapi/generator/deployment/circuitbreaker/CircuitBreakerConfigurationParserTest.java b/deployment/src/test/java/io/quarkiverse/openapi/generator/deployment/circuitbreaker/CircuitBreakerConfigurationParserTest.java
@@ -3,6 +3,8 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.io.IOException;
+import java.util.List;
+import java.util.Map;
 import java.util.Properties;
 
 import org.junit.jupiter.api.Test;
@@ -11,16 +13,16 @@ class CircuitBreakerConfigurationParserTest {
 
     @Test
     void parse() throws IOException {
-        CircuitBreakerConfiguration circuitBreakerConfiguration = loadConfiguration("/circuitbreaker/application.properties");
+        Map<String, List<String>> circuitBreakerConfiguration = loadConfiguration("/circuitbreaker/application.properties");
 
-        assertThat(circuitBreakerConfiguration.getClassConfiguration("org.acme.CountryResource").getMethods())
+        assertThat(circuitBreakerConfiguration.get("org.acme.CountryResource"))
                 .containsExactlyInAnyOrder("getCountries", "getByCapital");
 
-        assertThat(circuitBreakerConfiguration.getClassConfiguration("org.acme.CityResource").getMethods())
+        assertThat(circuitBreakerConfiguration.get("org.acme.CityResource"))
                 .containsOnly("get");
     }
 
-    private CircuitBreakerConfiguration loadConfiguration(String propertiesFile) throws IOException {
+    private Map<String, List<String>> loadConfiguration(String propertiesFile) throws IOException {
         Properties properties = new Properties();
         properties.load(CircuitBreakerConfigurationParserTest.class.getResourceAsStream(propertiesFile));
 
@@ -30,17 +32,17 @@ private CircuitBreakerConfiguration loadConfiguration(String propertiesFile) thr
 
     @Test
     void circuitBreakerDisabledShouldReturnEmptyConfig() throws IOException {
-        CircuitBreakerConfiguration circuitBreakerConfiguration = loadConfiguration(
+        Map<String, List<String>> circuitBreakerConfiguration = loadConfiguration(
                 "/circuitbreaker/circuit_breaker_disabled_application.properties");
 
-        assertThat(circuitBreakerConfiguration.getClassConfigurations()).isEmpty();
+        assertThat(circuitBreakerConfiguration).isEmpty();
     }
 
     @Test
     void missingCircuitBreakerEnabledConfigShouldReturnEmptyConfig() throws IOException {
-        CircuitBreakerConfiguration circuitBreakerConfiguration = loadConfiguration(
+        Map<String, List<String>> circuitBreakerConfiguration = loadConfiguration(
                 "/circuitbreaker/missing_circuit_breaker_enabled_application.properties");
 
-        assertThat(circuitBreakerConfiguration.getClassConfigurations()).isEmpty();
+        assertThat(circuitBreakerConfiguration).isEmpty();
     }
 }
diff --git a/deployment/src/test/java/io/quarkiverse/openapi/generator/deployment/wrapper/OpenApiClientGeneratorWrapperTest.java b/deployment/src/test/java/io/quarkiverse/openapi/generator/deployment/wrapper/OpenApiClientGeneratorWrapperTest.java
@@ -28,9 +28,6 @@
 import com.github.javaparser.ast.CompilationUnit;
 import com.github.javaparser.ast.body.MethodDeclaration;
 
-import io.quarkiverse.openapi.generator.deployment.circuitbreaker.CircuitBreakerConfiguration;
-import io.quarkiverse.openapi.generator.deployment.circuitbreaker.CircuitBreakerConfiguration.CircuitBreakerClassConfiguration;
-
 public class OpenApiClientGeneratorWrapperTest {
 
     @Test
@@ -124,16 +121,12 @@ void circuitBreaker() throws URISyntaxException, FileNotFoundException {
     private List<File> generateRestClientFiles() throws URISyntaxException {
         Path targetPath = Paths.get(getTargetDir(), "openapi-gen");
 
-        CircuitBreakerClassConfiguration classConfiguration = new CircuitBreakerClassConfiguration(
-                "org.openapitools.client.api.DefaultApi", List.of("opThatDoesNotExist", "byeGet"));
-
-        CircuitBreakerConfiguration circuitBreakerConfiguration = new CircuitBreakerConfiguration(List.of(classConfiguration));
-
         Path simpleOpenApiFile = Path.of(Objects.requireNonNull(getClass().getResource("/openapi/simple-openapi.json"))
                 .toURI());
 
         OpenApiClientGeneratorWrapper generatorWrapper = new OpenApiClientGeneratorWrapper(simpleOpenApiFile, targetPath)
-                .withCircuitBreakerConfiguration(circuitBreakerConfiguration);
+                .withCircuitBreakerConfiguration(Map.of(
+                        "org.openapitools.client.api.DefaultApi", List.of("opThatDoesNotExist", "byeGet")));
 
         return generatorWrapper.generate();
     }
