Skip to content

Commit 180aed6

Browse files
committed
Rename MongodbConfig to MongoConfig
1 parent 1c4a6ab commit 180aed6

File tree

13 files changed

+42
-42
lines changed

13 files changed

+42
-42
lines changed

extensions/liquibase/liquibase-mongodb/deployment/src/main/java/io/quarkus/liquibase/mongodb/deployment/LiquibaseMongodbProcessor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
import io.quarkus.liquibase.mongodb.runtime.LiquibaseMongodbRecorder;
5252
import io.quarkus.maven.dependency.ArtifactCoords;
5353
import io.quarkus.maven.dependency.Dependency;
54-
import io.quarkus.mongodb.runtime.MongodbConfig;
54+
import io.quarkus.mongodb.runtime.MongoConfig;
5555
import io.quarkus.paths.PathFilter;
5656
import liquibase.change.Change;
5757
import liquibase.change.DatabaseChangeProperty;
@@ -253,7 +253,7 @@ void createBeans(LiquibaseMongodbRecorder recorder,
253253
.unremovable()
254254
.supplier(recorder.liquibaseSupplier(clientName));
255255

256-
if (MongodbConfig.isDefaultClient(clientName)) {
256+
if (MongoConfig.isDefaultClient(clientName)) {
257257
configurator.addQualifier(Default.class);
258258
} else {
259259
configurator.name(LIQUIBASE_MONGODB_BEAN_NAME_PREFIX + clientName);

extensions/liquibase/liquibase-mongodb/runtime/src/main/java/io/quarkus/liquibase/mongodb/runtime/LiquibaseMongodbBuildTimeConfig.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import java.util.Map;
44

5-
import io.quarkus.mongodb.runtime.MongodbConfig;
5+
import io.quarkus.mongodb.runtime.MongoConfig;
66
import io.quarkus.runtime.annotations.ConfigDocMapKey;
77
import io.quarkus.runtime.annotations.ConfigDocSection;
88
import io.quarkus.runtime.annotations.ConfigPhase;
@@ -25,7 +25,7 @@ public interface LiquibaseMongodbBuildTimeConfig {
2525
@ConfigDocMapKey("client-name")
2626
@ConfigDocSection
2727
@WithParentName
28-
@WithUnnamedKey(MongodbConfig.DEFAULT_CLIENT_NAME)
28+
@WithUnnamedKey(MongoConfig.DEFAULT_CLIENT_NAME)
2929
@WithDefaults
3030
Map<String, LiquibaseMongodbBuildTimeClientConfig> clientConfigs();
3131
}

extensions/liquibase/liquibase-mongodb/runtime/src/main/java/io/quarkus/liquibase/mongodb/runtime/LiquibaseMongodbConfig.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import java.util.Map;
44

5-
import io.quarkus.mongodb.runtime.MongodbConfig;
5+
import io.quarkus.mongodb.runtime.MongoConfig;
66
import io.quarkus.runtime.annotations.ConfigDocMapKey;
77
import io.quarkus.runtime.annotations.ConfigDocSection;
88
import io.quarkus.runtime.annotations.ConfigPhase;
@@ -34,7 +34,7 @@ public interface LiquibaseMongodbConfig {
3434
@ConfigDocMapKey("client-name")
3535
@ConfigDocSection
3636
@WithParentName
37-
@WithUnnamedKey(MongodbConfig.DEFAULT_CLIENT_NAME)
37+
@WithUnnamedKey(MongoConfig.DEFAULT_CLIENT_NAME)
3838
@WithDefaults
3939
Map<String, LiquibaseMongodbClientConfig> clientConfigs();
4040
}

extensions/liquibase/liquibase-mongodb/runtime/src/main/java/io/quarkus/liquibase/mongodb/runtime/LiquibaseMongodbRecorder.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import io.quarkus.arc.InstanceHandle;
1313
import io.quarkus.liquibase.mongodb.LiquibaseMongodbFactory;
1414
import io.quarkus.mongodb.runtime.MongoClientConfig;
15-
import io.quarkus.mongodb.runtime.MongodbConfig;
15+
import io.quarkus.mongodb.runtime.MongoConfig;
1616
import io.quarkus.runtime.RuntimeValue;
1717
import io.quarkus.runtime.annotations.Recorder;
1818
import liquibase.Liquibase;
@@ -21,12 +21,12 @@
2121
public class LiquibaseMongodbRecorder {
2222
private final LiquibaseMongodbBuildTimeConfig buildTimeConfig;
2323
private final RuntimeValue<LiquibaseMongodbConfig> runtimeConfig;
24-
private final RuntimeValue<MongodbConfig> mongodbRuntimeConfig;
24+
private final RuntimeValue<MongoConfig> mongodbRuntimeConfig;
2525

2626
public LiquibaseMongodbRecorder(
2727
final LiquibaseMongodbBuildTimeConfig buildTimeConfig,
2828
final RuntimeValue<LiquibaseMongodbConfig> runtimeConfig,
29-
final RuntimeValue<MongodbConfig> mongodbRuntimeConfig) {
29+
final RuntimeValue<MongoConfig> mongodbRuntimeConfig) {
3030
this.buildTimeConfig = buildTimeConfig;
3131
this.runtimeConfig = runtimeConfig;
3232
this.mongodbRuntimeConfig = mongodbRuntimeConfig;
@@ -63,7 +63,7 @@ public LiquibaseMongodbFactory get() {
6363
"Mongo client named '%s' not found".formatted(forceMongoClientName));
6464
}
6565
clientNameSelected = forceMongoClientName;
66-
} else if (MongodbConfig.isDefaultClient(clientName)) {
66+
} else if (MongoConfig.isDefaultClient(clientName)) {
6767
mongoClientConfig = mongodbRuntimeConfig.getValue().clients().get(clientName);
6868
clientNameSelected = clientName;
6969
} else {
@@ -81,7 +81,7 @@ public LiquibaseMongodbFactory get() {
8181
}
8282

8383
private Annotation getLiquibaseMongodbQualifier(String clientName) {
84-
if (MongodbConfig.isDefaultClient(clientName)) {
84+
if (MongoConfig.isDefaultClient(clientName)) {
8585
return Default.Literal.INSTANCE;
8686
} else {
8787
return LiquibaseMongodbClient.LiquibaseMongodbClientLiteral.of(clientName);

extensions/mongodb-client/deployment/src/main/java/io/quarkus/mongodb/deployment/DevServicesMongoProcessor.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package io.quarkus.mongodb.deployment;
22

33
import static io.quarkus.devservices.common.ContainerLocator.locateContainerWithLabels;
4-
import static io.quarkus.mongodb.runtime.MongodbConfig.isDefaultClient;
4+
import static io.quarkus.mongodb.runtime.MongoConfig.isDefaultClient;
55

66
import java.io.Closeable;
77
import java.nio.charset.StandardCharsets;
@@ -41,7 +41,7 @@
4141
import io.quarkus.devservices.common.ConfigureUtil;
4242
import io.quarkus.devservices.common.ContainerLocator;
4343
import io.quarkus.devservices.common.Labels;
44-
import io.quarkus.mongodb.runtime.MongodbConfig;
44+
import io.quarkus.mongodb.runtime.MongoConfig;
4545
import io.quarkus.runtime.LaunchMode;
4646
import io.quarkus.runtime.configuration.ConfigUtils;
4747

@@ -242,7 +242,7 @@ private String getEffectiveUrl(String configPrefix, String host, int port, Captu
242242
}
243243

244244
private String getConfigPrefix(String connectionName) {
245-
String configPrefix = "quarkus." + MongodbConfig.CONFIG_NAME + ".";
245+
String configPrefix = "quarkus." + MongoConfig.CONFIG_NAME + ".";
246246
if (!isDefaultClient(connectionName)) {
247247
configPrefix = configPrefix + connectionName + ".";
248248
}

extensions/mongodb-client/deployment/src/main/java/io/quarkus/mongodb/deployment/MongoClientProcessor.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,9 @@
7171
import io.quarkus.mongodb.runtime.MongoClientRecorder;
7272
import io.quarkus.mongodb.runtime.MongoClientSupport;
7373
import io.quarkus.mongodb.runtime.MongoClients;
74+
import io.quarkus.mongodb.runtime.MongoConfig;
7475
import io.quarkus.mongodb.runtime.MongoReactiveContextProvider;
7576
import io.quarkus.mongodb.runtime.MongoServiceBindingConverter;
76-
import io.quarkus.mongodb.runtime.MongodbConfig;
7777
import io.quarkus.mongodb.runtime.dns.MongoDnsClient;
7878
import io.quarkus.mongodb.runtime.dns.MongoDnsClientProvider;
7979
import io.quarkus.mongodb.tracing.MongoTracingCommandListener;
@@ -281,7 +281,7 @@ void additionalBeans(BuildProducer<AdditionalBeanBuildItem> additionalBeans) {
281281
void connectionNames(
282282
List<MongoClientNameBuildItem> mongoClientNames,
283283
BuildProducer<MongoConnectionNameBuildItem> mongoConnections) {
284-
mongoConnections.produce(new MongoConnectionNameBuildItem(MongodbConfig.DEFAULT_CLIENT_NAME));
284+
mongoConnections.produce(new MongoConnectionNameBuildItem(MongoConfig.DEFAULT_CLIENT_NAME));
285285
for (MongoClientNameBuildItem bi : mongoClientNames) {
286286
mongoConnections.produce(new MongoConnectionNameBuildItem(bi.getName()));
287287
}
@@ -369,12 +369,12 @@ void generateClientBeans(MongoClientRecorder recorder,
369369
if (createDefaultBlockingMongoClient) {
370370
syntheticBeanBuildItemBuildProducer.produce(createBlockingSyntheticBean(recorder,
371371
makeUnremovable || mongoClientBuildTimeConfig.forceDefaultClients(),
372-
MongodbConfig.DEFAULT_CLIENT_NAME, false));
372+
MongoConfig.DEFAULT_CLIENT_NAME, false));
373373
}
374374
if (createDefaultReactiveMongoClient) {
375375
syntheticBeanBuildItemBuildProducer.produce(createReactiveSyntheticBean(recorder,
376376
makeUnremovable || mongoClientBuildTimeConfig.forceDefaultClients(),
377-
MongodbConfig.DEFAULT_CLIENT_NAME, false));
377+
MongoConfig.DEFAULT_CLIENT_NAME, false));
378378
}
379379

380380
for (MongoClientNameBuildItem mongoClientName : mongoClientNames) {
@@ -425,7 +425,7 @@ private SyntheticBeanBuildItem applyCommonBeanConfig(boolean makeUnremovable, St
425425
configurator.unremovable();
426426
}
427427

428-
if (MongodbConfig.isDefaultClient(clientName)) {
428+
if (MongoConfig.isDefaultClient(clientName)) {
429429
configurator.addQualifier(Default.class);
430430
} else {
431431
String namedQualifier = MongoClientBeanUtil.namedQualifier(clientName, isReactive);
@@ -506,7 +506,7 @@ void validateMongoConfigCustomizers(BeanDiscoveryFinishedBuildItem beans,
506506
String clientName = name.get().value().asString();
507507
customizers.computeIfAbsent(clientName, k -> new ArrayList<>()).add(bean.getBeanClass().toString());
508508
} else {
509-
customizers.computeIfAbsent(MongodbConfig.DEFAULT_CLIENT_NAME, k -> new ArrayList<>())
509+
customizers.computeIfAbsent(MongoConfig.DEFAULT_CLIENT_NAME, k -> new ArrayList<>())
510510
.add(bean.getBeanClass().toString());
511511
}
512512
}

extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/health/MongoHealthCheck.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.quarkus.mongodb.health;
22

3-
import static io.quarkus.mongodb.runtime.MongodbConfig.isDefaultClient;
3+
import static io.quarkus.mongodb.runtime.MongoConfig.isDefaultClient;
44

55
import java.time.Duration;
66
import java.util.ArrayList;
@@ -27,7 +27,7 @@
2727
import io.quarkus.mongodb.MongoClientName;
2828
import io.quarkus.mongodb.reactive.ReactiveMongoClient;
2929
import io.quarkus.mongodb.runtime.MongoClientConfig;
30-
import io.quarkus.mongodb.runtime.MongodbConfig;
30+
import io.quarkus.mongodb.runtime.MongoConfig;
3131
import io.smallrye.mutiny.Uni;
3232
import io.smallrye.mutiny.infrastructure.Infrastructure;
3333
import io.smallrye.mutiny.tuples.Tuple2;
@@ -45,7 +45,7 @@ public class MongoHealthCheck implements HealthCheck {
4545
private static final Document COMMAND = new Document("ping", 1);
4646

4747
// TODO - Rewrite this with active / inactive. Follow Redis implementation
48-
public MongoHealthCheck(MongodbConfig config) {
48+
public MongoHealthCheck(MongoConfig config) {
4949
Iterable<InstanceHandle<MongoClient>> handle = Arc.container()
5050
.select(MongoClient.class, Any.Literal.INSTANCE).handles();
5151
Iterable<InstanceHandle<ReactiveMongoClient>> reactiveHandlers = Arc.container()

extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/runtime/MongoClientBeanUtil.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ private MongoClientBeanUtil() {
1212
}
1313

1414
public static String namedQualifier(String clientName, boolean isReactive) {
15-
if (MongodbConfig.isDefaultClient(clientName)) {
15+
if (MongoConfig.isDefaultClient(clientName)) {
1616
throw new IllegalArgumentException("The default client should not have a named qualifier");
1717
}
1818
return isReactive ? clientName + REACTIVE_CLIENT_NAME_SUFFIX : clientName;
1919
}
2020

2121
@SuppressWarnings("rawtypes")
2222
public static AnnotationLiteral clientLiteral(String clientName, boolean isReactive) {
23-
if (MongodbConfig.isDefaultClient(clientName)) {
23+
if (MongoConfig.isDefaultClient(clientName)) {
2424
return Default.Literal.INSTANCE;
2525
}
2626
return NamedLiteral.of(namedQualifier(clientName, isReactive));

extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/runtime/MongoClientRecorder.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424

2525
@Recorder
2626
public class MongoClientRecorder {
27-
private final RuntimeValue<MongodbConfig> runtimeConfig;
27+
private final RuntimeValue<MongoConfig> runtimeConfig;
2828

29-
public MongoClientRecorder(final RuntimeValue<MongodbConfig> runtimeConfig) {
29+
public MongoClientRecorder(final RuntimeValue<MongoConfig> runtimeConfig) {
3030
this.runtimeConfig = runtimeConfig;
3131
}
3232

@@ -87,7 +87,7 @@ public RuntimeValue<ReactiveMongoClient> getReactiveClient(String name) {
8787

8888
@SuppressWarnings("rawtypes")
8989
private AnnotationLiteral literal(String name) {
90-
if (name.startsWith(MongodbConfig.DEFAULT_CLIENT_NAME)) {
90+
if (name.startsWith(MongoConfig.DEFAULT_CLIENT_NAME)) {
9191
return Default.Literal.INSTANCE;
9292
}
9393
return NamedLiteral.of(name);

extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/runtime/MongoClients.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public class MongoClients {
8585
private static final Pattern COLON_PATTERN = Pattern.compile(":");
8686
private static final MongoDriverInformation DRIVER_INFORMATION = MongoDriverInformation
8787
.builder(MongoDriverInformation.builder().build()).driverName("quarkus").build();
88-
private final MongodbConfig mongodbConfig;
88+
private final MongoConfig mongoConfig;
8989
private final MongoClientSupport mongoClientSupport;
9090
private final Instance<CodecProvider> codecProviders;
9191
private final TlsConfigurationRegistry tlsConfigurationRegistry;
@@ -98,15 +98,15 @@ public class MongoClients {
9898
private final Instance<MongoClientCustomizer> customizers;
9999
private final Vertx vertx;
100100

101-
public MongoClients(MongodbConfig mongodbConfig, MongoClientSupport mongoClientSupport,
101+
public MongoClients(MongoConfig mongoConfig, MongoClientSupport mongoClientSupport,
102102
Instance<CodecProvider> codecProviders,
103103
TlsConfigurationRegistry tlsConfigurationRegistry,
104104
Instance<PropertyCodecProvider> propertyCodecProviders,
105105
Instance<CommandListener> commandListeners,
106106
Instance<ReactiveContextProvider> reactiveContextProviders,
107107
@Any Instance<MongoClientCustomizer> customizers,
108108
Vertx vertx) {
109-
this.mongodbConfig = mongodbConfig;
109+
this.mongoConfig = mongoConfig;
110110
this.mongoClientSupport = mongoClientSupport;
111111
this.codecProviders = codecProviders;
112112
this.tlsConfigurationRegistry = tlsConfigurationRegistry;
@@ -126,7 +126,7 @@ public MongoClients(MongodbConfig mongodbConfig, MongoClientSupport mongoClientS
126126
}
127127

128128
public MongoClient createMongoClient(String clientName) throws MongoException {
129-
MongoClientSettings mongoConfiguration = createMongoConfiguration(clientName, mongodbConfig.clients().get(clientName),
129+
MongoClientSettings mongoConfiguration = createMongoConfiguration(clientName, mongoConfig.clients().get(clientName),
130130
false);
131131
MongoClient client = com.mongodb.client.MongoClients.create(mongoConfiguration, DRIVER_INFORMATION);
132132
mongoclients.put(clientName, client);
@@ -135,7 +135,7 @@ public MongoClient createMongoClient(String clientName) throws MongoException {
135135

136136
public ReactiveMongoClient createReactiveMongoClient(String clientName)
137137
throws MongoException {
138-
MongoClientSettings mongoConfiguration = createMongoConfiguration(clientName, mongodbConfig.clients().get(clientName),
138+
MongoClientSettings mongoConfiguration = createMongoConfiguration(clientName, mongoConfig.clients().get(clientName),
139139
true);
140140
com.mongodb.reactivestreams.client.MongoClient client = com.mongodb.reactivestreams.client.MongoClients
141141
.create(mongoConfiguration, DRIVER_INFORMATION);
@@ -389,7 +389,7 @@ private MongoClientSettings.Builder customize(String name, MongoClientSettings.B
389389
// If the client name is the default one, we use a customizer that does not have the MongoClientName qualifier.
390390
// Otherwise, we use the one that has the qualifier.
391391
// Note that at build time, we check that we have at most one customizer per client, including for the default one.
392-
if (MongodbConfig.isDefaultClient(name)) {
392+
if (MongoConfig.isDefaultClient(name)) {
393393
var maybe = customizers.handlesStream()
394394
.filter(h -> doesNotHaveClientNameQualifier(h.getBean()))
395395
.findFirst(); // We have at most one customizer without the qualifier.

0 commit comments

Comments
 (0)