review

Author: Michael Sonnleitner

.gitattributes

@@ -0,0 +1,2 @@
+* text eol=lf
+*.jar -text -eol -working-tree-encoding -merge -diff

client/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/GavItemConfig.java

@@ -0,0 +1,23 @@
+package io.quarkiverse.openapi.generator.deployment;
+
+import java.util.List;
+import java.util.Optional;
+
+import io.smallrye.config.WithDefault;
+import io.smallrye.config.WithName;
+
+/*
+ * Model for the configuration of this extension.
+ * It's used for documentation purposes only.
+ * The configuration is consumed in the codegen phase, before build time.
+ * Not meant to be used outside this scope.
+ * Config items can be applied only on gav
+ */
+public interface GavItemConfig extends CommonItemConfig {
+    /**
+     * List of OpenAPI spec files in GAV to be generated
+     */
+    @WithName("spec-files")
+    @WithDefault("openapi.yaml")
+    Optional<List<String>> gavSpecFiles();
+}

client/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/SpecItemConfig.java

@@ -1,6 +1,5 @@
 package io.quarkiverse.openapi.generator.deployment;
 
-import java.util.List;
 import java.util.Optional;
 
 import io.smallrye.config.WithDefault;
@@ -80,11 +79,4 @@ public interface SpecItemConfig extends CommonItemConfig {
     @WithDefault("false")
     Optional<Boolean> useDynamicUrl();
 
-    /**
-     * List of OpenAPI spec files in GAV to be generated
-     */
-    @WithName("gav-spec-files")
-    @WithDefault("openapi.yaml")
-    Optional<List<String>> gavSpecFiles();
-
 }

client/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/codegen/JarOrZipGAVCoordinateOpenApiSpecInputProvider.java

@@ -7,9 +7,9 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 import io.quarkus.bootstrap.prebuild.CodeGenException;
 import io.quarkus.deployment.CodeGenContext;
@@ -54,7 +54,7 @@
  * <li>{@code quarkus.openapi-generator.codegen.artifact-id-filter} - Regex pattern for artifact ID filtering</li>
  * <li>{@code quarkus.openapi-generator.codegen.exclude-gavs} - List of GAV coordinates to exclude
  * (format: groupId:artifactId:classifier)</li>
- * <li>{@code quarkus.openapi-generator.codegen.spec.com_sample_customer_service_openapi.gav-spec-files} - List of
+ * <li>{@code quarkus.openapi-generator.codegen.gav.com_sample_customer_service_openapi.spec-files} - List of
  * openAPI specification files in com.sample:customer-service-openapi:jar</li>
  * </ul>
  *
@@ -65,7 +65,7 @@
  * quarkus.openapi-generator.codegen.gav-scanning=true
  * quarkus.openapi-generator.codegen.artifact-id-filter=.*api.*
  * quarkus.openapi-generator.codegen.exclude-gavs=com.example:old-api
- * quarkus.openapi-generator.codegen.spec.com_sample_customer_service_api.gav-spec-files=customer.yaml,another.yaml
+ * quarkus.openapi-generator.codegen.gav.com_sample_customer_service_api.spec-files=customer.yaml,another.yaml
  * </pre>
  *
  * @see AbstractGAVCoordinateOpenApiSpecInputProvider
@@ -81,7 +81,7 @@ protected void addInputModels(CodeGenContext context,
             Path path,
             List<SpecInputModel> inputModels) throws CodeGenException {
         List<String> rootFilesOfSpecOfDependency = context.config()
-                .getOptionalValues(getSpecConfigName(GAV_SPEC_FILES, Paths.get(gacString)), String.class)
+                .getOptionalValues(getGavConfigName(SPEC_FILES, Paths.get(gacString)), String.class)
                 .orElse(List.of("openapi.yaml"));
         for (String rootFileOfSpecForDependency : rootFilesOfSpecOfDependency) {
             try {
@@ -104,9 +104,8 @@ protected Set<String> getSupportedExtensions() {
 
     @Override
     protected boolean specificGAVSpecInputProviderFilter(final CodeGenContext context, final String gacString) {
-        return context.config().getOptionalValues(getGlobalConfigName(INCLUDE_GAVS), String.class)
-                .orElse(List.of()) // default to empty list to disable all if not specified
-                .stream().collect(Collectors.toSet())
+        return new HashSet<>(context.config().getOptionalValues(getGlobalConfigName(INCLUDE_GAVS), String.class)
+                .orElse(List.of())) // default to empty list to disable all if not specified
                 .contains(gacString);
     }
 }

client/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/codegen/OpenApiConfigValidator.java

@@ -18,7 +18,7 @@ public final class OpenApiConfigValidator {
     private static final Logger LOGGER = LoggerFactory.getLogger(OpenApiConfigValidator.class);
 
     static final Pattern CONFIG_PATTERN = Pattern.compile(
-            "quarkus\\.openapi-generator\\.codegen\\.(spec.(?<specId>[\\w\\-]*)\\.)?(?<configName>[A-Za-z0-9_\\-]*)\\.?(?<configMap>.+)?");
+            "quarkus\\.openapi-generator\\.codegen\\.((spec|gav).(?<specId>[\\w\\-]*)\\.)?(?<configName>[A-Za-z0-9_\\-]*)\\.?(?<configMap>.+)?");
 
     private OpenApiConfigValidator() {
     }

client/integration-tests/gav/src/it/02-consume-gav/src/main/resources/application.properties

@@ -7,6 +7,6 @@ quarkus.openapi-generator.codegen.include-gavs=io.quarkiverse.openapi.generator:
     io.quarkiverse.openapi.generator:quarkus-openapi-generator-gav-source-splitted-echo
 quarkus.openapi-generator.codegen.spec.io_quarkiverse_openapi_generator_quarkus_openapi_generator_gav_source_echo1.serializable-model=true
 
-quarkus.openapi-generator.codegen.spec.io_quarkiverse_openapi_generator_quarkus_openapi_generator_gav_source_splitted_echo.gav-spec-files=echo.yaml
-quarkus.openapi-generator.codegen.spec.io_quarkiverse_openapi_generator_quarkus_openapi_generator_gav_source_selfcontained_echo.gav-spec-files=echo1.yaml,echo2.yaml
+quarkus.openapi-generator.codegen.gav.io_quarkiverse_openapi_generator_quarkus_openapi_generator_gav_source_splitted_echo.spec-files=echo.yaml
+quarkus.openapi-generator.codegen.gav.io_quarkiverse_openapi_generator_quarkus_openapi_generator_gav_source_selfcontained_echo.spec-files=echo1.yaml,echo2.yaml
 quarkus.openapi-generator.codegen.spec.io_quarkiverse_openapi_generator_quarkus_openapi_generator_gav_source_selfcontained_echo_echo1_yaml.serializable-model=true