File tree Expand file tree Collapse file tree 3 files changed +6
-2
lines changed
jfr-connection/src/main/java/io/opentelemetry/contrib/jfr/connection Expand file tree Collapse file tree 3 files changed +6
-2
lines changed Original file line number Diff line number Diff line change @@ -79,6 +79,9 @@ tasks {
7979 // cognitive load is dubious.
8080 disable(" YodaCondition" )
8181
82+ // We get this warning in modules that compile for old java versions
83+ disable(" StringConcatToTextBlock" )
84+
8285 if (name.contains(" Jmh" ) || name.contains(" Test" )) {
8386 // Allow underscore in test-type method names
8487 disable(" MemberName" )
Original file line number Diff line number Diff line change @@ -26,7 +26,7 @@ dependencies {
2626 api(" com.google.auto.value:auto-value:1.11.0" )
2727 api(" com.google.auto.value:auto-value-annotations:1.11.0" )
2828 api(" com.google.errorprone:error_prone_annotations:2.37.0" )
29- api(" com.google.errorprone:error_prone_core:2.36 .0" )
29+ api(" com.google.errorprone:error_prone_core:2.37 .0" )
3030 api(" io.github.netmikey.logunit:logunit-jul:2.0.0" )
3131 api(" io.opentelemetry.proto:opentelemetry-proto:1.5.0-alpha" )
3232 api(" io.prometheus:simpleclient:0.16.0" )
Original file line number Diff line number Diff line change @@ -66,7 +66,8 @@ private enum Option {
6666
6767 /* If the arg is null or an empty String, return the Option's default. */
6868 private static String normalize (String arg , Option option ) {
69- return arg == null || (arg = arg .trim ()).isEmpty () ? option .defaultValue : arg ;
69+ arg = arg == null ? "" : arg .trim ();
70+ return arg .isEmpty () ? option .defaultValue : arg ;
7071 }
7172
7273 /**
You can’t perform that action at this time.
0 commit comments