Skip to content

Commit 10eb296

Browse files
author
Michael Sonnleitner
committed
SUPPORTED_EXTENSIONS refactored for better use
1 parent 9a22578 commit 10eb296

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import java.nio.file.Files;
99
import java.util.ArrayList;
1010
import java.util.List;
11-
import java.util.Set;
1211

1312
import org.jboss.logging.Logger;
1413

@@ -19,8 +18,6 @@
1918
public class GAVCoordinateOpenApiSpecInputProvider implements OpenApiSpecInputProvider {
2019
private static final Logger LOG = Logger.getLogger(GAVCoordinateOpenApiSpecInputProvider.class);
2120

22-
private static final Set<String> SUPPORTED_EXTENSIONS = Set.of("yaml", "yml", "json");
23-
2421
@Override
2522
public List<SpecInputModel> read(CodeGenContext context) throws CodeGenException {
2623
if (!context.config().getOptionalValue(getGlobalConfigName(GAV_SCANNING), Boolean.class)
@@ -34,7 +31,7 @@ public List<SpecInputModel> read(CodeGenContext context) throws CodeGenException
3431
.orElse(List.of());
3532

3633
List<ResolvedDependency> yamlDependencies = context.applicationModel().getDependencies().stream()
37-
.filter(rd -> SUPPORTED_EXTENSIONS.contains(rd.getType()))
34+
.filter(rd -> OpenApiGeneratorCodeGenBase.SUPPORTED_EXTENSIONS.contains(rd.getType()))
3835
.filter(rd -> !gavsToExclude.contains(rd.getKey().toGacString()))
3936
.toList();
4037

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ public String providerId() {
88

99
@Override
1010
public String[] inputExtensions() {
11-
return new String[] { JSON, YAML, YML };
11+
return SUPPORTED_EXTENSIONS_WITH_LEADING_DOT.toArray(new String[0]);
1212
}
1313
}

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import java.util.List;
2727
import java.util.Map;
2828
import java.util.Optional;
29+
import java.util.Set;
2930
import java.util.function.Predicate;
3031
import java.util.stream.Collectors;
3132
import java.util.stream.Stream;
@@ -56,9 +57,12 @@
5657
*/
5758
public abstract class OpenApiGeneratorCodeGenBase implements CodeGenProvider {
5859

59-
static final String YAML = ".yaml";
60-
static final String YML = ".yml";
61-
static final String JSON = ".json";
60+
static final String YAML = "yaml";
61+
static final String YML = "yml";
62+
static final String JSON = "json";
63+
64+
static final Set<String> SUPPORTED_EXTENSIONS = Set.of(YAML, YML, JSON);
65+
static final Set<String> SUPPORTED_EXTENSIONS_WITH_LEADING_DOT = Set.of("." + YAML, "." + YML, "." + JSON);
6266

6367
private static final String DEFAULT_PACKAGE = "org.openapi.quarkus";
6468
private static final String CONFIG_KEY_PROPERTY = "config-key";

0 commit comments

Comments
 (0)