diff --git a/src/main/java/org/springframework/hateoas/PagedResources.java b/src/main/java/org/springframework/hateoas/PagedResources.java index 8b40fd14..f353f9f8 100644 --- a/src/main/java/org/springframework/hateoas/PagedResources.java +++ b/src/main/java/org/springframework/hateoas/PagedResources.java @@ -144,7 +144,7 @@ public class PagedResources extends Resources { PagedResources that = (PagedResources) obj; boolean metadataEquals = this.metadata == null ? that.metadata == null : this.metadata.equals(that.metadata); - return metadataEquals ? super.equals(obj) : false; + return metadataEquals && super.equals(obj); } /* diff --git a/src/main/java/org/springframework/hateoas/Resource.java b/src/main/java/org/springframework/hateoas/Resource.java index 51bf6498..c05d422f 100644 --- a/src/main/java/org/springframework/hateoas/Resource.java +++ b/src/main/java/org/springframework/hateoas/Resource.java @@ -100,7 +100,7 @@ public class Resource extends ResourceSupport { Resource that = (Resource) obj; boolean contentEqual = this.content == null ? that.content == null : this.content.equals(that.content); - return contentEqual ? super.equals(obj) : false; + return contentEqual && super.equals(obj); } /* diff --git a/src/main/java/org/springframework/hateoas/Resources.java b/src/main/java/org/springframework/hateoas/Resources.java index 8edec923..362b1943 100644 --- a/src/main/java/org/springframework/hateoas/Resources.java +++ b/src/main/java/org/springframework/hateoas/Resources.java @@ -135,7 +135,7 @@ public class Resources extends ResourceSupport implements Iterable { Resources that = (Resources) obj; boolean contentEqual = this.content == null ? that.content == null : this.content.equals(that.content); - return contentEqual ? super.equals(obj) : false; + return contentEqual && super.equals(obj); } /* diff --git a/src/main/java/org/springframework/hateoas/client/Rels.java b/src/main/java/org/springframework/hateoas/client/Rels.java index 74b4ff5e..2ec785e7 100644 --- a/src/main/java/org/springframework/hateoas/client/Rels.java +++ b/src/main/java/org/springframework/hateoas/client/Rels.java @@ -147,7 +147,7 @@ class Rels { */ @Override public Link findInResponse(String representation, MediaType mediaType) { - return new Link(JsonPath. read(representation, jsonPath).toString(), rel); + return new Link(JsonPath.read(representation, jsonPath).toString(), rel); } } } diff --git a/src/main/java/org/springframework/hateoas/collectionjson/Jackson2CollectionJsonModule.java b/src/main/java/org/springframework/hateoas/collectionjson/Jackson2CollectionJsonModule.java index d21d730e..7b5ea37b 100644 --- a/src/main/java/org/springframework/hateoas/collectionjson/Jackson2CollectionJsonModule.java +++ b/src/main/java/org/springframework/hateoas/collectionjson/Jackson2CollectionJsonModule.java @@ -299,7 +299,7 @@ public class Jackson2CollectionJsonModule extends SimpleModule { } @Override - public void serialize(Resources value, JsonGenerator jgen, SerializerProvider provider) throws IOException, JsonGenerationException { + public void serialize(Resources value, JsonGenerator jgen, SerializerProvider provider) throws IOException { CollectionJson collectionJson = new CollectionJson() .withVersion("1.0") @@ -362,7 +362,7 @@ public class Jackson2CollectionJsonModule extends SimpleModule { } @Override - public void serialize(PagedResources value, JsonGenerator jgen, SerializerProvider provider) throws IOException, JsonGenerationException { + public void serialize(PagedResources value, JsonGenerator jgen, SerializerProvider provider) throws IOException { CollectionJson collectionJson = new CollectionJson() .withVersion("1.0") @@ -427,7 +427,7 @@ public class Jackson2CollectionJsonModule extends SimpleModule { } @Override - public List deserialize(JsonParser jp, DeserializationContext deserializationContext) throws IOException, JsonProcessingException { + public List deserialize(JsonParser jp, DeserializationContext deserializationContext) throws IOException { CollectionJsonDocument document = jp.getCodec().readValue(jp, CollectionJsonDocument.class); @@ -617,7 +617,7 @@ public class Jackson2CollectionJsonModule extends SimpleModule { } @Override - public Resources deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException, JsonProcessingException { + public Resources deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException { JavaType rootType = JacksonHelper.findRootType(this.contentType); JavaType wrappedType = ctxt.getTypeFactory().constructParametricType(CollectionJsonDocument.class, rootType); @@ -690,7 +690,7 @@ public class Jackson2CollectionJsonModule extends SimpleModule { } @Override - public PagedResources deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException, JsonProcessingException { + public PagedResources deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException { JavaType rootType = JacksonHelper.findRootType(this.contentType); JavaType wrappedType = ctxt.getTypeFactory().constructParametricType(CollectionJsonDocument.class, rootType); diff --git a/src/main/java/org/springframework/hateoas/config/ConverterRegisteringWebMvcConfigurer.java b/src/main/java/org/springframework/hateoas/config/ConverterRegisteringWebMvcConfigurer.java index 9dfda066..0cff5b96 100644 --- a/src/main/java/org/springframework/hateoas/config/ConverterRegisteringWebMvcConfigurer.java +++ b/src/main/java/org/springframework/hateoas/config/ConverterRegisteringWebMvcConfigurer.java @@ -38,7 +38,7 @@ import org.springframework.hateoas.core.DelegatingRelProvider; import org.springframework.hateoas.hal.CurieProvider; import org.springframework.hateoas.hal.HalConfiguration; import org.springframework.hateoas.hal.Jackson2HalModule; -import org.springframework.hateoas.hal.Jackson2HalModule.*; +import org.springframework.hateoas.hal.Jackson2HalModule.HalHandlerInstantiator; import org.springframework.hateoas.hal.forms.HalFormsConfiguration; import org.springframework.hateoas.hal.forms.Jackson2HalFormsModule; import org.springframework.hateoas.hal.forms.Jackson2HalFormsModule.HalFormsHandlerInstantiator; diff --git a/src/main/java/org/springframework/hateoas/config/EnableHypermediaSupport.java b/src/main/java/org/springframework/hateoas/config/EnableHypermediaSupport.java index b19e090c..465e1022 100644 --- a/src/main/java/org/springframework/hateoas/config/EnableHypermediaSupport.java +++ b/src/main/java/org/springframework/hateoas/config/EnableHypermediaSupport.java @@ -27,7 +27,6 @@ import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Import; import org.springframework.hateoas.EntityLinks; import org.springframework.hateoas.LinkDiscoverer; -import org.springframework.http.MediaType; /** * Activates hypermedia support in the {@link ApplicationContext}. Will register infrastructure beans available for diff --git a/src/main/java/org/springframework/hateoas/core/AffordanceModelFactory.java b/src/main/java/org/springframework/hateoas/core/AffordanceModelFactory.java index 4c988082..7e16bc6d 100644 --- a/src/main/java/org/springframework/hateoas/core/AffordanceModelFactory.java +++ b/src/main/java/org/springframework/hateoas/core/AffordanceModelFactory.java @@ -40,7 +40,7 @@ public interface AffordanceModelFactory extends Plugin { */ default MediaType getMediaType() { return null; - }; + } /** * Look up the {@link AffordanceModel} for this factory. diff --git a/src/main/java/org/springframework/hateoas/core/ControllerEntityLinksFactoryBean.java b/src/main/java/org/springframework/hateoas/core/ControllerEntityLinksFactoryBean.java index 570cd31c..8311e130 100644 --- a/src/main/java/org/springframework/hateoas/core/ControllerEntityLinksFactoryBean.java +++ b/src/main/java/org/springframework/hateoas/core/ControllerEntityLinksFactoryBean.java @@ -85,7 +85,7 @@ public class ControllerEntityLinksFactoryBean extends AbstractFactoryBean> controllerTypes = new HashSet>(); diff --git a/src/main/java/org/springframework/hateoas/core/DummyInvocationUtils.java b/src/main/java/org/springframework/hateoas/core/DummyInvocationUtils.java index 8f9d8231..31621efc 100644 --- a/src/main/java/org/springframework/hateoas/core/DummyInvocationUtils.java +++ b/src/main/java/org/springframework/hateoas/core/DummyInvocationUtils.java @@ -117,7 +117,7 @@ public class DummyInvocationUtils { * @see org.aopalliance.intercept.MethodInterceptor#invoke(org.aopalliance.intercept.MethodInvocation) */ @Override - public Object invoke(org.aopalliance.intercept.MethodInvocation invocation) throws Throwable { + public Object invoke(org.aopalliance.intercept.MethodInvocation invocation) { return intercept(invocation.getThis(), invocation.getMethod(), invocation.getArguments(), null); } diff --git a/src/main/java/org/springframework/hateoas/core/JsonPathLinkDiscoverer.java b/src/main/java/org/springframework/hateoas/core/JsonPathLinkDiscoverer.java index a23156a5..cfd3a140 100644 --- a/src/main/java/org/springframework/hateoas/core/JsonPathLinkDiscoverer.java +++ b/src/main/java/org/springframework/hateoas/core/JsonPathLinkDiscoverer.java @@ -15,8 +15,6 @@ */ package org.springframework.hateoas.core; -import net.minidev.json.JSONArray; - import java.io.IOException; import java.io.InputStream; import java.lang.reflect.Array; @@ -27,13 +25,13 @@ import java.util.Collections; import java.util.List; import java.util.stream.Collectors; +import net.minidev.json.JSONArray; import org.springframework.hateoas.Link; import org.springframework.hateoas.LinkDiscoverer; import org.springframework.hateoas.MediaTypes; import org.springframework.http.MediaType; import org.springframework.util.Assert; import org.springframework.util.ReflectionUtils; -import org.springframework.util.StringUtils; import com.jayway.jsonpath.InvalidPathException; import com.jayway.jsonpath.JsonPath; diff --git a/src/main/java/org/springframework/hateoas/core/LinkBuilderSupport.java b/src/main/java/org/springframework/hateoas/core/LinkBuilderSupport.java index 7eb32f4f..d68edaa8 100644 --- a/src/main/java/org/springframework/hateoas/core/LinkBuilderSupport.java +++ b/src/main/java/org/springframework/hateoas/core/LinkBuilderSupport.java @@ -21,10 +21,10 @@ import static org.springframework.web.util.UriComponentsBuilder.*; import lombok.Getter; import java.net.URI; -import java.util.Optional; import java.util.ArrayList; import java.util.Collection; import java.util.List; +import java.util.Optional; import org.springframework.hateoas.Affordance; import org.springframework.hateoas.Identifiable; diff --git a/src/main/java/org/springframework/hateoas/core/Relation.java b/src/main/java/org/springframework/hateoas/core/Relation.java index b8782ef0..d7696607 100644 --- a/src/main/java/org/springframework/hateoas/core/Relation.java +++ b/src/main/java/org/springframework/hateoas/core/Relation.java @@ -34,7 +34,7 @@ import org.springframework.hateoas.Resources; @Retention(RetentionPolicy.RUNTIME) public @interface Relation { - static final String NO_RELATION = ""; + String NO_RELATION = ""; /** * Defines the relation to be used when referring to a single resource. diff --git a/src/main/java/org/springframework/hateoas/hal/Jackson2HalModule.java b/src/main/java/org/springframework/hateoas/hal/Jackson2HalModule.java index d5d88fb0..70c58c99 100644 --- a/src/main/java/org/springframework/hateoas/hal/Jackson2HalModule.java +++ b/src/main/java/org/springframework/hateoas/hal/Jackson2HalModule.java @@ -42,25 +42,12 @@ import org.springframework.util.Assert; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonUnwrapped; -import com.fasterxml.jackson.core.JsonGenerationException; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonToken; import com.fasterxml.jackson.core.Version; -import com.fasterxml.jackson.databind.BeanProperty; -import com.fasterxml.jackson.databind.DeserializationConfig; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.JavaType; -import com.fasterxml.jackson.databind.JsonDeserializer; -import com.fasterxml.jackson.databind.JsonMappingException; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.JsonSerializer; -import com.fasterxml.jackson.databind.KeyDeserializer; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.SerializationConfig; -import com.fasterxml.jackson.databind.SerializerProvider; +import com.fasterxml.jackson.databind.*; import com.fasterxml.jackson.databind.cfg.HandlerInstantiator; import com.fasterxml.jackson.databind.cfg.MapperConfig; import com.fasterxml.jackson.databind.deser.ContextualDeserializer; @@ -79,7 +66,7 @@ import com.fasterxml.jackson.databind.type.TypeFactory; /** * Jackson 2 module implementation to render {@link Link} and {@link ResourceSupport} instances in HAL compatible JSON. - * + * * @author Alexander Baetz * @author Oliver Gierke * @author Jeffrey Walraven @@ -100,7 +87,7 @@ public class Jackson2HalModule extends SimpleModule { /** * Returns whether the module was already registered in the given {@link ObjectMapper}. - * + * * @param mapper must not be {@literal null}. * @return */ @@ -112,7 +99,7 @@ public class Jackson2HalModule extends SimpleModule { /** * Custom {@link JsonSerializer} to render Link instances in HAL compatible JSON. - * + * * @author Alexander Baetz * @author Oliver Gierke */ @@ -129,12 +116,12 @@ public class Jackson2HalModule extends SimpleModule { private final HalConfiguration halConfiguration; public HalLinkListSerializer(CurieProvider curieProvider, EmbeddedMapper mapper, MessageSourceAccessor accessor, - HalConfiguration halConfiguration) { + HalConfiguration halConfiguration) { this(null, curieProvider, mapper, accessor, halConfiguration); } public HalLinkListSerializer(BeanProperty property, CurieProvider curieProvider, EmbeddedMapper mapper, - MessageSourceAccessor accessor, HalConfiguration halConfiguration) { + MessageSourceAccessor accessor, HalConfiguration halConfiguration) { super(TypeFactory.defaultInstance().constructType(List.class)); @@ -158,7 +145,7 @@ public class Jackson2HalModule extends SimpleModule { */ @Override public void serialize(List value, JsonGenerator jgen, SerializerProvider provider) - throws IOException, JsonGenerationException { + throws IOException { // sort links according to their relation Map> sortedLinks = new LinkedHashMap<>(); @@ -189,8 +176,8 @@ public class Jackson2HalModule extends SimpleModule { } sortedLinks // - .computeIfAbsent(rel, key -> new ArrayList<>())// - .add(toHalLink(link)); + .computeIfAbsent(rel, key -> new ArrayList<>())// + .add(toHalLink(link)); links.add(link); } @@ -208,15 +195,15 @@ public class Jackson2HalModule extends SimpleModule { JavaType valueType = typeFactory.constructCollectionType(ArrayList.class, Object.class); JavaType mapType = typeFactory.constructMapType(HashMap.class, keyType, valueType); - MapSerializer serializer = MapSerializer.construct(Collections. emptySet(), mapType, true, null, - provider.findKeySerializer(keyType, null), new OptionalListJackson2Serializer(property, halConfiguration), null); + MapSerializer serializer = MapSerializer.construct(Collections.emptySet(), mapType, true, null, + provider.findKeySerializer(keyType, null), new OptionalListJackson2Serializer(property, halConfiguration), null); serializer.serialize(sortedLinks, jgen, provider); } /** * Wraps the given link into a HAL specific extension. - * + * * @param link must not be {@literal null}. * @return */ @@ -235,7 +222,7 @@ public class Jackson2HalModule extends SimpleModule { /** * Returns the title for the given local link relation resolved through the configured {@link MessageSourceAccessor} * . - * + * * @param localRel must not be {@literal null} or empty. * @return */ @@ -256,7 +243,7 @@ public class Jackson2HalModule extends SimpleModule { */ @Override public JsonSerializer createContextual(SerializerProvider provider, BeanProperty property) - throws JsonMappingException { + throws JsonMappingException { return new HalLinkListSerializer(property, curieProvider, mapper, accessor, halConfiguration); } @@ -307,12 +294,12 @@ public class Jackson2HalModule extends SimpleModule { /** * Custom {@link JsonSerializer} to render {@link Resource}-Lists in HAL compatible JSON. Renders the list as a Map. - * + * * @author Alexander Baetz * @author Oliver Gierke */ public static class HalResourcesSerializer extends ContainerSerializer> - implements ContextualSerializer { + implements ContextualSerializer { private static final long serialVersionUID = 8030706944344625390L; @@ -333,13 +320,13 @@ public class Jackson2HalModule extends SimpleModule { /* * (non-Javadoc) - * + * * @see org.codehaus.jackson.map.ser.std.SerializerBase#serialize(java.lang.Object, org.codehaus.jackson.JsonGenerator, * org.codehaus.jackson.map.SerializerProvider) */ @Override public void serialize(Collection value, JsonGenerator jgen, SerializerProvider provider) - throws IOException, JsonGenerationException { + throws IOException { Map embeddeds = embeddedMapper.map(value); @@ -357,7 +344,7 @@ public class Jackson2HalModule extends SimpleModule { @Override public JsonSerializer createContextual(SerializerProvider prov, BeanProperty property) - throws JsonMappingException { + throws JsonMappingException { return new HalResourcesSerializer(property, embeddedMapper); } @@ -389,12 +376,12 @@ public class Jackson2HalModule extends SimpleModule { /** * Custom {@link JsonSerializer} to render Link instances in HAL compatible JSON. Renders the {@link Link} as * immediate object if we have a single one or as array if we have multiple ones. - * + * * @author Alexander Baetz * @author Oliver Gierke */ public static class OptionalListJackson2Serializer extends ContainerSerializer - implements ContextualSerializer { + implements ContextualSerializer { private static final long serialVersionUID = 3700806118177419817L; @@ -404,7 +391,7 @@ public class Jackson2HalModule extends SimpleModule { /** * Creates a new {@link OptionalListJackson2Serializer} using the given {@link BeanProperty}. - * + * * @param property */ public OptionalListJackson2Serializer(BeanProperty property, HalConfiguration halConfiguration) { @@ -449,7 +436,7 @@ public class Jackson2HalModule extends SimpleModule { } private void serializeContents(Iterator value, JsonGenerator jgen, SerializerProvider provider) - throws IOException, JsonGenerationException { + throws IOException { while (value.hasNext()) { Object elem = value.next(); @@ -462,7 +449,7 @@ public class Jackson2HalModule extends SimpleModule { } private JsonSerializer getOrLookupSerializerFor(Class type, SerializerProvider provider) - throws JsonMappingException { + throws JsonMappingException { JsonSerializer serializer = serializers.get(type); @@ -494,7 +481,7 @@ public class Jackson2HalModule extends SimpleModule { /* * (non-Javadoc) - * + * * @see com.fasterxml.jackson.databind.ser.ContainerSerializer#hasSingleElement(java.lang.Object) */ @Override @@ -512,13 +499,13 @@ public class Jackson2HalModule extends SimpleModule { /* * (non-Javadoc) - * + * * @see com.fasterxml.jackson.databind.ser.ContextualSerializer#createContextual(com.fasterxml.jackson.databind.SerializerProvider, * com.fasterxml.jackson.databind.BeanProperty) */ @Override public JsonSerializer createContextual(SerializerProvider provider, BeanProperty property) - throws JsonMappingException { + throws JsonMappingException { return new OptionalListJackson2Serializer(property, halConfiguration); } } @@ -555,7 +542,7 @@ public class Jackson2HalModule extends SimpleModule { */ @Override public List deserialize(JsonParser jp, DeserializationContext ctxt) - throws IOException, JsonProcessingException { + throws IOException { List result = new ArrayList<>(); String relation; @@ -595,7 +582,7 @@ public class Jackson2HalModule extends SimpleModule { } public static class HalResourcesDeserializer extends ContainerDeserializerBase> - implements ContextualDeserializer { + implements ContextualDeserializer { private static final long serialVersionUID = 4755806754621032622L; @@ -639,7 +626,7 @@ public class Jackson2HalModule extends SimpleModule { */ @Override public List deserialize(JsonParser jp, DeserializationContext ctxt) - throws IOException, JsonProcessingException { + throws IOException { List result = new ArrayList<>(); JsonDeserializer deser = ctxt.findRootValueDeserializer(contentType); @@ -668,7 +655,7 @@ public class Jackson2HalModule extends SimpleModule { @Override public JsonDeserializer createContextual(DeserializationContext ctxt, BeanProperty property) - throws JsonMappingException { + throws JsonMappingException { JavaType vc = property.getType().getContentType(); HalResourcesDeserializer des = new HalResourcesDeserializer(vc); @@ -687,7 +674,7 @@ public class Jackson2HalModule extends SimpleModule { private final AutowireCapableBeanFactory delegate; public HalHandlerInstantiator(RelProvider provider, CurieProvider curieProvider, - MessageSourceAccessor messageSourceAccessor) { + MessageSourceAccessor messageSourceAccessor) { this(provider, curieProvider, messageSourceAccessor, new HalConfiguration()); } @@ -695,13 +682,13 @@ public class Jackson2HalModule extends SimpleModule { * Creates a new {@link HalHandlerInstantiator} using the given {@link RelProvider}, {@link CurieProvider} and * {@link MessageSourceAccessor}. Registers a prepared {@link HalResourcesSerializer} and * {@link HalLinkListSerializer} falling back to instantiation expecting a default constructor. - * + * * @param provider must not be {@literal null}. * @param curieProvider can be {@literal null}. * @param messageSourceAccessor can be {@literal null}. */ public HalHandlerInstantiator(RelProvider provider, CurieProvider curieProvider, - MessageSourceAccessor messageSourceAccessor, HalConfiguration halConfiguration) { + MessageSourceAccessor messageSourceAccessor, HalConfiguration halConfiguration) { this(provider, curieProvider, messageSourceAccessor, true, halConfiguration); } @@ -710,19 +697,19 @@ public class Jackson2HalModule extends SimpleModule { * {@link MessageSourceAccessor} and whether to enforce embedded collections. Registers a prepared * {@link HalResourcesSerializer} and {@link HalLinkListSerializer} falling back to instantiation expecting a * default constructor. - * + * * @param provider must not be {@literal null}. * @param curieProvider can be {@literal null} * @param accessor can be {@literal null}. * @param enforceEmbeddedCollections */ public HalHandlerInstantiator(RelProvider provider, CurieProvider curieProvider, MessageSourceAccessor accessor, - boolean enforceEmbeddedCollections, HalConfiguration halConfiguration) { + boolean enforceEmbeddedCollections, HalConfiguration halConfiguration) { this(provider, curieProvider, accessor, enforceEmbeddedCollections, null, halConfiguration); } private HalHandlerInstantiator(RelProvider provider, CurieProvider curieProvider, MessageSourceAccessor accessor, - boolean enforceEmbeddedCollections, AutowireCapableBeanFactory delegate, HalConfiguration halConfiguration) { + boolean enforceEmbeddedCollections, AutowireCapableBeanFactory delegate, HalConfiguration halConfiguration) { Assert.notNull(provider, "RelProvider must not be null!"); @@ -732,7 +719,7 @@ public class Jackson2HalModule extends SimpleModule { this.serializers.put(HalResourcesSerializer.class, new HalResourcesSerializer(mapper)); this.serializers.put(HalLinkListSerializer.class, - new HalLinkListSerializer(curieProvider, mapper, accessor, halConfiguration)); + new HalLinkListSerializer(curieProvider, mapper, accessor, halConfiguration)); } /* @@ -741,7 +728,7 @@ public class Jackson2HalModule extends SimpleModule { */ @Override public JsonDeserializer deserializerInstance(DeserializationConfig config, Annotated annotated, - Class deserClass) { + Class deserClass) { return (JsonDeserializer) findInstance(deserClass); } @@ -751,7 +738,7 @@ public class Jackson2HalModule extends SimpleModule { */ @Override public KeyDeserializer keyDeserializerInstance(DeserializationConfig config, Annotated annotated, - Class keyDeserClass) { + Class keyDeserClass) { return (KeyDeserializer) findInstance(keyDeserClass); } @@ -770,7 +757,7 @@ public class Jackson2HalModule extends SimpleModule { */ @Override public TypeResolverBuilder typeResolverBuilderInstance(MapperConfig config, Annotated annotated, - Class builderClass) { + Class builderClass) { return (TypeResolverBuilder) findInstance(builderClass); } @@ -793,7 +780,7 @@ public class Jackson2HalModule extends SimpleModule { /** * {@link JsonSerializer} to only render {@link Boolean} values if they're set to {@literal true}. - * + * * @author Oliver Gierke * @since 0.9 */ @@ -819,7 +806,7 @@ public class Jackson2HalModule extends SimpleModule { */ @Override public void serialize(Boolean value, JsonGenerator jgen, SerializerProvider provider) - throws IOException, JsonGenerationException { + throws IOException { jgen.writeBoolean(value.booleanValue()); } @@ -838,7 +825,7 @@ public class Jackson2HalModule extends SimpleModule { */ @Override public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint) - throws JsonMappingException { + throws JsonMappingException { if (visitor != null) { visitor.expectBooleanFormat(typeHint); } @@ -859,7 +846,7 @@ public class Jackson2HalModule extends SimpleModule { /** * Creates a new {@link EmbeddedMapper} for the given {@link RelProvider}, {@link CurieProvider} and flag whether to * prefer collection relations. - * + * * @param relProvider must not be {@literal null}. * @param curieProvider can be {@literal null}. * @param preferCollectionRels @@ -875,7 +862,7 @@ public class Jackson2HalModule extends SimpleModule { /** * Maps the given source elements as embedded values. - * + * * @param source must not be {@literal null}. * @return */ @@ -894,14 +881,14 @@ public class Jackson2HalModule extends SimpleModule { /** * Returns whether the given source elements will be namespaced. - * + * * @param source must not be {@literal null}. * @return */ public boolean hasCuriedEmbed(Iterable source) { return map(source).keySet().stream() // - .anyMatch(rel -> rel.contains(":")); + .anyMatch(rel -> rel.contains(":")); } } diff --git a/src/main/java/org/springframework/hateoas/hal/forms/Jackson2HalFormsModule.java b/src/main/java/org/springframework/hateoas/hal/forms/Jackson2HalFormsModule.java index cc81534f..c49e7c4a 100644 --- a/src/main/java/org/springframework/hateoas/hal/forms/Jackson2HalFormsModule.java +++ b/src/main/java/org/springframework/hateoas/hal/forms/Jackson2HalFormsModule.java @@ -82,7 +82,7 @@ public class Jackson2HalFormsModule extends SimpleModule { } @JsonSerialize(using = HalFormsResourceSerializer.class) - static interface ResourceMixin {} + interface ResourceMixin {} @JsonSerialize(using = HalFormsResourcesSerializer.class) abstract class ResourcesMixin extends Resources { diff --git a/src/main/java/org/springframework/hateoas/mvc/ForwardedHeader.java b/src/main/java/org/springframework/hateoas/mvc/ForwardedHeader.java index 3c1aa228..761e0b1e 100644 --- a/src/main/java/org/springframework/hateoas/mvc/ForwardedHeader.java +++ b/src/main/java/org/springframework/hateoas/mvc/ForwardedHeader.java @@ -15,7 +15,7 @@ */ package org.springframework.hateoas.mvc; -import static org.springframework.util.StringUtils.hasText; +import static org.springframework.util.StringUtils.*; import java.util.Arrays; import java.util.Collections; diff --git a/src/main/java/org/springframework/hateoas/mvc/JacksonSerializers.java b/src/main/java/org/springframework/hateoas/mvc/JacksonSerializers.java index 92f3f602..808706c6 100644 --- a/src/main/java/org/springframework/hateoas/mvc/JacksonSerializers.java +++ b/src/main/java/org/springframework/hateoas/mvc/JacksonSerializers.java @@ -52,7 +52,7 @@ public class JacksonSerializers { */ @Override public MediaType deserialize(JsonParser p, DeserializationContext ctxt) - throws IOException, JsonProcessingException { + throws IOException { return MediaType.parseMediaType(p.getText()); } } diff --git a/src/main/java/org/springframework/hateoas/support/PropertyUtils.java b/src/main/java/org/springframework/hateoas/support/PropertyUtils.java index f4cedc9a..2337c8c6 100644 --- a/src/main/java/org/springframework/hateoas/support/PropertyUtils.java +++ b/src/main/java/org/springframework/hateoas/support/PropertyUtils.java @@ -49,8 +49,8 @@ public class PropertyUtils { static { FIELDS_TO_IGNORE.add("class"); FIELDS_TO_IGNORE.add("links"); - }; - + } + public static Map findProperties(Object object) { if (object.getClass().equals(Resource.class)) { diff --git a/src/test/java/org/springframework/hateoas/LinkUnitTest.java b/src/test/java/org/springframework/hateoas/LinkUnitTest.java index 32cfb4b0..1dec12cf 100755 --- a/src/test/java/org/springframework/hateoas/LinkUnitTest.java +++ b/src/test/java/org/springframework/hateoas/LinkUnitTest.java @@ -111,7 +111,7 @@ public class LinkUnitTest { @Test public void differentTypeDoesNotEqual() { - assertThat(new Link("foo")).isNotEqualTo((Object) new ResourceSupport()); + assertThat(new Link("foo")).isNotEqualTo(new ResourceSupport()); } @Test diff --git a/src/test/java/org/springframework/hateoas/VndErrorsMarshallingTest.java b/src/test/java/org/springframework/hateoas/VndErrorsMarshallingTest.java index e40569c8..a1f86c12 100755 --- a/src/test/java/org/springframework/hateoas/VndErrorsMarshallingTest.java +++ b/src/test/java/org/springframework/hateoas/VndErrorsMarshallingTest.java @@ -56,7 +56,7 @@ public class VndErrorsMarshallingTest { } @Before - public void setUp() throws Exception { + public void setUp() { jackson2Mapper = new com.fasterxml.jackson.databind.ObjectMapper(); jackson2Mapper.registerModule(new Jackson2HalModule()); diff --git a/src/test/java/org/springframework/hateoas/client/Server.java b/src/test/java/org/springframework/hateoas/client/Server.java index daaa4fa2..736daeac 100644 --- a/src/test/java/org/springframework/hateoas/client/Server.java +++ b/src/test/java/org/springframework/hateoas/client/Server.java @@ -222,7 +222,7 @@ public class Server implements Closeable { * @see java.io.Closeable#close() */ @Override - public void close() throws IOException { + public void close() { closeJadler(); } } diff --git a/src/test/java/org/springframework/hateoas/config/EnableHypermediaSupportIntegrationTest.java b/src/test/java/org/springframework/hateoas/config/EnableHypermediaSupportIntegrationTest.java index c1e37e33..83c13aa6 100755 --- a/src/test/java/org/springframework/hateoas/config/EnableHypermediaSupportIntegrationTest.java +++ b/src/test/java/org/springframework/hateoas/config/EnableHypermediaSupportIntegrationTest.java @@ -446,7 +446,7 @@ public class EnableHypermediaSupportIntegrationTest { } @Test - public void verifyDefaultHalConfigurationRendersSingleItemAsSingleItem() throws JsonProcessingException { + public void verifyDefaultHalConfigurationRendersSingleItemAsSingleItem() { withContext(HalConfig.class, context -> { diff --git a/src/test/java/org/springframework/hateoas/core/ControllerEntityLinksFactoryBeanUnitTest.java b/src/test/java/org/springframework/hateoas/core/ControllerEntityLinksFactoryBeanUnitTest.java index c01fb285..2460c1e4 100755 --- a/src/test/java/org/springframework/hateoas/core/ControllerEntityLinksFactoryBeanUnitTest.java +++ b/src/test/java/org/springframework/hateoas/core/ControllerEntityLinksFactoryBeanUnitTest.java @@ -35,7 +35,7 @@ import org.springframework.stereotype.Controller; public class ControllerEntityLinksFactoryBeanUnitTest { @Test - public void rejectsFactoryBeanIfAnnotationNotSet() throws Exception { + public void rejectsFactoryBeanIfAnnotationNotSet() { ControllerEntityLinksFactoryBean builder = new ControllerEntityLinksFactoryBean(); diff --git a/src/test/java/org/springframework/hateoas/core/EmbeddedWrappersUnitTest.java b/src/test/java/org/springframework/hateoas/core/EmbeddedWrappersUnitTest.java index 77771f73..6d6b55cd 100755 --- a/src/test/java/org/springframework/hateoas/core/EmbeddedWrappersUnitTest.java +++ b/src/test/java/org/springframework/hateoas/core/EmbeddedWrappersUnitTest.java @@ -42,7 +42,7 @@ public class EmbeddedWrappersUnitTest { assertEmptyCollectionValue(wrapper); assertThat(wrapper.getRel()).isNull(); - assertThat(wrapper.getRelTargetType()).isEqualTo((Class) String.class); + assertThat(wrapper.getRelTargetType()).isEqualTo(String.class); } /** diff --git a/src/test/java/org/springframework/hateoas/hal/HalEmbeddedBuilderUnitTest.java b/src/test/java/org/springframework/hateoas/hal/HalEmbeddedBuilderUnitTest.java index 5b480c0e..b0fcfd92 100755 --- a/src/test/java/org/springframework/hateoas/hal/HalEmbeddedBuilderUnitTest.java +++ b/src/test/java/org/springframework/hateoas/hal/HalEmbeddedBuilderUnitTest.java @@ -51,8 +51,8 @@ public class HalEmbeddedBuilderUnitTest { Map map = setUpBuilder(null, "foo", 1L); - assertThat(map.get("string")).isEqualTo((Object) "foo"); - assertThat(map.get("long")).isEqualTo((Object) 1L); + assertThat(map.get("string")).isEqualTo("foo"); + assertThat(map.get("long")).isEqualTo(1L); } @Test @@ -121,8 +121,8 @@ public class HalEmbeddedBuilderUnitTest { Map map = setUpBuilder(curieProvider, "foo", 1L); - assertThat(map.get("curie:string")).isEqualTo((Object) "foo"); - assertThat(map.get("curie:long")).isEqualTo((Object) 1L); + assertThat(map.get("curie:string")).isEqualTo("foo"); + assertThat(map.get("curie:long")).isEqualTo(1L); } /** @@ -134,7 +134,7 @@ public class HalEmbeddedBuilderUnitTest { Map map = setUpBuilder(curieProvider, "foo", "bar", 1L); assertThat(map.containsKey("curie:string")).isFalse(); - assertThat(map.get("curie:long")).isEqualTo((Object) 1L); + assertThat(map.get("curie:long")).isEqualTo(1L); assertHasValues(map, "curie:strings", "foo", "bar"); } @@ -148,7 +148,7 @@ public class HalEmbeddedBuilderUnitTest { assertThat(map.containsKey("curie:string")).isFalse(); assertHasValues(map, "curie:strings", "foo", "bar", "foobar"); - assertThat(map.get("curie:long")).isEqualTo((Object) 1L); + assertThat(map.get("curie:long")).isEqualTo(1L); } /** diff --git a/src/test/java/org/springframework/hateoas/hal/forms/HalFormsMessageConverterUnitTest.java b/src/test/java/org/springframework/hateoas/hal/forms/HalFormsMessageConverterUnitTest.java index 0648af1d..6ce2ed52 100644 --- a/src/test/java/org/springframework/hateoas/hal/forms/HalFormsMessageConverterUnitTest.java +++ b/src/test/java/org/springframework/hateoas/hal/forms/HalFormsMessageConverterUnitTest.java @@ -119,7 +119,7 @@ public class HalFormsMessageConverterUnitTest { HttpOutputMessage convertedMessage = new HttpOutputMessage() { @Override - public OutputStream getBody() throws IOException { + public OutputStream getBody() { return stream; } diff --git a/src/test/java/org/springframework/hateoas/mvc/ControllerLinkBuilderUnitTest.java b/src/test/java/org/springframework/hateoas/mvc/ControllerLinkBuilderUnitTest.java index da287a11..ce172a1b 100755 --- a/src/test/java/org/springframework/hateoas/mvc/ControllerLinkBuilderUnitTest.java +++ b/src/test/java/org/springframework/hateoas/mvc/ControllerLinkBuilderUnitTest.java @@ -429,7 +429,7 @@ public class ControllerLinkBuilderUnitTest extends TestUtils { * @see #257, #107 */ @Test - public void usesXForwardedProtoHeaderAsLinkSchema() throws ServletException, IOException { + public void usesXForwardedProtoHeaderAsLinkSchema() { for (String proto : Arrays.asList("http", "https")) { diff --git a/src/test/java/org/springframework/hateoas/mvc/MultiMediatypeWebMvcIntegrationTest.java b/src/test/java/org/springframework/hateoas/mvc/MultiMediatypeWebMvcIntegrationTest.java index 9948d37f..90bd9fe0 100644 --- a/src/test/java/org/springframework/hateoas/mvc/MultiMediatypeWebMvcIntegrationTest.java +++ b/src/test/java/org/springframework/hateoas/mvc/MultiMediatypeWebMvcIntegrationTest.java @@ -214,7 +214,6 @@ public class MultiMediatypeWebMvcIntegrationTest { .andExpect(jsonPath("$._templates['partiallyUpdateEmployee'].properties[0].required", is(false))) .andExpect(jsonPath("$._templates['partiallyUpdateEmployee'].properties[1].name", is("role"))) .andExpect(jsonPath("$._templates['partiallyUpdateEmployee'].properties[1].required", is(false))); - ; } @Test diff --git a/src/test/java/org/springframework/hateoas/support/ChangelogCreator.java b/src/test/java/org/springframework/hateoas/support/ChangelogCreator.java index 81723e17..bbda100e 100644 --- a/src/test/java/org/springframework/hateoas/support/ChangelogCreator.java +++ b/src/test/java/org/springframework/hateoas/support/ChangelogCreator.java @@ -33,7 +33,7 @@ class ChangelogCreator { private static final int MILESTONE_ID = 23; private static final String URI_TEMPLATE = "https://api.github.com/repos/spring-projects/spring-hateoas/issues?milestone={id}&state=closed"; - public static void main(String... args) throws Exception { + public static void main(String... args) { RestTemplate template = new RestTemplate(); String response = template.getForObject(URI_TEMPLATE, String.class, MILESTONE_ID); diff --git a/src/test/java/org/springframework/hateoas/support/PropertyUtilsTest.java b/src/test/java/org/springframework/hateoas/support/PropertyUtilsTest.java index 25dc35a2..bba5c8d9 100644 --- a/src/test/java/org/springframework/hateoas/support/PropertyUtilsTest.java +++ b/src/test/java/org/springframework/hateoas/support/PropertyUtilsTest.java @@ -70,7 +70,7 @@ public class PropertyUtilsTest { } @Test - public void resourceWrappedSpringMvcParameter() throws NoSuchMethodException { + public void resourceWrappedSpringMvcParameter() { Method method = ReflectionUtils.findMethod(TestController.class, "newEmployee", Resource.class); MethodParameters parameters = new MethodParameters(method);