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

BATCH-2111: Java 8 / Upgrade to Spring 4

Browse Source 
* Upgrade Spring framework to 4.0.2.RELEASE
* Upgrade maven compiler plugin to 3.1
* Use LinkedHashMap to preseve ordering in AbstractFlowParser (found when upgrading to JDK 8)
* Match on EnhancerBySpringCGLIB in StepScopeProxyTargetClassOverrideIntegrationTests (SPR-11398)
This commit is contained in:
Chris Schaefer
2014-02-13 18:06:29 -05:00
committed by Michael Minella
parent e8a0035844
commit ef0823938c
6 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/AbstractFlowParser.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2006-2013 the original author or authors.
* Copyright 2006-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -40,6 +41,7 @@ import org.w3c.dom.NodeList;
/**
* @author Dave Syer
* @author Michael Minella
* @author Chris Schaefer
*
*/
public abstract class AbstractFlowParser extends AbstractSingleBeanDefinitionParser {
@@ -119,7 +121,7 @@ public abstract class AbstractFlowParser extends AbstractSingleBeanDefinitionPar
parserContext.pushContainingComponent(compositeDef);
boolean stepExists = false;
Map<String, Set<String>> reachableElementMap = new HashMap<String, Set<String>>();
Map<String, Set<String>> reachableElementMap = new LinkedHashMap<String, Set<String>>();
String startElement = null;
NodeList children = element.getChildNodes();
for (int i = 0; i < children.getLength(); i++) {

2
spring-batch-core/src/test/java/org/springframework/batch/core/scope/StepScopeProxyTargetClassOverrideIntegrationTests.java
View File

@@ -29,7 +29,7 @@ public class StepScopeProxyTargetClassOverrideIntegrationTests implements BeanFa
private static final String JDK_PROXY_TO_STRING_REGEX = "class .*\\$Proxy\\d+";
private static final String CGLIB_PROXY_TO_STRING_REGEX = "class .*\\$EnhancerByCGLIB.*";
private static final String CGLIB_PROXY_TO_STRING_REGEX = "class .*\\$EnhancerBySpringCGLIB.*";
@Autowired
@Qualifier("simple")