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

Java 8: Anonymous type can be replaced with lambda

Browse Source
This commit is contained in:
Lars Grefer
2019-08-27 02:13:37 +02:00
committed by Rossen Stoyanchev
parent ef48c15603
commit 2be8bcbc18
4 changed files with 11 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -164,11 +164,7 @@ public class DefaultConversionServiceTests {
DefaultConversionService service = new DefaultConversionService();
service.addConverter("princy", new CustomTwoWayConverter());
ConversionExecutor executor = service.getConversionExecutor("princy", Principal.class, String.class);
assertEquals("name", executor.execute(new Principal() {
public String getName() {
return "name";
}
}));
assertEquals("name", executor.execute((Principal) () -> "name"));
}
@Test
@@ -197,16 +193,8 @@ public class DefaultConversionServiceTests {
DefaultConversionService service = new DefaultConversionService();
service.addConverter("princy", new CustomTwoWayConverter());
ConversionExecutor executor = service.getConversionExecutor("princy", Principal[].class, String[].class);
final Principal princy1 = new Principal() {
public String getName() {
return "princy1";
}
};
final Principal princy2 = new Principal() {
public String getName() {
return "princy2";
}
};
final Principal princy1 = () -> "princy1";
final Principal princy2 = () -> "princy2";
String[] p = (String[]) executor.execute(new Principal[] { princy1, princy2 });
assertEquals("princy1", p[0]);
assertEquals("princy2", p[1]);
@@ -567,11 +555,7 @@ public class DefaultConversionServiceTests {
private static class CustomConverter implements Converter {
public Object convertSourceToTargetClass(final Object source, Class<?> targetClass) throws Exception {
return new Principal() {
public String getName() {
return (String) source;
}
};
return (Principal) () -> (String) source;
}
public Class<?> getSourceClass() {

8
spring-faces/src/main/java/org/springframework/faces/webflow/FlowFacesContext.java
View File

@@ -230,12 +230,8 @@ public class FlowFacesContext extends FacesContextWrapper {
*/
public List<FacesMessage> getMessageList(final String clientId) {
final FacesMessageSource source = new FacesMessageSource(clientId);
Message[] messages = this.context.getMessageContext().getMessagesByCriteria(new MessageCriteria() {
public boolean test(Message message) {
return ObjectUtils.nullSafeEquals(message.getSource(), source)
|| ObjectUtils.nullSafeEquals(message.getSource(), clientId);
}
});
Message[] messages = this.context.getMessageContext().getMessagesByCriteria(message -> ObjectUtils.nullSafeEquals(message.getSource(), source)
|| ObjectUtils.nullSafeEquals(message.getSource(), clientId));
return asFacesMessages(messages);
}

18
spring-webflow/src/main/java/org/springframework/webflow/expression/spel/FlowVariablePropertyAccessor.java
View File

@@ -50,21 +50,9 @@ public class FlowVariablePropertyAccessor implements PropertyAccessor {
private static Map<String, FlowVariableAccessor> variables = new HashMap<>();
static {
variables.put("currentUser", new FlowVariableAccessor() {
public Object getVariable() {
return RequestContextHolder.getRequestContext().getExternalContext().getCurrentUser();
}
});
variables.put("flowRequestContext", new FlowVariableAccessor() {
public Object getVariable() {
return RequestContextHolder.getRequestContext();
}
});
variables.put("resourceBundle", new FlowVariableAccessor() {
public Object getVariable() {
return RequestContextHolder.getRequestContext().getActiveFlow().getApplicationContext();
}
});
variables.put("currentUser", () -> RequestContextHolder.getRequestContext().getExternalContext().getCurrentUser());
variables.put("flowRequestContext", () -> RequestContextHolder.getRequestContext());
variables.put("resourceBundle", () -> RequestContextHolder.getRequestContext().getActiveFlow().getApplicationContext());
}
public Class<?>[] getSpecificTargetClasses() {

6
spring-webflow/src/test/java/org/springframework/webflow/expression/spel/ScopeSearchingPropertyAccessorTests.java
View File

@@ -79,10 +79,8 @@ public class ScopeSearchingPropertyAccessorTests {
protected void initView(MockRequestContext requestContext) {
((MockFlowSession) requestContext.getFlowExecutionContext().getActiveSession()).setState(new ViewState(
requestContext.getRootFlow(), "view", new ViewFactory() {
public View getView(RequestContext context) {
throw new UnsupportedOperationException("Not implemented");
}
requestContext.getRootFlow(), "view", context -> {
throw new UnsupportedOperationException("Not implemented");
}));
}