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

Use diamond operator

Browse Source 
Issue: SWF-1718
This commit is contained in:
Rossen Stoyanchev
2018-02-08 13:06:46 -05:00
parent 0a618b0791
commit d66c25ffd0
146 changed files with 328 additions and 328 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-binding/src/test/java/org/springframework/binding/collection/MapAccessorTests.java
View File

@@ -9,11 +9,11 @@ public class MapAccessorTests extends TestCase {
private MapAccessor<String, Object> accessor;
protected void setUp() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
Map<String, Object> map = new HashMap<>();
map.put("string", "hello");
map.put("integer", 9);
map.put("null", null);
this.accessor = new MapAccessor<String, Object>(map);
this.accessor = new MapAccessor<>(map);
}
public void testAccessNullAttribute() {

6
spring-binding/src/test/java/org/springframework/binding/collection/SharedMapDecoratorTests.java
View File

@@ -27,8 +27,8 @@ import junit.framework.TestCase;
*/
public class SharedMapDecoratorTests extends TestCase {
private SharedMapDecorator<String, String> map = new SharedMapDecorator<String, String>(
new HashMap<String, String>());
private SharedMapDecorator<String, String> map = new SharedMapDecorator<>(
new HashMap<>());
public void testGetPutRemove() {
assertTrue(map.size() == 0);
@@ -48,7 +48,7 @@ public class SharedMapDecoratorTests extends TestCase {
}
public void testPutAll() {
Map<String, String> all = new HashMap<String, String>();
Map<String, String> all = new HashMap<>();
all.put("foo", "bar");
all.put("bar", "baz");
map.putAll(all);

4
spring-binding/src/test/java/org/springframework/binding/collection/StringKeyedMapAdapterTests.java
View File

@@ -28,7 +28,7 @@ import junit.framework.TestCase;
*/
public class StringKeyedMapAdapterTests extends TestCase {
private Map<String, String> contents = new HashMap<String, String>();
private Map<String, String> contents = new HashMap<>();
private StringKeyedMapAdapter<String> map = new StringKeyedMapAdapter<String>() {
@@ -67,7 +67,7 @@ public class StringKeyedMapAdapterTests extends TestCase {
}
public void testPutAll() {
Map<String, String> all = new HashMap<String, String>();
Map<String, String> all = new HashMap<>();
all.put("foo", "bar");
all.put("bar", "baz");
map.putAll(all);

18
spring-binding/src/test/java/org/springframework/binding/convert/service/DefaultConversionServiceTests.java
View File

@@ -49,7 +49,7 @@ public class DefaultConversionServiceTests extends TestCase {
public void testConvertCompatibleTypes() {
DefaultConversionService service = new DefaultConversionService();
List<Object> lst = new ArrayList<Object>();
List<Object> lst = new ArrayList<>();
assertSame(lst, service.getConversionExecutor(ArrayList.class, List.class).execute(lst));
}
@@ -250,7 +250,7 @@ public class DefaultConversionServiceTests extends TestCase {
DefaultConversionService service = new DefaultConversionService();
service.addConverter("princy", new CustomTwoWayConverter());
ConversionExecutor executor = service.getConversionExecutor("princy", List.class, Principal[].class);
List<String> princyList = new ArrayList<String>();
List<String> princyList = new ArrayList<>();
princyList.add("princy1");
princyList.add("princy2");
Principal[] p = (Principal[]) executor.execute(princyList);
@@ -272,7 +272,7 @@ public class DefaultConversionServiceTests extends TestCase {
return "princy2";
}
};
List<Principal> princyList = new ArrayList<Principal>();
List<Principal> princyList = new ArrayList<>();
princyList.add(princy1);
princyList.add(princy2);
String[] p = (String[]) executor.execute(princyList);
@@ -373,7 +373,7 @@ public class DefaultConversionServiceTests extends TestCase {
DefaultConversionService service = new DefaultConversionService();
service.addConverter("princy", new CustomTwoWayConverter());
ConversionExecutor executor = service.getConversionExecutor("princy", List.class, List.class);
List<String> princyList = new ArrayList<String>();
List<String> princyList = new ArrayList<>();
princyList.add("princy1");
princyList.add("princy2");
List<Principal> list = (List<Principal>) executor.execute(princyList);
@@ -396,7 +396,7 @@ public class DefaultConversionServiceTests extends TestCase {
return "princy2";
}
};
List<Principal> princyList = new ArrayList<Principal>();
List<Principal> princyList = new ArrayList<>();
princyList.add(princy1);
princyList.add(princy2);
List<String> list = (List<String>) executor.execute(princyList);
@@ -408,7 +408,7 @@ public class DefaultConversionServiceTests extends TestCase {
DefaultConversionService service = new DefaultConversionService();
service.addConverter("princy", new CustomTwoWayConverter());
ConversionExecutor executor = service.getConversionExecutor("princy", List.class, List.class);
List<Integer> princyList = new ArrayList<Integer>();
List<Integer> princyList = new ArrayList<>();
princyList.add(1);
try {
executor.execute(princyList);
@@ -456,7 +456,7 @@ public class DefaultConversionServiceTests extends TestCase {
public void testListToArrayConversion() {
DefaultConversionService service = new DefaultConversionService();
ConversionExecutor executor = service.getConversionExecutor(Collection.class, String[].class);
List<String> list = new ArrayList<String>();
List<String> list = new ArrayList<>();
list.add("1");
list.add("2");
list.add("3");
@@ -470,7 +470,7 @@ public class DefaultConversionServiceTests extends TestCase {
public void testSetToListConversion() {
DefaultConversionService service = new DefaultConversionService();
ConversionExecutor executor = service.getConversionExecutor(Set.class, List.class);
Set<String> set = new LinkedHashSet<String>();
Set<String> set = new LinkedHashSet<>();
set.add("1");
set.add("2");
set.add("3");
@@ -599,7 +599,7 @@ public class DefaultConversionServiceTests extends TestCase {
}
protected Object toObject(String string, Class<?> targetClass) throws Exception {
List<Principal> principals = new ArrayList<Principal>();
List<Principal> principals = new ArrayList<>();
StringTokenizer tokenizer = new StringTokenizer(string, ",");
while (tokenizer.hasMoreTokens()) {
final String name = tokenizer.nextToken();

2
spring-binding/src/test/java/org/springframework/binding/expression/beanwrapper/TestBean.java
View File

@@ -27,7 +27,7 @@ public class TestBean {
private Date date;
private List<Object> list = new ArrayList<Object>();
private List<Object> list = new ArrayList<>();
public boolean isFlag() {
return flag;

2
spring-binding/src/test/java/org/springframework/binding/expression/el/MapAdaptableELResolverTests.java
View File

@@ -56,7 +56,7 @@ public class MapAdaptableELResolverTests extends TestCase {
}
private class TestMapAdaptable implements MapAdaptable<String, String> {
private Map<String, String> map = new HashMap<String, String>();
private Map<String, String> map = new HashMap<>();
public TestMapAdaptable() {
map.put("bar", "bar");

2
spring-binding/src/test/java/org/springframework/binding/expression/el/TestBean.java
View File

@@ -23,7 +23,7 @@ public class TestBean {
private String value = "foo";
private int maximum = 2;
private TestBean bean;
private List<String> list = new ArrayList<String>();
private List<String> list = new ArrayList<>();
public TestBean() {
initList();

4
spring-binding/src/test/java/org/springframework/binding/mapping/DefaultMapperTests.java
View File

@@ -49,7 +49,7 @@ public class DefaultMapperTests extends TestCase {
DefaultMapping mapping1 = new DefaultMapping(parser.parseExpression("beep", null), parser.parseExpression(
"beep", null));
mapper.addMapping(mapping1);
Map<String, String> bean1 = new HashMap<String, String>();
Map<String, String> bean1 = new HashMap<>();
bean1.put("beep", "en");
TestBean2 bean2 = new TestBean2();
MappingResults results = mapper.map(bean1, bean2);
@@ -61,7 +61,7 @@ public class DefaultMapperTests extends TestCase {
DefaultMapping mapping1 = new DefaultMapping(parser.parseExpression("boop", null), parser.parseExpression(
"boop", null));
mapper.addMapping(mapping1);
Map<String, String> bean1 = new HashMap<String, String>();
Map<String, String> bean1 = new HashMap<>();
bean1.put("boop", "bogus");
TestBean2 bean2 = new TestBean2();
MappingResults results = mapper.map(bean1, bean2);

2
spring-binding/src/test/java/org/springframework/binding/message/MessageContextErrorsTests.java
View File

@@ -80,7 +80,7 @@ public class MessageContextErrorsTests extends TestCase {
}
public void testAddAllErrors() {
MapBindingResult result = new MapBindingResult(new HashMap<Object, Object>(), "object");
MapBindingResult result = new MapBindingResult(new HashMap<>(), "object");
result.reject("bar", new Object[] { "boop" }, null);
result.rejectValue("field", "bar", new Object[] { "boop" }, null);
errors.addAllErrors(result);