This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
commit 376bc05a27a8702a2cee804966c5b5e6057f1872 Author: Claus Ibsen <[email protected]> AuthorDate: Thu Oct 1 22:15:51 2020 +0200 CAMEL-15605: Languages should be singleton for better performance. --- .../apache/camel/jsonpath/JsonPathExpression.java | 1 - .../org/apache/camel/jsonpath/JsonPathLanguage.java | 12 ++++++------ .../camel/language/xquery/XQueryLanguage.java | 2 +- .../apache/camel/language/xpath/XPathLanguage.java | 12 ++++++------ .../camel/language/tokenizer/TokenizeLanguage.java | 21 +++++++++++---------- .../language/xtokenizer/XMLTokenizeLanguage.java | 10 +++++----- 6 files changed, 29 insertions(+), 29 deletions(-) diff --git a/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathExpression.java b/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathExpression.java index 7dfb850..e3b7230 100644 --- a/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathExpression.java +++ b/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathExpression.java @@ -44,7 +44,6 @@ public class JsonPathExpression extends ExpressionAdapter implements AfterProper private boolean allowEasyPredicate = true; private boolean writeAsString; private String headerName; - private String option; private Option[] options; public JsonPathExpression(String expression) { diff --git a/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathLanguage.java b/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathLanguage.java index e04bb94..58d8f52 100644 --- a/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathLanguage.java +++ b/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathLanguage.java @@ -126,12 +126,12 @@ public class JsonPathLanguage extends LanguageSupport { public Expression createExpression(Map<String, Object> properties) { String exp = (String) properties.get("expression"); JsonPathExpression answer = new JsonPathExpression(exp); - answer.setResultType(property(Class.class, properties, "resultType", null)); - answer.setSuppressExceptions(property(boolean.class, properties, "suppressExceptions", true)); - answer.setAllowEasyPredicate(property(boolean.class, properties, "allowEasyPredicate", true)); - answer.setAllowSimple(property(boolean.class, properties, "allowSimple", true)); - answer.setWriteAsString(property(boolean.class, properties, "writeAsString", false)); - answer.setHeaderName(property(String.class, properties, "headerName", null)); + answer.setResultType(property(Class.class, properties, "resultType", resultType)); + answer.setSuppressExceptions(property(boolean.class, properties, "suppressExceptions", suppressExceptions)); + answer.setAllowEasyPredicate(property(boolean.class, properties, "allowEasyPredicate", allowEasyPredicate)); + answer.setAllowSimple(property(boolean.class, properties, "allowSimple", allowSimple)); + answer.setWriteAsString(property(boolean.class, properties, "writeAsString", writeAsString)); + answer.setHeaderName(property(String.class, properties, "headerName", headerName)); String option = (String) properties.get("option"); if (option != null) { List<Option> list = new ArrayList<>(); diff --git a/components/camel-saxon/src/main/java/org/apache/camel/language/xquery/XQueryLanguage.java b/components/camel-saxon/src/main/java/org/apache/camel/language/xquery/XQueryLanguage.java index edf2742..520f7b3 100644 --- a/components/camel-saxon/src/main/java/org/apache/camel/language/xquery/XQueryLanguage.java +++ b/components/camel-saxon/src/main/java/org/apache/camel/language/xquery/XQueryLanguage.java @@ -78,7 +78,7 @@ public class XQueryLanguage extends LanguageSupport { if (clazz != null) { setResultType(clazz); } - setHeaderName(property(String.class, properties, "headerName", null)); + setHeaderName(property(String.class, properties, "headerName", headerName)); XQueryBuilder builder = XQueryBuilder.xquery(expression); configureBuilder(builder); diff --git a/components/camel-xpath/src/main/java/org/apache/camel/language/xpath/XPathLanguage.java b/components/camel-xpath/src/main/java/org/apache/camel/language/xpath/XPathLanguage.java index 5c6ccd5..6339f1c 100644 --- a/components/camel-xpath/src/main/java/org/apache/camel/language/xpath/XPathLanguage.java +++ b/components/camel-xpath/src/main/java/org/apache/camel/language/xpath/XPathLanguage.java @@ -81,12 +81,12 @@ public class XPathLanguage extends LanguageSupport { if (qname != null) { setResultQName(qname); } - setUseSaxon(property(Boolean.class, properties, "useSaxon", null)); - setObjectModelUri(property(String.class, properties, "objectModelUri", null)); - setThreadSafety(property(Boolean.class, properties, "threadSafety", null)); - setLogNamespaces(property(Boolean.class, properties, "logNamespaces", null)); - setHeaderName(property(String.class, properties, "headerName", null)); - setXpathFactory(property(XPathFactory.class, properties, "xpathFactory", null)); + setUseSaxon(property(Boolean.class, properties, "useSaxon", useSaxon)); + setObjectModelUri(property(String.class, properties, "objectModelUri", objectModelUri)); + setThreadSafety(property(Boolean.class, properties, "threadSafety", threadSafety)); + setLogNamespaces(property(Boolean.class, properties, "logNamespaces", logNamespaces)); + setHeaderName(property(String.class, properties, "headerName", headerName)); + setXpathFactory(property(XPathFactory.class, properties, "xpathFactory", xpathFactory)); XPathBuilder builder = XPathBuilder.xpath(expression); configureBuilder(builder); diff --git a/core/camel-core-languages/src/main/java/org/apache/camel/language/tokenizer/TokenizeLanguage.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/tokenizer/TokenizeLanguage.java index aa087ae..7021f3b 100644 --- a/core/camel-core-languages/src/main/java/org/apache/camel/language/tokenizer/TokenizeLanguage.java +++ b/core/camel-core-languages/src/main/java/org/apache/camel/language/tokenizer/TokenizeLanguage.java @@ -160,16 +160,17 @@ public class TokenizeLanguage extends LanguageSupport { @Override public Expression createExpression(Map<String, Object> properties) { TokenizeLanguage answer = new TokenizeLanguage(); - answer.setInheritNamespaceTagName(property(String.class, properties, "inheritNamespaceTagName", null)); - answer.setToken(property(String.class, properties, "token", null)); - answer.setEndToken(property(String.class, properties, "endToken", null)); - answer.setHeaderName(property(String.class, properties, "headerName", null)); - answer.setRegex(property(boolean.class, properties, "regex", false)); - answer.setXml(property(boolean.class, properties, "xml", false)); - answer.setIncludeTokens(property(boolean.class, properties, "includeTokens", false)); - answer.setGroup(property(String.class, properties, "group", null)); - answer.setGroupDelimiter(property(String.class, properties, "groupDelimiter", null)); - answer.setSkipFirst(property(boolean.class, properties, "skipFirst", false)); + answer.setInheritNamespaceTagName( + property(String.class, properties, "inheritNamespaceTagName", inheritNamespaceTagName)); + answer.setToken(property(String.class, properties, "token", token)); + answer.setEndToken(property(String.class, properties, "endToken", endToken)); + answer.setHeaderName(property(String.class, properties, "headerName", headerName)); + answer.setRegex(property(boolean.class, properties, "regex", regex)); + answer.setXml(property(boolean.class, properties, "xml", xml)); + answer.setIncludeTokens(property(boolean.class, properties, "includeTokens", includeTokens)); + answer.setGroup(property(String.class, properties, "group", group)); + answer.setGroupDelimiter(property(String.class, properties, "groupDelimiter", groupDelimiter)); + answer.setSkipFirst(property(boolean.class, properties, "skipFirst", skipFirst)); return answer.createExpression(); } diff --git a/core/camel-xml-jaxp/src/main/java/org/apache/camel/language/xtokenizer/XMLTokenizeLanguage.java b/core/camel-xml-jaxp/src/main/java/org/apache/camel/language/xtokenizer/XMLTokenizeLanguage.java index 876957a..0cd0447 100644 --- a/core/camel-xml-jaxp/src/main/java/org/apache/camel/language/xtokenizer/XMLTokenizeLanguage.java +++ b/core/camel-xml-jaxp/src/main/java/org/apache/camel/language/xtokenizer/XMLTokenizeLanguage.java @@ -41,8 +41,8 @@ public class XMLTokenizeLanguage extends LanguageSupport { private String headerName; private String path; - private char mode; - private int group; + private char mode = 'i'; + private int group = 1; private Namespaces namespaces; public static Expression tokenize(String path) { @@ -97,9 +97,9 @@ public class XMLTokenizeLanguage extends LanguageSupport { @Override public Expression createExpression(Map<String, Object> properties) { XMLTokenizeLanguage answer = new XMLTokenizeLanguage(); - answer.setHeaderName(property(String.class, properties, "headerName", null)); - answer.setMode(property(char.class, properties, "mode", 'i')); - answer.setGroup(property(int.class, properties, "group", 1)); + answer.setHeaderName(property(String.class, properties, "headerName", headerName)); + answer.setMode(property(char.class, properties, "mode", mode)); + answer.setGroup(property(int.class, properties, "group", group)); String path = property(String.class, properties, "path", null); return answer.createExpression(path); }
