Skip to content

Commit cd0c198

Browse files
authored
Alignment of the capability detection logic (#291)
1 parent d0692e7 commit cd0c198

File tree

1 file changed

+8
-11
lines changed

1 file changed

+8
-11
lines changed

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

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
import io.quarkus.deployment.Capability;
3434
import io.quarkus.deployment.CodeGenContext;
3535
import io.quarkus.deployment.CodeGenProvider;
36-
import io.quarkus.maven.dependency.ResolvedDependency;
3736
import io.smallrye.config.SmallRyeConfig;
3837

3938
/**
@@ -119,20 +118,18 @@ public boolean trigger(CodeGenContext context) throws CodeGenException {
119118
return false;
120119
}
121120

122-
private boolean isJacksonReactiveClientPresent(CodeGenContext context) {
123-
return context.applicationModel().getDependencies().stream()
124-
.anyMatch(this::isJacksonReactiveClient);
121+
private static boolean isJacksonReactiveClientPresent(CodeGenContext context) {
122+
return isExtensionCapabilityPresent(context, Capability.REST_CLIENT_REACTIVE_JACKSON);
125123
}
126124

127-
private boolean isJacksonClassicClientPresent(CodeGenContext context) {
128-
return context.applicationModel().getExtensionCapabilities().stream()
129-
.flatMap(extensionCapability -> extensionCapability.getProvidesCapabilities().stream())
130-
.anyMatch(Capability.RESTEASY_JSON_JACKSON_CLIENT::equals);
125+
private static boolean isJacksonClassicClientPresent(CodeGenContext context) {
126+
return isExtensionCapabilityPresent(context, Capability.RESTEASY_JSON_JACKSON_CLIENT);
131127
}
132128

133-
private boolean isJacksonReactiveClient(ResolvedDependency resolvedDependency) {
134-
return "quarkus-rest-client-reactive-jackson".equals(resolvedDependency.getArtifactId())
135-
&& "io.quarkus".equals(resolvedDependency.getGroupId());
129+
private static boolean isExtensionCapabilityPresent(CodeGenContext context, String capability) {
130+
return context.applicationModel().getExtensionCapabilities().stream()
131+
.flatMap(extensionCapability -> extensionCapability.getProvidesCapabilities().stream())
132+
.anyMatch(capability::equals);
136133
}
137134

138135
// TODO: do not generate if the output dir has generated files and the openapi file has the same checksum of the previous run

0 commit comments

Comments
 (0)