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 dfec129 CAMEL-13459: camel3 - Move language annotations for bean
parameter bindings into their own package
dfec129 is described below
commit dfec129e0cab3bab919541c73f770346ead17d3c
Author: Claus Ibsen <[email protected]>
AuthorDate: Mon Apr 29 09:40:49 2019 +0200
CAMEL-13459: camel3 - Move language annotations for bean parameter bindings
into their own package
---
MIGRATION.md | 6 ++++
.../java/org/apache/camel/language/spel}/SpEL.java | 2 +-
.../org/apache/camel/builder/SimpleBuilder.java | 3 +-
.../java/org/apache/camel/language/Constant.java | 38 ----------------------
.../java/org/apache/camel/language/package.html | 4 +--
.../apache/camel/language/{ => simple}/Simple.java | 2 +-
.../BeanParameterBindingStreamCachingTest.java | 2 +-
.../BeanWithExpressionInjectionPredicateTest.java | 2 +-
.../bean/BeanWithExpressionInjectionTest.java | 2 +-
...ressionAnnotationToDisambiguateMethodsTest.java | 2 +-
10 files changed, 15 insertions(+), 48 deletions(-)
diff --git a/MIGRATION.md b/MIGRATION.md
index 2b3dd26..6f8fd86 100644
--- a/MIGRATION.md
+++ b/MIGRATION.md
@@ -223,6 +223,12 @@ The exception
`org.apache.camel.builder.xml.InvalidXPathExpression` has been ren
The annotation `org.apache.camel.language.Bean` has been moved to
`org.apache.camel.language.bean.Bean` and in the `camel-bean` JAR.
+The annotation `org.apache.camel.language.Simple` has been moved to
`org.apache.camel.language.simple.Simple`.
+
+The annotation `org.apache.camel.Constant` has been removed.
+
+The annotation `org.apache.camel.language.SpEL` has been moved to
`org.apache.camel.language.spel.SpEL` and in the `camel-spring` JAR.
+
#### camel-test
If you are using camel-test and override the `createRegistry` method, for
example to register beans from the `JndiRegisty` class, then this is no longer
necessary, and instead
diff --git a/core/camel-core/src/main/java/org/apache/camel/language/SpEL.java
b/components/camel-spring/src/main/java/org/apache/camel/language/spel/SpEL.java
similarity index 97%
rename from core/camel-core/src/main/java/org/apache/camel/language/SpEL.java
rename to
components/camel-spring/src/main/java/org/apache/camel/language/spel/SpEL.java
index b387005..b861807 100644
--- a/core/camel-core/src/main/java/org/apache/camel/language/SpEL.java
+++
b/components/camel-spring/src/main/java/org/apache/camel/language/spel/SpEL.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.language;
+package org.apache.camel.language.spel;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
diff --git
a/core/camel-core/src/main/java/org/apache/camel/builder/SimpleBuilder.java
b/core/camel-core/src/main/java/org/apache/camel/builder/SimpleBuilder.java
index ef15a26..6fc1882 100644
--- a/core/camel-core/src/main/java/org/apache/camel/builder/SimpleBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/builder/SimpleBuilder.java
@@ -20,13 +20,14 @@ import org.apache.camel.CamelExecutionException;
import org.apache.camel.Exchange;
import org.apache.camel.Expression;
import org.apache.camel.Predicate;
+import org.apache.camel.language.simple.Simple;
import org.apache.camel.spi.ExpressionResultTypeAware;
import org.apache.camel.spi.Language;
import org.apache.camel.support.PredicateToExpressionAdapter;
import org.apache.camel.support.ScriptHelper;
/**
- * Creates an {@link org.apache.camel.language.Simple} language builder.
+ * Creates an {@link Simple} language builder.
* <p/>
* This builder is available in the Java DSL from the {@link RouteBuilder}
which means that using
* simple language for {@link Expression}s or {@link Predicate}s is very easy
with the help of this builder.
diff --git
a/core/camel-core/src/main/java/org/apache/camel/language/Constant.java
b/core/camel-core/src/main/java/org/apache/camel/language/Constant.java
deleted file mode 100644
index 73a7c39..0000000
--- a/core/camel-core/src/main/java/org/apache/camel/language/Constant.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.language;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.apache.camel.support.language.LanguageAnnotation;
-
-/**
- * Used to inject a constant expression into a field, property, method or
parameter when using
- * <a href="http://camel.apache.org/bean-integration.html";>Bean
Integration</a>.
- *
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER })
-@LanguageAnnotation(language = "constant")
-public @interface Constant {
- String value();
-}
diff --git
a/core/camel-core/src/main/java/org/apache/camel/language/package.html
b/core/camel-core/src/main/java/org/apache/camel/language/package.html
index 949149f..e4eecda 100644
--- a/core/camel-core/src/main/java/org/apache/camel/language/package.html
+++ b/core/camel-core/src/main/java/org/apache/camel/language/package.html
@@ -21,8 +21,6 @@
</head>
<body>
-Camel language support such as <a
href="http://camel.apache.org/bean-language.html";>Bean</a>
-and <a href="http://camel.apache.org/simple.html";>Simple</a> language.
-
+Camel language support.
</body>
</html>
diff --git
a/core/camel-core/src/main/java/org/apache/camel/language/Simple.java
b/core/camel-core/src/main/java/org/apache/camel/language/simple/Simple.java
similarity index 97%
rename from core/camel-core/src/main/java/org/apache/camel/language/Simple.java
rename to
core/camel-core/src/main/java/org/apache/camel/language/simple/Simple.java
index 7387f0e..9287b0b 100644
--- a/core/camel-core/src/main/java/org/apache/camel/language/Simple.java
+++ b/core/camel-core/src/main/java/org/apache/camel/language/simple/Simple.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.language;
+package org.apache.camel.language.simple;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
diff --git
a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterBindingStreamCachingTest.java
b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterBindingStreamCachingTest.java
index d80e9c6..6f69d13 100644
---
a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterBindingStreamCachingTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterBindingStreamCachingTest.java
@@ -20,7 +20,7 @@ import java.io.ByteArrayInputStream;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.language.Simple;
+import org.apache.camel.language.simple.Simple;
import org.junit.Test;
public class BeanParameterBindingStreamCachingTest extends ContextTestSupport {
diff --git
a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithExpressionInjectionPredicateTest.java
b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithExpressionInjectionPredicateTest.java
index c2a1b3b..c1c9cc0 100644
---
a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithExpressionInjectionPredicateTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithExpressionInjectionPredicateTest.java
@@ -20,7 +20,7 @@ import javax.naming.Context;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.language.Simple;
+import org.apache.camel.language.simple.Simple;
import org.apache.camel.support.jndi.JndiContext;
import org.junit.Test;
diff --git
a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithExpressionInjectionTest.java
b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithExpressionInjectionTest.java
index 37025b4..9ad362d 100644
---
a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithExpressionInjectionTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithExpressionInjectionTest.java
@@ -20,7 +20,7 @@ import javax.naming.Context;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.language.Simple;
+import org.apache.camel.language.simple.Simple;
import org.apache.camel.processor.BeanRouteTest;
import org.apache.camel.support.jndi.JndiContext;
import org.junit.Test;
diff --git
a/core/camel-core/src/test/java/org/apache/camel/component/bean/ExpressionAnnotationToDisambiguateMethodsTest.java
b/core/camel-core/src/test/java/org/apache/camel/component/bean/ExpressionAnnotationToDisambiguateMethodsTest.java
index 6b147a3..1df4e24 100644
---
a/core/camel-core/src/test/java/org/apache/camel/component/bean/ExpressionAnnotationToDisambiguateMethodsTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/component/bean/ExpressionAnnotationToDisambiguateMethodsTest.java
@@ -21,7 +21,7 @@ import javax.naming.Context;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Handler;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.language.Simple;
+import org.apache.camel.language.simple.Simple;
import org.apache.camel.processor.BeanRouteTest;
import org.apache.camel.support.jndi.JndiContext;
import org.junit.Test;
