Skip to content

Commit feaa56a

Browse files
gregturngregturn
committed
#987 - Drop UTF8 HAL media type.
1 parent 400a6bb commit feaa56a

12 files changed

+43
-70
lines changed

‎src/main/java/org/springframework/hateoas/MediaTypes.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,6 @@ public class MediaTypes {
3737
*/
3838
public static final MediaType HAL_JSON = MediaType.valueOf(HAL_JSON_VALUE);
3939

40-
/**
41-
* A String equivalent of {@link MediaTypes#HAL_JSON_UTF8}.
42-
*/
43-
public static final String HAL_JSON_UTF8_VALUE = HAL_JSON_VALUE + ";charset=UTF-8";
44-
45-
/**
46-
* Public constant media type for {@code application/hal+json;charset=UTF-8}.
47-
*/
48-
public static final MediaType HAL_JSON_UTF8 = MediaType.valueOf(HAL_JSON_UTF8_VALUE);
49-
5040
/**
5141
* A String equivalent of {@link MediaTypes#ALPS_JSON}.
5242
*/

‎src/main/java/org/springframework/hateoas/config/EnableHypermediaSupport.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ enum HypermediaType {
7373
* @see http://stateless.co/hal_specification.html
7474
* @see https://tools.ietf.org/html/draft-kelly-json-hal-05
7575
*/
76-
HAL(MediaTypes.HAL_JSON, MediaTypes.HAL_JSON_UTF8),
76+
HAL(MediaTypes.HAL_JSON),
7777

7878
/**
7979
* HAL-FORMS - Independent, backward-compatible extension of the HAL designed to add runtime FORM support

‎src/main/java/org/springframework/hateoas/mediatype/hal/HalLinkDiscoverer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public class HalLinkDiscoverer extends JsonPathLinkDiscoverer {
3636
* Constructor for {@link MediaTypes#HAL_JSON}.
3737
*/
3838
public HalLinkDiscoverer() {
39-
this(MediaTypes.HAL_JSON, MediaTypes.HAL_JSON_UTF8);
39+
this(MediaTypes.HAL_JSON);
4040
}
4141

4242
protected HalLinkDiscoverer(MediaType... mediaTypes) {

‎src/main/java/org/springframework/hateoas/mediatype/hal/HalTraversonDefaults.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
import java.nio.charset.StandardCharsets;
1919
import java.util.ArrayList;
20-
import java.util.Arrays;
2120
import java.util.Collection;
2221
import java.util.Collections;
2322
import java.util.List;
@@ -41,7 +40,7 @@
4140
*/
4241
class HalTraversonDefaults implements TraversonDefaults {
4342

44-
private static final List<MediaType> HAL_FLAVORS = Arrays.asList(MediaTypes.HAL_JSON, MediaTypes.HAL_JSON_UTF8);
43+
private static final List<MediaType> HAL_FLAVORS = Collections.singletonList(MediaTypes.HAL_JSON);
4544

4645
/*
4746
* (non-Javadoc)
@@ -54,7 +53,7 @@ public List<HttpMessageConverter<?>> getHttpMessageConverters(Collection<MediaTy
5453
converters.add(new StringHttpMessageConverter(StandardCharsets.UTF_8));
5554

5655
List<MediaType> halFlavors = mediaTypes.stream() //
57-
.filter(it -> HAL_FLAVORS.contains(it)) //
56+
.filter(HAL_FLAVORS::contains) //
5857
.collect(Collectors.toList());
5958

6059
if (!halFlavors.isEmpty()) {

‎src/test/java/org/springframework/hateoas/client/TraversonTest.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public static void setUpClass() {
7676

7777
@BeforeEach
7878
void setUp() {
79-
this.traverson = new Traverson(baseUri, MediaTypes.HAL_JSON_UTF8, MediaTypes.HAL_JSON);
79+
this.traverson = new Traverson(baseUri, MediaTypes.HAL_JSON);
8080

8181
}
8282

@@ -120,7 +120,7 @@ void sendsConfiguredMediaTypesInAcceptHeader() {
120120

121121
verifyThatRequest() //
122122
.havingPathEqualTo("/") //
123-
.havingHeader("Accept", contains(MediaTypes.HAL_JSON_UTF8_VALUE + ", " + MediaTypes.HAL_JSON_VALUE)); //
123+
.havingHeader("Accept", contains(MediaTypes.HAL_JSON_VALUE)); //
124124
}
125125

126126
/**
@@ -284,7 +284,7 @@ void returnsDefaultMessageConvertersForHal() {
284284
assertThat(converters.get(0)).isInstanceOf(StringHttpMessageConverter.class);
285285
assertThat(converters.get(1)).isInstanceOf(MappingJackson2HttpMessageConverter.class);
286286

287-
converters = Traverson.getDefaultMessageConverters(MediaTypes.HAL_JSON_UTF8);
287+
converters = Traverson.getDefaultMessageConverters(MediaTypes.HAL_JSON);
288288

289289
assertThat(converters).hasSize(2);
290290
assertThat(converters.get(0)).isInstanceOf(StringHttpMessageConverter.class);
@@ -424,19 +424,19 @@ void customHeaders() {
424424

425425
verifyThatRequest() //
426426
.havingPathEqualTo("/") //
427-
.havingHeader(HttpHeaders.ACCEPT, contains(MediaTypes.HAL_JSON_UTF8_VALUE + ", " + MediaTypes.HAL_JSON_VALUE)); //
427+
.havingHeader(HttpHeaders.ACCEPT, contains(MediaTypes.HAL_JSON_VALUE)); //
428428

429429
verifyThatRequest().havingPathEqualTo("/movies") // aggregate root movies
430-
.havingHeader(HttpHeaders.ACCEPT, contains(MediaTypes.HAL_JSON_UTF8_VALUE + ", " + MediaTypes.HAL_JSON_VALUE)) //
430+
.havingHeader(HttpHeaders.ACCEPT, contains(MediaTypes.HAL_JSON_VALUE)) //
431431
.havingHeader(customHeaderName, contains("alpha")) //
432432
.havingHeader(HttpHeaders.LOCATION, contains("http://localhost:8080/my/custom/location")); //
433433

434434
verifyThatRequest().havingPath(startsWith("/movies/")) // single movie
435-
.havingHeader(HttpHeaders.ACCEPT, contains(MediaTypes.HAL_JSON_UTF8_VALUE + ", " + MediaTypes.HAL_JSON_VALUE)) //
435+
.havingHeader(HttpHeaders.ACCEPT, contains(MediaTypes.HAL_JSON_VALUE)) //
436436
.havingHeader(customHeaderName, contains("bravo")); //
437437

438438
verifyThatRequest().havingPath(startsWith("/actors/")) // single actor
439-
.havingHeader(HttpHeaders.ACCEPT, contains(MediaTypes.HAL_JSON_UTF8_VALUE + ", " + MediaTypes.HAL_JSON_VALUE)) //
439+
.havingHeader(HttpHeaders.ACCEPT, contains(MediaTypes.HAL_JSON_VALUE)) //
440440
.havingHeader(customHeaderName, contains("charlie")); //
441441
}
442442

‎src/test/java/org/springframework/hateoas/config/EnableHypermediaSupportIntegrationTest.java

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,6 @@ void registersHalLinkDiscoverers() {
110110
assertThat(discoverers).isNotNull();
111111
assertThat(discoverers.getLinkDiscovererFor(MediaTypes.HAL_JSON))
112112
.hasValueSatisfying(HalLinkDiscoverer.class::isInstance);
113-
assertThat(discoverers.getLinkDiscovererFor(MediaTypes.HAL_JSON_UTF8))
114-
.hasValueSatisfying(HalLinkDiscoverer.class::isInstance);
115113
assertRelProvidersSetUp(context);
116114
});
117115
}
@@ -140,8 +138,6 @@ void registersHalAndHalFormsLinkDiscoverers() {
140138
assertThat(discoverers).isNotNull();
141139
assertThat(discoverers.getLinkDiscovererFor(MediaTypes.HAL_JSON))
142140
.hasValueSatisfying(HalLinkDiscoverer.class::isInstance);
143-
assertThat(discoverers.getLinkDiscovererFor(MediaTypes.HAL_JSON_UTF8))
144-
.hasValueSatisfying(HalLinkDiscoverer.class::isInstance);
145141

146142
assertThat(discoverers.getLinkDiscovererFor(MediaTypes.HAL_FORMS_JSON))
147143
.hasValueSatisfying(HalFormsLinkDiscoverer.class::isInstance);
@@ -210,7 +206,7 @@ void halSetupIsAppliedToAllTransitiveComponentsInRequestMappingHandlerAdapter()
210206
RequestMappingHandlerAdapter adapter = context.getBean(RequestMappingHandlerAdapter.class);
211207

212208
assertThat(adapter.getMessageConverters().get(0).getSupportedMediaTypes()) //
213-
.contains(MediaTypes.HAL_JSON, MediaTypes.HAL_JSON_UTF8);
209+
.contains(MediaTypes.HAL_JSON);
214210

215211
boolean found = false;
216212

@@ -225,7 +221,7 @@ void halSetupIsAppliedToAllTransitiveComponentsInRequestMappingHandlerAdapter()
225221
.getField(processor, "messageConverters");
226222

227223
assertThat(converters.get(0)).isInstanceOfSatisfying(TypeConstrainedMappingJackson2HttpMessageConverter.class,
228-
it -> assertThat(it.getSupportedMediaTypes()).contains(MediaTypes.HAL_JSON, MediaTypes.HAL_JSON_UTF8));
224+
it -> assertThat(it.getSupportedMediaTypes()).contains(MediaTypes.HAL_JSON));
229225
}
230226
}
231227

@@ -343,7 +339,7 @@ void registersHalHttpMessageConvertersForRestTemplate() {
343339
RestTemplate template = context.getBean(RestTemplate.class);
344340

345341
assertThat(template.getMessageConverters().get(0).getSupportedMediaTypes()) //
346-
.contains(MediaTypes.HAL_JSON, MediaTypes.HAL_JSON_UTF8);
342+
.contains(MediaTypes.HAL_JSON);
347343
});
348344
}
349345

‎src/test/java/org/springframework/hateoas/config/HypermediaRestTemplateBeanPostProcessorTest.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ void shouldRegisterJustHal() {
5252
assertThat(lookupSupportedHypermediaTypes(context.getBean(RestTemplate.class))) //
5353
.containsExactlyInAnyOrder( //
5454
MediaTypes.HAL_JSON, //
55-
MediaTypes.HAL_JSON_UTF8, //
5655
MediaType.APPLICATION_JSON, //
5756
MediaType.parseMediaType("application/*+json"));
5857
});
@@ -69,7 +68,6 @@ void shouldRegisterHalAndCollectionJsonMessageConverters() {
6968
assertThat(lookupSupportedHypermediaTypes(context.getBean(RestTemplate.class))) //
7069
.containsExactlyInAnyOrder( //
7170
MediaTypes.HAL_JSON, //
72-
MediaTypes.HAL_JSON_UTF8, //
7371
MediaTypes.COLLECTION_JSON, //
7472
MediaType.APPLICATION_JSON, //
7573
MediaType.parseMediaType("application/*+json"));
@@ -87,7 +85,6 @@ void shouldRegisterHypermediaMessageConverters() {
8785
assertThat(lookupSupportedHypermediaTypes(context.getBean(RestTemplate.class))) //
8886
.containsExactlyInAnyOrder( //
8987
MediaTypes.HAL_JSON, //
90-
MediaTypes.HAL_JSON_UTF8, //
9188
MediaTypes.HAL_FORMS_JSON, //
9289
MediaTypes.COLLECTION_JSON, //
9390
MediaTypes.UBER_JSON, //
@@ -104,7 +101,6 @@ void shouldRegisterCustomHypermediaMessageConverters() {
104101
assertThat(lookupSupportedHypermediaTypes(context.getBean(RestTemplate.class))) //
105102
.containsExactlyInAnyOrder( //
106103
MediaTypes.HAL_JSON, //
107-
MediaTypes.HAL_JSON_UTF8, //
108104
MediaType.parseMediaType("application/frodo+json"), //
109105
MediaType.APPLICATION_JSON, //
110106
MediaType.parseMediaType("application/*+json") //

‎src/test/java/org/springframework/hateoas/config/HypermediaWebFluxConfigurerTest.java

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,12 @@ void registeringHalShouldServeHal() {
8181

8282
setUp(HalWebFluxConfig.class);
8383

84-
verifyRootUriServesHypermedia(MediaTypes.HAL_JSON, MediaTypes.HAL_JSON_UTF8);
85-
verifyAggregateRootServesHypermedia(MediaTypes.HAL_JSON, MediaTypes.HAL_JSON_UTF8);
86-
verifySingleItemResourceServesHypermedia(MediaTypes.HAL_JSON, MediaTypes.HAL_JSON_UTF8);
84+
verifyRootUriServesHypermedia(MediaTypes.HAL_JSON);
85+
verifyAggregateRootServesHypermedia(MediaTypes.HAL_JSON);
86+
verifySingleItemResourceServesHypermedia(MediaTypes.HAL_JSON);
8787

88-
verifyCreatingNewEntityWorks(MediaTypes.HAL_JSON, MediaTypes.HAL_JSON_UTF8);
89-
verifyCreatingNewEntityReactivelyShouldWork(MediaTypes.HAL_JSON, MediaTypes.HAL_JSON_UTF8);
88+
verifyCreatingNewEntityWorks(MediaTypes.HAL_JSON);
89+
verifyCreatingNewEntityReactivelyShouldWork(MediaTypes.HAL_JSON);
9090
}
9191

9292
/**
@@ -145,9 +145,9 @@ void registeringHalAndHalFormsShouldServerHalAndHalForms() {
145145

146146
setUp(AllHalWebFluxConfig.class);
147147

148-
verifyRootUriServesHypermedia(MediaTypes.HAL_JSON, MediaTypes.HAL_JSON_UTF8);
149-
verifyAggregateRootServesHypermedia(MediaTypes.HAL_JSON, MediaTypes.HAL_JSON_UTF8);
150-
verifySingleItemResourceServesHypermedia(MediaTypes.HAL_JSON, MediaTypes.HAL_JSON_UTF8);
148+
verifyRootUriServesHypermedia(MediaTypes.HAL_JSON);
149+
verifyAggregateRootServesHypermedia(MediaTypes.HAL_JSON);
150+
verifySingleItemResourceServesHypermedia(MediaTypes.HAL_JSON);
151151

152152
verifyRootUriServesHypermedia(MediaTypes.HAL_FORMS_JSON);
153153
verifyAggregateRootServesHypermedia(MediaTypes.HAL_FORMS_JSON);
@@ -162,8 +162,8 @@ void registeringHalAndHalFormsShouldAllowCreatingViaHalAndHalForms() {
162162

163163
setUp(AllHalWebFluxConfig.class);
164164

165-
verifyCreatingNewEntityWorks(MediaTypes.HAL_JSON, MediaTypes.HAL_JSON_UTF8);
166-
verifyCreatingNewEntityReactivelyShouldWork(MediaTypes.HAL_JSON, MediaTypes.HAL_JSON_UTF8);
165+
verifyCreatingNewEntityWorks(MediaTypes.HAL_JSON);
166+
verifyCreatingNewEntityReactivelyShouldWork(MediaTypes.HAL_JSON);
167167

168168
verifyCreatingNewEntityWorks(MediaTypes.HAL_FORMS_JSON);
169169
verifyCreatingNewEntityReactivelyShouldWork(MediaTypes.HAL_FORMS_JSON);
@@ -177,9 +177,9 @@ void registeringHalAndCollectionJsonShouldServerHalAndCollectionJson() {
177177

178178
setUp(HalAndCollectionJsonWebFluxConfig.class);
179179

180-
verifyRootUriServesHypermedia(MediaTypes.HAL_JSON, MediaTypes.HAL_JSON_UTF8);
181-
verifyAggregateRootServesHypermedia(MediaTypes.HAL_JSON, MediaTypes.HAL_JSON_UTF8);
182-
verifySingleItemResourceServesHypermedia(MediaTypes.HAL_JSON, MediaTypes.HAL_JSON_UTF8);
180+
verifyRootUriServesHypermedia(MediaTypes.HAL_JSON);
181+
verifyAggregateRootServesHypermedia(MediaTypes.HAL_JSON);
182+
verifySingleItemResourceServesHypermedia(MediaTypes.HAL_JSON);
183183

184184
verifyRootUriServesHypermedia(MediaTypes.HAL_FORMS_JSON);
185185
verifyAggregateRootServesHypermedia(MediaTypes.HAL_FORMS_JSON);
@@ -198,8 +198,8 @@ void registeringHalAndCollectionJsonShouldAllowCreatingViaHalAndCollectionJson()
198198

199199
setUp(HalAndCollectionJsonWebFluxConfig.class);
200200

201-
verifyCreatingNewEntityWorks(MediaTypes.HAL_JSON, MediaTypes.HAL_JSON_UTF8);
202-
verifyCreatingNewEntityReactivelyShouldWork(MediaTypes.HAL_JSON, MediaTypes.HAL_JSON_UTF8);
201+
verifyCreatingNewEntityWorks(MediaTypes.HAL_JSON);
202+
verifyCreatingNewEntityReactivelyShouldWork(MediaTypes.HAL_JSON);
203203

204204
verifyCreatingNewEntityWorks(MediaTypes.HAL_FORMS_JSON);
205205
verifyCreatingNewEntityReactivelyShouldWork(MediaTypes.HAL_FORMS_JSON);
@@ -216,9 +216,9 @@ void registeringAllHypermediaTypesShouldServerThemAll() {
216216

217217
setUp(AllHypermediaTypesWebFluxConfig.class);
218218

219-
verifyRootUriServesHypermedia(MediaTypes.HAL_JSON, MediaTypes.HAL_JSON_UTF8);
220-
verifyAggregateRootServesHypermedia(MediaTypes.HAL_JSON, MediaTypes.HAL_JSON_UTF8);
221-
verifySingleItemResourceServesHypermedia(MediaTypes.HAL_JSON, MediaTypes.HAL_JSON_UTF8);
219+
verifyRootUriServesHypermedia(MediaTypes.HAL_JSON);
220+
verifyAggregateRootServesHypermedia(MediaTypes.HAL_JSON);
221+
verifySingleItemResourceServesHypermedia(MediaTypes.HAL_JSON);
222222

223223
verifyRootUriServesHypermedia(MediaTypes.HAL_FORMS_JSON);
224224
verifyAggregateRootServesHypermedia(MediaTypes.HAL_FORMS_JSON);
@@ -241,8 +241,8 @@ void registeringAllHypermediaTypesShouldAllowCreatingThroughAllFormats() {
241241

242242
setUp(AllHypermediaTypesWebFluxConfig.class);
243243

244-
verifyCreatingNewEntityWorks(MediaTypes.HAL_JSON, MediaTypes.HAL_JSON_UTF8);
245-
verifyCreatingNewEntityReactivelyShouldWork(MediaTypes.HAL_JSON, MediaTypes.HAL_JSON_UTF8);
244+
verifyCreatingNewEntityWorks(MediaTypes.HAL_JSON);
245+
verifyCreatingNewEntityReactivelyShouldWork(MediaTypes.HAL_JSON);
246246

247247
verifyCreatingNewEntityWorks(MediaTypes.HAL_FORMS_JSON);
248248
verifyCreatingNewEntityReactivelyShouldWork(MediaTypes.HAL_FORMS_JSON);
@@ -276,7 +276,7 @@ void reactorTypesShouldWork() {
276276

277277
this.testClient.get().uri("/reactive").accept(MediaTypes.HAL_JSON).exchange() //
278278
.expectStatus().isOk() //
279-
.expectHeader().contentType(MediaTypes.HAL_JSON_UTF8) //
279+
.expectHeader().contentType(MediaTypes.HAL_JSON) //
280280
.returnResult(RepresentationModel.class).getResponseBody().as(StepVerifier::create)
281281
.expectNextMatches(resourceSupport -> {
282282

@@ -287,7 +287,7 @@ void reactorTypesShouldWork() {
287287
}).verifyComplete();
288288

289289
this.testClient.get().uri("/reactive/employees").accept(MediaTypes.HAL_JSON).exchange() //
290-
.expectStatus().isOk().expectHeader().contentType(MediaTypes.HAL_JSON_UTF8) //
290+
.expectStatus().isOk().expectHeader().contentType(MediaTypes.HAL_JSON) //
291291
.returnResult(this.resourcesEmployeeType).getResponseBody() //
292292
.as(StepVerifier::create).expectNextMatches(resources -> {
293293

@@ -304,7 +304,7 @@ void reactorTypesShouldWork() {
304304
}).verifyComplete();
305305

306306
this.testClient.get().uri("/reactive/employees/1").accept(MediaTypes.HAL_JSON).exchange() //
307-
.expectStatus().isOk().expectHeader().contentType(MediaTypes.HAL_JSON_UTF8) //
307+
.expectStatus().isOk().expectHeader().contentType(MediaTypes.HAL_JSON) //
308308
.returnResult(this.resourceEmployeeType).getResponseBody() //
309309
.as(StepVerifier::create).expectNextMatches(employee -> {
310310

‎src/test/java/org/springframework/hateoas/mediatype/hal/HalLinkDiscovererUnitTest.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -71,14 +71,6 @@ void discoversAllTheLinkAttributes() throws IOException {
7171
.hasValue(expected);
7272
}
7373

74-
/**
75-
* @see #470
76-
*/
77-
@Test
78-
void supportsHalUtf8() {
79-
assertThat(getDiscoverer().supports(MediaTypes.HAL_JSON_UTF8)).isTrue();
80-
}
81-
8274
@Override
8375
protected LinkDiscoverer getDiscoverer() {
8476
return discoverer;

‎src/test/java/org/springframework/hateoas/mediatype/hal/RenderHypermediaForDefaultAcceptHeadersTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ void browserBasedDefaultAcceptHeadersShouldProduceHalJson() throws Exception {
7878

7979
this.mockMvc.perform(get("/employees").accept(MediaType.APPLICATION_XHTML_XML, MediaType.ALL)) //
8080
.andExpect(status().isOk())
81-
.andExpect(header().string(HttpHeaders.CONTENT_TYPE, MediaTypes.HAL_JSON_UTF8_VALUE));
81+
.andExpect(header().string(HttpHeaders.CONTENT_TYPE, MediaTypes.HAL_JSON_VALUE));
8282
}
8383

8484
/**
@@ -91,7 +91,7 @@ void curlBasedDefaultAcceptHeadersShouldProduceHalJson() throws Exception {
9191

9292
this.mockMvc.perform(get("/employees").accept(MediaType.ALL)) //
9393
.andExpect(status().isOk())
94-
.andExpect(header().string(HttpHeaders.CONTENT_TYPE, MediaTypes.HAL_JSON_UTF8_VALUE));
94+
.andExpect(header().string(HttpHeaders.CONTENT_TYPE, MediaTypes.HAL_JSON_VALUE));
9595
}
9696

9797
@RestController

‎src/test/java/org/springframework/hateoas/server/mvc/RepresentationModelProcessorIntegrationTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public void setUp() {
9090
public void collectionModelProcessorShouldWork() throws Exception {
9191

9292
String results = this.mockMvc.perform(get("/employees").accept(HAL_JSON)) //
93-
.andExpect(header().string(HttpHeaders.CONTENT_TYPE, HAL_JSON.toString() + ";charset=UTF-8")) //
93+
.andExpect(header().string(HttpHeaders.CONTENT_TYPE, HAL_JSON.toString())) //
9494
.andReturn() //
9595
.getResponse() //
9696
.getContentAsString();
@@ -109,7 +109,7 @@ public void collectionModelProcessorShouldWork() throws Exception {
109109
public void entityModelProcessorShouldWork() throws Exception {
110110

111111
String results = this.mockMvc.perform(get("/employees/1").accept(HAL_JSON)) //
112-
.andExpect(header().string(HttpHeaders.CONTENT_TYPE, HAL_JSON.toString() + ";charset=UTF-8")) //
112+
.andExpect(header().string(HttpHeaders.CONTENT_TYPE, HAL_JSON.toString())) //
113113
.andReturn() //
114114
.getResponse() //
115115
.getContentAsString();
@@ -125,7 +125,7 @@ public void entityModelProcessorShouldWork() throws Exception {
125125
public void wildcardProcessorShouldNotWork() throws Exception {
126126

127127
String results = this.mockMvc.perform(get("/employees").accept(HAL_JSON)) //
128-
.andExpect(header().string(HttpHeaders.CONTENT_TYPE, HAL_JSON.toString() + ";charset=UTF-8")) //
128+
.andExpect(header().string(HttpHeaders.CONTENT_TYPE, HAL_JSON.toString())) //
129129
.andReturn() //
130130
.getResponse() //
131131
.getContentAsString();

‎src/test/java/org/springframework/hateoas/server/reactive/HypermediaWebFilterTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ void webFilterShouldEmbedExchangeIntoContext() {
7171
.accept(MediaTypes.HAL_JSON) //
7272
.exchange() //
7373
.expectStatus().isOk() //
74-
.expectHeader().contentType(MediaTypes.HAL_JSON_UTF8) //
74+
.expectHeader().contentType(MediaTypes.HAL_JSON) //
7575
.returnResult(RepresentationModel.class) //
7676
.getResponseBody() //
7777
.as(StepVerifier::create) //

0 commit comments

Comments
 (0)