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

Upgrade to Boot 1.4.1

Browse Source 
- Align related spring train deps
- Modify some other deps to get correct versions
- Some testing changes as boot 1.4.1 shuffled some
  test stuff around.
- Fixed deprecations with newer boot and framework
- Fixes #256
This commit is contained in:
Janne Valkealahti
2016-09-30 07:55:12 +01:00
parent 638e3e21ff
commit 3cc626c947
12 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-statemachine-core/src/main/java/org/springframework/statemachine/config/configuration/StateMachineConfiguration.java
View File

@@ -85,7 +85,7 @@ public class StateMachineConfiguration<S, E> extends
AnnotationAttributes scopeAttributes = AnnotationAttributes.fromMap(importingClassMetadata.getAnnotationAttributes(
Scope.class.getName(), false));
if (scopeAttributes != null) {
String scope = scopeAttributes.getAliasedString("value", Scope.class, enableStateMachineEnclosingClass);
String scope = scopeAttributes.getString("value");
if (StringUtils.hasText(scope)) {
beanDefinitionBuilder.setScope(scope);
}

2
spring-statemachine-core/src/main/java/org/springframework/statemachine/processor/StateMachineMethodInvokerHelper.java
View File

@@ -438,7 +438,7 @@ public class StateMachineMethodInvokerHelper<T, S, E> extends AbstractExpression
} else if (annotationType.equals(ExtendedStateVariable.class)) {
AnnotationAttributes annotationAttributes = AnnotationAttributes
.fromMap(AnnotationUtils.getAnnotationAttributes(mappingAnnotation));
String key = annotationAttributes.getAliasedString("value", ExtendedStateVariable.class, null);
String key = annotationAttributes.getString("value");
sb.append("variables.get('" + key + "')");
}