From 5dbf458c4279ebc58e0b646ea57bc13e9fa1d566 Mon Sep 17 00:00:00 2001 From: HildoYe Date: Sun, 28 Nov 2021 15:17:51 -0600 Subject: [PATCH 01/16] Ignore the order of LinkRelations --- .../org/springframework/hateoas/IanaLinkRelationUnitTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/test/java/org/springframework/hateoas/IanaLinkRelationUnitTest.java b/src/test/java/org/springframework/hateoas/IanaLinkRelationUnitTest.java index 251ed6b1a..8213d980d 100644 --- a/src/test/java/org/springframework/hateoas/IanaLinkRelationUnitTest.java +++ b/src/test/java/org/springframework/hateoas/IanaLinkRelationUnitTest.java @@ -16,6 +16,7 @@ package org.springframework.hateoas; import static org.assertj.core.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; import lombok.Value; @@ -107,7 +108,7 @@ void testAllIanaLinkRelationsHaveStringConstant() { .map(String.class::cast) // .collect(Collectors.toSet()); - assertThat(linkRelations).containsExactlyElementsOf(stringConstants); + assertEquals(linkRelations, stringConstants); } /** From 482de1593c7d4f1f08b01b370aaa1c8721b43c3d Mon Sep 17 00:00:00 2001 From: HildoYe Date: Sun, 28 Nov 2021 16:09:50 -0600 Subject: [PATCH 02/16] Ordered Link Class --- src/main/java/org/springframework/hateoas/Link.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/org/springframework/hateoas/Link.java b/src/main/java/org/springframework/hateoas/Link.java index 1831633fb..51c012d7d 100755 --- a/src/main/java/org/springframework/hateoas/Link.java +++ b/src/main/java/org/springframework/hateoas/Link.java @@ -34,6 +34,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; /** * Value object for links. @@ -42,7 +43,11 @@ * @author Greg Turnquist * @author Jens Schauder */ +// private Link(LinkRelation rel, String href, @Nullable String hreflang, @Nullable String media, @Nullable String title, +// @Nullable String type, @Nullable String deprecation, @Nullable String profile, @Nullable String name, +// @Nullable UriTemplate template, List affordances) { @JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({"rel", "href", "hreflang", "media", "title", "type", "deprecation", "profile", "name", "template", "affordances"}) @JsonIgnoreProperties(value = { "templated", "template" }, ignoreUnknown = true) public class Link implements Serializable { From b82344f428f314bf9b04fa011ed4b293baf66975 Mon Sep 17 00:00:00 2001 From: HildoYe Date: Sun, 28 Nov 2021 16:09:58 -0600 Subject: [PATCH 03/16] Ordered PagedModel Class --- src/main/java/org/springframework/hateoas/PagedModel.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/org/springframework/hateoas/PagedModel.java b/src/main/java/org/springframework/hateoas/PagedModel.java index 354139a04..f40e8eac6 100644 --- a/src/main/java/org/springframework/hateoas/PagedModel.java +++ b/src/main/java/org/springframework/hateoas/PagedModel.java @@ -29,6 +29,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; /** * DTO to implement binding response representations of pageable collections. @@ -388,6 +389,7 @@ public int hashCode() { * * @author Oliver Gierke */ + @JsonPropertyOrder({"size", "totalElements", "totalPages", "number"}) public static class PageMetadata { @JsonProperty private long size; From 703d101d77aef5e4793d2218832a265d45208c94 Mon Sep 17 00:00:00 2001 From: HildoYe Date: Sun, 28 Nov 2021 16:10:11 -0600 Subject: [PATCH 04/16] Ordered Employee Class --- src/test/java/org/springframework/hateoas/support/Employee.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/java/org/springframework/hateoas/support/Employee.java b/src/test/java/org/springframework/hateoas/support/Employee.java index 5c9d9a9a6..f6a9c6803 100644 --- a/src/test/java/org/springframework/hateoas/support/Employee.java +++ b/src/test/java/org/springframework/hateoas/support/Employee.java @@ -22,6 +22,7 @@ import javax.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; /** * @author Greg Turnquist @@ -30,6 +31,7 @@ @With @AllArgsConstructor @JsonIgnoreProperties(ignoreUnknown = true) +@JsonPropertyOrder({"name", "role"}) public class Employee { private @NotNull String name; From adcebe691d41a8112173ab24818e0d4c49565841 Mon Sep 17 00:00:00 2001 From: HildoYe Date: Sun, 28 Nov 2021 16:12:43 -0600 Subject: [PATCH 05/16] Ordered User Class --- .../org/springframework/hateoas/EntityModelIntegrationTest.java | 2 ++ .../hateoas/Jackson2ResourceIntegrationTest.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/test/java/org/springframework/hateoas/EntityModelIntegrationTest.java b/src/test/java/org/springframework/hateoas/EntityModelIntegrationTest.java index 8c094e7e8..6f16c02e8 100755 --- a/src/test/java/org/springframework/hateoas/EntityModelIntegrationTest.java +++ b/src/test/java/org/springframework/hateoas/EntityModelIntegrationTest.java @@ -20,6 +20,7 @@ import org.junit.jupiter.api.Test; import com.fasterxml.jackson.annotation.JsonAutoDetect; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility; import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.ObjectMapper; @@ -87,6 +88,7 @@ public PersonModel(Person person) { protected PersonModel() {} } + @JsonPropertyOrder({"firstname", "lastname"}) @JsonAutoDetect(fieldVisibility = Visibility.ANY) static class Person { diff --git a/src/test/java/org/springframework/hateoas/Jackson2ResourceIntegrationTest.java b/src/test/java/org/springframework/hateoas/Jackson2ResourceIntegrationTest.java index df3602617..73ba1afa1 100755 --- a/src/test/java/org/springframework/hateoas/Jackson2ResourceIntegrationTest.java +++ b/src/test/java/org/springframework/hateoas/Jackson2ResourceIntegrationTest.java @@ -5,6 +5,7 @@ import org.junit.jupiter.api.Test; import com.fasterxml.jackson.annotation.JsonAutoDetect; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; /** * Integration tests for {@link EntityModel}. @@ -54,6 +55,7 @@ public PersonResource() { } } + @JsonPropertyOrder({"firstname", "lastname"}) @JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY) static class Person { From 553521dcd75e15078e913a85d1f954d94f310758 Mon Sep 17 00:00:00 2001 From: HildoYe Date: Sun, 28 Nov 2021 16:13:03 -0600 Subject: [PATCH 06/16] Ordered User Class --- .../hateoas/Jackson2PagedResourcesIntegrationTest.java | 3 +++ .../hateoas/server/core/TypeReferencesIntegrationTest.java | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/test/java/org/springframework/hateoas/Jackson2PagedResourcesIntegrationTest.java b/src/test/java/org/springframework/hateoas/Jackson2PagedResourcesIntegrationTest.java index 1541d25a1..dc2813e8f 100755 --- a/src/test/java/org/springframework/hateoas/Jackson2PagedResourcesIntegrationTest.java +++ b/src/test/java/org/springframework/hateoas/Jackson2PagedResourcesIntegrationTest.java @@ -24,6 +24,8 @@ import java.lang.reflect.Type; import java.util.Collections; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; + import org.apache.commons.io.output.WriterOutputStream; import org.junit.jupiter.api.Test; import org.springframework.hateoas.PagedModel.PageMetadata; @@ -86,6 +88,7 @@ interface Sample { CollectionModel someMethod(); } + @JsonPropertyOrder({"firstname", "lastname"}) static class User { public String firstname, lastname; } diff --git a/src/test/java/org/springframework/hateoas/server/core/TypeReferencesIntegrationTest.java b/src/test/java/org/springframework/hateoas/server/core/TypeReferencesIntegrationTest.java index 2ce62215d..b6bae8421 100755 --- a/src/test/java/org/springframework/hateoas/server/core/TypeReferencesIntegrationTest.java +++ b/src/test/java/org/springframework/hateoas/server/core/TypeReferencesIntegrationTest.java @@ -24,6 +24,8 @@ import java.util.Collection; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -218,6 +220,7 @@ private static void assertExpectedUser(User user) { } @Data + @JsonPropertyOrder({"firstname", "lastname"}) static class User { public String firstname, lastname; } From 61b4c38155acffaafc531e1288b2915bfdc00d9f Mon Sep 17 00:00:00 2001 From: HildoYe Date: Sun, 28 Nov 2021 16:35:41 -0600 Subject: [PATCH 07/16] Ordered HalFormsProperty class --- .../hateoas/mediatype/hal/forms/HalFormsProperty.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/org/springframework/hateoas/mediatype/hal/forms/HalFormsProperty.java b/src/main/java/org/springframework/hateoas/mediatype/hal/forms/HalFormsProperty.java index f52a672b8..865397266 100644 --- a/src/main/java/org/springframework/hateoas/mediatype/hal/forms/HalFormsProperty.java +++ b/src/main/java/org/springframework/hateoas/mediatype/hal/forms/HalFormsProperty.java @@ -27,6 +27,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; /** * Describe a parameter for the associated state transition in a HAL-FORMS document. A {@link HalFormsTemplate} may @@ -35,6 +36,7 @@ * @see https://mamund.site44.com/misc/hal-forms/ */ @JsonInclude(Include.NON_DEFAULT) +@JsonPropertyOrder({"name", "prompt", "regex", "placeholder", "value", "templated", "multi", "readOnly", "required", "min", "max", "minLength", "maxLength", "type", "options"}) final class HalFormsProperty implements Named { private final String name, prompt, regex, placeholder; From 92c093a25ab38de3bf9707e1a0bb2d36cb1bb1ae Mon Sep 17 00:00:00 2001 From: HildoYe Date: Sun, 28 Nov 2021 16:45:41 -0600 Subject: [PATCH 08/16] Ordered SimplePojo Class --- .../org/springframework/hateoas/mediatype/hal/SimplePojo.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/java/org/springframework/hateoas/mediatype/hal/SimplePojo.java b/src/test/java/org/springframework/hateoas/mediatype/hal/SimplePojo.java index 9eebf931a..fe390d496 100644 --- a/src/test/java/org/springframework/hateoas/mediatype/hal/SimplePojo.java +++ b/src/test/java/org/springframework/hateoas/mediatype/hal/SimplePojo.java @@ -6,7 +6,9 @@ import lombok.NoArgsConstructor; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +@JsonPropertyOrder({"text", "number"}) @Data @Getter(onMethod = @__(@JsonProperty)) @NoArgsConstructor From 03edd09d308e76272ea26093414f50a39c53e581 Mon Sep 17 00:00:00 2001 From: HildoYe Date: Mon, 29 Nov 2021 10:17:14 -0600 Subject: [PATCH 09/16] Ordered Author class --- .../hateoas/mediatype/hal/HalModelBuilderUnitTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/java/org/springframework/hateoas/mediatype/hal/HalModelBuilderUnitTest.java b/src/test/java/org/springframework/hateoas/mediatype/hal/HalModelBuilderUnitTest.java index 4df712820..09ceafb5c 100644 --- a/src/test/java/org/springframework/hateoas/mediatype/hal/HalModelBuilderUnitTest.java +++ b/src/test/java/org/springframework/hateoas/mediatype/hal/HalModelBuilderUnitTest.java @@ -49,6 +49,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; @@ -387,6 +388,7 @@ private void assertEmptyEmbed(RepresentationModel model, String name) throws @Value @AllArgsConstructor + @JsonPropertyOrder({"name", "born", "died"}) static class Author { private String name; From 17ee9f21c66c6f54d16eda4fe1b89ec24a8f7eca Mon Sep 17 00:00:00 2001 From: HildoYe Date: Mon, 29 Nov 2021 10:21:41 -0600 Subject: [PATCH 10/16] Ordered Product class --- .../hateoas/mediatype/hal/HalModelBuilderUnitTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/java/org/springframework/hateoas/mediatype/hal/HalModelBuilderUnitTest.java b/src/test/java/org/springframework/hateoas/mediatype/hal/HalModelBuilderUnitTest.java index 09ceafb5c..a0983de49 100644 --- a/src/test/java/org/springframework/hateoas/mediatype/hal/HalModelBuilderUnitTest.java +++ b/src/test/java/org/springframework/hateoas/mediatype/hal/HalModelBuilderUnitTest.java @@ -406,6 +406,7 @@ static class Staff { @Value @AllArgsConstructor + @JsonPropertyOrder({"name", "price"}) static class Product { private String name; From 83271c91f4632b5390c947ee2b131a47f2c22cdf Mon Sep 17 00:00:00 2001 From: HildoYe Date: Mon, 29 Nov 2021 11:15:54 -0600 Subject: [PATCH 11/16] Ordered Problem class --- .../org/springframework/hateoas/mediatype/problem/Problem.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/org/springframework/hateoas/mediatype/problem/Problem.java b/src/main/java/org/springframework/hateoas/mediatype/problem/Problem.java index c379416a6..e9fc97472 100644 --- a/src/main/java/org/springframework/hateoas/mediatype/problem/Problem.java +++ b/src/main/java/org/springframework/hateoas/mediatype/problem/Problem.java @@ -33,6 +33,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonUnwrapped; /** @@ -42,6 +43,7 @@ * @author Greg Turnquist * @author Oliver Drotbohm */ +@JsonPropertyOrder({"type", "title", "detail", "instance"}) @JsonInclude(Include.NON_NULL) public class Problem { From c517ea2bcf0d6602e09bf692885aea2d81db66ab Mon Sep 17 00:00:00 2001 From: HildoYe Date: Mon, 29 Nov 2021 11:16:12 -0600 Subject: [PATCH 12/16] Ordered AccountProblemDetails class --- .../hateoas/mediatype/problem/JacksonSerializationTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/java/org/springframework/hateoas/mediatype/problem/JacksonSerializationTest.java b/src/test/java/org/springframework/hateoas/mediatype/problem/JacksonSerializationTest.java index bf2c17b8e..6bdca6ad7 100644 --- a/src/test/java/org/springframework/hateoas/mediatype/problem/JacksonSerializationTest.java +++ b/src/test/java/org/springframework/hateoas/mediatype/problem/JacksonSerializationTest.java @@ -42,6 +42,7 @@ import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.JavaType; @@ -332,6 +333,7 @@ static class Sample { */ @Value @Getter(onMethod = @__(@JsonProperty)) + @JsonPropertyOrder({"balance", "accounts"}) @RequiredArgsConstructor(access = AccessLevel.PRIVATE) @NoArgsConstructor(staticName = "empty", force = true) @With From ca7450f916873fc758c00d50341073aa99df5950 Mon Sep 17 00:00:00 2001 From: HildoYe Date: Mon, 29 Nov 2021 11:39:40 -0600 Subject: [PATCH 13/16] Replace HashMap with LinkedHashMap --- .../hateoas/mediatype/hal/forms/HalFormsTemplateBuilder.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/springframework/hateoas/mediatype/hal/forms/HalFormsTemplateBuilder.java b/src/main/java/org/springframework/hateoas/mediatype/hal/forms/HalFormsTemplateBuilder.java index d08eb5c4c..4da0ce106 100644 --- a/src/main/java/org/springframework/hateoas/mediatype/hal/forms/HalFormsTemplateBuilder.java +++ b/src/main/java/org/springframework/hateoas/mediatype/hal/forms/HalFormsTemplateBuilder.java @@ -15,7 +15,7 @@ */ package org.springframework.hateoas.mediatype.hal.forms; -import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.Map; import java.util.Optional; import java.util.stream.Stream; @@ -53,7 +53,7 @@ public HalFormsTemplateBuilder(HalFormsConfiguration configuration, MessageResol */ public Map findTemplates(RepresentationModel resource) { - Map templates = new HashMap<>(); + Map templates = new LinkedHashMap<>(); Link selfLink = resource.getLink(IanaLinkRelations.SELF).orElse(null); resource.getLinks().stream() // From 2b7365d8a23f73e1d1178f4220af1820276f3022 Mon Sep 17 00:00:00 2001 From: HildoYe Date: Mon, 29 Nov 2021 12:26:28 -0600 Subject: [PATCH 14/16] Made mappers able to sort nested keys --- .../hateoas/mediatype/hal/Jackson2HalIntegrationTest.java | 6 ++++++ .../hal/forms/Jackson2HalFormsIntegrationTest.java | 3 +++ 2 files changed, 9 insertions(+) diff --git a/src/test/java/org/springframework/hateoas/mediatype/hal/Jackson2HalIntegrationTest.java b/src/test/java/org/springframework/hateoas/mediatype/hal/Jackson2HalIntegrationTest.java index 4e71ee783..65c2f715b 100755 --- a/src/test/java/org/springframework/hateoas/mediatype/hal/Jackson2HalIntegrationTest.java +++ b/src/test/java/org/springframework/hateoas/mediatype/hal/Jackson2HalIntegrationTest.java @@ -21,6 +21,8 @@ import net.minidev.json.JSONObject; import java.io.IOException; +import java.io.StringWriter; +import java.io.Writer; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -58,6 +60,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JavaType; +import com.fasterxml.jackson.databind.MapperFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.PropertyNamingStrategies; import com.fasterxml.jackson.databind.PropertyNamingStrategy; @@ -721,6 +724,9 @@ private ObjectMapper getCuriedObjectMapper(CurieProvider provider, @Nullable Mes mapper.registerModule(new Jackson2HalModule()); mapper.setHandlerInstantiator( new HalHandlerInstantiator(new AnnotationLinkRelationProvider(), provider, MessageResolver.of(messageSource))); + + // the current alternative SerializationFeature.ORDERED_MAP_ENTRIES_BY_KEYS does not sort nested keys + mapper.configure(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY, true); return mapper; } diff --git a/src/test/java/org/springframework/hateoas/mediatype/hal/forms/Jackson2HalFormsIntegrationTest.java b/src/test/java/org/springframework/hateoas/mediatype/hal/forms/Jackson2HalFormsIntegrationTest.java index 2983ab0f5..51bb43149 100644 --- a/src/test/java/org/springframework/hateoas/mediatype/hal/forms/Jackson2HalFormsIntegrationTest.java +++ b/src/test/java/org/springframework/hateoas/mediatype/hal/forms/Jackson2HalFormsIntegrationTest.java @@ -76,6 +76,7 @@ import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility; import com.fasterxml.jackson.annotation.JsonUnwrapped; +import com.fasterxml.jackson.databind.MapperFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; import com.jayway.jsonpath.DocumentContext; @@ -668,6 +669,8 @@ private ContextualMapper getCuriedObjectMapper(CurieProvider provider, @Nullable return MappingTestUtils.createMapper(Jackson2HalFormsIntegrationTest.class, configurer.andThen(it -> { it.setHandlerInstantiator(new Jackson2HalModule.HalHandlerInstantiator(this.provider, provider, resolver, new HalConfiguration(), factory)); + // the current alternative SerializationFeature.ORDERED_MAP_ENTRIES_BY_KEYS does not sort nested keys + it.configure(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY, true); })); } From eff8585272e4b94c9edc21c3b22115411e73f1e9 Mon Sep 17 00:00:00 2001 From: HildoYe Date: Mon, 29 Nov 2021 12:29:46 -0600 Subject: [PATCH 15/16] Removed Extra lines --- src/main/java/org/springframework/hateoas/Link.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/main/java/org/springframework/hateoas/Link.java b/src/main/java/org/springframework/hateoas/Link.java index 51c012d7d..6de7e672f 100755 --- a/src/main/java/org/springframework/hateoas/Link.java +++ b/src/main/java/org/springframework/hateoas/Link.java @@ -43,9 +43,6 @@ * @author Greg Turnquist * @author Jens Schauder */ -// private Link(LinkRelation rel, String href, @Nullable String hreflang, @Nullable String media, @Nullable String title, -// @Nullable String type, @Nullable String deprecation, @Nullable String profile, @Nullable String name, -// @Nullable UriTemplate template, List affordances) { @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({"rel", "href", "hreflang", "media", "title", "type", "deprecation", "profile", "name", "template", "affordances"}) @JsonIgnoreProperties(value = { "templated", "template" }, ignoreUnknown = true) From 34b19f177c55c17edc897f314a787e7cdc40681a Mon Sep 17 00:00:00 2001 From: HildoYe Date: Mon, 29 Nov 2021 12:52:20 -0600 Subject: [PATCH 16/16] Removed extra lines --- .../hateoas/mediatype/hal/Jackson2HalIntegrationTest.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/test/java/org/springframework/hateoas/mediatype/hal/Jackson2HalIntegrationTest.java b/src/test/java/org/springframework/hateoas/mediatype/hal/Jackson2HalIntegrationTest.java index 65c2f715b..ab40e3bde 100755 --- a/src/test/java/org/springframework/hateoas/mediatype/hal/Jackson2HalIntegrationTest.java +++ b/src/test/java/org/springframework/hateoas/mediatype/hal/Jackson2HalIntegrationTest.java @@ -21,8 +21,6 @@ import net.minidev.json.JSONObject; import java.io.IOException; -import java.io.StringWriter; -import java.io.Writer; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection;