Skip to content

Commit d86f6d4

Browse files
carlesarnalcarlesarnal
committed
Rename missing properties
1 parent d516118 commit d86f6d4

30 files changed

+78
-78
lines changed

‎app/src/main/java/io/apicurio/registry/ImportLifecycleBean.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public class ImportLifecycleBean {
3333
@Current
3434
RegistryStorage storage;
3535

36-
@ConfigProperty(name = "registry.import.url")
36+
@ConfigProperty(name = "apicurio.import.url")
3737
@Info(category = "import", description = "The import URL", availableSince = "2.1.0.Final")
3838
Optional<URL> registryImportUrlProp;
3939

‎app/src/main/java/io/apicurio/registry/auth/AuthConfig.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -24,26 +24,26 @@ public class AuthConfig {
2424
@Info(category = "auth", description = "Enable role based authorization", availableSince = "2.1.0.Final")
2525
boolean roleBasedAuthorizationEnabled;
2626

27-
@Dynamic(label = "Artifact owner-only authorization", description = "When selected, Service Registry allows only the artifact owner (creator) to modify an artifact.", requires = "registry.auth.enabled=true")
27+
@Dynamic(label = "Artifact owner-only authorization", description = "When selected, Service Registry allows only the artifact owner (creator) to modify an artifact.", requires = "apicurio.auth.enabled=true")
2828
@ConfigProperty(name = "apicurio.auth.owner-only-authorization", defaultValue = "false")
2929
@Info(category = "auth", description = "Artifact owner-only authorization", availableSince = "2.0.0.Final")
3030
Supplier<Boolean> ownerOnlyAuthorizationEnabled;
3131

3232
@Dynamic(label = "Artifact group owner-only authorization", description = "When selected, Service Registry allows only the artifact group owner (creator) to modify an artifact group.", requires = {
33-
"registry.auth.enabled=true",
33+
"apicurio.auth.enabled=true",
3434
"apicurio.auth.owner-only-authorization=true"
3535
})
3636
@ConfigProperty(name = "apicurio.auth.owner-only-authorization.limit-group-access", defaultValue = "false")
3737
@Info(category = "auth", description = "Artifact group owner-only authorization", availableSince = "2.1.0.Final")
3838
Supplier<Boolean> ownerOnlyAuthorizationLimitGroupAccess;
3939

40-
@Dynamic(label = "Anonymous read access", description = "When selected, requests from anonymous users (requests without any credentials) are granted read-only access.", requires = "registry.auth.enabled=true")
40+
@Dynamic(label = "Anonymous read access", description = "When selected, requests from anonymous users (requests without any credentials) are granted read-only access.", requires = "apicurio.auth.enabled=true")
4141
@ConfigProperty(name = "apicurio.auth.anonymous-read-access.enabled", defaultValue = "false")
4242
@Info(category = "auth", description = "Anonymous read access", availableSince = "2.1.0.Final")
4343
Supplier<Boolean> anonymousReadAccessEnabled;
4444

4545
@Dynamic(label = "Authenticated read access", description = "When selected, requests from any authenticated user are granted at least read-only access.", requires = {
46-
"registry.auth.enabled=true",
46+
"apicurio.auth.enabled=true",
4747
"apicurio.auth.role-based-authorization=true"
4848
})
4949
@ConfigProperty(name = "apicurio.auth.authenticated-read-access.enabled", defaultValue = "false")

‎app/src/main/java/io/apicurio/registry/events/http/HttpEventSinkConfiguration.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public class HttpEventSinkConfiguration {
2121
Optional<String> ksink;
2222

2323
@Produces
24-
public HttpSinksConfiguration sinkConfig(@RegistryProperties(value = {"registry.events.sink"}) Properties properties) {
24+
public HttpSinksConfiguration sinkConfig(@RegistryProperties(value = {"apicurio.events.sink"}) Properties properties) {
2525
List<HttpSinkConfiguration> httpSinks = properties.stringPropertyNames().stream()
2626
.map(key -> new HttpSinkConfiguration(key, properties.getProperty(key)))
2727
.collect(Collectors.toList());

‎app/src/main/java/io/apicurio/registry/events/kafka/KafkaEventSink.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,19 +30,19 @@ public class KafkaEventSink implements EventSink {
3030

3131
@Inject
3232
@RegistryProperties(
33-
value = {"registry.events.kafka.config"},
33+
value = {"apicurio.events.kafka.config"},
3434
empties = {"ssl.endpoint.identification.algorithm="}
3535
)
3636
Properties producerProperties;
3737

3838
private ProducerActions<String, byte[]> producer;
3939
private Integer partition;
4040

41-
@ConfigProperty(name = "registry.events.kafka.topic")
41+
@ConfigProperty(name = "apicurio.events.kafka.topic")
4242
@Info(category = "kafka", description = "Events Kafka topic", availableSince = "2.0.0.Final")
4343
Optional<String> eventsTopic;
4444

45-
@ConfigProperty(name = "registry.events.kafka.topic-partition")
45+
@ConfigProperty(name = "apicurio.events.kafka.topic-partition")
4646
@Info(category = "kafka", description = "Events Kafka topic partition", availableSince = "2.0.0.Final")
4747
Optional<Integer> eventsTopicPartition;
4848

‎app/src/main/java/io/apicurio/registry/limits/RegistryLimitsConfigurationProducer.java

+12-12
Original file line numberDiff line numberDiff line change
@@ -15,58 +15,58 @@ public class RegistryLimitsConfigurationProducer {
1515
//All limits to -1 , which means by default all limits are disabled
1616

1717
@Inject
18-
@ConfigProperty(defaultValue = "-1", name = "registry.limits.config.max-total-schemas")
18+
@ConfigProperty(defaultValue = "-1", name = "apicurio.limits.config.max-total-schemas")
1919
@Info(category = "limits", description = "Max total schemas", availableSince = "2.1.0.Final")
2020
Long defaultMaxTotalSchemas;
2121

2222
@Inject
23-
@ConfigProperty(defaultValue = "-1", name = "registry.limits.config.max-schema-size-bytes")
23+
@ConfigProperty(defaultValue = "-1", name = "apicurio.limits.config.max-schema-size-bytes")
2424
@Info(category = "limits", description = "Max schema size (bytes)", availableSince = "2.2.3.Final")
2525
Long defaultMaxSchemaSizeBytes;
2626

2727
@Inject
28-
@ConfigProperty(defaultValue = "-1", name = "registry.limits.config.max-artifacts")
28+
@ConfigProperty(defaultValue = "-1", name = "apicurio.limits.config.max-artifacts")
2929
@Info(category = "limits", description = "Max artifacts", availableSince = "2.1.0.Final")
3030
Long defaultMaxArtifacts;
3131
@Inject
32-
@ConfigProperty(defaultValue = "-1", name = "registry.limits.config.max-versions-per-artifact")
32+
@ConfigProperty(defaultValue = "-1", name = "apicurio.limits.config.max-versions-per-artifact")
3333
@Info(category = "limits", description = "Max versions per artifacts", availableSince = "2.1.0.Final")
3434
Long defaultMaxVersionsPerArtifact;
3535

3636
//TODO content size
3737
@Inject
38-
@ConfigProperty(defaultValue = "-1", name = "registry.limits.config.max-artifact-properties")
38+
@ConfigProperty(defaultValue = "-1", name = "apicurio.limits.config.max-artifact-properties")
3939
@Info(category = "limits", description = "Max artifact properties", availableSince = "2.1.0.Final")
4040
Long defaultMaxArtifactProperties;
4141
@Inject
42-
@ConfigProperty(defaultValue = "-1", name = "registry.limits.config.max-property-key-size")
42+
@ConfigProperty(defaultValue = "-1", name = "apicurio.limits.config.max-property-key-size")
4343
@Info(category = "limits", description = "Max artifact property key size", availableSince = "2.1.0.Final")
4444
Long defaultMaxPropertyKeyBytesSize;
4545
@Inject
46-
@ConfigProperty(defaultValue = "-1", name = "registry.limits.config.max-property-value-size")
46+
@ConfigProperty(defaultValue = "-1", name = "apicurio.limits.config.max-property-value-size")
4747
@Info(category = "limits", description = "Max artifact property value size", availableSince = "2.1.0.Final")
4848
Long defaultMaxPropertyValueBytesSize;
4949

5050
@Inject
51-
@ConfigProperty(defaultValue = "-1", name = "registry.limits.config.max-artifact-labels")
51+
@ConfigProperty(defaultValue = "-1", name = "apicurio.limits.config.max-artifact-labels")
5252
@Info(category = "limits", description = "Max artifact labels", availableSince = "2.2.3.Final")
5353
Long defaultMaxArtifactLabels;
5454
@Inject
55-
@ConfigProperty(defaultValue = "-1", name = "registry.limits.config.max-label-size")
55+
@ConfigProperty(defaultValue = "-1", name = "apicurio.limits.config.max-label-size")
5656
@Info(category = "limits", description = "Max artifact label size", availableSince = "2.1.0.Final")
5757
Long defaultMaxLabelBytesSize;
5858

5959
@Inject
60-
@ConfigProperty(defaultValue = "-1", name = "registry.limits.config.max-name-length")
60+
@ConfigProperty(defaultValue = "-1", name = "apicurio.limits.config.max-name-length")
6161
@Info(category = "limits", description = "Max artifact name length", availableSince = "2.1.0.Final")
6262
Long defaultMaxNameLength;
6363
@Inject
64-
@ConfigProperty(defaultValue = "-1", name = "registry.limits.config.max-description-length")
64+
@ConfigProperty(defaultValue = "-1", name = "apicurio.limits.config.max-description-length")
6565
@Info(category = "limits", description = "Max artifact description length", availableSince = "2.1.0.Final")
6666
Long defaultMaxDescriptionLength;
6767

6868
@Inject
69-
@ConfigProperty(defaultValue = "-1", name = "registry.limits.config.max-requests-per-second")
69+
@ConfigProperty(defaultValue = "-1", name = "apicurio.limits.config.max-requests-per-second")
7070
@Info(category = "limits", description = "Max artifact requests per second", availableSince = "2.2.3.Final")
7171
Long defaultMaxRequestsPerSecond;
7272

‎app/src/main/java/io/apicurio/registry/rest/v2/AbstractResourceImpl.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public abstract class AbstractResourceImpl {
4242
@Context
4343
HttpServletRequest request;
4444

45-
@ConfigProperty(name = "registry.apis.v2.base-href", defaultValue = "_")
45+
@ConfigProperty(name = "apicurio.apis.v2.base-href", defaultValue = "_")
4646
@Info(category = "api", description = "API base href (URI)", availableSince = "2.5.0.Final")
4747
String apiBaseHref;
4848

‎app/src/main/java/io/apicurio/registry/rest/v3/AbstractResourceImpl.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public abstract class AbstractResourceImpl {
4242
@Context
4343
HttpServletRequest request;
4444

45-
@ConfigProperty(name = "registry.apis.v3.base-href", defaultValue = "_")
45+
@ConfigProperty(name = "apicurio.apis.v3.base-href", defaultValue = "_")
4646
@Info(category = "api", description = "API base href (URI)", availableSince = "2.5.0.Final")
4747
String apiBaseHref;
4848

‎app/src/main/java/io/apicurio/registry/rules/RulesConfiguration.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public class RulesConfiguration {
1111

1212
@Produces
1313
@ApplicationScoped
14-
public RulesProperties rulesProperties(@RegistryProperties(value = {"registry.rules.global"}) Properties properties) {
14+
public RulesProperties rulesProperties(@RegistryProperties(value = {"apicurio.rules.global"}) Properties properties) {
1515
return new RulesPropertiesImpl(properties);
1616
}
1717

‎app/src/main/java/io/apicurio/registry/services/DisabledApisMatcherService.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public class DisabledApisMatcherService {
2525
private final List<Pattern> disabledPatternsList = new ArrayList<>();
2626

2727
@Inject
28-
@ConfigProperty(name = "registry.disable.apis")
28+
@ConfigProperty(name = "apicurio.disable.apis")
2929
@Info(category = "api", description = "Disable APIs", availableSince = "2.0.0.Final")
3030
Optional<List<String>> disableRegexps;
3131

‎app/src/main/java/io/apicurio/registry/storage/decorator/ReadOnlyRegistryStorageDecorator.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
@ApplicationScoped
4848
public class ReadOnlyRegistryStorageDecorator extends RegistryStorageDecoratorReadOnlyBase implements RegistryStorageDecorator {
4949

50-
public static final String READ_ONLY_MODE_ENABLED_PROPERTY_NAME = "registry.storage.read-only";
50+
public static final String READ_ONLY_MODE_ENABLED_PROPERTY_NAME = "apicurio.storage.read-only";
5151

5252

5353
@Dynamic(label = "Storage read-only mode", description = "When selected, " +

‎app/src/main/java/io/apicurio/registry/storage/impl/gitops/GitOpsConfigProperties.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public class GitOpsConfigProperties {
1414
@Getter
1515
String registryId;
1616

17-
@ConfigProperty(name = "registry.gitops.workdir", defaultValue = "/tmp/apicurio-registry-gitops")
17+
@ConfigProperty(name = "apicurio.gitops.workdir", defaultValue = "/tmp/apicurio-registry-gitops")
1818
@Info(category = "gitops", description = "Path to GitOps working directory, which is used to store the local git repository.", availableSince = "3.0.0")
1919
@Getter
2020
String workDir;

‎app/src/main/java/io/apicurio/registry/storage/impl/kafkasql/KafkaSqlFactory.java

+12-12
Original file line numberDiff line numberDiff line change
@@ -52,27 +52,27 @@ public class KafkaSqlFactory {
5252
Integer pollTimeout;
5353

5454
@Inject
55-
@ConfigProperty(name = "registry.kafkasql.coordinator.response-timeout", defaultValue = "30000")
55+
@ConfigProperty(name = "apicurio.kafkasql.coordinator.response-timeout", defaultValue = "30000")
5656
@Info(category = "storage", description = "Kafka sql storage coordinator response timeout")
5757
Integer responseTimeout;
5858

5959
@Inject
6060
@RegistryProperties(
61-
value = {"registry.kafka.common", "registry.kafkasql.producer"},
61+
value = {"apicurio.kafka.common", "apicurio.kafkasql.producer"},
6262
empties = {"ssl.endpoint.identification.algorithm="}
6363
)
6464
Properties producerProperties;
6565

6666
@Inject
6767
@RegistryProperties(
68-
value = {"registry.kafka.common", "registry.kafkasql.consumer"},
68+
value = {"apicurio.kafka.common", "apicurio.kafkasql.consumer"},
6969
empties = {"ssl.endpoint.identification.algorithm="}
7070
)
7171
Properties consumerProperties;
7272

7373
@Inject
7474
@RegistryProperties(
75-
value = {"registry.kafka.common", "registry.kafkasql.admin"},
75+
value = {"apicurio.kafka.common", "apicurio.kafkasql.admin"},
7676
empties = {"ssl.endpoint.identification.algorithm="}
7777
)
7878
Properties adminProperties;
@@ -81,7 +81,7 @@ public class KafkaSqlFactory {
8181
@Info(category = "storage", description = "Kafka sql storage sasl enabled")
8282
boolean saslEnabled;
8383

84-
@ConfigProperty(name = "registry.kafkasql.security.protocol", defaultValue = "")
84+
@ConfigProperty(name = "apicurio.kafkasql.security.protocol", defaultValue = "")
8585
@Info(category = "storage", description = "Kafka sql storage security protocol")
8686
Optional<String> protocol;
8787

@@ -105,31 +105,31 @@ public class KafkaSqlFactory {
105105
@Info(category = "storage", description = "Kafka sql storage sasl login callback handler")
106106
String loginCallbackHandler;
107107

108-
@ConfigProperty(name = "registry.kafkasql.security.ssl.truststore.location")
108+
@ConfigProperty(name = "apicurio.kafkasql.security.ssl.truststore.location")
109109
@Info(category = "storage", description = "Kafka sql storage ssl truststore location")
110110
Optional<String> trustStoreLocation;
111111

112-
@ConfigProperty(name = "registry.kafkasql.security.ssl.truststore.type")
112+
@ConfigProperty(name = "apicurio.kafkasql.security.ssl.truststore.type")
113113
@Info(category = "storage", description = "Kafka sql storage ssl truststore type")
114114
Optional<String> trustStoreType;
115115

116-
@ConfigProperty(name = "registry.kafkasql.ssl.truststore.password")
116+
@ConfigProperty(name = "apicurio.kafkasql.ssl.truststore.password")
117117
@Info(category = "storage", description = "Kafka sql storage ssl truststore password")
118118
Optional<String> trustStorePassword;
119119

120-
@ConfigProperty(name = "registry.kafkasql.ssl.keystore.location")
120+
@ConfigProperty(name = "apicurio.kafkasql.ssl.keystore.location")
121121
@Info(category = "storage", description = "Kafka sql storage ssl keystore location")
122122
Optional<String> keyStoreLocation;
123123

124-
@ConfigProperty(name = "registry.kafkasql.ssl.keystore.type")
124+
@ConfigProperty(name = "apicurio.kafkasql.ssl.keystore.type")
125125
@Info(category = "storage", description = "Kafka sql storage ssl keystore type")
126126
Optional<String> keyStoreType;
127127

128-
@ConfigProperty(name = "registry.kafkasql.ssl.keystore.password")
128+
@ConfigProperty(name = "apicurio.kafkasql.ssl.keystore.password")
129129
@Info(category = "storage", description = "Kafka sql storage ssl keystore password")
130130
Optional<String> keyStorePassword;
131131

132-
@ConfigProperty(name = "registry.kafkasql.ssl.key.password")
132+
@ConfigProperty(name = "apicurio.kafkasql.ssl.key.password")
133133
@Info(category = "storage", description = "Kafka sql storage ssl key password")
134134
Optional<String> keyPassword;
135135

‎app/src/main/java/io/apicurio/registry/ui/URLUtil.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@
1818
@ApplicationScoped
1919
public class URLUtil {
2020

21-
@ConfigProperty(name = "registry.url.override.host")
21+
@ConfigProperty(name = "apicurio.url.override.host")
2222
@Info(category = "redirects", description = "Override the hostname used for generating externally-accessible URLs. " +
2323
"The host and port overrides are useful when deploying Registry with HTTPS passthrough Ingress or Route. " +
2424
"In cases like these, the request URL (and port) that is then re-used for redirection " +
2525
"does not belong to actual external URL used by the client, because the request is proxied. " +
2626
"The redirection then fails because the target URL is not reachable.", availableSince = "2.5.0.Final")
2727
Optional<String> urlOverrideHost;
2828

29-
@ConfigProperty(name = "registry.url.override.port")
29+
@ConfigProperty(name = "apicurio.url.override.port")
3030
@Info(category = "redirects", description = "Override the port used for generating externally-accessible URLs.", availableSince = "2.5.0.Final")
3131
Optional<Integer> urlOverridePort;
3232

‎app/src/main/java/io/apicurio/registry/ui/UserInterfaceConfigProperties.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
@Singleton
99
public class UserInterfaceConfigProperties {
1010

11-
@ConfigProperty(name = "registry.ui.contextPath", defaultValue = "/")
11+
@ConfigProperty(name = "apicurio.ui.contextPath", defaultValue = "/")
1212
@Info(category = "ui", description = "Context path of the UI", availableSince = "3.0.0")
1313
public String contextPath;
14-
@ConfigProperty(name = "registry.ui.navPrefixPath", defaultValue = "/")
14+
@ConfigProperty(name = "apicurio.ui.navPrefixPath", defaultValue = "/")
1515
@Info(category = "ui", description = "Navigation prefix for all UI paths", availableSince = "3.0.0")
1616
public String navPrefixPath;
17-
@ConfigProperty(name = "registry.ui.docsUrl", defaultValue = "/docs/")
17+
@ConfigProperty(name = "apicurio.ui.docsUrl", defaultValue = "/docs/")
1818
@Info(category = "ui", description = "URL of the Documentation component", availableSince = "3.0.0")
1919
public String docsUrl;
2020

@@ -29,13 +29,13 @@ public class UserInterfaceConfigProperties {
2929
public String authOidcClientId;
3030

3131

32-
@ConfigProperty(name = "registry.ui.features.readOnly", defaultValue = "false")
32+
@ConfigProperty(name = "apicurio.ui.features.readOnly", defaultValue = "false")
3333
@Info(category = "ui", description = "Enabled to set the UI to read-only mode", availableSince = "3.0.0")
3434
public String featureReadOnly;
35-
@ConfigProperty(name = "registry.ui.features.breadcrumbs", defaultValue = "true")
35+
@ConfigProperty(name = "apicurio.ui.features.breadcrumbs", defaultValue = "true")
3636
@Info(category = "ui", description = "Enabled to show breadcrumbs in the UI", availableSince = "3.0.0")
3737
public String featureBreadcrumbs;
38-
@ConfigProperty(name = "registry.ui.features.settings", defaultValue = "true")
38+
@ConfigProperty(name = "apicurio.ui.features.settings", defaultValue = "true")
3939
@Info(category = "ui", description = "Enabled to show the Settings tab in the UI", availableSince = "3.0.0")
4040
public String featureSettings;
4141

‎app/src/main/java/io/apicurio/registry/util/DtoUtil.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ public static final ArtifactMetaDataDto setEditableMetaDataInArtifact(ArtifactMe
2626
}
2727

2828
public static String registryAuthPropertyToApp(String propertyName) {
29-
return propertyName.replace("registry.auth.", "app.authn.");
29+
return propertyName.replace("apicurio.auth.", "app.authn.");
3030
}
3131

3232
public static String appAuthPropertyToRegistry(String propertyName) {
33-
return propertyName.replace("app.authn.", "registry.auth.");
33+
return propertyName.replace("app.authn.", "apicurio.auth.");
3434
}
3535

3636
}

‎app/src/test/java/io/apicurio/registry/ImportLifecycleBeanTestProfile.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public class ImportLifecycleBeanTestProfile implements QuarkusTestProfile {
99

1010
@Override
1111
public Map<String, String> getConfigOverrides() {
12-
return Collections.singletonMap("registry.import.url", getClass().getResource("rest/v3/export.zip").toExternalForm());
12+
return Collections.singletonMap("apicurio.import.url", getClass().getResource("rest/v3/export.zip").toExternalForm());
1313
}
1414

1515
}

‎app/src/test/java/io/apicurio/registry/events/HttpEventsProfile.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public class HttpEventsProfile implements QuarkusTestProfile {
99

1010
@Override
1111
public Map<String, String> getConfigOverrides() {
12-
return Collections.singletonMap("registry.events.sink.testsink", "http://localhost:8976/");
12+
return Collections.singletonMap("apicurio.events.sink.testsink", "http://localhost:8976/");
1313
}
1414

1515
}

‎app/src/test/java/io/apicurio/registry/events/KafkaEventsTestResource.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public class KafkaEventsTestResource implements QuarkusTestResourceLifecycleMana
1212
*/
1313
@Override
1414
public Map<String, String> start() {
15-
return Collections.singletonMap("registry.events.kafka.topic", KafkaEventsProfile.EVENTS_TOPIC);
15+
return Collections.singletonMap("apicurio.events.kafka.topic", KafkaEventsProfile.EVENTS_TOPIC);
1616
}
1717

1818
/**

0 commit comments

Comments
 (0)