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

#788 - Remove redundant generics.

Browse Source
This commit is contained in:
Greg Turnquist
2019-01-18 12:03:41 -06:00
parent 74647cb5b1
commit 0f696dd637
24 changed files with 76 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/springframework/hateoas/hal/HalEmbeddedBuilder.java
View File

@@ -41,7 +41,7 @@ class HalEmbeddedBuilder {
private static final String DEFAULT_REL = "content";
private static final String INVALID_EMBEDDED_WRAPPER = "Embedded wrapper %s returned null for both the static rel and the rel target type! Make sure one of the two returns a non-null value!";
private final Map<String, Object> embeddeds = new HashMap<String, Object>();
private final Map<String, Object> embeddeds = new HashMap<>();
private final RelProvider provider;
private final CurieProvider curieProvider;
private final EmbeddedWrappers wrappers;
@@ -90,7 +90,7 @@ class HalEmbeddedBuilder {
return;
}
List<Object> list = new ArrayList<Object>();
List<Object> list = new ArrayList<>();
list.addAll(asCollection(currentValue));
list.addAll(asCollection(wrapper.getValue()));

2
src/main/java/org/springframework/hateoas/hal/Jackson2HalModule.java
View File

@@ -807,7 +807,7 @@ public class Jackson2HalModule extends SimpleModule {
@Override
public void serialize(Boolean value, JsonGenerator jgen, SerializerProvider provider)
throws IOException {
jgen.writeBoolean(value.booleanValue());
jgen.writeBoolean(value);
}
/*

2
src/main/java/org/springframework/hateoas/hal/forms/HalFormsDeserializers.java
View File

@@ -60,7 +60,7 @@ class HalFormsDeserializers {
@Override
public List<Object> deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException {
List<Object> result = new ArrayList<Object>();
List<Object> result = new ArrayList<>();
JsonDeserializer<Object> deser = ctxt.findRootValueDeserializer(contentType);
Object object;

8
src/main/java/org/springframework/hateoas/hal/forms/HalFormsDocument.java
View File

@@ -158,7 +158,7 @@ public class HalFormsDocument<T> {
List<Link> links = new ArrayList<>(this.links);
links.add(link);
return new HalFormsDocument<T>(resource, resources, embedded, pageMetadata, links, templates);
return new HalFormsDocument<>(resource, resources, embedded, pageMetadata, links, templates);
}
/**
@@ -176,7 +176,7 @@ public class HalFormsDocument<T> {
Map<String, HalFormsTemplate> templates = new HashMap<>(this.templates);
templates.put(name, template);
return new HalFormsDocument<T>(resource, resources, embedded, pageMetadata, links, templates);
return new HalFormsDocument<>(resource, resources, embedded, pageMetadata, links, templates);
}
/**
@@ -191,9 +191,9 @@ public class HalFormsDocument<T> {
Assert.notNull(key, "Embedded key must not be null!");
Assert.notNull(value, "Embedded value must not be null!");
Map<String, Object> embedded = new HashMap<String, Object>(this.embedded);
Map<String, Object> embedded = new HashMap<>(this.embedded);
embedded.put(key, value);
return new HalFormsDocument<T>(resource, resources, embedded, pageMetadata, links, templates);
return new HalFormsDocument<>(resource, resources, embedded, pageMetadata, links, templates);
}
}

2
src/main/java/org/springframework/hateoas/hal/forms/Jackson2HalFormsModule.java
View File

@@ -113,7 +113,7 @@ public class Jackson2HalFormsModule extends SimpleModule {
*/
public static class HalFormsHandlerInstantiator extends HalHandlerInstantiator {
private final Map<Class<?>, Object> serializers = new HashMap<Class<?>, Object>();
private final Map<Class<?>, Object> serializers = new HashMap<>();
public HalFormsHandlerInstantiator(RelProvider resolver, CurieProvider curieProvider,
MessageSourceAccessor messageSource, boolean enforceEmbeddedCollections,