Add support for offical, IANA-registered media type for HAL.

Fixes GH-2453.
spring-projects · Jan 17, 2025 · 4f214bb · 4f214bb
1 parent 351010a
commit 4f214bb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/...bmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryRestHandlerMapping.java b/...bmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryRestHandlerMapping.java
@@ -189,6 +189,8 @@ protected ProducesRequestCondition customize(ProducesRequestCondition condition)
 
 		Set<String> mediaTypes = new LinkedHashSet<String>();
 		mediaTypes.add(configuration.getDefaultMediaType().toString());
+		mediaTypes.add(MediaTypes.HAL_JSON_VALUE);
+		mediaTypes.add(MediaTypes.VND_HAL_JSON_VALUE);
 		mediaTypes.add(MediaType.APPLICATION_JSON_VALUE);
 		mediaTypes.add(MediaTypes.HAL_FORMS_JSON_VALUE);
 

diff --git a/...main/java/org/springframework/data/rest/webmvc/config/RepositoryRestMvcConfiguration.java b/...main/java/org/springframework/data/rest/webmvc/config/RepositoryRestMvcConfiguration.java
@@ -575,6 +575,7 @@ public TypeConstrainedMappingJackson2HttpMessageConverter halJacksonHttpMessageC
 
 		ArrayList<MediaType> mediaTypes = new ArrayList<>();
 		mediaTypes.add(MediaTypes.HAL_JSON);
+		mediaTypes.add(MediaTypes.VND_HAL_JSON);
 
 		// Enable returning HAL if application/json is asked if it's configured to be the default type
 		if (repositoryRestConfiguration.useHalAsDefaultJsonMediaType()) {
@@ -809,7 +810,8 @@ public List<HttpMessageConverter<?>> defaultMessageConverters(
 			messageConverters.add(alpsJsonHttpMessageConverter);
 		}
 
-		if (repositoryRestConfiguration.getDefaultMediaType().equals(MediaTypes.HAL_JSON)) {
+		if (List.of(MediaTypes.HAL_JSON, MediaTypes.VND_HAL_JSON)
+				.contains(repositoryRestConfiguration.getDefaultMediaType())) {
 			messageConverters.add(halJacksonHttpMessageConverter);
 			messageConverters.add(jacksonHttpMessageConverter);
 		} else {