You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by as...@apache.org on 2017/04/07 10:14:57 UTC
[1/3] camel git commit: Polish camel-cdi
Repository: camel
Updated Branches:
refs/heads/master a88c016a2 -> 5fa359bc5
Polish camel-cdi
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5fa359bc
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5fa359bc
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5fa359bc
Branch: refs/heads/master
Commit: 5fa359bc59e21e74a973f136ad36f63a6d112e57
Parents: 9cdb693
Author: Antonin Stefanutti <an...@stefanutti.fr>
Authored: Fri Apr 7 12:14:15 2017 +0200
Committer: Antonin Stefanutti <an...@stefanutti.fr>
Committed: Fri Apr 7 12:14:43 2017 +0200
----------------------------------------------------------------------
.../org/apache/camel/cdi/CdiCamelBeanPostProcessor.java | 11 +----------
.../main/java/org/apache/camel/cdi/CdiCamelFactory.java | 2 +-
.../main/java/org/apache/camel/cdi/CdiCamelRegistry.java | 2 +-
.../main/java/org/apache/camel/cdi/CdiEventEndpoint.java | 2 +-
.../main/java/org/apache/camel/cdi/CdiEventNotifier.java | 2 +-
5 files changed, 5 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/5fa359bc/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelBeanPostProcessor.java
----------------------------------------------------------------------
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelBeanPostProcessor.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelBeanPostProcessor.java
index f19a3a5..707ebbb 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelBeanPostProcessor.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelBeanPostProcessor.java
@@ -97,16 +97,7 @@ final class CdiCamelBeanPostProcessor extends DefaultCamelBeanPostProcessor {
}
private CamelPostProcessorHelper getPostProcessorHelper(String contextName) {
- CamelPostProcessorHelper helper = postProcessorHelpers.get(contextName);
- if (helper == null) {
- CamelContext context = getOrLookupCamelContext(contextName);
- if (context == null) {
- throw new UnsatisfiedResolutionException("No Camel context with name [" + contextName + "] is deployed!");
- }
- helper = new CamelPostProcessorHelper(context);
- postProcessorHelpers.put(contextName, helper);
- }
- return helper;
+ return postProcessorHelpers.computeIfAbsent(contextName, k -> new CamelPostProcessorHelper(getOrLookupCamelContext(k)));
}
private CamelContext getOrLookupCamelContext(String contextName) {
http://git-wip-us.apache.org/repos/asf/camel/blob/5fa359bc/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelFactory.java
----------------------------------------------------------------------
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelFactory.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelFactory.java
index 8c4c0f3..e5e0ca8 100755
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelFactory.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelFactory.java
@@ -215,7 +215,7 @@ final class CdiCamelFactory {
if (qualifiers.isEmpty() && !instance.select(DEFAULT).isUnsatisfied()) {
return instance.select(DEFAULT).get();
}
- return instance.select(qualifiers.stream().toArray(Annotation[]::new)).get();
+ return instance.select(qualifiers.toArray(new Annotation[0])).get();
}
private static <T extends Annotation> Optional<T> getQualifierByType(InjectionPoint ip, Class<T> type) {
http://git-wip-us.apache.org/repos/asf/camel/blob/5fa359bc/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelRegistry.java
----------------------------------------------------------------------
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelRegistry.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelRegistry.java
index 9593955..7a3c2c5 100755
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelRegistry.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelRegistry.java
@@ -33,7 +33,7 @@ import static org.apache.camel.cdi.AnyLiteral.ANY;
import static org.apache.camel.cdi.BeanManagerHelper.getReference;
import static org.apache.camel.cdi.BeanManagerHelper.getReferenceByName;
import static org.apache.camel.cdi.BeanManagerHelper.getReferencesByType;
-import static org.apache.camel.util.ObjectHelper.notEmpty;
+import static org.apache.camel.util.StringHelper.notEmpty;
import static org.apache.camel.util.ObjectHelper.notNull;
/**
http://git-wip-us.apache.org/repos/asf/camel/blob/5fa359bc/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventEndpoint.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventEndpoint.java
index ece2bcb..3581690 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventEndpoint.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventEndpoint.java
@@ -165,7 +165,7 @@ public final class CdiEventEndpoint<T> extends DefaultEndpoint {
AnyEvent instance = target.produce(ctx);
target.inject(instance, ctx);
return new CdiEventProducer<>(this, instance.event
- .select(literal, qualifiers.stream().toArray(Annotation[]::new)));
+ .select(literal, qualifiers.toArray(new Annotation[0])));
}
@Vetoed
http://git-wip-us.apache.org/repos/asf/camel/blob/5fa359bc/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventNotifier.java
----------------------------------------------------------------------
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventNotifier.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventNotifier.java
index 5bd2d65..1fba23b 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventNotifier.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventNotifier.java
@@ -62,7 +62,7 @@ final class CdiEventNotifier extends EventNotifierSupport {
List<Annotation> annotations = new ArrayList<>();
Collections.addAll(annotations, qualifiers);
annotations.add(NamedLiteral.of(id));
- manager.fireEvent(event, annotations.stream().toArray(Annotation[]::new));
+ manager.fireEvent(event, annotations.toArray(new Annotation[0]));
} else {
manager.fireEvent(event, qualifiers);
}
[3/3] camel git commit: Upgrade Weld 3 to version 3.0.0.CR2
Posted by as...@apache.org.
Upgrade Weld 3 to version 3.0.0.CR2
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c75c0ae7
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c75c0ae7
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c75c0ae7
Branch: refs/heads/master
Commit: c75c0ae7619b3e4b9d38a838d31a827cbfa1949e
Parents: a88c016
Author: Antonin Stefanutti <an...@stefanutti.fr>
Authored: Fri Apr 7 11:52:59 2017 +0200
Committer: Antonin Stefanutti <an...@stefanutti.fr>
Committed: Fri Apr 7 12:14:43 2017 +0200
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c75c0ae7/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 258557a..2c2b895b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -652,7 +652,7 @@
<vysper-version>0.7</vysper-version>
<weld1-version>1.1.28.Final</weld1-version>
<weld2-version>2.4.2.Final</weld2-version>
- <weld3-version>3.0.0.Beta1</weld3-version>
+ <weld3-version>3.0.0.CR2</weld3-version>
<werken-xpath-bundle-version>0.9.4_5</werken-xpath-bundle-version>
<wiremock-version>2.5.1</wiremock-version>
<woodstox-version>4.4.1</woodstox-version>
[2/3] camel git commit: Upgrade CDI 2 to version 2.0-PFD2
Posted by as...@apache.org.
Upgrade CDI 2 to version 2.0-PFD2
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9cdb693a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9cdb693a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9cdb693a
Branch: refs/heads/master
Commit: 9cdb693a10a41acd5008c1324151e795e5e9b1ce
Parents: c75c0ae
Author: Antonin Stefanutti <an...@stefanutti.fr>
Authored: Fri Apr 7 11:56:16 2017 +0200
Committer: Antonin Stefanutti <an...@stefanutti.fr>
Committed: Fri Apr 7 12:14:43 2017 +0200
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/9cdb693a/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 2c2b895b..2985113 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -104,7 +104,7 @@
<cdi-api-1.0-version>1.0-SP4</cdi-api-1.0-version>
<cdi-api-1.1-version>1.1</cdi-api-1.1-version>
<cdi-api-1.2-version>1.2</cdi-api-1.2-version>
- <cdi-api-2.0-version>2.0.Beta1</cdi-api-2.0-version>
+ <cdi-api-2.0-version>2.0-PFD2</cdi-api-2.0-version>
<cglib-bundle-version>3.2.4_1</cglib-bundle-version>
<cglib-version>3.2.4</cglib-version>
<chronicle-bytes-version>1.7.35</chronicle-bytes-version>