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

Fix SpelPropertyAccessorRegistrar

Browse Source 
The `SpelPropertyAccessorRegistrar` ctor and
`add(PropertyAccessor... propertyAccessors)` method use wrong variable
to build a key for the provided `PropertyAccessor`.
Therefore during iteration the next `PropertyAccessor` overrides the
previous and we end up just only with one instance in the registry

* Extract `private static obtainAccessorKey()` method to build
decapitalized key for the `PropertyAccessor`
* Change the map store to the `LinkedHashMap` to keep order of the
provided `PropertyAccessor` s
* Modify `EnableIntegrationTests` to ensure that we support several
`PropertyAccessor` s and in the proper order

**Cherry-pick to 4.3.x**
This commit is contained in:
Artem Bilan
2018-01-11 20:25:56 -05:00
committed by Gary Russell
parent 00b910c874
commit a4eb55bf7a
2 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
spring-integration-core/src/main/java/org/springframework/integration/expression/SpelPropertyAccessorRegistrar.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2017 the original author or authors.
* Copyright 2017-2018 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.
@@ -16,7 +16,8 @@
package org.springframework.integration.expression;
import java.util.HashMap;
import java.beans.Introspector;
import java.util.LinkedHashMap;
import java.util.Map;
import org.springframework.expression.PropertyAccessor;
@@ -34,7 +35,7 @@ import org.springframework.util.Assert;
*/
public class SpelPropertyAccessorRegistrar {
private final Map<String, PropertyAccessor> propertyAccessors = new HashMap<String, PropertyAccessor>();
private final Map<String, PropertyAccessor> propertyAccessors = new LinkedHashMap<String, PropertyAccessor>();
public SpelPropertyAccessorRegistrar() {
}
@@ -48,7 +49,7 @@ public class SpelPropertyAccessorRegistrar {
public SpelPropertyAccessorRegistrar(PropertyAccessor... propertyAccessors) {
Assert.notEmpty(propertyAccessors, "'propertyAccessors' must not be empty");
for (PropertyAccessor propertyAccessor : propertyAccessors) {
this.propertyAccessors.put(propertyAccessors.getClass().getSimpleName(), propertyAccessor);
this.propertyAccessors.put(obtainAccessorKey(propertyAccessor), propertyAccessor);
}
}
@@ -95,9 +96,13 @@ public class SpelPropertyAccessorRegistrar {
public SpelPropertyAccessorRegistrar add(PropertyAccessor... propertyAccessors) {
Assert.notEmpty(propertyAccessors, "'propertyAccessors' must not be empty");
for (PropertyAccessor propertyAccessor : propertyAccessors) {
this.propertyAccessors.put(propertyAccessors.getClass().getSimpleName(), propertyAccessor);
this.propertyAccessors.put(obtainAccessorKey(propertyAccessor), propertyAccessor);
}
return this;
}
private static String obtainAccessorKey(PropertyAccessor propertyAccessor) {
return Introspector.decapitalize(propertyAccessor.getClass().getSimpleName());
}
}