You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2023/06/13 11:46:19 UTC
[camel] 07/07: (chores) camel-core-languages: cleanup duplicated code handling creating quotes
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 4e6a6e88f4fc328b55a30a04cb9097d40037a9ec
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Tue Jun 13 09:47:59 2023 +0200
(chores) camel-core-languages: cleanup duplicated code handling creating quotes
---
.../apache/camel/language/simple/ast/BaseSimpleNode.java | 15 +++++++++++++++
.../camel/language/simple/ast/DoubleQuoteStart.java | 11 +----------
.../camel/language/simple/ast/SingleQuoteStart.java | 12 +-----------
3 files changed, 17 insertions(+), 21 deletions(-)
diff --git a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/BaseSimpleNode.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/BaseSimpleNode.java
index 392be61ed01..374212071f3 100644
--- a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/BaseSimpleNode.java
+++ b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/BaseSimpleNode.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.language.simple.ast;
+import org.apache.camel.language.simple.types.SimpleParserException;
import org.apache.camel.language.simple.types.SimpleToken;
/**
@@ -38,4 +39,18 @@ public abstract class BaseSimpleNode implements SimpleNode {
public String toString() {
return token.getText();
}
+
+ protected static String createCode(String expression, CompositeNodes block) throws SimpleParserException {
+ String answer = null;
+ if (block != null) {
+ answer = block.createCode(expression);
+ }
+ // use double quote as this become used as string literals in the generated code
+ if (answer == null) {
+ answer = "\"\"";
+ } else {
+ answer = "\"" + answer + "\"";
+ }
+ return answer;
+ }
}
diff --git a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/DoubleQuoteStart.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/DoubleQuoteStart.java
index f447f5001e5..bd4428db5b6 100644
--- a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/DoubleQuoteStart.java
+++ b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/DoubleQuoteStart.java
@@ -61,15 +61,6 @@ public class DoubleQuoteStart extends BaseSimpleNode implements BlockStart {
@Override
public String createCode(String expression) throws SimpleParserException {
- String answer = null;
- if (block != null) {
- answer = block.createCode(expression);
- }
- if (answer == null) {
- answer = "\"\"";
- } else {
- answer = "\"" + answer + "\"";
- }
- return answer;
+ return BaseSimpleNode.createCode(expression, block);
}
}
diff --git a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/SingleQuoteStart.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/SingleQuoteStart.java
index bde77782d60..ce23e4246d6 100644
--- a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/SingleQuoteStart.java
+++ b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/SingleQuoteStart.java
@@ -65,16 +65,6 @@ public class SingleQuoteStart extends BaseSimpleNode implements BlockStart {
@Override
public String createCode(String expression) throws SimpleParserException {
- String answer = null;
- if (block != null) {
- answer = block.createCode(expression);
- }
- // use double quote as this become used as string literals in the generated code
- if (answer == null) {
- answer = "\"\"";
- } else {
- answer = "\"" + answer + "\"";
- }
- return answer;
+ return BaseSimpleNode.createCode(expression, block);
}
}