You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2020/10/08 07:44:12 UTC
[camel] branch master updated: camel-core - Optimize languages
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
The following commit(s) were added to refs/heads/master by this push:
new 1f28253 camel-core - Optimize languages
1f28253 is described below
commit 1f28253517119a3d0d833166e53470a3288e4343
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Oct 8 09:24:32 2020 +0200
camel-core - Optimize languages
---
.../org/apache/camel/language/constant/ConstantLanguage.java | 12 ------------
.../org/apache/camel/language/header/HeaderLanguage.java | 12 ------------
.../camel/language/property/ExchangePropertyLanguage.java | 12 ------------
.../main/java/org/apache/camel/language/ref/RefLanguage.java | 12 ------------
.../org/apache/camel/language/simple/SimpleLanguage.java | 10 ----------
.../apache/camel/impl/DefaultCamelContextResolverTest.java | 10 ----------
.../org/apache/camel/impl/LanguageCamelContextAwareTest.java | 12 ------------
.../java/org/apache/camel/language/LanguageServiceTest.java | 12 ------------
8 files changed, 92 deletions(-)
diff --git a/core/camel-core-languages/src/main/java/org/apache/camel/language/constant/ConstantLanguage.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/constant/ConstantLanguage.java
index 520f25b..ef67763 100644
--- a/core/camel-core-languages/src/main/java/org/apache/camel/language/constant/ConstantLanguage.java
+++ b/core/camel-core-languages/src/main/java/org/apache/camel/language/constant/ConstantLanguage.java
@@ -16,8 +16,6 @@
*/
package org.apache.camel.language.constant;
-import java.util.Map;
-
import org.apache.camel.Expression;
import org.apache.camel.IsSingleton;
import org.apache.camel.Predicate;
@@ -46,16 +44,6 @@ public class ConstantLanguage implements Language, IsSingleton {
}
@Override
- public Predicate createPredicate(String expression, Map<String, Object> properties) {
- return createPredicate(expression);
- }
-
- @Override
- public Expression createExpression(String expression, Map<String, Object> properties) {
- return createExpression(expression);
- }
-
- @Override
public boolean isSingleton() {
return true;
}
diff --git a/core/camel-core-languages/src/main/java/org/apache/camel/language/header/HeaderLanguage.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/header/HeaderLanguage.java
index ed3c2e3..eba8e0c 100644
--- a/core/camel-core-languages/src/main/java/org/apache/camel/language/header/HeaderLanguage.java
+++ b/core/camel-core-languages/src/main/java/org/apache/camel/language/header/HeaderLanguage.java
@@ -16,8 +16,6 @@
*/
package org.apache.camel.language.header;
-import java.util.Map;
-
import org.apache.camel.Expression;
import org.apache.camel.IsSingleton;
import org.apache.camel.Predicate;
@@ -46,16 +44,6 @@ public class HeaderLanguage implements Language, IsSingleton {
}
@Override
- public Predicate createPredicate(String expression, Map<String, Object> properties) {
- return createPredicate(expression);
- }
-
- @Override
- public Expression createExpression(String expression, Map<String, Object> properties) {
- return createExpression(expression);
- }
-
- @Override
public boolean isSingleton() {
return true;
}
diff --git a/core/camel-core-languages/src/main/java/org/apache/camel/language/property/ExchangePropertyLanguage.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/property/ExchangePropertyLanguage.java
index bf9997d..d2bc194 100644
--- a/core/camel-core-languages/src/main/java/org/apache/camel/language/property/ExchangePropertyLanguage.java
+++ b/core/camel-core-languages/src/main/java/org/apache/camel/language/property/ExchangePropertyLanguage.java
@@ -16,8 +16,6 @@
*/
package org.apache.camel.language.property;
-import java.util.Map;
-
import org.apache.camel.Expression;
import org.apache.camel.IsSingleton;
import org.apache.camel.Predicate;
@@ -46,16 +44,6 @@ public class ExchangePropertyLanguage implements Language, IsSingleton {
}
@Override
- public Predicate createPredicate(String expression, Map<String, Object> properties) {
- return createPredicate(expression);
- }
-
- @Override
- public Expression createExpression(String expression, Map<String, Object> properties) {
- return createExpression(expression);
- }
-
- @Override
public boolean isSingleton() {
return true;
}
diff --git a/core/camel-core-languages/src/main/java/org/apache/camel/language/ref/RefLanguage.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/ref/RefLanguage.java
index a4a6975..0b31f1e 100644
--- a/core/camel-core-languages/src/main/java/org/apache/camel/language/ref/RefLanguage.java
+++ b/core/camel-core-languages/src/main/java/org/apache/camel/language/ref/RefLanguage.java
@@ -16,8 +16,6 @@
*/
package org.apache.camel.language.ref;
-import java.util.Map;
-
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.Expression;
@@ -80,14 +78,4 @@ public class RefLanguage extends LanguageSupport {
return answer;
}
- @Override
- public Predicate createPredicate(String expression, Map<String, Object> properties) {
- return createPredicate(expression);
- }
-
- @Override
- public Expression createExpression(String expression, Map<String, Object> properties) {
- return createExpression(expression);
- }
-
}
diff --git a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleLanguage.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleLanguage.java
index 284db42..6c0415f 100644
--- a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleLanguage.java
+++ b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleLanguage.java
@@ -139,16 +139,6 @@ public class SimpleLanguage extends LanguageSupport implements StaticService {
return answer;
}
- @Override
- public Predicate createPredicate(String expression, Map<String, Object> properties) {
- return createPredicate(expression);
- }
-
- @Override
- public Expression createExpression(String expression, Map<String, Object> properties) {
- return createExpression(expression);
- }
-
/**
* Creates a new {@link Expression}.
* <p/>
diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextResolverTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextResolverTest.java
index 724b0df..725f852 100644
--- a/core/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextResolverTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextResolverTest.java
@@ -218,16 +218,6 @@ public class DefaultCamelContextResolverTest {
throw new UnsupportedOperationException("Should not be called");
}
- @Override
- public Predicate createPredicate(String expression, Map<String, Object> properties) {
- throw new UnsupportedOperationException("Should not be called");
- }
-
- @Override
- public Expression createExpression(String expression, Map<String, Object> properties) {
- throw new UnsupportedOperationException("Should not be called");
- }
-
public boolean isFallback() {
return fallback;
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/LanguageCamelContextAwareTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/LanguageCamelContextAwareTest.java
index 9af5bed..9ac3f21 100644
--- a/core/camel-core/src/test/java/org/apache/camel/impl/LanguageCamelContextAwareTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/impl/LanguageCamelContextAwareTest.java
@@ -16,8 +16,6 @@
*/
package org.apache.camel.impl;
-import java.util.Map;
-
import org.apache.camel.CamelContext;
import org.apache.camel.CamelContextAware;
import org.apache.camel.ContextTestSupport;
@@ -76,15 +74,5 @@ public class LanguageCamelContextAwareTest extends ContextTestSupport {
return null;
}
- @Override
- public Predicate createPredicate(String expression, Map<String, Object> properties) {
- return null;
- }
-
- @Override
- public Expression createExpression(String expression, Map<String, Object> properties) {
- return null;
- }
-
}
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/language/LanguageServiceTest.java b/core/camel-core/src/test/java/org/apache/camel/language/LanguageServiceTest.java
index f307498..fe5d3d0 100644
--- a/core/camel-core/src/test/java/org/apache/camel/language/LanguageServiceTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/language/LanguageServiceTest.java
@@ -16,8 +16,6 @@
*/
package org.apache.camel.language;
-import java.util.Map;
-
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Expression;
import org.apache.camel.IsSingleton;
@@ -78,16 +76,6 @@ public class LanguageServiceTest extends ContextTestSupport {
return ExpressionBuilder.constantExpression(expression);
}
- @Override
- public Predicate createPredicate(String expression, Map<String, Object> properties) {
- return createPredicate(expression);
- }
-
- @Override
- public Expression createExpression(String expression, Map<String, Object> properties) {
- return createExpression(expression);
- }
-
public String getState() {
return state;
}