#1516 - Support for NamingBase in property translation for HAL.

We now also support the newly NamingBase introduced in Jackson 2.12 as a replacement for PropertyNamingStrategyBase.
spring-projects · Apr 14, 2021 · 91e17f1 · 91e17f1
1 parent e939852
commit 91e17f1
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/src/main/java/org/springframework/hateoas/mediatype/hal/Jackson2HalModule.java b/src/main/java/org/springframework/hateoas/mediatype/hal/Jackson2HalModule.java
@@ -53,6 +53,7 @@
 import com.fasterxml.jackson.core.JsonToken;
 import com.fasterxml.jackson.core.Version;
 import com.fasterxml.jackson.databind.*;
+import com.fasterxml.jackson.databind.PropertyNamingStrategies.NamingBase;
 import com.fasterxml.jackson.databind.PropertyNamingStrategy.PropertyNamingStrategyBase;
 import com.fasterxml.jackson.databind.deser.ContextualDeserializer;
 import com.fasterxml.jackson.databind.deser.std.ContainerDeserializerBase;
@@ -843,12 +844,13 @@ private EmbeddedMapper(LinkRelationProvider relProvider, CurieProvider curieProv
 		 */
 		public EmbeddedMapper with(@Nullable PropertyNamingStrategy strategy) {
 
-			if (!(strategy instanceof PropertyNamingStrategyBase)) {
-				return this;
-			}
+			Function<String, String> mapper = strategy instanceof PropertyNamingStrategyBase
+					? ((PropertyNamingStrategyBase) strategy)::translate
+					: strategy instanceof NamingBase ? ((NamingBase) strategy)::translate : null;
 
-			return new EmbeddedMapper(relProvider, curieProvider, preferCollectionRels,
-					((PropertyNamingStrategyBase) strategy)::translate);
+			return mapper == null
+					? this
+					: new EmbeddedMapper(relProvider, curieProvider, preferCollectionRels, mapper);
 		}
 
 		/**

diff --git a/src/test/java/org/springframework/hateoas/mediatype/hal/Jackson2HalIntegrationTest.java b/src/test/java/org/springframework/hateoas/mediatype/hal/Jackson2HalIntegrationTest.java
@@ -59,6 +59,7 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.PropertyNamingStrategies;
 import com.fasterxml.jackson.databind.PropertyNamingStrategy;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.databind.type.TypeFactory;
@@ -643,6 +644,13 @@ void rendersLinksWhenMapEntrySortingIsEnabled() throws Exception {
 				.writeValueAsString(new RepresentationModel<>().add(Link.of("/href")));
 	}
 
+	@Test // #1516
+	void considersNamingBase() throws Exception {
+
+		mapper.setPropertyNamingStrategy(PropertyNamingStrategies.SNAKE_CASE)
+				.writeValueAsString(new RepresentationModel<>().add(Link.of("/href", "fooBar")));
+	}
+
 	@Relation(collectionRelation = "someSample")
 	static class SomeSample {
 		@JsonProperty String name;