Generating sources from an InputStream

Signed-off-by: Ricardo Zanini <[email protected]>

Author: ricardozanini

deployment/pom.xml

@@ -100,7 +100,6 @@
     <dependency>
       <groupId>io.quarkiverse.openapi.generator</groupId>
       <artifactId>quarkus-openapi-generator-test-utils</artifactId>
-      <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
 

deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/codegen/OpenApiGeneratorCodeGenBase.java

@@ -1,5 +1,7 @@
 package io.quarkiverse.openapi.generator.deployment.codegen;
 
+import static io.quarkiverse.openapi.generator.deployment.SpecConfig.getResolvedBasePackageProperty;
+
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -11,8 +13,6 @@
 import io.quarkus.deployment.CodeGenContext;
 import io.quarkus.deployment.CodeGenProvider;
 
-import static io.quarkiverse.openapi.generator.deployment.SpecConfig.getResolvedBasePackageProperty;
-
 /**
  * Code generation for OpenApi Client. Generates Java classes from OpenApi spec files located in src/main/openapi or
  * src/test/openapi
@@ -56,8 +56,8 @@ public boolean trigger(CodeGenContext context) throws CodeGenException {
     protected void generate(CodeGenContext context, final Path openApiFilePath, final Path outDir) {
         final OpenApiClientGeneratorWrapper generator = new OpenApiClientGeneratorWrapper(
                 openApiFilePath.normalize(), outDir)
-                .withCircuitBreakerConfiguration(CircuitBreakerConfigurationParser.parse(
-                        context.config()));
+                        .withCircuitBreakerConfiguration(CircuitBreakerConfigurationParser.parse(
+                                context.config()));
         context.config()
                 .getOptionalValue(getResolvedBasePackageProperty(openApiFilePath), String.class)
                 .ifPresent(generator::withBasePackage);

deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/codegen/OpenApiGeneratorStreamCodeGen.java

@@ -18,7 +18,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import io.quarkiverse.openapi.generator.OpenApiSpecInputProvider;
+import io.quarkiverse.openapi.generator.codegen.OpenApiSpecInputProvider;
+import io.quarkiverse.openapi.generator.codegen.SpecInputModel;
 import io.quarkus.bootstrap.prebuild.CodeGenException;
 import io.quarkus.deployment.CodeGenContext;
 
@@ -60,18 +61,20 @@ public boolean trigger(CodeGenContext context) throws CodeGenException {
         boolean generated = false;
 
         for (final OpenApiSpecInputProvider provider : this.providers) {
-            for (final InputStream is : provider.read()) {
+            for (SpecInputModel inputModel : provider.read()) {
+                if (inputModel == null) {
+                    throw new CodeGenException("SpecInputModel from provider " + provider + " is null");
+                }
                 // TODO: in the future, we can use the checksum to not generate the stub files again
-                final String checksum = generateChecksumCRC32(is);
-                final Path openApiFilePath = Paths.get(outDir.toString(), checksum + ".yaml");
-
-                try (ReadableByteChannel channel = Channels.newChannel(is);
+                final Path openApiFilePath = Paths.get(outDir.toString(), inputModel.getFileName());
+                try (ReadableByteChannel channel = Channels.newChannel(inputModel.getInputStream());
                         FileOutputStream output = new FileOutputStream(openApiFilePath.toString())) {
                     output.getChannel().transferFrom(channel, 0, Integer.MAX_VALUE);
                     this.generate(context, openApiFilePath, outDir);
                     generated = true;
                 } catch (IOException e) {
-                    throw new UncheckedIOException("Fail to save openapi file", e);
+                    throw new UncheckedIOException("Failed to save InputStream from provider " + provider + " into location ",
+                            e);
                 }
             }
         }

integration-tests/pom.xml

@@ -36,11 +36,11 @@
       <artifactId>microprofile-fault-tolerance-api</artifactId>
     </dependency>
 
+    <!-- exceptionally here, we are using the test utils with default scope because of the ClassPathOpenApiSpecInputProvider -->
     <dependency>
       <groupId>io.quarkiverse.openapi.generator</groupId>
       <artifactId>quarkus-openapi-generator-test-utils</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>

integration-tests/src/main/java/io/quarkiverse/openapi/generator/it/providers/ClassPathOpenApiSpecInputProvider.java

@@ -0,0 +1 @@
+io.quarkiverse.openapi.generator.testutils.codegen.ClassPathPetstoreOpenApiSpecInputProvider

integration-tests/src/main/resources/META-INF/services/io.quarkiverse.openapi.generator.OpenApiSpecInputProvider

@@ -41,6 +41,11 @@
         <artifactId>microprofile-fault-tolerance-api</artifactId>
         <version>${version.org.eclipse.microprofile.fault-tolerance}</version>
       </dependency>
+      <dependency>
+        <groupId>io.quarkiverse.openapi.generator</groupId>
+        <artifactId>quarkus-openapi-generator</artifactId>
+        <version>${project.version}</version>
+      </dependency>
       <!-- Test -->
       <dependency>
         <groupId>com.github.javaparser</groupId>
@@ -54,6 +59,12 @@
         <version>${version.org.assertj}</version>
         <scope>test</scope>
       </dependency>
+      <dependency>
+        <groupId>io.quarkiverse.openapi.generator</groupId>
+        <artifactId>quarkus-openapi-generator-test-utils</artifactId>
+        <version>${project.version}</version>
+        <scope>test</scope>
+      </dependency>
     </dependencies>
   </dependencyManagement>
   <build>

integration-tests/src/main/resources/META-INF/services/io.quarkiverse.openapi.generator.codegen.OpenApiSpecInputProvider

@@ -1,4 +1,4 @@
-package io.quarkiverse.openapi.generator;
+package io.quarkiverse.openapi.generator.codegen;
 
 import java.io.InputStream;
 import java.util.List;
@@ -10,9 +10,9 @@ public interface OpenApiSpecInputProvider {
 
     /**
      * Fetch OpenAPI specification files from a given source.
-     * 
+     *
      * @return a list of spec files in {@link InputStream} format.
      */
-    List<InputStream> read();
+    List<SpecInputModel> read();
 
 }

pom.xml

@@ -0,0 +1,51 @@
+package io.quarkiverse.openapi.generator.codegen;
+
+import static java.util.Objects.requireNonNull;
+
+import java.io.InputStream;
+import java.util.Objects;
+
+public class SpecInputModel {
+
+    private final InputStream inputStream;
+    private final String filename;
+
+    public SpecInputModel(final String filename, final InputStream inputStream) {
+        requireNonNull(inputStream, "InputStream can't be null");
+        requireNonNull(filename, "File name can't be null");
+        this.inputStream = inputStream;
+        this.filename = filename;
+    }
+
+    public String getFileName() {
+        return filename;
+    }
+
+    public InputStream getInputStream() {
+        return inputStream;
+    }
+
+    @Override
+    public String toString() {
+        return "SpecInputModel{" +
+                "name='" + filename + '\'' +
+                '}';
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        SpecInputModel that = (SpecInputModel) o;
+        return inputStream.equals(that.inputStream) && filename.equals(that.filename);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(inputStream, filename);
+    }
+}