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-faces/src/test/java/org/springframework/faces/model/SelectionTrackingActionListenerTests.java
View File

@@ -51,11 +51,11 @@ public class SelectionTrackingActionListenerTests extends TestCase {
public void setUp() throws Exception {
this.jsfMockHelper.setUp();
this.viewToTest = new UIViewRoot();
List<Object> rows = new ArrayList<Object>();
List<Object> rows = new ArrayList<>();
rows.add(new TestRowData());
rows.add(new TestRowData());
rows.add(new TestRowData());
this.dataModel = new OneSelectionTrackingListDataModel<Object>(rows);
this.dataModel = new OneSelectionTrackingListDataModel<>(rows);
}
protected void tearDown() throws Exception {

6
spring-faces/src/test/java/org/springframework/faces/model/converter/DataModelConverterTests.java
View File

@@ -18,7 +18,7 @@ public class DataModelConverterTests extends TestCase {
@SuppressWarnings("unchecked")
public void testConvertListToDataModel() throws Exception {
List<Object> sourceList = new ArrayList<Object>();
List<Object> sourceList = new ArrayList<>();
DataModel<Object> resultModel = (DataModel<Object>) this.converter.convertSourceToTargetClass(sourceList,
DataModel.class);
@@ -29,7 +29,7 @@ public class DataModelConverterTests extends TestCase {
@SuppressWarnings("unchecked")
public void testConvertListToListDataModel() throws Exception {
List<Object> sourceList = new ArrayList<Object>();
List<Object> sourceList = new ArrayList<>();
DataModel<Object> resultModel = (DataModel<Object>) this.converter.convertSourceToTargetClass(sourceList,
ListDataModel.class);
@@ -40,7 +40,7 @@ public class DataModelConverterTests extends TestCase {
@SuppressWarnings("unchecked")
public void testConvertListToSerializableListDataModel() throws Exception {
List<Object> sourceList = new ArrayList<Object>();
List<Object> sourceList = new ArrayList<>();
DataModel<Object> resultModel = (DataModel<Object>) this.converter.convertSourceToTargetClass(sourceList,
SerializableListDataModel.class);

2
spring-faces/src/test/java/org/springframework/faces/model/converter/FacesConversionServiceTests.java
View File

@@ -18,7 +18,7 @@ public class FacesConversionServiceTests extends TestCase {
public void testGetAbstractType() {
ConversionExecutor executor = this.service.getConversionExecutor(List.class, DataModel.class);
ArrayList<Object> list = new ArrayList<Object>();
ArrayList<Object> list = new ArrayList<>();
list.add("foo");
executor.execute(list);
}

2
spring-faces/src/test/java/org/springframework/faces/mvc/JsfViewTests.java
View File

@@ -47,7 +47,7 @@ public class JsfViewTests extends TestCase {
JsfView view = (JsfView) this.resolver.resolveViewName("intro", new Locale("EN"));
view.setApplicationContext(new StaticWebApplicationContext());
view.setServletContext(new MockServletContext());
view.render(new HashMap<String, Object>(), new MockHttpServletRequest(), new MockHttpServletResponse());
view.render(new HashMap<>(), new MockHttpServletRequest(), new MockHttpServletResponse());
}
private class ResourceCheckingViewHandler extends MockViewHandler {

2
spring-faces/src/test/java/org/springframework/faces/webflow/FlowActionListenerTests.java
View File

@@ -31,7 +31,7 @@ public class FlowActionListenerTests extends TestCase {
this.listener = new FlowActionListener(this.jsfMock.application().getActionListener());
RequestContextHolder.setRequestContext(this.context);
LocalAttributeMap<Object> flash = new LocalAttributeMap<Object>();
LocalAttributeMap<Object> flash = new LocalAttributeMap<>();
EasyMock.expect(this.context.getFlashScope()).andStubReturn(flash);
EasyMock.expect(this.context.getCurrentState()).andStubReturn(new MockViewState());
EasyMock.replay(new Object[] { this.context });

2
spring-faces/src/test/java/org/springframework/faces/webflow/FlowELResolverTests.java
View File

@@ -65,7 +65,7 @@ public class FlowELResolverTests extends TestCase {
}
public void testMapAdaptableResolve() throws Exception {
LocalAttributeMap<String> base = new LocalAttributeMap<String>();
LocalAttributeMap<String> base = new LocalAttributeMap<>();
base.put("test", "test");
Object actual = this.resolver.getValue(this.elContext, base, "test");
assertTrue(this.elContext.isPropertyResolved());

2
spring-faces/src/test/java/org/springframework/faces/webflow/FlowFacesContextTests.java
View File

@@ -193,7 +193,7 @@ public class FlowFacesContextTests extends TestCase {
EasyMock.expect(this.requestContext.getMessageContext()).andStubReturn(this.messageContext);
EasyMock.replay(new Object[] { this.requestContext });
List<String> expectedOrderedIds = new ArrayList<String>();
List<String> expectedOrderedIds = new ArrayList<>();
expectedOrderedIds.add(null);
expectedOrderedIds.add("componentId");
expectedOrderedIds.add("userMessage");

4
spring-faces/src/test/java/org/springframework/faces/webflow/FlowResponseStateManagerTests.java
View File

@@ -43,7 +43,7 @@ public class FlowResponseStateManagerTests extends TestCase {
public void testWriteFlowSerializedView() throws Exception {
EasyMock.expect(this.flowExecutionContext.getKey()).andReturn(new MockFlowExecutionKey("e1s1"));
LocalAttributeMap<Object> viewMap = new LocalAttributeMap<Object>();
LocalAttributeMap<Object> viewMap = new LocalAttributeMap<>();
EasyMock.expect(this.requestContext.getViewScope()).andStubReturn(viewMap);
EasyMock.expect(this.requestContext.getFlowExecutionContext()).andReturn(this.flowExecutionContext);
EasyMock.replay(this.requestContext, this.flowExecutionContext);
@@ -61,7 +61,7 @@ public class FlowResponseStateManagerTests extends TestCase {
public void testGetState() throws Exception {
Object state = new Object();
LocalAttributeMap<Object> viewMap = new LocalAttributeMap<Object>();
LocalAttributeMap<Object> viewMap = new LocalAttributeMap<>();
viewMap.put(FlowResponseStateManager.FACES_VIEW_STATE, state);
EasyMock.expect(this.requestContext.getViewScope()).andStubReturn(viewMap);
EasyMock.replay(this.requestContext);

2
spring-faces/src/test/java/org/springframework/faces/webflow/JSFManagedBean.java
View File

@@ -7,7 +7,7 @@ public class JSFManagedBean {
String prop1;
JSFModel model;
List<String> values = new ArrayList<String>();
List<String> values = new ArrayList<>();
public JSFModel getModel() {
return this.model;

6
spring-faces/src/test/java/org/springframework/faces/webflow/JsfFinalResponseActionTests.java
View File

@@ -76,10 +76,10 @@ public class JsfFinalResponseActionTests extends TestCase {
ext.setNativeRequest(new MockHttpServletRequest());
ext.setNativeResponse(new MockHttpServletResponse());
EasyMock.expect(this.context.getExternalContext()).andStubReturn(ext);
LocalAttributeMap<Object> requestMap = new LocalAttributeMap<Object>();
LocalAttributeMap<Object> requestMap = new LocalAttributeMap<>();
EasyMock.expect(this.context.getFlashScope()).andStubReturn(requestMap);
EasyMock.expect(this.context.getRequestParameters()).andStubReturn(
new LocalParameterMap(new HashMap<String, Object>()));
new LocalParameterMap(new HashMap<>()));
}
public void testRender() throws Exception {
@@ -119,7 +119,7 @@ public class JsfFinalResponseActionTests extends TestCase {
private class TrackingPhaseListener implements PhaseListener {
private final List<String> phaseCallbacks = new ArrayList<String>();
private final List<String> phaseCallbacks = new ArrayList<>();
public void afterPhase(PhaseEvent event) {
String phaseCallback = "AFTER_" + event.getPhaseId();

4
spring-faces/src/test/java/org/springframework/faces/webflow/JsfUtilsTests.java
View File

@@ -27,7 +27,7 @@ public class JsfUtilsTests extends AbstractJsfTestCase {
}
public void testBeforeListenersCalledInForwardOrder() throws Exception {
List<OrderVerifyingPhaseListener> list = new ArrayList<OrderVerifyingPhaseListener>();
List<OrderVerifyingPhaseListener> list = new ArrayList<>();
MockLifecycle lifecycle = new MockLifecycle();
PhaseListener listener1 = new OrderVerifyingPhaseListener(null, list);
lifecycle.addPhaseListener(listener1);
@@ -42,7 +42,7 @@ public class JsfUtilsTests extends AbstractJsfTestCase {
}
public void testAfterListenersCalledInReverseOrder() throws Exception {
List<OrderVerifyingPhaseListener> list = new ArrayList<OrderVerifyingPhaseListener>();
List<OrderVerifyingPhaseListener> list = new ArrayList<>();
MockLifecycle lifecycle = new MockLifecycle();
PhaseListener listener1 = new OrderVerifyingPhaseListener(list, null);
lifecycle.addPhaseListener(listener1);

6
spring-faces/src/test/java/org/springframework/faces/webflow/JsfViewFactoryTests.java
View File

@@ -54,7 +54,7 @@ public class JsfViewFactoryTests extends TestCase {
private final RequestContext context = EasyMock.createMock(RequestContext.class);
private final LocalAttributeMap<Object> flashMap = new LocalAttributeMap<Object>();
private final LocalAttributeMap<Object> flashMap = new LocalAttributeMap<>();
private final ViewHandler viewHandler = new MockViewHandler();
@@ -81,7 +81,7 @@ public class JsfViewFactoryTests extends TestCase {
EasyMock.expect(this.context.getFlashScope()).andStubReturn(this.flashMap);
EasyMock.expect(this.context.getExternalContext()).andStubReturn(this.extContext);
EasyMock.expect(this.context.getRequestParameters()).andStubReturn(
new LocalParameterMap(new HashMap<String, Object>()));
new LocalParameterMap(new HashMap<>()));
}
protected void tearDown() throws Exception {
@@ -302,7 +302,7 @@ public class JsfViewFactoryTests extends TestCase {
private class TrackingPhaseListener implements PhaseListener {
private final List<String> phaseCallbacks = new ArrayList<String>();
private final List<String> phaseCallbacks = new ArrayList<>();
public void afterPhase(PhaseEvent event) {
String phaseCallback = "AFTER_" + event.getPhaseId();

6
spring-faces/src/test/java/org/springframework/faces/webflow/MockJsfExternalContext.java
View File

@@ -32,11 +32,11 @@ import javax.faces.context.ExternalContext;
public class MockJsfExternalContext extends ExternalContext {
private final Map<String, Object> applicationMap = new HashMap<String, Object>();
private final Map<String, Object> applicationMap = new HashMap<>();
private final Map<String, Object> sessionMap = new HashMap<String, Object>();
private final Map<String, Object> sessionMap = new HashMap<>();
private Map<String, Object> requestMap = new HashMap<String, Object>();
private Map<String, Object> requestMap = new HashMap<>();
private Map<String, String> requestParameterMap = Collections.emptyMap();