diff --git a/src/main/java/org/springframework/hateoas/AffordanceModel.java b/src/main/java/org/springframework/hateoas/AffordanceModel.java index bd6de6f8..b8883c8a 100644 --- a/src/main/java/org/springframework/hateoas/AffordanceModel.java +++ b/src/main/java/org/springframework/hateoas/AffordanceModel.java @@ -114,7 +114,7 @@ public abstract class AffordanceModel { */ public interface PayloadMetadata { - public static PayloadMetadata NONE = NoPayloadMetadata.INSTANCE; + PayloadMetadata NONE = NoPayloadMetadata.INSTANCE; /** * Returns all properties contained in a payload. @@ -135,7 +135,7 @@ public abstract class AffordanceModel { */ public interface InputPayloadMetadata extends PayloadMetadata { - static InputPayloadMetadata NONE = from(PayloadMetadata.NONE); + InputPayloadMetadata NONE = from(PayloadMetadata.NONE); static InputPayloadMetadata from(PayloadMetadata metadata) { @@ -298,7 +298,7 @@ public abstract class AffordanceModel { * * @author Oliver Drotbohm */ - private static enum NoPayloadMetadata implements PayloadMetadata { + private enum NoPayloadMetadata implements PayloadMetadata { INSTANCE; diff --git a/src/main/java/org/springframework/hateoas/Link.java b/src/main/java/org/springframework/hateoas/Link.java index 7f489f6d..72a3a219 100755 --- a/src/main/java/org/springframework/hateoas/Link.java +++ b/src/main/java/org/springframework/hateoas/Link.java @@ -202,8 +202,7 @@ public class Link implements Serializable { Assert.notNull(affordance, "Affordance must not be null!"); - List newAffordances = new ArrayList<>(); - newAffordances.addAll(this.affordances); + List newAffordances = new ArrayList<>(this.affordances); newAffordances.add(affordance); return withAffordances(newAffordances); @@ -281,7 +280,7 @@ public class Link implements Serializable { * @param arguments must not be {@literal null}. * @return */ - public Link expand(Map arguments) { + public Link expand(Map arguments) { return new Link(template.expand(arguments).toString(), getRel()); } diff --git a/src/main/java/org/springframework/hateoas/Links.java b/src/main/java/org/springframework/hateoas/Links.java index 32d108a1..408c25ba 100644 --- a/src/main/java/org/springframework/hateoas/Links.java +++ b/src/main/java/org/springframework/hateoas/Links.java @@ -457,7 +457,7 @@ public class Links implements Iterable { * * @author Oliver Drotbohm */ - public static enum MergeMode { + public enum MergeMode { /** * Skips to add the same links on merge. Multiple links with the same link relation might appear. @@ -472,6 +472,6 @@ public class Links implements Iterable { /** * Replaces existing links with the same link relation. */ - REPLACE_BY_REL; + REPLACE_BY_REL } } diff --git a/src/main/java/org/springframework/hateoas/StringLinkRelation.java b/src/main/java/org/springframework/hateoas/StringLinkRelation.java index 4acde914..ab7e56b5 100644 --- a/src/main/java/org/springframework/hateoas/StringLinkRelation.java +++ b/src/main/java/org/springframework/hateoas/StringLinkRelation.java @@ -41,7 +41,7 @@ import com.fasterxml.jackson.annotation.JsonValue; class StringLinkRelation implements LinkRelation, Serializable { private static final long serialVersionUID = -3904935345545567957L; - private static final Map CACHE = new ConcurrentHashMap(256); + private static final Map CACHE = new ConcurrentHashMap<>(256); @NonNull String relation; diff --git a/src/main/java/org/springframework/hateoas/UriTemplate.java b/src/main/java/org/springframework/hateoas/UriTemplate.java index 92335d49..3b9986d0 100644 --- a/src/main/java/org/springframework/hateoas/UriTemplate.java +++ b/src/main/java/org/springframework/hateoas/UriTemplate.java @@ -267,7 +267,7 @@ public class UriTemplate implements Iterable, Serializable { * @param parameters must not be {@literal null}. * @return */ - public URI expand(Map parameters) { + public URI expand(Map parameters) { if (TemplateVariables.NONE.equals(variables)) { return URI.create(baseUri); @@ -373,8 +373,7 @@ public class UriTemplate implements Iterable, Serializable { } else if (value instanceof Map) { - ((Map) value).entrySet() // - .forEach(it -> builder.queryParam(it.getKey().toString(), it.getValue())); + ((Map) value).forEach((key, value1) -> builder.queryParam(key.toString(), value1)); } else { diff --git a/src/main/java/org/springframework/hateoas/client/Traverson.java b/src/main/java/org/springframework/hateoas/client/Traverson.java index e7a3efea..386764be 100644 --- a/src/main/java/org/springframework/hateoas/client/Traverson.java +++ b/src/main/java/org/springframework/hateoas/client/Traverson.java @@ -126,7 +126,7 @@ public class Traverson { return DEFAULTS.getHttpMessageConverters(Arrays.asList(mediaTypes)); } - private static final RestOperations createDefaultTemplate(List mediaTypes) { + private static RestOperations createDefaultTemplate(List mediaTypes) { RestTemplate template = new RestTemplate(); template.setMessageConverters(DEFAULTS.getHttpMessageConverters(mediaTypes)); diff --git a/src/main/java/org/springframework/hateoas/config/HypermediaConfigurationImportSelector.java b/src/main/java/org/springframework/hateoas/config/HypermediaConfigurationImportSelector.java index e91a76d4..eccb0a9a 100644 --- a/src/main/java/org/springframework/hateoas/config/HypermediaConfigurationImportSelector.java +++ b/src/main/java/org/springframework/hateoas/config/HypermediaConfigurationImportSelector.java @@ -53,11 +53,6 @@ class HypermediaConfigurationImportSelector implements ImportSelector { List configurationProviders = SpringFactoriesLoader.loadFactories( MediaTypeConfigurationProvider.class, HypermediaConfigurationImportSelector.class.getClassLoader()); - // No additional filtering needed. - if (types.isEmpty()) { - return configurationProviders.toArray(new String[0]); - } - // Filter the ones supporting the given media types return configurationProviders.stream() // .filter(it -> it.supportsAny(types)) // diff --git a/src/main/java/org/springframework/hateoas/mediatype/MessageResolver.java b/src/main/java/org/springframework/hateoas/mediatype/MessageResolver.java index 71c9ae87..672a987f 100644 --- a/src/main/java/org/springframework/hateoas/mediatype/MessageResolver.java +++ b/src/main/java/org/springframework/hateoas/mediatype/MessageResolver.java @@ -28,7 +28,7 @@ import org.springframework.lang.Nullable; */ public interface MessageResolver { - public static final MessageResolver DEFAULTS_ONLY = DefaultOnlyMessageResolver.INSTANCE; + MessageResolver DEFAULTS_ONLY = DefaultOnlyMessageResolver.INSTANCE; /** * Resolve the given {@link MessageSourceResolvable}. Return {@literal null} if no message was found. @@ -45,7 +45,7 @@ public interface MessageResolver { * @param messageSource can be {@literal null}. * @return will never be {@literal null}. */ - public static MessageResolver of(@Nullable MessageSource messageSource) { + static MessageResolver of(@Nullable MessageSource messageSource) { return messageSource == null // ? DefaultOnlyMessageResolver.INSTANCE // diff --git a/src/main/java/org/springframework/hateoas/mediatype/collectionjson/Jackson2CollectionJsonModule.java b/src/main/java/org/springframework/hateoas/mediatype/collectionjson/Jackson2CollectionJsonModule.java index ab27a43e..3c975ae8 100644 --- a/src/main/java/org/springframework/hateoas/mediatype/collectionjson/Jackson2CollectionJsonModule.java +++ b/src/main/java/org/springframework/hateoas/mediatype/collectionjson/Jackson2CollectionJsonModule.java @@ -876,7 +876,7 @@ class Jackson2CollectionJsonModule extends SimpleModule { return collection.getItems().stream() // .map(CollectionJsonItem::withOwnSelfLink) // - . map(it -> isResource // + .map(it -> isResource // ? new EntityModel<>(it.toRawData(rootType), it.getLinks()) // : it.toRawData(rootType)) // .collect(Collectors.collectingAndThen(Collectors.toList(), it -> finalizer.apply(it, links))); diff --git a/src/main/java/org/springframework/hateoas/mediatype/hal/CurieProvider.java b/src/main/java/org/springframework/hateoas/mediatype/hal/CurieProvider.java index f58a5b52..333e0a1e 100644 --- a/src/main/java/org/springframework/hateoas/mediatype/hal/CurieProvider.java +++ b/src/main/java/org/springframework/hateoas/mediatype/hal/CurieProvider.java @@ -31,7 +31,7 @@ import org.springframework.hateoas.Links; */ public interface CurieProvider { - public static CurieProvider NONE = new CurieProvider() { + CurieProvider NONE = new CurieProvider() { @Override public HalLinkRelation getNamespacedRelFrom(Link link) { @@ -44,7 +44,7 @@ public interface CurieProvider { } @Override - public Collection getCurieInformation(Links links) { + public Collection getCurieInformation(Links links) { throw new UnsupportedOperationException(); } }; @@ -75,5 +75,5 @@ public interface CurieProvider { * @param links the {@link Links} that have been added to the response so far. * @return must not be {@literal null}. */ - Collection getCurieInformation(Links links); + Collection getCurieInformation(Links links); } diff --git a/src/main/java/org/springframework/hateoas/mediatype/hal/DefaultCurieProvider.java b/src/main/java/org/springframework/hateoas/mediatype/hal/DefaultCurieProvider.java index dcf7f5e3..a46f98b8 100644 --- a/src/main/java/org/springframework/hateoas/mediatype/hal/DefaultCurieProvider.java +++ b/src/main/java/org/springframework/hateoas/mediatype/hal/DefaultCurieProvider.java @@ -98,7 +98,7 @@ public class DefaultCurieProvider implements CurieProvider { * @see org.springframework.hateoas.hal.CurieProvider#getCurieInformation() */ @Override - public Collection getCurieInformation(Links links) { + public Collection getCurieInformation(Links links) { return curies.entrySet().stream() // .map(it -> new Curie(it.getKey(), getCurieHref(it.getKey(), it.getValue()))) // diff --git a/src/main/java/org/springframework/hateoas/mediatype/hal/HalTraversonDefaults.java b/src/main/java/org/springframework/hateoas/mediatype/hal/HalTraversonDefaults.java index 642a6998..262047b1 100644 --- a/src/main/java/org/springframework/hateoas/mediatype/hal/HalTraversonDefaults.java +++ b/src/main/java/org/springframework/hateoas/mediatype/hal/HalTraversonDefaults.java @@ -80,7 +80,7 @@ class HalTraversonDefaults implements TraversonDefaults { * * @return */ - private static final HttpMessageConverter getHalConverter(List halFlavours) { + private static HttpMessageConverter getHalConverter(List halFlavours) { ObjectMapper mapper = new ObjectMapper(); mapper.registerModule(new Jackson2HalModule()); diff --git a/src/main/java/org/springframework/hateoas/mediatype/hal/Jackson2HalModule.java b/src/main/java/org/springframework/hateoas/mediatype/hal/Jackson2HalModule.java index 7d790232..812f6787 100644 --- a/src/main/java/org/springframework/hateoas/mediatype/hal/Jackson2HalModule.java +++ b/src/main/java/org/springframework/hateoas/mediatype/hal/Jackson2HalModule.java @@ -182,8 +182,7 @@ public class Jackson2HalModule extends SimpleModule { if (!skipCuries && prefixingRequired && curiedLinkPresent) { - ArrayList curies = new ArrayList<>(); - curies.addAll(curieProvider.getCurieInformation(Links.of(links))); + ArrayList curies = new ArrayList<>(curieProvider.getCurieInformation(Links.of(links))); sortedLinks.put(HalLinkRelation.CURIES, curies); } @@ -525,7 +524,7 @@ public class Jackson2HalModule extends SimpleModule { private JsonSerializer getOrLookupSerializerFor(Object value, SerializerProvider provider) throws JsonMappingException { - Class type = value.getClass(); + Class type = value.getClass(); JsonSerializer serializer = serializers.get(type); if (serializer == null) { diff --git a/src/main/java/org/springframework/hateoas/mediatype/hal/forms/HalFormsDocument.java b/src/main/java/org/springframework/hateoas/mediatype/hal/forms/HalFormsDocument.java index 1d302368..4888f467 100644 --- a/src/main/java/org/springframework/hateoas/mediatype/hal/forms/HalFormsDocument.java +++ b/src/main/java/org/springframework/hateoas/mediatype/hal/forms/HalFormsDocument.java @@ -171,11 +171,11 @@ public class HalFormsDocument { } public HalFormsDocument withPageMetadata(@Nullable PageMetadata metadata) { - return new HalFormsDocument(attributes, entity, entities, embedded, metadata, links, templates); + return new HalFormsDocument<>(attributes, entity, entities, embedded, metadata, links, templates); } private HalFormsDocument withEntity(@Nullable T entity) { - return new HalFormsDocument(attributes, entity, entities, embedded, pageMetadata, links, templates); + return new HalFormsDocument<>(attributes, entity, entities, embedded, pageMetadata, links, templates); } /** 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 7f47cc15..a742d3f3 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 @@ -206,7 +206,7 @@ class HalFormsTemplateBuilder { codes.add(globalCode); - return codes.toArray(new String[codes.size()]); + return codes.toArray(new String[0]); } } } diff --git a/src/main/java/org/springframework/hateoas/mediatype/uber/Jackson2UberModule.java b/src/main/java/org/springframework/hateoas/mediatype/uber/Jackson2UberModule.java index c460ab10..b0152b99 100644 --- a/src/main/java/org/springframework/hateoas/mediatype/uber/Jackson2UberModule.java +++ b/src/main/java/org/springframework/hateoas/mediatype/uber/Jackson2UberModule.java @@ -847,7 +847,7 @@ public class Jackson2UberModule extends SimpleModule { List rel = item.getRel(); if (rel != null) { - item.getLinks().forEach(resourceLinks::add); + resourceLinks.addAll(item.getLinks()); } else { // Primitive type diff --git a/src/main/java/org/springframework/hateoas/server/EntityLinks.java b/src/main/java/org/springframework/hateoas/server/EntityLinks.java index 2a1c0fd9..6f87a44c 100644 --- a/src/main/java/org/springframework/hateoas/server/EntityLinks.java +++ b/src/main/java/org/springframework/hateoas/server/EntityLinks.java @@ -127,7 +127,7 @@ public interface EntityLinks extends Plugin> { * @param extractor the extractor to use to derive an identifier from the given entity. * @return */ - default TypedEntityLinks forType(Function extractor) { + default TypedEntityLinks forType(Function extractor) { return new TypedEntityLinks<>(extractor, this); } diff --git a/src/main/java/org/springframework/hateoas/server/LinkRelationProvider.java b/src/main/java/org/springframework/hateoas/server/LinkRelationProvider.java index 6528322d..f3c4565e 100644 --- a/src/main/java/org/springframework/hateoas/server/LinkRelationProvider.java +++ b/src/main/java/org/springframework/hateoas/server/LinkRelationProvider.java @@ -73,10 +73,10 @@ public interface LinkRelationProvider extends Plugin { */ @RequiredArgsConstructor(staticName = "of", access = AccessLevel.PRIVATE) @EqualsAndHashCode - static class LookupContext { + class LookupContext { private enum ResourceType { - ITEM, COLLECTION; + ITEM, COLLECTION } private final @NonNull @Getter Class type; diff --git a/src/main/java/org/springframework/hateoas/server/TypedEntityLinks.java b/src/main/java/org/springframework/hateoas/server/TypedEntityLinks.java index 3b7876b2..896409b7 100644 --- a/src/main/java/org/springframework/hateoas/server/TypedEntityLinks.java +++ b/src/main/java/org/springframework/hateoas/server/TypedEntityLinks.java @@ -35,7 +35,7 @@ import org.springframework.util.Assert; @RequiredArgsConstructor(access = AccessLevel.PACKAGE) public class TypedEntityLinks { - private final @NonNull Function identifierExtractor; + private final @NonNull Function identifierExtractor; private final @NonNull EntityLinks entityLinks; /** @@ -73,7 +73,7 @@ public class TypedEntityLinks { private final Class type; private final EntityLinks delegate; - ExtendedTypedEntityLinks(Function identifierExtractor, EntityLinks delegate, Class type) { + ExtendedTypedEntityLinks(Function identifierExtractor, EntityLinks delegate, Class type) { super(identifierExtractor, delegate); diff --git a/src/main/java/org/springframework/hateoas/server/core/UriTemplateFactory.java b/src/main/java/org/springframework/hateoas/server/core/UriTemplateFactory.java index 7b7ad2d4..ec2b3c6e 100644 --- a/src/main/java/org/springframework/hateoas/server/core/UriTemplateFactory.java +++ b/src/main/java/org/springframework/hateoas/server/core/UriTemplateFactory.java @@ -30,7 +30,7 @@ import org.springframework.web.util.UriTemplate; */ public class UriTemplateFactory { - private static final Map CACHE = new ConcurrentReferenceHashMap(); + private static final Map CACHE = new ConcurrentReferenceHashMap<>(); /** * Returns the the {@link UriTemplate} for the given mapping. diff --git a/src/main/java/org/springframework/hateoas/server/mvc/RepresentationModelProcessorHandlerMethodReturnValueHandler.java b/src/main/java/org/springframework/hateoas/server/mvc/RepresentationModelProcessorHandlerMethodReturnValueHandler.java index 4738e586..945768d1 100644 --- a/src/main/java/org/springframework/hateoas/server/mvc/RepresentationModelProcessorHandlerMethodReturnValueHandler.java +++ b/src/main/java/org/springframework/hateoas/server/mvc/RepresentationModelProcessorHandlerMethodReturnValueHandler.java @@ -142,7 +142,7 @@ public class RepresentationModelProcessorHandlerMethodReturnValueHandler impleme return rootLinksAsHeaders ? HeaderLinksResponseEntity.wrap(newBody) : newBody; } - HttpEntity> entity = null; + HttpEntity> entity; if (originalValue instanceof ResponseEntity) { ResponseEntity source = (ResponseEntity) originalValue; diff --git a/src/test/java/org/springframework/hateoas/mediatype/collectionjson/CollectionJsonWebFluxIntegrationTest.java b/src/test/java/org/springframework/hateoas/mediatype/collectionjson/CollectionJsonWebFluxIntegrationTest.java index c4f915cc..f6fcf08a 100644 --- a/src/test/java/org/springframework/hateoas/mediatype/collectionjson/CollectionJsonWebFluxIntegrationTest.java +++ b/src/test/java/org/springframework/hateoas/mediatype/collectionjson/CollectionJsonWebFluxIntegrationTest.java @@ -61,12 +61,12 @@ class CollectionJsonWebFluxIntegrationTest { @Test void singleEmployee() { - this.testClient.get().uri("http://localhost/employees/0") - .accept(MediaTypes.COLLECTION_JSON) - .exchange() - .expectStatus().isOk() - .expectHeader().contentType(MediaTypes.COLLECTION_JSON) - .expectBody(String.class) + this.testClient.get().uri("http://localhost/employees/0") // + .accept(MediaTypes.COLLECTION_JSON) // + .exchange() // + .expectStatus().isOk() // + .expectHeader().contentType(MediaTypes.COLLECTION_JSON) // + .expectBody(String.class) // .value(jsonPath("$.collection.version", is("1.0"))) .value(jsonPath("$.collection.href", is("http://localhost/employees/0"))) .value(jsonPath("$.collection.links.*", hasSize(1))) @@ -96,12 +96,12 @@ class CollectionJsonWebFluxIntegrationTest { @Test void collectionOfEmployees() { - this.testClient.get().uri("http://localhost/employees") - .accept(MediaTypes.COLLECTION_JSON) - .exchange() - .expectStatus().isOk() - .expectHeader().contentType(MediaTypes.COLLECTION_JSON) - .expectBody(String.class) + this.testClient.get().uri("http://localhost/employees") // + .accept(MediaTypes.COLLECTION_JSON) // + .exchange() // + .expectStatus().isOk() // + .expectHeader().contentType(MediaTypes.COLLECTION_JSON) // + .expectBody(String.class) // .value(jsonPath("$.collection.version", is("1.0"))) .value(jsonPath("$.collection.href", is("http://localhost/employees"))) @@ -140,19 +140,19 @@ class CollectionJsonWebFluxIntegrationTest { String specBasedJson = read(new ClassPathResource("spec-part7-adjusted.json", getClass())); - this.testClient.post().uri("http://localhost/employees") - .contentType(MediaTypes.COLLECTION_JSON) - .syncBody(specBasedJson) - .exchange() - .expectStatus().isCreated() + this.testClient.post().uri("http://localhost/employees") // + .contentType(MediaTypes.COLLECTION_JSON) // + .syncBody(specBasedJson) // + .exchange() // + .expectStatus().isCreated() // .expectHeader().valueEquals(HttpHeaders.LOCATION, "http://localhost/employees/2"); - this.testClient.get().uri("http://localhost/employees/2") - .accept(MediaTypes.COLLECTION_JSON) - .exchange() - .expectStatus().isOk() - .expectHeader().contentType(MediaTypes.COLLECTION_JSON) - .expectBody(String.class) + this.testClient.get().uri("http://localhost/employees/2") // + .accept(MediaTypes.COLLECTION_JSON) // + .exchange() // + .expectStatus().isOk() // + .expectHeader().contentType(MediaTypes.COLLECTION_JSON) // + .expectBody(String.class) // .value(jsonPath("$.collection.version", is("1.0"))) .value(jsonPath("$.collection.href", is("http://localhost/employees/2"))) @@ -190,11 +190,11 @@ class CollectionJsonWebFluxIntegrationTest { @Bean WebTestClient webTestClient(WebClientConfigurer webClientConfigurer, ApplicationContext ctx) { - - return WebTestClient.bindToApplicationContext(ctx).build() - .mutate() - .exchangeStrategies(webClientConfigurer.hypermediaExchangeStrategies()) - .build(); + + return WebTestClient.bindToApplicationContext(ctx).build() // + .mutate() // + .exchangeStrategies(webClientConfigurer.hypermediaExchangeStrategies()) // + .build(); } } } diff --git a/src/test/java/org/springframework/hateoas/mediatype/hal/forms/HalFormsWebFluxIntegrationTest.java b/src/test/java/org/springframework/hateoas/mediatype/hal/forms/HalFormsWebFluxIntegrationTest.java index ed6de2d6..33660062 100644 --- a/src/test/java/org/springframework/hateoas/mediatype/hal/forms/HalFormsWebFluxIntegrationTest.java +++ b/src/test/java/org/springframework/hateoas/mediatype/hal/forms/HalFormsWebFluxIntegrationTest.java @@ -122,8 +122,10 @@ class HalFormsWebFluxIntegrationTest { String specBasedJson = MappingUtils.read(new ClassPathResource("new-employee.json", getClass())); this.testClient.post().uri("http://localhost/employees").contentType(MediaTypes.HAL_FORMS_JSON) - .syncBody(specBasedJson).exchange().expectStatus().isCreated().expectHeader() - .valueEquals(HttpHeaders.LOCATION, "http://localhost/employees/2"); + .syncBody(specBasedJson) // + .exchange() // + .expectStatus().isCreated() // + .expectHeader().valueEquals(HttpHeaders.LOCATION, "http://localhost/employees/2"); } @Configuration diff --git a/src/test/java/org/springframework/hateoas/mediatype/uber/UberWebFluxIntegrationTest.java b/src/test/java/org/springframework/hateoas/mediatype/uber/UberWebFluxIntegrationTest.java index d59404f0..be0b7585 100644 --- a/src/test/java/org/springframework/hateoas/mediatype/uber/UberWebFluxIntegrationTest.java +++ b/src/test/java/org/springframework/hateoas/mediatype/uber/UberWebFluxIntegrationTest.java @@ -61,12 +61,12 @@ class UberWebFluxIntegrationTest { @Test void singleEmployee() { - this.testClient.get().uri("http://localhost/employees/0") - .accept(MediaTypes.UBER_JSON) - .exchange() - .expectStatus().isOk() - .expectHeader().contentType(MediaTypes.UBER_JSON) - .expectBody(String.class) + this.testClient.get().uri("http://localhost/employees/0") // + .accept(MediaTypes.UBER_JSON) // + .exchange() // + .expectStatus().isOk() // + .expectHeader().contentType(MediaTypes.UBER_JSON) // + .expectBody(String.class) // .value(jsonPath("$.uber.version", is("1.0"))) @@ -89,12 +89,10 @@ class UberWebFluxIntegrationTest { .value(jsonPath("$.uber.data[2].model", is("name={name}&role={role}"))) .value(jsonPath("$.uber.data[3].name", is("employees"))) - .value(jsonPath("$.uber.data[3].rel[0]", is("employees"))) - .value(jsonPath("$.uber.data[3].rel[1]", is("all"))) + .value(jsonPath("$.uber.data[3].rel[0]", is("employees"))).value(jsonPath("$.uber.data[3].rel[1]", is("all"))) .value(jsonPath("$.uber.data[3].url", is("http://localhost/employees"))) - .value(jsonPath("$.uber.data[4].name", is("employee"))) - .value(jsonPath("$.uber.data[4].data.*", hasSize(2))) + .value(jsonPath("$.uber.data[4].name", is("employee"))).value(jsonPath("$.uber.data[4].data.*", hasSize(2))) .value(jsonPath("$.uber.data[4].data[0].name", is("role"))) .value(jsonPath("$.uber.data[4].data[0].value", is("ring bearer"))) .value(jsonPath("$.uber.data[4].data[1].name", is("name"))) @@ -107,20 +105,19 @@ class UberWebFluxIntegrationTest { @Test void collectionOfEmployees() { - this.testClient.get().uri("http://localhost/employees") - .accept(MediaTypes.UBER_JSON) - .exchange() - .expectStatus().isOk() - .expectHeader().contentType(MediaTypes.UBER_JSON) - .expectBody(String.class) + this.testClient.get().uri("http://localhost/employees") // + .accept(MediaTypes.UBER_JSON) // + .exchange() // + .expectStatus().isOk() // + .expectHeader().contentType(MediaTypes.UBER_JSON) // + .expectBody(String.class) // .value(jsonPath("$.uber.version", is("1.0"))) .value(jsonPath("$.uber.data.*", hasSize(4))) .value(jsonPath("$.uber.data[0].name", is("self"))) // - .value(jsonPath("$.uber.data[0].rel[0]", is("self"))) - .value(jsonPath("$.uber.data[0].rel[1]", is("all"))) + .value(jsonPath("$.uber.data[0].rel[0]", is("self"))).value(jsonPath("$.uber.data[0].rel[1]", is("all"))) .value(jsonPath("$.uber.data[0].url", is("http://localhost/employees"))) .value(jsonPath("$.uber.data[1].name", is("newEmployee"))) @@ -192,19 +189,19 @@ class UberWebFluxIntegrationTest { String input = read(new ClassPathResource("create-employee.json", getClass())); - this.testClient.post().uri("http://localhost/employees") - .contentType(MediaTypes.UBER_JSON) - .syncBody(input) - .exchange() - .expectStatus().isCreated() + this.testClient.post().uri("http://localhost/employees") // + .contentType(MediaTypes.UBER_JSON) // + .syncBody(input) // + .exchange() // + .expectStatus().isCreated() // .expectHeader().valueEquals(HttpHeaders.LOCATION, "http://localhost/employees/2"); - this.testClient.get().uri("http://localhost/employees/2") - .accept(MediaTypes.UBER_JSON) - .exchange() - .expectStatus().isOk() - .expectHeader().contentType(MediaTypes.UBER_JSON) - .expectBody(String.class) + this.testClient.get().uri("http://localhost/employees/2") // + .accept(MediaTypes.UBER_JSON) // + .exchange() // + .expectStatus().isOk() // + .expectHeader().contentType(MediaTypes.UBER_JSON) // + .expectBody(String.class) // .value(jsonPath("$.uber.version", is("1.0"))) @@ -252,10 +249,10 @@ class UberWebFluxIntegrationTest { @Bean WebTestClient webTestClient(WebClientConfigurer webClientConfigurer, ApplicationContext ctx) { - return WebTestClient.bindToApplicationContext(ctx).build() - .mutate() - .exchangeStrategies(webClientConfigurer.hypermediaExchangeStrategies()) - .build(); + return WebTestClient.bindToApplicationContext(ctx).build() // + .mutate() // + .exchangeStrategies(webClientConfigurer.hypermediaExchangeStrategies()) // + .build(); } } }