Skip to content

Commit 1d9fff5

Browse files
committed
Minor straightening of code post merge
1 parent 440dc47 commit 1d9fff5

File tree

1 file changed

+8
-11
lines changed

1 file changed

+8
-11
lines changed

src/main/java/com/fasterxml/jackson/databind/util/EnumValues.java

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -244,21 +244,18 @@ protected static Enum<?>[] _enumConstants(Class<?> enumCls) {
244244
}
245245

246246
protected static String _findNameToUse(String explicitName, String otherName, boolean toLowerCase) {
247-
String name;
248247
// If explicitly named, like @JsonProperty-annotated, then use it
249248
if (explicitName != null) {
250-
name = explicitName;
251-
} else {
252-
name = otherName;
253-
// [databind#4788] Since 2.18.2 : EnumFeature.WRITE_ENUMS_TO_LOWERCASE should not
254-
// override @JsonProperty values
255-
if (toLowerCase) {
256-
name = name.toLowerCase();
257-
}
249+
return explicitName;
250+
}
251+
// [databind#4788] Since 2.18.2 : EnumFeature.WRITE_ENUMS_TO_LOWERCASE should not
252+
// override @JsonProperty values
253+
if (toLowerCase) {
254+
return otherName.toLowerCase();
258255
}
259-
return name;
256+
return otherName;
260257
}
261-
258+
262259
/*
263260
/**********************************************************************
264261
/* Public API

0 commit comments

Comments
 (0)