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 2016/04/19 17:46:38 UTC
camel git commit: Use Java 8 better target-type inference in Camel CDI
Repository: camel
Updated Branches:
refs/heads/master 8a37e5e7d -> 930d49af0
Use Java 8 better target-type inference in Camel CDI
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/930d49af
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/930d49af
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/930d49af
Branch: refs/heads/master
Commit: 930d49af0249fba963e88a895d73db281e5aa146
Parents: 8a37e5e
Author: Antonin Stefanutti <an...@stefanutti.fr>
Authored: Tue Apr 19 17:46:01 2016 +0200
Committer: Antonin Stefanutti <an...@stefanutti.fr>
Committed: Tue Apr 19 17:46:01 2016 +0200
----------------------------------------------------------------------
.../org/apache/camel/cdi/CdiCamelExtension.java | 14 +++++++-------
.../cdi/rule/ExpectedDeploymentException.java | 4 ++--
.../camel/cdi/test/CamelEventNotifierTest.java | 8 ++++----
.../cdi/test/MultiContextEventNotifierTest.java | 17 +++++++++--------
4 files changed, 22 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/930d49af/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelExtension.java
----------------------------------------------------------------------
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelExtension.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelExtension.java
index 69a205b..5b02425 100755
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelExtension.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelExtension.java
@@ -90,25 +90,25 @@ public class CdiCamelExtension implements Extension {
private final CdiCamelEnvironment environment = new CdiCamelEnvironment();
- private final Set<Class<?>> converters = newSetFromMap(new ConcurrentHashMap<Class<?>, Boolean>());
+ private final Set<Class<?>> converters = newSetFromMap(new ConcurrentHashMap<>());
- private final Set<AnnotatedType<?>> camelBeans = newSetFromMap(new ConcurrentHashMap<AnnotatedType<?>, Boolean>());
+ private final Set<AnnotatedType<?>> camelBeans = newSetFromMap(new ConcurrentHashMap<>());
- private final Set<AnnotatedType<?>> eagerBeans = newSetFromMap(new ConcurrentHashMap<AnnotatedType<?>, Boolean>());
+ private final Set<AnnotatedType<?>> eagerBeans = newSetFromMap(new ConcurrentHashMap<>());
private final Map<InjectionPoint, ForwardingObserverMethod<?>> cdiEventEndpoints = new ConcurrentHashMap<>();
- private final Set<Bean<?>> contextBeans = newSetFromMap(new ConcurrentHashMap<Bean<?>, Boolean>());
+ private final Set<Bean<?>> contextBeans = newSetFromMap(new ConcurrentHashMap<>());
- private final Set<Annotation> contextQualifiers = newSetFromMap(new ConcurrentHashMap<Annotation, Boolean>());
+ private final Set<Annotation> contextQualifiers = newSetFromMap(new ConcurrentHashMap<>());
- private final Set<Annotation> eventQualifiers = newSetFromMap(new ConcurrentHashMap<Annotation, Boolean>());
+ private final Set<Annotation> eventQualifiers = newSetFromMap(new ConcurrentHashMap<>());
private final Map<Method, Bean<?>> producerBeans = new ConcurrentHashMap<>();
private final Map<Method, Set<Annotation>> producerQualifiers = new ConcurrentHashMap<>();
- private final Set<ContextName> contextNames = newSetFromMap(new ConcurrentHashMap<ContextName, Boolean>());
+ private final Set<ContextName> contextNames = newSetFromMap(new ConcurrentHashMap<>());
private final Set<ImportResource> resources = newSetFromMap(new ConcurrentHashMap<>());
http://git-wip-us.apache.org/repos/asf/camel/blob/930d49af/components/camel-cdi/src/test/java/org/apache/camel/cdi/rule/ExpectedDeploymentException.java
----------------------------------------------------------------------
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/rule/ExpectedDeploymentException.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/rule/ExpectedDeploymentException.java
index b6c2b5f..3f2769a 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/rule/ExpectedDeploymentException.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/rule/ExpectedDeploymentException.java
@@ -19,8 +19,8 @@ package org.apache.camel.cdi.rule;
import java.util.ArrayList;
import java.util.List;
-import org.hamcrest.CoreMatchers;
import org.hamcrest.Matcher;
+import org.hamcrest.Matchers;
import org.junit.rules.RuleChain;
import org.junit.rules.TestRule;
import org.junit.runner.Description;
@@ -75,7 +75,7 @@ public final class ExpectedDeploymentException implements TestRule {
}
public ExpectedDeploymentException expect(Class<? extends Throwable> type) {
- exceptions.add(CoreMatchers.<Throwable>instanceOf(type));
+ exceptions.add(Matchers.instanceOf(type));
return this;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/930d49af/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelEventNotifierTest.java
----------------------------------------------------------------------
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelEventNotifierTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelEventNotifierTest.java
index 3a07d9f..96b656a 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelEventNotifierTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelEventNotifierTest.java
@@ -39,7 +39,6 @@ import org.apache.camel.management.event.ExchangeCompletedEvent;
import org.apache.camel.management.event.ExchangeCreatedEvent;
import org.apache.camel.management.event.ExchangeSendingEvent;
import org.apache.camel.management.event.ExchangeSentEvent;
-import org.hamcrest.Matchers;
import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.arquillian.junit.InSequence;
@@ -51,6 +50,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import static org.apache.camel.component.mock.MockEndpoint.assertIsSatisfied;
+import static org.hamcrest.Matchers.contains;
import static org.junit.Assert.assertThat;
@RunWith(Arquillian.class)
@@ -103,7 +103,7 @@ public class CamelEventNotifierTest {
@InSequence(1)
public void startedCamelContext(List<Class> events) throws Exception {
assertThat("Events fired are incorrect", events,
- Matchers.<Class>contains(
+ contains(
CamelContextStartingEvent.class,
CamelContextStartedEvent.class));
}
@@ -119,7 +119,7 @@ public class CamelEventNotifierTest {
assertIsSatisfied(2L, TimeUnit.SECONDS, outbound);
assertThat("Events fired are incorrect", events,
- Matchers.<Class>contains(
+ contains(
CamelContextStartingEvent.class,
CamelContextStartedEvent.class,
ExchangeSendingEvent.class,
@@ -136,7 +136,7 @@ public class CamelEventNotifierTest {
context.stop();
assertThat("Events fired are incorrect", events,
- Matchers.<Class>contains(
+ contains(
CamelContextStartingEvent.class,
CamelContextStartedEvent.class,
ExchangeSendingEvent.class,
http://git-wip-us.apache.org/repos/asf/camel/blob/930d49af/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/MultiContextEventNotifierTest.java
----------------------------------------------------------------------
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/MultiContextEventNotifierTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/MultiContextEventNotifierTest.java
index 57d24fe..937f933 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/MultiContextEventNotifierTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/MultiContextEventNotifierTest.java
@@ -46,7 +46,6 @@ import org.apache.camel.management.event.ExchangeCompletedEvent;
import org.apache.camel.management.event.ExchangeCreatedEvent;
import org.apache.camel.management.event.ExchangeSendingEvent;
import org.apache.camel.management.event.ExchangeSentEvent;
-import org.hamcrest.Matchers;
import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.arquillian.junit.InSequence;
@@ -59,8 +58,10 @@ import org.junit.runner.RunWith;
import static org.apache.camel.cdi.expression.ExchangeExpression.fromCamelContext;
import static org.apache.camel.component.mock.MockEndpoint.assertIsSatisfied;
+import static org.hamcrest.Matchers.contains;
import static org.hamcrest.Matchers.everyItem;
import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.isOneOf;
import static org.junit.Assert.assertThat;
@RunWith(Arquillian.class)
@@ -194,19 +195,19 @@ public class MultiContextEventNotifierTest {
assertThat("Events fired for any contexts are incorrect", anyEvents,
everyItem(
- Matchers.<Class>isOneOf(
+ isOneOf(
CamelContextStartingEvent.class,
CamelContextStartedEvent.class)));
assertThat("Events fired for default context are incorrect", defaultEvents,
- Matchers.<Class>contains(
+ contains(
CamelContextStartingEvent.class,
CamelContextStartedEvent.class));
assertThat("Events fired for first context are incorrect", firstEvents,
- Matchers.<Class>contains(
+ contains(
CamelContextStartingEvent.class,
CamelContextStartedEvent.class));
assertThat("Events fired for second context are incorrect", secondEvents,
- Matchers.<Class>contains(
+ contains(
CamelContextStartingEvent.class,
CamelContextStartedEvent.class));
}
@@ -223,7 +224,7 @@ public class MultiContextEventNotifierTest {
assertIsSatisfied(2L, TimeUnit.SECONDS, defaultOutbound);
assertThat("Events fired are incorrect", events,
- Matchers.<Class>contains(
+ contains(
CamelContextStartingEvent.class,
CamelContextStartedEvent.class,
ExchangeSendingEvent.class,
@@ -247,7 +248,7 @@ public class MultiContextEventNotifierTest {
assertIsSatisfied(2L, TimeUnit.SECONDS, firstOutbound);
assertThat("Events fired are incorrect", events,
- Matchers.<Class>contains(
+ contains(
CamelContextStartingEvent.class,
CamelContextStartedEvent.class,
ExchangeSendingEvent.class,
@@ -271,7 +272,7 @@ public class MultiContextEventNotifierTest {
assertIsSatisfied(2L, TimeUnit.SECONDS, secondOutbound);
assertThat("Events fired are incorrect", events,
- Matchers.<Class>contains(
+ contains(
CamelContextStartingEvent.class,
CamelContextStartedEvent.class,
ExchangeSendingEvent.class,