Skip to content

Commit 51c8d75

Browse files
committed
Apply pull request suggestions
1 parent b670b00 commit 51c8d75

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/binder/HttpBinderProcessor.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ static class HttpServerBinderEnabled implements BooleanSupplier {
4040

4141
public boolean getAsBoolean() {
4242
return mConfig.isEnabled(mConfig.binder().vertx())
43-
&& mConfig.checkBinderEnabledWithDefault(mConfig.binder().httpServer());
43+
&& mConfig.isEnabled(mConfig.binder().httpServer());
4444
}
4545
}
4646

@@ -49,7 +49,7 @@ static class HttpClientBinderEnabled implements BooleanSupplier {
4949

5050
public boolean getAsBoolean() {
5151
return QuarkusClassLoader.isClassPresentAtRuntime(REST_CLIENT_REQUEST_FILTER)
52-
&& mConfig.checkBinderEnabledWithDefault(mConfig.binder().httpClient());
52+
&& mConfig.isEnabled(mConfig.binder().httpClient());
5353
}
5454
}
5555

@@ -59,8 +59,8 @@ SyntheticBeanBuildItem enableHttpBinders(MicrometerRecorder recorder,
5959
MicrometerConfig buildTimeConfig,
6060
BuildProducer<AdditionalBeanBuildItem> additionalBeans) {
6161

62-
boolean clientEnabled = buildTimeConfig.checkBinderEnabledWithDefault(buildTimeConfig.binder().httpClient());
63-
boolean serverEnabled = buildTimeConfig.checkBinderEnabledWithDefault(buildTimeConfig.binder().httpServer());
62+
boolean clientEnabled = buildTimeConfig.isEnabled(buildTimeConfig.binder().httpClient());
63+
boolean serverEnabled = buildTimeConfig.isEnabled(buildTimeConfig.binder().httpServer());
6464

6565
if (clientEnabled || serverEnabled) {
6666
// Protect from uri tag flood

extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/binder/VertxBinderProcessor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ static class VertxBinderEnabled implements BooleanSupplier {
3333
MicrometerConfig mConfig;
3434

3535
public boolean getAsBoolean() {
36-
return METRIC_OPTIONS_CLASS != null && mConfig.checkBinderEnabledWithDefault(mConfig.binder().vertx());
36+
return METRIC_OPTIONS_CLASS != null && mConfig.isEnabled(mConfig.binder().vertx());
3737
}
3838
}
3939

extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/config/MicrometerConfig.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,10 @@ default boolean checkRegistryEnabledWithDefault(CapabilityEnabled config) {
6464
* For MeterBinder configurations with optional 'enabled' attributes,
6565
* determine whether the binder is enabled using {@link #binderEnabledDefault}
6666
* as the default value.
67+
*
68+
* @deprecated use {@link #isEnabled(CapabilityEnabled)} instead.
6769
*/
70+
@Deprecated
6871
default boolean checkBinderEnabledWithDefault(CapabilityEnabled config) {
6972
if (enabled()) {
7073
Optional<Boolean> configValue = config.enabled();
@@ -90,7 +93,8 @@ default boolean isEnabled(CapabilityEnabled config) {
9093
if (this.binder().enableAll()) {
9194
return true;
9295
} else {
93-
return checkBinderEnabledWithDefault(config);
96+
Optional<Boolean> configValue = config.enabled();
97+
return configValue.orElseGet(this::binderEnabledDefault);
9498
}
9599
}
96100
return false;

0 commit comments

Comments
 (0)