test: add RawFormatModuleTest for configurable default format

fix: simplify AnnotationIntrospector to only override when @IdFormat
is present, allowing module-level default format to take effect

Author: mariuszs

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

@@ -0,0 +1,71 @@
+package com.devskiller.friendly_id.spring;
+
+import java.util.UUID;
+
+import org.junit.jupiter.api.Test;
+import tools.jackson.databind.json.JsonMapper;
+
+import com.devskiller.friendly_id.FriendlyIdFormat;
+import com.devskiller.friendly_id.FriendlyIds;
+import com.devskiller.friendly_id.jackson.FriendlyIdModule;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class RawFormatModuleTest {
+
+	private final UUID uuid = UUID.fromString("f088ce5b-9279-4cc3-946a-c15ad740dd6d");
+
+	private final JsonMapper mapper = JsonMapper.builder()
+			.addModule(new FriendlyIdModule(FriendlyIdFormat.RAW))
+			.build();
+
+	@Test
+	void shouldSerializeUuidInStandardFormat() {
+		String json = mapper.writeValueAsString(uuid);
+
+		assertThat(json).isEqualTo("\"f088ce5b-9279-4cc3-946a-c15ad740dd6d\"");
+	}
+
+	@Test
+	void shouldDeserializeStandardUuid() {
+		UUID result = mapper.readValue("\"f088ce5b-9279-4cc3-946a-c15ad740dd6d\"", UUID.class);
+
+		assertThat(result).isEqualTo(uuid);
+	}
+
+	@Test
+	void shouldDeserializeFriendlyIdWhenModuleIsRaw() {
+		String friendlyId = FriendlyIds.toFriendlyId(uuid);
+
+		UUID result = mapper.readValue("\"" + friendlyId + "\"", UUID.class);
+
+		assertThat(result).isEqualTo(uuid);
+	}
+
+	@Test
+	void shouldRespectPerFieldOverrideWhenModuleIsRaw() {
+		var foo = new Foo(uuid, uuid);
+
+		String json = mapper.writeValueAsString(foo);
+
+		// rawUuid has @IdFormat(RAW) -> standard format
+		assertThat(json).contains("\"rawUuid\":\"f088ce5b-9279-4cc3-946a-c15ad740dd6d\"");
+		// friendlyId has no annotation, module default is RAW -> standard format
+		assertThat(json).contains("\"friendlyId\":\"f088ce5b-9279-4cc3-946a-c15ad740dd6d\"");
+	}
+
+	@Test
+	void shouldSerializeFriendlyFormatWithUrl62Override() {
+		var mapper = JsonMapper.builder()
+				.addModule(new FriendlyIdModule(FriendlyIdFormat.RAW))
+				.build();
+
+		// Foo: rawUuid=@IdFormat(RAW), friendlyId=no annotation (module default RAW)
+		// Both should be standard UUID when module is RAW
+		var foo = new Foo(uuid, uuid);
+		String json = mapper.writeValueAsString(foo);
+
+		assertThat(json).contains("\"rawUuid\":\"f088ce5b-9279-4cc3-946a-c15ad740dd6d\"");
+		assertThat(json).contains("\"friendlyId\":\"f088ce5b-9279-4cc3-946a-c15ad740dd6d\"");
+	}
+}

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

@@ -19,30 +19,23 @@ public class FriendlyIdAnnotationIntrospector extends JacksonAnnotationIntrospec
 	@Override
 	public Object findSerializer(Annotated annotatedMethod) {
 		IdFormat annotation = _findAnnotation(annotatedMethod, IdFormat.class);
-		if (annotatedMethod.getRawType() == UUID.class) {
-			if (annotation != null) {
-				return switch (annotation.value()) {
-					case RAW -> UUIDSerializer.class;
-					case URL62 -> FriendlyIdSerializer.class;
-				};
-			}
-			return FriendlyIdSerializer.class;
-		} else {
-			return null;
+		if (annotatedMethod.getRawType() == UUID.class && annotation != null) {
+			return switch (annotation.value()) {
+				case RAW -> UUIDSerializer.class;
+				case URL62 -> FriendlyIdSerializer.class;
+			};
 		}
+		return null;
 	}
 
 	@Override
 	public Object findDeserializer(Annotated annotatedMethod) {
 		var annotation = _findAnnotation(annotatedMethod, IdFormat.class);
-		if (rawDeserializationType(annotatedMethod) == UUID.class) {
-			if (annotation != null) {
-				return switch (annotation.value()) {
-					case RAW -> UUIDDeserializer.class;
-					case URL62 -> FriendlyIdDeserializer.class;
-				};
-			}
-			return FriendlyIdDeserializer.class;
+		if (rawDeserializationType(annotatedMethod) == UUID.class && annotation != null) {
+			return switch (annotation.value()) {
+				case RAW -> UUIDDeserializer.class;
+				case URL62 -> FriendlyIdDeserializer.class;
+			};
 		}
 		return null;
 	}

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

@@ -0,0 +1,57 @@
+package com.devskiller.friendly_id.spring;
+
+import java.util.UUID;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.junit.jupiter.api.Test;
+
+import com.devskiller.friendly_id.FriendlyIdFormat;
+import com.devskiller.friendly_id.FriendlyIds;
+import com.devskiller.friendly_id.jackson2.FriendlyIdJackson2Module;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class RawFormatModuleTest {
+
+	private final UUID uuid = UUID.fromString("f088ce5b-9279-4cc3-946a-c15ad740dd6d");
+
+	private final ObjectMapper mapper = new ObjectMapper()
+			.registerModule(new FriendlyIdJackson2Module(FriendlyIdFormat.RAW));
+
+	@Test
+	void shouldSerializeUuidInStandardFormat() throws Exception {
+		String json = mapper.writeValueAsString(uuid);
+
+		assertThat(json).isEqualTo("\"f088ce5b-9279-4cc3-946a-c15ad740dd6d\"");
+	}
+
+	@Test
+	void shouldDeserializeStandardUuid() throws Exception {
+		UUID result = mapper.readValue("\"f088ce5b-9279-4cc3-946a-c15ad740dd6d\"", UUID.class);
+
+		assertThat(result).isEqualTo(uuid);
+	}
+
+	@Test
+	void shouldDeserializeFriendlyIdWhenModuleIsRaw() throws Exception {
+		String friendlyId = FriendlyIds.toFriendlyId(uuid);
+
+		UUID result = mapper.readValue("\"" + friendlyId + "\"", UUID.class);
+
+		assertThat(result).isEqualTo(uuid);
+	}
+
+	@Test
+	void shouldRespectPerFieldAnnotationWhenModuleIsRaw() throws Exception {
+		Foo foo = new Foo();
+		foo.setRawUuid(uuid);
+		foo.setFriendlyId(uuid);
+
+		String json = mapper.writeValueAsString(foo);
+
+		// rawUuid has @IdFormat(RAW) -> standard format
+		assertThat(json).contains("\"rawUuid\":\"f088ce5b-9279-4cc3-946a-c15ad740dd6d\"");
+		// friendlyId has no annotation, module default is RAW -> standard format
+		assertThat(json).contains("\"friendlyId\":\"f088ce5b-9279-4cc3-946a-c15ad740dd6d\"");
+	}
+}