Skip to content

Commit 4f214bb

Browse files
committed
Add support for offical, IANA-registered media type for HAL.
Fixes GH-2453.
1 parent 351010a commit 4f214bb

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryRestHandlerMapping.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,8 @@ protected ProducesRequestCondition customize(ProducesRequestCondition condition)
189189

190190
Set<String> mediaTypes = new LinkedHashSet<String>();
191191
mediaTypes.add(configuration.getDefaultMediaType().toString());
192+
mediaTypes.add(MediaTypes.HAL_JSON_VALUE);
193+
mediaTypes.add(MediaTypes.VND_HAL_JSON_VALUE);
192194
mediaTypes.add(MediaType.APPLICATION_JSON_VALUE);
193195
mediaTypes.add(MediaTypes.HAL_FORMS_JSON_VALUE);
194196

spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/RepositoryRestMvcConfiguration.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -575,6 +575,7 @@ public TypeConstrainedMappingJackson2HttpMessageConverter halJacksonHttpMessageC
575575

576576
ArrayList<MediaType> mediaTypes = new ArrayList<>();
577577
mediaTypes.add(MediaTypes.HAL_JSON);
578+
mediaTypes.add(MediaTypes.VND_HAL_JSON);
578579

579580
// Enable returning HAL if application/json is asked if it's configured to be the default type
580581
if (repositoryRestConfiguration.useHalAsDefaultJsonMediaType()) {
@@ -809,7 +810,8 @@ public List<HttpMessageConverter<?>> defaultMessageConverters(
809810
messageConverters.add(alpsJsonHttpMessageConverter);
810811
}
811812

812-
if (repositoryRestConfiguration.getDefaultMediaType().equals(MediaTypes.HAL_JSON)) {
813+
if (List.of(MediaTypes.HAL_JSON, MediaTypes.VND_HAL_JSON)
814+
.contains(repositoryRestConfiguration.getDefaultMediaType())) {
813815
messageConverters.add(halJacksonHttpMessageConverter);
814816
messageConverters.add(jacksonHttpMessageConverter);
815817
} else {

0 commit comments

Comments
 (0)