Skip to content

Commit 290a83a

Browse files
#1045 - Refactor inputExtension method to inputExtensions (#1052) (#1061)
#1045 - Refactor inputExtension method to inputExtensions# This is a combination of 2 commits. #1045 - Refactor inputExtension method to inputExtensions Co-authored-by: vladprado <[email protected]>
1 parent 4b65be7 commit 290a83a

File tree

8 files changed

+18
-50
lines changed

8 files changed

+18
-50
lines changed
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package io.quarkiverse.openapi.generator.deployment.codegen;
2+
3+
public class OpenApiGeneratorCodeGen extends OpenApiGeneratorCodeGenBase {
4+
@Override
5+
public String providerId() {
6+
return OpenApiGeneratorOutputPaths.OPENAPI_PATH;
7+
}
8+
9+
@Override
10+
public String[] inputExtensions() {
11+
return new String[] { JSON, YAML, YML };
12+
}
13+
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import java.io.IOException;
2323
import java.nio.file.Files;
2424
import java.nio.file.Path;
25+
import java.util.Arrays;
2526
import java.util.List;
2627
import java.util.Map;
2728
import java.util.Optional;
@@ -132,7 +133,7 @@ public boolean trigger(CodeGenContext context) throws CodeGenException {
132133
.filter(Files::isRegularFile)
133134
.filter(path -> {
134135
String fileName = path.getFileName().toString();
135-
return fileName.endsWith(inputExtension())
136+
return Arrays.stream(this.inputExtensions()).anyMatch(fileName::endsWith)
136137
&& !filesToExclude.contains(fileName)
137138
&& (filesToInclude.isEmpty() || filesToInclude.contains(fileName));
138139
}).toList();

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

Lines changed: 0 additions & 14 deletions
This file was deleted.

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@
99

1010
public class OpenApiGeneratorOutputPaths {
1111

12-
public static final String YAML_PATH = "open-api-yaml";
13-
public static final String YML_PATH = "open-api-yml";
14-
public static final String JSON_PATH = "open-api-json";
12+
public static final String OPENAPI_PATH = "open-api";
1513
public static final String STREAM_PATH = "open-api-stream";
1614

1715
private static final Collection<String> rootPaths = Arrays.asList(STREAM_PATH);

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

Lines changed: 0 additions & 14 deletions
This file was deleted.

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

Lines changed: 0 additions & 14 deletions
This file was deleted.
Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
1-
io.quarkiverse.openapi.generator.deployment.codegen.OpenApiGeneratorJsonCodeGen
2-
io.quarkiverse.openapi.generator.deployment.codegen.OpenApiGeneratorYamlCodeGen
3-
io.quarkiverse.openapi.generator.deployment.codegen.OpenApiGeneratorYmlCodeGen
1+
io.quarkiverse.openapi.generator.deployment.codegen.OpenApiGeneratorCodeGen
42
io.quarkiverse.openapi.generator.deployment.codegen.OpenApiGeneratorStreamCodeGen

client/integration-tests/circuit-breaker/src/test/java/io/quarkiverse/openapi/generator/it/circuit/breaker/SimpleOpenApiTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class SimpleOpenApiTest {
2424

2525
@Test
2626
void circuitBreaker() throws IOException {
27-
Path generatedRestClient = Paths.get("target", "generated-sources", "open-api-json", "org", "acme",
27+
Path generatedRestClient = Paths.get("target", "generated-sources", "open-api", "org", "acme",
2828
"openapi", "simple", "api", "DefaultApi.java");
2929

3030
assertThat(generatedRestClient)

0 commit comments

Comments
 (0)