Spring/spring-data-rest
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Fixes GH-2453.
This commit is contained in:
Oliver Drotbohm
2025-01-17 16:41:15 +01:00
parent 351010a905
commit 4f214bbbad
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -189,6 +189,8 @@ public class RepositoryRestHandlerMapping extends BasePathAwareHandlerMapping {
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);

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

@@ -575,6 +575,7 @@ public class RepositoryRestMvcConfiguration extends HateoasAwareSpringDataWebCon
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 class RepositoryRestMvcConfiguration extends HateoasAwareSpringDataWebCon
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 {