Skip to content

Commit 8879623

Browse files
authored
refactor: rename FriendlyIdFormat.RAW to UUID for clarity (#21)
RAW was ambiguous — UUID clearly communicates that the field will be serialized in standard UUID format without Base62 conversion.
1 parent 99cb9b1 commit 8879623

16 files changed

Lines changed: 27 additions & 26 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1515
- Spring Boot JPA demo application showcasing FriendlyId with JPA, REST API, and OpenFeign
1616

1717
### Changed
18+
- **Breaking**: Renamed `FriendlyIdFormat.RAW` to `FriendlyIdFormat.UUID` for clarity
1819
- Upgraded from Java 8 to Java 21
1920
- Upgraded from Spring Boot 2.2.2 to 3.4.1
2021
- Upgraded from JUnit 4 to JUnit 5

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public UUID deserialize(JsonParser parser, DeserializationContext ctxt) {
4545
public ValueDeserializer<?> createContextual(DeserializationContext ctxt, BeanProperty property) {
4646
if (property != null) {
4747
var annotation = property.getAnnotation(IdFormat.class);
48-
if (annotation != null && annotation.value() == FriendlyIdFormat.RAW) {
48+
if (annotation != null && annotation.value() == FriendlyIdFormat.UUID) {
4949
return new FriendlyIdDeserializer(false);
5050
}
5151
}

friendly-id-jackson-datatype/src/main/java/com/devskiller/friendly_id/jackson/FriendlyIdModule.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* enabling automatic conversion between UUID values and their FriendlyId string representation.
1515
* </p>
1616
* <p>
17-
* By default, UUIDs are serialized as Base62 FriendlyIds. Use {@link FriendlyIdFormat#RAW}
17+
* By default, UUIDs are serialized as Base62 FriendlyIds. Use {@link FriendlyIdFormat#UUID}
1818
* to serialize UUIDs in standard format while still accepting both formats on deserialization.
1919
* Per-field format can always be overridden with {@link com.devskiller.friendly_id.IdFormat @IdFormat}.
2020
* </p>
@@ -31,7 +31,7 @@ public FriendlyIdModule() {
3131
/**
3232
* Creates a module with the specified default serialization format.
3333
* <p>
34-
* When {@link FriendlyIdFormat#RAW} is used, UUIDs are serialized in standard format
34+
* When {@link FriendlyIdFormat#UUID} is used, UUIDs are serialized in standard format
3535
* but deserialization still accepts both standard UUIDs and Base62 FriendlyIds.
3636
* Per-field format can be overridden with {@link com.devskiller.friendly_id.IdFormat @IdFormat}.
3737
*

friendly-id-jackson-datatype/src/main/java/com/devskiller/friendly_id/jackson/FriendlyIdSerializer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public void serialize(UUID uuid, JsonGenerator jsonGenerator, SerializationConte
3838
public ValueSerializer<?> createContextual(SerializationContext ctxt, BeanProperty property) {
3939
if (property != null) {
4040
IdFormat annotation = property.getAnnotation(IdFormat.class);
41-
if (annotation != null && annotation.value() == FriendlyIdFormat.RAW) {
41+
if (annotation != null && annotation.value() == FriendlyIdFormat.UUID) {
4242
return new FriendlyIdSerializer(false);
4343
}
4444
}

friendly-id-jackson-datatype/src/test/java/com/devskiller/friendly_id/spring/Bar.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
import com.devskiller.friendly_id.IdFormat;
77

88
public record Bar(
9-
@IdFormat(FriendlyIdFormat.RAW) UUID rawUuid,
9+
@IdFormat(FriendlyIdFormat.UUID) UUID rawUuid,
1010
UUID friendlyId
1111
) {}

friendly-id-jackson-datatype/src/test/java/com/devskiller/friendly_id/spring/Foo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
import com.devskiller.friendly_id.IdFormat;
77

88
public record Foo(
9-
@IdFormat(FriendlyIdFormat.RAW) UUID rawUuid,
9+
@IdFormat(FriendlyIdFormat.UUID) UUID rawUuid,
1010
UUID friendlyId
1111
) {}

friendly-id-jackson-datatype/src/test/java/com/devskiller/friendly_id/spring/RawFormatModuleTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class RawFormatModuleTest {
1616
private final UUID uuid = UUID.fromString("f088ce5b-9279-4cc3-946a-c15ad740dd6d");
1717

1818
private final JsonMapper mapper = JsonMapper.builder()
19-
.addModule(new FriendlyIdModule(FriendlyIdFormat.RAW))
19+
.addModule(new FriendlyIdModule(FriendlyIdFormat.UUID))
2020
.build();
2121

2222
@Test
@@ -48,9 +48,9 @@ void shouldRespectPerFieldOverrideWhenModuleIsRaw() {
4848

4949
String json = mapper.writeValueAsString(foo);
5050

51-
// rawUuid has @IdFormat(RAW) -> standard format
51+
// rawUuid has @IdFormat(UUID) -> standard format
5252
assertThat(json).contains("\"rawUuid\":\"f088ce5b-9279-4cc3-946a-c15ad740dd6d\"");
53-
// friendlyId has no annotation, module default is RAW -> standard format
53+
// friendlyId has no annotation, module default is UUID -> standard format
5454
assertThat(json).contains("\"friendlyId\":\"f088ce5b-9279-4cc3-946a-c15ad740dd6d\"");
5555
}
5656

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public Object findSerializer(Annotated annotatedMethod) {
2121
IdFormat annotation = _findAnnotation(annotatedMethod, IdFormat.class);
2222
if (annotatedMethod.getRawType() == UUID.class && annotation != null) {
2323
return switch (annotation.value()) {
24-
case RAW -> UUIDSerializer.class;
24+
case UUID -> UUIDSerializer.class;
2525
case URL62 -> FriendlyIdSerializer.class;
2626
};
2727
}
@@ -33,7 +33,7 @@ public Object findDeserializer(Annotated annotatedMethod) {
3333
var annotation = _findAnnotation(annotatedMethod, IdFormat.class);
3434
if (rawDeserializationType(annotatedMethod) == UUID.class && annotation != null) {
3535
return switch (annotation.value()) {
36-
case RAW -> UUIDDeserializer.class;
36+
case UUID -> UUIDDeserializer.class;
3737
case URL62 -> FriendlyIdDeserializer.class;
3838
};
3939
}

friendly-id-jackson2-datatype/src/test/java/com/devskiller/friendly_id/spring/Bar.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
public class Bar {
99

10-
@IdFormat(FriendlyIdFormat.RAW)
10+
@IdFormat(FriendlyIdFormat.UUID)
1111
private final UUID rawUuid;
1212

1313
private final UUID friendlyId;

friendly-id-jackson2-datatype/src/test/java/com/devskiller/friendly_id/spring/Foo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
public class Foo {
99

10-
@IdFormat(FriendlyIdFormat.RAW)
10+
@IdFormat(FriendlyIdFormat.UUID)
1111
private UUID rawUuid;
1212

1313
private UUID friendlyId;

0 commit comments

Comments
 (0)