Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,9 @@ tasks {
// cognitive load is dubious.
disable("YodaCondition")

// We get this warning in modules that compile for old java versions
disable("StringConcatToTextBlock")

if (name.contains("Jmh") || name.contains("Test")) {
// Allow underscore in test-type method names
disable("MemberName")
Expand Down
2 changes: 1 addition & 1 deletion dependencyManagement/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ dependencies {
api("com.google.auto.value:auto-value:1.11.0")
api("com.google.auto.value:auto-value-annotations:1.11.0")
api("com.google.errorprone:error_prone_annotations:2.37.0")
api("com.google.errorprone:error_prone_core:2.36.0")
api("com.google.errorprone:error_prone_core:2.37.0")
api("io.github.netmikey.logunit:logunit-jul:2.0.0")
api("io.opentelemetry.proto:opentelemetry-proto:1.5.0-alpha")
api("io.prometheus:simpleclient:0.16.0")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@ private enum Option {

/* If the arg is null or an empty String, return the Option's default. */
private static String normalize(String arg, Option option) {
return arg == null || (arg = arg.trim()).isEmpty() ? option.defaultValue : arg;
arg = arg == null ? "" : arg.trim();
return arg.isEmpty() ? option.defaultValue : arg;
}

/**
Expand Down
Loading