Skip to content

Commit fda3f31

Browse files
gregturngregturn
committed
#340 - Polishing.
Used IDE to migrate several Java 6 constructors to Java 8.
1 parent 21976bd commit fda3f31

25 files changed

+166
-181
lines changed

‎src/test/java/org/springframework/hateoas/Jackson2PagedResourcesIntegrationTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public void serializesPagedResourcesCorrectly() throws Exception {
6666
user.lastname = "Matthews";
6767

6868
PageMetadata metadata = new PagedResources.PageMetadata(1, 0, 2);
69-
PagedResources<User> resources = new PagedResources<User>(Collections.singleton(user), metadata);
69+
PagedResources<User> resources = new PagedResources<>(Collections.singleton(user), metadata);
7070

7171
Method method = Sample.class.getMethod("someMethod");
7272
StringWriter writer = new StringWriter();

‎src/test/java/org/springframework/hateoas/Jackson2ResourceIntegrationTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public void inlinesContent() throws Exception {
2727
person.firstname = "Dave";
2828
person.lastname = "Matthews";
2929

30-
Resource<Person> resource = new Resource<Person>(person);
30+
Resource<Person> resource = new Resource<>(person);
3131
resource.add(new Link("localhost"));
3232

3333
assertThat(write(resource)).isEqualTo(REFERENCE);

‎src/test/java/org/springframework/hateoas/PagedResourcesMarshallingTest.java‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public void setUp() throws Exception {
5757
marshaller = context.createMarshaller();
5858
unmarshaller = context.createUnmarshaller();
5959

60-
pagedResources = new PagedResources<Inner>(new ArrayList<Inner>(), null);
60+
pagedResources = new PagedResources<>(new ArrayList<>(), null);
6161
}
6262

6363
/**
@@ -73,14 +73,10 @@ public static class Inner {}
7373

7474
private static String readFile(org.springframework.core.io.Resource resource) throws IOException {
7575

76-
FileInputStream stream = new FileInputStream(resource.getFile());
77-
78-
try {
76+
try (FileInputStream stream = new FileInputStream(resource.getFile())) {
7977
FileChannel fc = stream.getChannel();
8078
MappedByteBuffer bb = fc.map(FileChannel.MapMode.READ_ONLY, 0, fc.size());
8179
return Charset.defaultCharset().decode(bb).toString();
82-
} finally {
83-
stream.close();
8480
}
8581
}
8682
}

‎src/test/java/org/springframework/hateoas/PagedResourcesUnitTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public class PagedResourcesUnitTest {
3636

3737
@Before
3838
public void setUp() {
39-
resources = new PagedResources<Object>(Collections.emptyList(), metadata);
39+
resources = new PagedResources<>(Collections.emptyList(), metadata);
4040
}
4141

4242
@Test

‎src/test/java/org/springframework/hateoas/ResourceIntegrationTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public void inlinesContent() throws Exception {
4747
person.firstname = "Dave";
4848
person.lastname = "Matthews";
4949

50-
Resource<Person> resource = new Resource<Person>(person);
50+
Resource<Person> resource = new Resource<>(person);
5151
resource.add(new Link("localhost"));
5252

5353
assertThat(write(resource)).isEqualTo(REFERENCE);

‎src/test/java/org/springframework/hateoas/ResourceUnitTest.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ public class ResourceUnitTest {
3131
@Test
3232
public void equalsForSelfReference() {
3333

34-
Resource<String> resource = new Resource<String>("foo");
34+
Resource<String> resource = new Resource<>("foo");
3535
assertThat(resource).isEqualTo(resource);
3636
}
3737

3838
@Test
3939
public void equalsWithEqualContent() {
4040

41-
Resource<String> left = new Resource<String>("foo");
42-
Resource<String> right = new Resource<String>("foo");
41+
Resource<String> left = new Resource<>("foo");
42+
Resource<String> right = new Resource<>("foo");
4343

4444
assertThat(left).isEqualTo(right);
4545
assertThat(right).isEqualTo(left);
@@ -48,8 +48,8 @@ public void equalsWithEqualContent() {
4848
@Test
4949
public void notEqualForDifferentContent() {
5050

51-
Resource<String> left = new Resource<String>("foo");
52-
Resource<String> right = new Resource<String>("bar");
51+
Resource<String> left = new Resource<>("foo");
52+
Resource<String> right = new Resource<>("bar");
5353

5454
assertThat(left).isNotEqualTo(right);
5555
assertThat(right).isNotEqualTo(left);
@@ -58,8 +58,8 @@ public void notEqualForDifferentContent() {
5858
@Test
5959
public void notEqualForDifferentLinks() {
6060

61-
Resource<String> left = new Resource<String>("foo");
62-
Resource<String> right = new Resource<String>("foo");
61+
Resource<String> left = new Resource<>("foo");
62+
Resource<String> right = new Resource<>("foo");
6363
right.add(new Link("localhost"));
6464

6565
assertThat(left).isNotEqualTo(right);

‎src/test/java/org/springframework/hateoas/ResourcesUnitTest.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,21 +29,21 @@
2929
*/
3030
public class ResourcesUnitTest {
3131

32-
Set<Resource<String>> foo = Collections.singleton(new Resource<String>("foo"));
33-
Set<Resource<String>> bar = Collections.singleton(new Resource<String>("bar"));
32+
Set<Resource<String>> foo = Collections.singleton(new Resource<>("foo"));
33+
Set<Resource<String>> bar = Collections.singleton(new Resource<>("bar"));
3434

3535
@Test
3636
public void equalsForSelfReference() {
3737

38-
Resources<Resource<String>> resource = new Resources<Resource<String>>(foo);
38+
Resources<Resource<String>> resource = new Resources<>(foo);
3939
assertThat(resource).isEqualTo(resource);
4040
}
4141

4242
@Test
4343
public void equalsWithEqualContent() {
4444

45-
Resources<Resource<String>> left = new Resources<Resource<String>>(foo);
46-
Resources<Resource<String>> right = new Resources<Resource<String>>(foo);
45+
Resources<Resource<String>> left = new Resources<>(foo);
46+
Resources<Resource<String>> right = new Resources<>(foo);
4747

4848
assertThat(left).isEqualTo(right);
4949
assertThat(right).isEqualTo(left);
@@ -52,8 +52,8 @@ public void equalsWithEqualContent() {
5252
@Test
5353
public void notEqualForDifferentContent() {
5454

55-
Resources<Resource<String>> left = new Resources<Resource<String>>(foo);
56-
Resources<Resource<String>> right = new Resources<Resource<String>>(bar);
55+
Resources<Resource<String>> left = new Resources<>(foo);
56+
Resources<Resource<String>> right = new Resources<>(bar);
5757

5858
assertThat(left).isNotEqualTo(right);
5959
assertThat(right).isNotEqualTo(left);
@@ -62,8 +62,8 @@ public void notEqualForDifferentContent() {
6262
@Test
6363
public void notEqualForDifferentLinks() {
6464

65-
Resources<Resource<String>> left = new Resources<Resource<String>>(foo);
66-
Resources<Resource<String>> right = new Resources<Resource<String>>(bar);
65+
Resources<Resource<String>> left = new Resources<>(foo);
66+
Resources<Resource<String>> right = new Resources<>(bar);
6767
right.add(new Link("localhost"));
6868

6969
assertThat(left).isNotEqualTo(right);

‎src/test/java/org/springframework/hateoas/UriTemplateUnitTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ public void expandsRequestParameter() {
133133
@Test
134134
public void expandsMultipleRequestParameters() {
135135

136-
Map<String, Object> parameters = new HashMap<String, Object>();
136+
Map<String, Object> parameters = new HashMap<>();
137137
parameters.put("bar", "myBar");
138138
parameters.put("fooBar", "myFooBar");
139139

@@ -150,7 +150,7 @@ public void expandsMultipleRequestParameters() {
150150
public void rejectsMissingRequiredPathVariable() {
151151

152152
UriTemplate template = new UriTemplate("/foo/{bar}");
153-
template.expand(Collections.<String, Object> emptyMap());
153+
template.expand(Collections.emptyMap());
154154
}
155155

156156
/**
@@ -200,7 +200,7 @@ public void addsTemplateVariables() {
200200
UriTemplate source = new UriTemplate("/{foo}/bar{?page}");
201201
List<TemplateVariable> toAdd = Arrays.asList(new TemplateVariable("bar", VariableType.REQUEST_PARAM));
202202

203-
List<TemplateVariable> expected = new ArrayList<TemplateVariable>();
203+
List<TemplateVariable> expected = new ArrayList<>();
204204
expected.addAll(source.getVariables());
205205
expected.addAll(toAdd);
206206

‎src/test/java/org/springframework/hateoas/VndErrorsMarshallingTest.java‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -122,14 +122,10 @@ public void jaxbUnMarshalling() throws Exception {
122122

123123
private static String readFile(org.springframework.core.io.Resource resource) throws IOException {
124124

125-
FileInputStream stream = new FileInputStream(resource.getFile());
126-
127-
try {
125+
try (FileInputStream stream = new FileInputStream(resource.getFile())) {
128126
FileChannel fc = stream.getChannel();
129127
MappedByteBuffer bb = fc.map(FileChannel.MapMode.READ_ONLY, 0, fc.size());
130128
return Charset.defaultCharset().decode(bb).toString();
131-
} finally {
132-
stream.close();
133129
}
134130
}
135131
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public void replacesParametersForWither() {
7575
Hop hop = Hop.rel("rel").withParameter("key", "value").withParameters(Collections.singletonMap("foo", "bar"));
7676

7777
assertThat(hop.getParameters()).hasSize(1) //
78-
.containsEntry("foo", (Object) "bar");
78+
.containsEntry("foo", "bar");
7979
}
8080

8181
/**
@@ -99,7 +99,7 @@ public void localParameterOverridesGlobalOnMerging() {
9999

100100
Hop hop = Hop.rel("rel").withParameter("key", "value");
101101

102-
Map<String, Object> result = hop.getMergedParameters(Collections.singletonMap("key", (Object) "global"));
102+
Map<String, Object> result = hop.getMergedParameters(Collections.singletonMap("key", "global"));
103103

104104
assertThat(result).hasSize(1) //
105105
.containsEntry("key", "value");

0 commit comments

Comments
 (0)