You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by dh...@apache.org on 2014/06/10 21:51:32 UTC
[04/35] git commit: Fixed substitution order in
ArgumentSubstitutionParser
Fixed substitution order in ArgumentSubstitutionParser
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2ffeacc0
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2ffeacc0
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2ffeacc0
Branch: refs/heads/master
Commit: 2ffeacc0217a21a4c883e367f58a8a709219cf79
Parents: 10a0b61
Author: Dhiraj Bokde <dh...@yahoo.com>
Authored: Fri May 23 17:47:51 2014 -0700
Committer: Dhiraj Bokde <dh...@yahoo.com>
Committed: Tue Jun 10 12:48:29 2014 -0700
----------------------------------------------------------------------
.../camel/util/component/ArgumentSubstitutionParser.java | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/2ffeacc0/camel-core/src/main/java/org/apache/camel/util/component/ArgumentSubstitutionParser.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/util/component/ArgumentSubstitutionParser.java b/camel-core/src/main/java/org/apache/camel/util/component/ArgumentSubstitutionParser.java
index 06ab253..0e15833 100644
--- a/camel-core/src/main/java/org/apache/camel/util/component/ArgumentSubstitutionParser.java
+++ b/camel-core/src/main/java/org/apache/camel/util/component/ArgumentSubstitutionParser.java
@@ -1,7 +1,6 @@
package org.apache.camel.util.component;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -13,7 +12,7 @@ import java.util.regex.Pattern;
*/
public class ArgumentSubstitutionParser<T> extends ApiMethodParser<T> {
- private final HashMap<Pattern, Map<Pattern, List<NameReplacement>>> methodMap;
+ private final Map<Pattern, Map<Pattern, List<NameReplacement>>> methodMap;
/**
* Create a parser using regular expressions to adapt parameter names.
@@ -22,7 +21,7 @@ public class ArgumentSubstitutionParser<T> extends ApiMethodParser<T> {
*/
public ArgumentSubstitutionParser(Class<T> proxyType, Substitution[] substitutions) {
super(proxyType);
- Map<String, Map<String, List<NameReplacement>>> regexMap = new HashMap<String, Map<String, List<NameReplacement>>>();
+ Map<String, Map<String, List<NameReplacement>>> regexMap = new LinkedHashMap<String, Map<String, List<NameReplacement>>>();
for (Substitution tuple : substitutions) {
tuple.validate();
@@ -35,7 +34,7 @@ public class ArgumentSubstitutionParser<T> extends ApiMethodParser<T> {
Map<String, List<NameReplacement>> replacementMap = regexMap.get(tuple.method);
if (replacementMap == null) {
- replacementMap = new HashMap<String, List<NameReplacement>>();
+ replacementMap = new LinkedHashMap<String, List<NameReplacement>>();
regexMap.put(tuple.method, replacementMap);
}
List<NameReplacement> replacements = replacementMap.get(tuple.argName);
@@ -85,7 +84,7 @@ public class ArgumentSubstitutionParser<T> extends ApiMethodParser<T> {
updatedArguments.add(argument);
}
- model = new ApiMethodModel(model.getName(), model.getUniqueName(), model.getResultType(),
+ model = new ApiMethodModel(model.getUniqueName(), model.getName(), model.getResultType(),
updatedArguments, model.getMethod());
}
}