Skip to content

Commit 4627bd8

Browse files
committed
refactor: simplify Jackson2 deserializer using FriendlyIds.toUuid
1 parent 73f6bc6 commit 4627bd8

1 file changed

Lines changed: 3 additions & 12 deletions

File tree

friendly-id-jackson2-datatype/src/main/java/com/devskiller/friendly_id/jackson2/FriendlyIdDeserializer.java

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,11 @@ public class FriendlyIdDeserializer extends UUIDDeserializer {
1414

1515
@Override
1616
public UUID deserialize(JsonParser parser, DeserializationContext deserializationContext) throws IOException {
17-
1817
JsonToken token = parser.getCurrentToken();
1918
if (token == JsonToken.VALUE_STRING) {
20-
String string = parser.getValueAsString().trim();
21-
if (looksLikeUuid(string)) {
22-
return super.deserialize(parser, deserializationContext);
23-
} else {
24-
return FriendlyIds.toUuid(string);
25-
}
19+
String value = parser.getValueAsString().trim();
20+
return FriendlyIds.toUuid(value);
2621
}
27-
throw new IllegalStateException("This is not friendly id");
28-
}
29-
30-
private boolean looksLikeUuid(String value) {
31-
return value.contains("-");
22+
throw new IllegalStateException("Expected UUID or FriendlyId string");
3223
}
3324
}

0 commit comments

Comments
 (0)