From 47bbb335eeb0f0caf878c9488a323cdc1bdefe39 Mon Sep 17 00:00:00 2001
From: altro3 <alexuyt@gmail.com>
Date: Wed, 27 Sep 2023 15:04:46 +0700
Subject: [PATCH] Add import java.io.InputStream to generated api client class
 (#1225)

Fixed #1223
---
 .../generator/JavaMicronautClientCodegen.java |  1 +
 .../generator/MicronautClientCodegenTest.java | 10 ++++++++
 .../src/test/resources/3_0/inputStream.yml    | 24 +++++++++++++++++++
 3 files changed, 35 insertions(+)
 create mode 100644 openapi-generator/src/test/resources/3_0/inputStream.yml

diff --git a/openapi-generator/src/main/java/io/micronaut/openapi/generator/JavaMicronautClientCodegen.java b/openapi-generator/src/main/java/io/micronaut/openapi/generator/JavaMicronautClientCodegen.java
index 6c521ae64b..0f83a00e88 100644
--- a/openapi-generator/src/main/java/io/micronaut/openapi/generator/JavaMicronautClientCodegen.java
+++ b/openapi-generator/src/main/java/io/micronaut/openapi/generator/JavaMicronautClientCodegen.java
@@ -63,6 +63,7 @@ public class JavaMicronautClientCodegen extends AbstractMicronautJavaCodegen<Jav
 
         typeMapping.put("file", "byte[]");
         typeMapping.put("responseFile", "InputStream");
+        importMapping.put("InputStream", "java.io.InputStream");
     }
 
     @Override
diff --git a/openapi-generator/src/test/java/io/micronaut/openapi/generator/MicronautClientCodegenTest.java b/openapi-generator/src/test/java/io/micronaut/openapi/generator/MicronautClientCodegenTest.java
index cf7c4250ed..e1e8721d03 100644
--- a/openapi-generator/src/test/java/io/micronaut/openapi/generator/MicronautClientCodegenTest.java
+++ b/openapi-generator/src/test/java/io/micronaut/openapi/generator/MicronautClientCodegenTest.java
@@ -291,4 +291,14 @@ void testDiscriminatorConstructorBug() {
         assertFileContains(apiPath + "BasicBookInfo.java", "public BasicBookInfo(String author, String name)", "super(name)");
         assertFileContains(apiPath + "DetailedBookInfo.java", "public DetailedBookInfo(String isbn, String name, String author)", "super(author, name)");
     }
+
+    @Test
+    void testWrongImportInputStream() {
+
+        var codegen = new JavaMicronautClientCodegen();
+        String outputPath = generateFiles(codegen, "src/test/resources/3_0/inputStream.yml", CodegenConstants.APIS, CodegenConstants.API_TESTS);
+        String apiPath = outputPath + "src/main/java/org/openapitools/api/";
+
+        assertFileContains(apiPath + "DefaultApi.java", "import java.io.InputStream;");
+    }
 }
diff --git a/openapi-generator/src/test/resources/3_0/inputStream.yml b/openapi-generator/src/test/resources/3_0/inputStream.yml
new file mode 100644
index 0000000000..9a2b00e272
--- /dev/null
+++ b/openapi-generator/src/test/resources/3_0/inputStream.yml
@@ -0,0 +1,24 @@
+openapi: "3.0.3"
+info:
+  version: "v1"
+  title: "Dummy"
+paths:
+  /assets:export:
+    get:
+      operationId: "Dummy"
+      description: ""
+      parameters:
+        - name: "query"
+          in: "query"
+          description: ""
+          required: false
+          schema:
+            type: "string"
+      responses:
+        "200":
+          description: ""
+          content:
+            '*/*':
+              schema:
+                type: "string"
+                format: "binary"