Skip to content

Commit 82f6351

Browse files
gastaldigastaldi
authored
Merge pull request #30983 from HerrDerb/harmonize-capability-strings
2 parents 66b4938 + ebcbd16 commit 82f6351

File tree

2 files changed

+95
-54
lines changed

2 files changed

+95
-54
lines changed

‎core/deployment/src/main/java/io/quarkus/deployment/Capability.java

+54-54
Original file line numberDiff line numberDiff line change
@@ -5,47 +5,47 @@
55
*/
66
public interface Capability {
77

8-
String QUARKUS_PREFIX = "io.quarkus.";
8+
String QUARKUS_PREFIX = "io.quarkus";
99

1010
/**
1111
* A datasource connection pool implementation
1212
*/
13-
String AGROAL = QUARKUS_PREFIX + "agroal";
13+
String AGROAL = QUARKUS_PREFIX + ".agroal";
1414

1515
/**
1616
* JSR 365 compatible contexts and dependency injection
1717
*/
18-
String CDI = QUARKUS_PREFIX + "cdi";
18+
String CDI = QUARKUS_PREFIX + ".cdi";
1919

20-
String CONFIG_YAML = QUARKUS_PREFIX + "config.yaml";
20+
String CONFIG_YAML = QUARKUS_PREFIX + ".config.yaml";
2121

2222
/**
2323
* Java Servlet API
2424
*/
25-
String SERVLET = QUARKUS_PREFIX + "servlet";
25+
String SERVLET = QUARKUS_PREFIX + ".servlet";
2626

2727
/**
2828
* Java Transaction API (JTA)
2929
*/
30-
String TRANSACTIONS = QUARKUS_PREFIX + "transactions";
30+
String TRANSACTIONS = QUARKUS_PREFIX + ".transactions";
3131

32-
String LRA_PARTICIPANT = QUARKUS_PREFIX + "lra.participant";
32+
String LRA_PARTICIPANT = QUARKUS_PREFIX + ".lra.participant";
3333

34-
String JACKSON = QUARKUS_PREFIX + "jackson";
34+
String JACKSON = QUARKUS_PREFIX + ".jackson";
3535

36-
String KOTLIN = QUARKUS_PREFIX + "kotlin";
36+
String KOTLIN = QUARKUS_PREFIX + ".kotlin";
3737

38-
String JSONB = QUARKUS_PREFIX + "jsonb";
38+
String JSONB = QUARKUS_PREFIX + ".jsonb";
3939

40-
String HAL = QUARKUS_PREFIX + "hal";
40+
String HAL = QUARKUS_PREFIX + ".hal";
4141

42-
String REST = QUARKUS_PREFIX + "rest";
42+
String REST = QUARKUS_PREFIX + ".rest";
4343
String REST_CLIENT = REST + ".client";
4444
String REST_CLIENT_REACTIVE = REST_CLIENT + ".reactive";
4545
String REST_JACKSON = REST + ".jackson";
4646
String REST_JSONB = REST + ".jsonb";
4747

48-
String RESTEASY = QUARKUS_PREFIX + "resteasy";
48+
String RESTEASY = QUARKUS_PREFIX + ".resteasy";
4949
String RESTEASY_JSON = RESTEASY + ".json";
5050

5151
String RESTEASY_JSON_JACKSON = RESTEASY_JSON + ".jackson";
@@ -60,86 +60,86 @@ public interface Capability {
6060
String RESTEASY_REACTIVE_JSON_JACKSON = RESTEASY_REACTIVE_JSON + ".jackson";
6161
String RESTEASY_REACTIVE_JSON_JSONB = RESTEASY_REACTIVE_JSON + ".jsonb";
6262

63-
String JWT = QUARKUS_PREFIX + "jwt";
63+
String JWT = QUARKUS_PREFIX + ".jwt";
6464

6565
/**
6666
* @deprecated Tika has been moved to the Quarkiverse
6767
*/
6868
@Deprecated
69-
String TIKA = QUARKUS_PREFIX + "tika";
69+
String TIKA = QUARKUS_PREFIX + ".tika";
7070

71-
String MONGODB_CLIENT = QUARKUS_PREFIX + "mongodb-client";
72-
String MONGODB_PANACHE = QUARKUS_PREFIX + "mongodb.panache";
71+
String MONGODB_CLIENT = QUARKUS_PREFIX + ".mongodb-client";
72+
String MONGODB_PANACHE = QUARKUS_PREFIX + ".mongodb.panache";
7373
String MONGODB_PANACHE_KOTLIN = MONGODB_PANACHE + ".kotlin";
7474

75-
String ELASTICSEARCH_REST_HIGH_LEVEL_CLIENT = QUARKUS_PREFIX + "elasticsearch-rest-high-level-client";
75+
String ELASTICSEARCH_REST_HIGH_LEVEL_CLIENT = QUARKUS_PREFIX + ".elasticsearch-rest-high-level-client";
7676

77-
String FLYWAY = QUARKUS_PREFIX + "flyway";
78-
String LIQUIBASE = QUARKUS_PREFIX + "liquibase";
77+
String FLYWAY = QUARKUS_PREFIX + ".flyway";
78+
String LIQUIBASE = QUARKUS_PREFIX + ".liquibase";
7979

80-
String SECURITY = QUARKUS_PREFIX + "security";
80+
String SECURITY = QUARKUS_PREFIX + ".security";
8181
String SECURITY_ELYTRON_OAUTH2 = SECURITY + ".elytron.oauth2";
8282
String SECURITY_ELYTRON_JDBC = SECURITY + ".elytron.jdbc";
8383
String SECURITY_ELYTRON_LDAP = SECURITY + ".elytron.ldap";
8484
String SECURITY_JPA = SECURITY + ".jpa";
8585

86-
String QUARTZ = QUARKUS_PREFIX + "quartz";
87-
String KUBERNETES_SERVICE_BINDING = QUARKUS_PREFIX + "kubernetes.service.binding";
88-
String KUBERNETES_CLIENT = QUARKUS_PREFIX + "kubernetes.client";
86+
String QUARTZ = QUARKUS_PREFIX + ".quartz";
87+
String KUBERNETES_SERVICE_BINDING = QUARKUS_PREFIX + ".kubernetes.service.binding";
88+
String KUBERNETES_CLIENT = QUARKUS_PREFIX + ".kubernetes.client";
8989

9090
/**
9191
* @deprecated
9292
* @see io.quarkus.deployment.metrics.MetricsCapabilityBuildItem
9393
*/
94-
String METRICS = QUARKUS_PREFIX + "metrics";
95-
String CONTAINER_IMAGE_JIB = QUARKUS_PREFIX + "container.image.jib";
96-
String CONTAINER_IMAGE_DOCKER = QUARKUS_PREFIX + "container.image.docker";
97-
String CONTAINER_IMAGE_S2I = QUARKUS_PREFIX + "container.image.s2i";
98-
String CONTAINER_IMAGE_OPENSHIFT = QUARKUS_PREFIX + "container.image.openshift";
99-
String CONTAINER_IMAGE_BUILDPACK = QUARKUS_PREFIX + "container.image.buildpack";
100-
String HIBERNATE_ORM = QUARKUS_PREFIX + "hibernate.orm";
101-
String HIBERNATE_ENVERS = QUARKUS_PREFIX + "hibernate.envers";
102-
String HIBERNATE_REACTIVE = QUARKUS_PREFIX + "hibernate.reactive";
103-
String HIBERNATE_VALIDATOR = QUARKUS_PREFIX + "hibernate.validator";
104-
String OPENTELEMETRY_TRACER = QUARKUS_PREFIX + "opentelemetry.tracer";
105-
106-
String OPENSHIFT = QUARKUS_PREFIX + "openshift";
94+
String METRICS = QUARKUS_PREFIX + ".metrics";
95+
String CONTAINER_IMAGE_JIB = QUARKUS_PREFIX + ".container.image.jib";
96+
String CONTAINER_IMAGE_DOCKER = QUARKUS_PREFIX + ".container.image.docker";
97+
String CONTAINER_IMAGE_S2I = QUARKUS_PREFIX + ".container.image.s2i";
98+
String CONTAINER_IMAGE_OPENSHIFT = QUARKUS_PREFIX + ".container.image.openshift";
99+
String CONTAINER_IMAGE_BUILDPACK = QUARKUS_PREFIX + ".container.image.buildpack";
100+
String HIBERNATE_ORM = QUARKUS_PREFIX + ".hibernate.orm";
101+
String HIBERNATE_ENVERS = QUARKUS_PREFIX + ".hibernate.envers";
102+
String HIBERNATE_REACTIVE = QUARKUS_PREFIX + ".hibernate.reactive";
103+
String HIBERNATE_VALIDATOR = QUARKUS_PREFIX + ".hibernate.validator";
104+
String OPENTELEMETRY_TRACER = QUARKUS_PREFIX + ".opentelemetry.tracer";
105+
106+
String OPENSHIFT = QUARKUS_PREFIX + ".openshift";
107107
String OPENSHIFT_CLIENT = OPENSHIFT + ".client";
108108

109-
String OIDC = QUARKUS_PREFIX + "oidc";
109+
String OIDC = QUARKUS_PREFIX + ".oidc";
110110

111111
/**
112112
* Presence of an io.opentracing tracer (for example, Jaeger).
113113
*/
114-
String OPENTRACING = QUARKUS_PREFIX + "opentracing";
114+
String OPENTRACING = QUARKUS_PREFIX + ".opentracing";
115115
/**
116116
* Presence of SmallRye OpenTracing.
117117
*/
118-
String SMALLRYE_OPENTRACING = QUARKUS_PREFIX + "smallrye.opentracing";
119-
String SMALLRYE_HEALTH = QUARKUS_PREFIX + "smallrye.health";
120-
String SMALLRYE_OPENAPI = QUARKUS_PREFIX + "smallrye.openapi";
121-
String SMALLRYE_GRAPHQL = QUARKUS_PREFIX + "smallrye.graphql";
122-
String SMALLRYE_FAULT_TOLERANCE = QUARKUS_PREFIX + "smallrye.faulttolerance";
118+
String SMALLRYE_OPENTRACING = QUARKUS_PREFIX + ".smallrye.opentracing";
119+
String SMALLRYE_HEALTH = QUARKUS_PREFIX + ".smallrye.health";
120+
String SMALLRYE_OPENAPI = QUARKUS_PREFIX + ".smallrye.openapi";
121+
String SMALLRYE_GRAPHQL = QUARKUS_PREFIX + ".smallrye.graphql";
122+
String SMALLRYE_FAULT_TOLERANCE = QUARKUS_PREFIX + ".smallrye.faulttolerance";
123123

124-
String SPRING_WEB = QUARKUS_PREFIX + "spring.web";
124+
String SPRING_WEB = QUARKUS_PREFIX + ".spring.web";
125125

126-
String VERTX = QUARKUS_PREFIX + "vertx";
126+
String VERTX = QUARKUS_PREFIX + ".vertx";
127127
String VERTX_CORE = VERTX + ".core";
128128
String VERTX_HTTP = VERTX + ".http";
129129

130-
String APICURIO_REGISTRY = QUARKUS_PREFIX + "apicurio.registry";
130+
String APICURIO_REGISTRY = QUARKUS_PREFIX + ".apicurio.registry";
131131
String APICURIO_REGISTRY_AVRO = APICURIO_REGISTRY + ".avro";
132132

133-
String CONFLUENT_REGISTRY = QUARKUS_PREFIX + "confluent.registry";
133+
String CONFLUENT_REGISTRY = QUARKUS_PREFIX + ".confluent.registry";
134134
String CONFLUENT_REGISTRY_AVRO = CONFLUENT_REGISTRY + ".avro";
135135

136-
String PICOCLI = QUARKUS_PREFIX + "picocli";
136+
String PICOCLI = QUARKUS_PREFIX + ".picocli";
137137

138-
String KAFKA = QUARKUS_PREFIX + "kafka";
138+
String KAFKA = QUARKUS_PREFIX + ".kafka";
139139

140-
String SMALLRYE_REACTIVE_MESSAGING = QUARKUS_PREFIX + "smallrye.reactive.messaging";
141-
String REDIS_CLIENT = QUARKUS_PREFIX + "redis";
140+
String SMALLRYE_REACTIVE_MESSAGING = QUARKUS_PREFIX + ".smallrye.reactive.messaging";
141+
String REDIS_CLIENT = QUARKUS_PREFIX + ".redis";
142142

143-
String CACHE = QUARKUS_PREFIX + "cache";
144-
String JDBC_ORACLE = QUARKUS_PREFIX + "jdbc.oracle";
143+
String CACHE = QUARKUS_PREFIX + ".cache";
144+
String JDBC_ORACLE = QUARKUS_PREFIX + ".jdbc.oracle";
145145
}

‎core/deployment/src/test/java/io/quarkus/deployment/CapabilityTest.java

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
package io.quarkus.deployment;
2+
3+
import static java.util.function.Predicate.not;
4+
import static org.assertj.core.api.Assertions.assertThat;
5+
import static org.junit.jupiter.api.Assertions.fail;
6+
7+
import java.lang.reflect.Field;
8+
import java.lang.reflect.Modifier;
9+
import java.util.stream.Stream;
10+
11+
import org.junit.jupiter.params.ParameterizedTest;
12+
import org.junit.jupiter.params.provider.Arguments;
13+
import org.junit.jupiter.params.provider.MethodSource;
14+
15+
public class CapabilityTest {
16+
private static Stream<Arguments> capabilityFields() {
17+
Field[] declaredFields = Capability.class.getDeclaredFields();
18+
return Stream.of(declaredFields)
19+
.filter(field -> Modifier.isStatic(field.getModifiers()))
20+
.filter(field -> field.getType().equals(String.class))
21+
.map(CapabilityTest::getString)
22+
.filter(not(Capability.QUARKUS_PREFIX::equals))
23+
.map(value -> Arguments.of(value));
24+
}
25+
26+
@ParameterizedTest
27+
@MethodSource("capabilityFields")
28+
void validateCapabilityString(String capabilityName) {
29+
assertThat(capabilityName).startsWith(Capability.QUARKUS_PREFIX + ".");
30+
assertThat(capabilityName).doesNotContain("..");
31+
}
32+
33+
private static String getString(Field field) {
34+
try {
35+
return (String) field.get(null);
36+
} catch (IllegalArgumentException | IllegalAccessException e) {
37+
fail(e);
38+
return "";
39+
}
40+
}
41+
}

0 commit comments

Comments
 (0)