You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bv...@apache.org on 2018/04/17 19:47:29 UTC
[camel] 01/05: polish
This is an automated email from the ASF dual-hosted git repository.
bvahdat pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit c3b6ec20f1306ce6337f07123ce0326170eb39cd
Author: Babak Vahdat <bv...@apache.org>
AuthorDate: Tue Apr 17 21:44:47 2018 +0200
polish
---
.../integration/DigitalOceanComponentIntegrationTest.java | 6 +++---
.../apache/camel/component/disruptor/DisruptorComponent.java | 2 +-
.../apache/camel/component/disruptor/DisruptorConsumer.java | 2 +-
.../apache/camel/component/disruptor/DisruptorEndpoint.java | 6 +++---
.../apache/camel/component/disruptor/DisruptorReference.java | 12 ++++++------
.../camel/component/disruptor/vm/DisruptorVmComponent.java | 2 +-
.../camel/component/disruptor/DisruptorConcurrentTest.java | 4 ++--
.../disruptor/DisruptorShouldNotUseSameThreadTest.java | 2 +-
.../disruptor/DisruptorWaitClaimStrategyComponentTest.java | 2 +-
.../camel/component/disruptor/SedaDisruptorCompareTest.java | 8 ++++----
.../disruptor/vm/DisruptorVmShouldNotUseSameThreadTest.java | 2 +-
.../org/apache/camel/component/dns/policy/DnsActivation.java | 11 ++++-------
.../camel/component/dns/policy/DnsActivationPolicy.java | 2 +-
.../org/apache/camel/component/dns/types/DnsConverter.java | 2 +-
.../apache/camel/component/dns/DnsDigEndpointSpringTest.java | 2 +-
.../org/apache/camel/component/dns/DnsDigEndpointTest.java | 2 +-
.../camel/component/dns/DnsLookupEndpointSpringTest.java | 4 ++--
.../apache/camel/component/dns/DnsLookupEndpointTest.java | 4 ++--
.../camel/component/dns/WikipediaEndpointSpringTest.java | 2 +-
.../apache/camel/component/dns/WikipediaEndpointTest.java | 2 +-
.../apache/camel/component/dns/policy/DnsActivationTest.java | 1 -
.../org/apache/camel/component/docker/DockerComponent.java | 2 +-
.../apache/camel/component/docker/DockerConfiguration.java | 2 +-
.../org/apache/camel/component/docker/DockerConstants.java | 2 +-
.../org/apache/camel/component/docker/DockerOperation.java | 2 +-
.../camel/component/docker/DockerConfigurationTest.java | 2 +-
.../camel/component/docker/headers/BaseDockerHeaderTest.java | 2 +-
.../apache/camel/component/docker/util/DockerTestUtils.java | 2 +-
.../java/org/apache/camel/component/dozer/BaseConverter.java | 2 +-
.../java/org/apache/camel/component/dozer/DozerEndpoint.java | 2 +-
.../org/apache/camel/component/dozer/ExpressionMapper.java | 2 +-
.../camel/converter/dozer/DozerTypeConverterLoader.java | 4 ++--
.../component/dozer/ExpressionMappingClasspathTest.java | 2 +-
.../camel/component/dozer/ExpressionMappingFileTest.java | 2 +-
.../apache/camel/component/dozer/ExpressionMappingTest.java | 2 +-
.../apache/camel/component/dozer/example/abc/ABCOrder.java | 2 +-
.../apache/camel/component/dozer/example/xyz/XYZOrder.java | 2 +-
.../apache/camel/converter/dozer/DozerTypeConverterTest.java | 1 -
.../java/org/apache/camel/component/drill/DrillEndpoint.java | 2 +-
39 files changed, 56 insertions(+), 61 deletions(-)
diff --git a/components/camel-digitalocean/src/test/java/org/apache/camel/component/digitalocean/integration/DigitalOceanComponentIntegrationTest.java b/components/camel-digitalocean/src/test/java/org/apache/camel/component/digitalocean/integration/DigitalOceanComponentIntegrationTest.java
index 9269f8e..64b3a0a 100644
--- a/components/camel-digitalocean/src/test/java/org/apache/camel/component/digitalocean/integration/DigitalOceanComponentIntegrationTest.java
+++ b/components/camel-digitalocean/src/test/java/org/apache/camel/component/digitalocean/integration/DigitalOceanComponentIntegrationTest.java
@@ -89,7 +89,7 @@ public class DigitalOceanComponentIntegrationTest extends DigitalOceanTestSuppor
.setHeader(DigitalOceanHeaders.DROPLET_IMAGE, constant("ubuntu-14-04-x64"))
.setHeader(DigitalOceanHeaders.DROPLET_SIZE, constant("512mb"))
.process(e -> {
- Collection<String> tags = new ArrayList<String>();
+ Collection<String> tags = new ArrayList<>();
tags.add("tag1");
tags.add("tag2");
e.getIn().setHeader(DigitalOceanHeaders.DROPLET_TAGS, tags);
@@ -101,7 +101,7 @@ public class DigitalOceanComponentIntegrationTest extends DigitalOceanTestSuppor
from("direct:createMultipleDroplets")
.setHeader(DigitalOceanHeaders.OPERATION, constant(DigitalOceanOperations.create))
.process(e -> {
- Collection<String> names = new ArrayList<String>();
+ Collection<String> names = new ArrayList<>();
names.add("droplet1");
names.add("droplet2");
e.getIn().setHeader(DigitalOceanHeaders.NAMES, names);
@@ -111,7 +111,7 @@ public class DigitalOceanComponentIntegrationTest extends DigitalOceanTestSuppor
.setHeader(DigitalOceanHeaders.DROPLET_IMAGE, constant("ubuntu-14-04-x64"))
.setHeader(DigitalOceanHeaders.DROPLET_SIZE, constant("512mb"))
.process(e -> {
- Collection<String> tags = new ArrayList<String>();
+ Collection<String> tags = new ArrayList<>();
tags.add("tag1");
tags.add("tag2");
e.getIn().setHeader(DigitalOceanHeaders.DROPLET_TAGS, tags);
diff --git a/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/DisruptorComponent.java b/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/DisruptorComponent.java
index 2295768..3da739d 100644
--- a/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/DisruptorComponent.java
+++ b/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/DisruptorComponent.java
@@ -54,7 +54,7 @@ public class DisruptorComponent extends UriEndpointComponent {
private boolean defaultBlockWhenFull = true;
//synchronized access guarded by this
- private final Map<String, DisruptorReference> disruptors = new HashMap<String, DisruptorReference>();
+ private final Map<String, DisruptorReference> disruptors = new HashMap<>();
public DisruptorComponent() {
super(DisruptorEndpoint.class);
diff --git a/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/DisruptorConsumer.java b/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/DisruptorConsumer.java
index c766f7e..db9e168 100644
--- a/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/DisruptorConsumer.java
+++ b/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/DisruptorConsumer.java
@@ -96,7 +96,7 @@ public class DisruptorConsumer extends ServiceSupport implements Consumer, Suspe
}
Set<LifecycleAwareExchangeEventHandler> createEventHandlers(final int concurrentConsumers) {
- final Set<LifecycleAwareExchangeEventHandler> eventHandlers = new HashSet<LifecycleAwareExchangeEventHandler>();
+ final Set<LifecycleAwareExchangeEventHandler> eventHandlers = new HashSet<>();
for (int i = 0; i < concurrentConsumers; ++i) {
eventHandlers.add(new ConsumerEventHandler(i, concurrentConsumers));
diff --git a/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/DisruptorEndpoint.java b/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/DisruptorEndpoint.java
index c58ac27..3efcde0 100644
--- a/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/DisruptorEndpoint.java
+++ b/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/DisruptorEndpoint.java
@@ -54,8 +54,8 @@ public class DisruptorEndpoint extends DefaultEndpoint implements AsyncEndpoint,
public static final String DISRUPTOR_IGNORE_EXCHANGE = "disruptor.ignoreExchange";
private static final Logger LOGGER = LoggerFactory.getLogger(DisruptorEndpoint.class);
- private final Set<DisruptorProducer> producers = new CopyOnWriteArraySet<DisruptorProducer>();
- private final Set<DisruptorConsumer> consumers = new CopyOnWriteArraySet<DisruptorConsumer>();
+ private final Set<DisruptorProducer> producers = new CopyOnWriteArraySet<>();
+ private final Set<DisruptorConsumer> consumers = new CopyOnWriteArraySet<>();
private final DisruptorReference disruptorReference;
@UriPath(description = "Name of queue") @Metadata(required = "true")
@@ -316,7 +316,7 @@ public class DisruptorEndpoint extends DefaultEndpoint implements AsyncEndpoint,
Map<DisruptorConsumer, Collection<LifecycleAwareExchangeEventHandler>> createConsumerEventHandlers() {
Map<DisruptorConsumer, Collection<LifecycleAwareExchangeEventHandler>> result =
- new HashMap<DisruptorConsumer, Collection<LifecycleAwareExchangeEventHandler>>();
+ new HashMap<>();
for (final DisruptorConsumer consumer : consumers) {
result.put(consumer, consumer.createEventHandlers(concurrentConsumers));
diff --git a/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/DisruptorReference.java b/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/DisruptorReference.java
index 9ca08e3..35b2b62 100644
--- a/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/DisruptorReference.java
+++ b/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/DisruptorReference.java
@@ -64,7 +64,7 @@ public class DisruptorReference {
//(null, true) : in process of reconfiguring
//( x , false) : normally functioning Disruptor
//( x , true) : never set
- private final AtomicMarkableReference<Disruptor<ExchangeEvent>> disruptor = new AtomicMarkableReference<Disruptor<ExchangeEvent>>(null, false);
+ private final AtomicMarkableReference<Disruptor<ExchangeEvent>> disruptor = new AtomicMarkableReference<>(null, false);
private final DelayedExecutor delayedExecutor = new DelayedExecutor();
@@ -91,7 +91,7 @@ public class DisruptorReference {
this.size = size;
this.producerType = producerType;
this.waitStrategy = waitStrategy;
- temporaryExchangeBuffer = new ArrayBlockingQueue<Exchange>(size);
+ temporaryExchangeBuffer = new ArrayBlockingQueue<>(size);
reconfigure();
}
@@ -190,12 +190,12 @@ public class DisruptorReference {
private Disruptor<ExchangeEvent> createDisruptor() throws Exception {
//create a new Disruptor
- final Disruptor<ExchangeEvent> newDisruptor = new Disruptor<ExchangeEvent>(
+ final Disruptor<ExchangeEvent> newDisruptor = new Disruptor<>(
ExchangeEventFactory.INSTANCE, size, delayedExecutor, producerType.getProducerType(),
waitStrategy.createWaitStrategyInstance());
//determine the list of eventhandlers to be associated to the Disruptor
- final ArrayList<LifecycleAwareExchangeEventHandler> eventHandlers = new ArrayList<LifecycleAwareExchangeEventHandler>();
+ final ArrayList<LifecycleAwareExchangeEventHandler> eventHandlers = new ArrayList<>();
uniqueConsumerCount = 0;
@@ -234,7 +234,7 @@ public class DisruptorReference {
private void publishBufferedExchanges(Disruptor<ExchangeEvent> newDisruptor) {
//now empty out all buffered Exchange if we had any
- final List<Exchange> exchanges = new ArrayList<Exchange>(temporaryExchangeBuffer.size());
+ final List<Exchange> exchanges = new ArrayList<>(temporaryExchangeBuffer.size());
while (!temporaryExchangeBuffer.isEmpty()) {
exchanges.add(temporaryExchangeBuffer.remove());
}
@@ -428,7 +428,7 @@ public class DisruptorReference {
*/
private static class DelayedExecutor implements Executor {
- private final Queue<Runnable> delayedCommands = new LinkedList<Runnable>();
+ private final Queue<Runnable> delayedCommands = new LinkedList<>();
@Override
public void execute(final Runnable command) {
diff --git a/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/vm/DisruptorVmComponent.java b/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/vm/DisruptorVmComponent.java
index 1d97394..7a8ce62 100644
--- a/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/vm/DisruptorVmComponent.java
+++ b/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/vm/DisruptorVmComponent.java
@@ -31,7 +31,7 @@ import org.apache.camel.component.disruptor.DisruptorReference;
* web application contexts, providing that camel-disruptor.jar is on the system classpath.
*/
public class DisruptorVmComponent extends DisruptorComponent {
- protected static final Map<String, DisruptorReference> DISRUPTORS = new HashMap<String, DisruptorReference>();
+ protected static final Map<String, DisruptorReference> DISRUPTORS = new HashMap<>();
private static final AtomicInteger START_COUNTER = new AtomicInteger();
@Override
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorConcurrentTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorConcurrentTest.java
index f9ef235..3238630 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorConcurrentTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorConcurrentTest.java
@@ -74,7 +74,7 @@ public class DisruptorConcurrentTest extends CamelTestSupport {
mock.setMinimumResultWaitTime(3000);
final ExecutorService executors = Executors.newFixedThreadPool(10);
- final List<Object> replies = new ArrayList<Object>(20);
+ final List<Object> replies = new ArrayList<>(20);
for (int i = 0; i < 20; i++) {
final int num = i;
final Object out = executors.submit(new Callable<Object>() {
@@ -107,7 +107,7 @@ public class DisruptorConcurrentTest extends CamelTestSupport {
// must start the template
pt.start();
- final List<Future<Object>> replies = new ArrayList<Future<Object>>(20);
+ final List<Future<Object>> replies = new ArrayList<>(20);
for (int i = 0; i < 20; i++) {
final Future<Object> out = pt.asyncRequestBody("disruptor:bar", "Message " + i);
replies.add(out);
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorShouldNotUseSameThreadTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorShouldNotUseSameThreadTest.java
index addcd6c..2a11692 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorShouldNotUseSameThreadTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorShouldNotUseSameThreadTest.java
@@ -45,7 +45,7 @@ public class DisruptorShouldNotUseSameThreadTest extends CamelTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- final ThreadLocal<String> local = new ThreadLocal<String>();
+ final ThreadLocal<String> local = new ThreadLocal<>();
from("direct:start").process(new Processor() {
@Override
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitClaimStrategyComponentTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitClaimStrategyComponentTest.java
index 1042e9a..eaa2c5d 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitClaimStrategyComponentTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/DisruptorWaitClaimStrategyComponentTest.java
@@ -59,7 +59,7 @@ public class DisruptorWaitClaimStrategyComponentTest extends CamelTestSupport {
@Parameters
public static Collection<String[]> strategies() {
- final List<String[]> strategies = new ArrayList<String[]>();
+ final List<String[]> strategies = new ArrayList<>();
for (final DisruptorWaitStrategy waitStrategy : DisruptorWaitStrategy.values()) {
for (final DisruptorProducerType producerType : DisruptorProducerType.values()) {
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/SedaDisruptorCompareTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/SedaDisruptorCompareTest.java
index 7593369..84c19ba 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/SedaDisruptorCompareTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/SedaDisruptorCompareTest.java
@@ -72,7 +72,7 @@ public class SedaDisruptorCompareTest extends CamelTestSupport {
private final int amountProducers;
private final long[] sizeHistogramBounds;
- private final Queue<Integer> endpointSizeQueue = new ConcurrentLinkedQueue<Integer>();
+ private final Queue<Integer> endpointSizeQueue = new ConcurrentLinkedQueue<>();
public SedaDisruptorCompareTest(final String componentName, final String endpointUri,
final int amountProducers, final int amountConsumers,
@@ -142,7 +142,7 @@ public class SedaDisruptorCompareTest extends CamelTestSupport {
@Parameterized.Parameters(name = "{index}: {0}")
public static Collection<Object[]> parameters() {
- final List<Object[]> parameters = new ArrayList<Object[]>();
+ final List<Object[]> parameters = new ArrayList<>();
// This parameter set can be compared to the next and shows the impact of a 'long' endpoint name
// It defines all parameters to the same values as the default, so the result should be the same as
@@ -350,14 +350,14 @@ public class SedaDisruptorCompareTest extends CamelTestSupport {
private final int count;
private long countDownReachedTime;
- private Queue<Long> latencyQueue = new ConcurrentLinkedQueue<Long>();
+ private Queue<Long> latencyQueue = new ConcurrentLinkedQueue<>();
ExchangeAwaiter(final int count) {
this.count = count;
}
public void reset() {
- latencyQueue = new ConcurrentLinkedQueue<Long>();
+ latencyQueue = new ConcurrentLinkedQueue<>();
latch = new CountDownLatch(count);
countDownReachedTime = 0;
}
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmShouldNotUseSameThreadTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmShouldNotUseSameThreadTest.java
index a7bbbf9..ffbd672 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmShouldNotUseSameThreadTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/vm/DisruptorVmShouldNotUseSameThreadTest.java
@@ -28,7 +28,7 @@ import org.apache.camel.component.vm.AbstractVmTestSupport;
public class DisruptorVmShouldNotUseSameThreadTest extends AbstractVmTestSupport {
private static long id;
- private final ThreadLocal<String> local = new ThreadLocal<String>();
+ private final ThreadLocal<String> local = new ThreadLocal<>();
public void testNotUseSameThread() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
diff --git a/components/camel-dns/src/main/java/org/apache/camel/component/dns/policy/DnsActivation.java b/components/camel-dns/src/main/java/org/apache/camel/component/dns/policy/DnsActivation.java
index 30490eb..7d7e886 100644
--- a/components/camel-dns/src/main/java/org/apache/camel/component/dns/policy/DnsActivation.java
+++ b/components/camel-dns/src/main/java/org/apache/camel/component/dns/policy/DnsActivation.java
@@ -18,20 +18,17 @@ package org.apache.camel.component.dns.policy;
import java.net.InetAddress;
import java.net.NetworkInterface;
-import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.List;
import javax.naming.NamingEnumeration;
-import javax.naming.NamingException;
import javax.naming.directory.Attribute;
import javax.naming.directory.Attributes;
import javax.naming.directory.InitialDirContext;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -43,7 +40,7 @@ public class DnsActivation {
private static final transient Logger LOG = LoggerFactory.getLogger(DnsActivation.class);
private String hostname;
- private final List<String> resolvesTo = new ArrayList<String>();
+ private final List<String> resolvesTo = new ArrayList<>();
public DnsActivation() {
}
@@ -76,10 +73,10 @@ public class DnsActivation {
}
LOG.debug("Resolving " + hostname);
- List<String> hostnames = new ArrayList<String>();
+ List<String> hostnames = new ArrayList<>();
hostnames.add(hostname);
- List<String> resolved = new ArrayList<String>();
+ List<String> resolved = new ArrayList<>();
while (!hostnames.isEmpty()) {
NamingEnumeration attributeEnumeration = null;
try {
@@ -119,7 +116,7 @@ public class DnsActivation {
}
private List<String> getLocalIps() throws Exception {
- List<String> localIps = new ArrayList<String>();
+ List<String> localIps = new ArrayList<>();
Enumeration<NetworkInterface> networkInterfacesEnumeration = NetworkInterface.getNetworkInterfaces();
while (networkInterfacesEnumeration.hasMoreElements()) {
diff --git a/components/camel-dns/src/main/java/org/apache/camel/component/dns/policy/DnsActivationPolicy.java b/components/camel-dns/src/main/java/org/apache/camel/component/dns/policy/DnsActivationPolicy.java
index bac2e14..4833136 100644
--- a/components/camel-dns/src/main/java/org/apache/camel/component/dns/policy/DnsActivationPolicy.java
+++ b/components/camel-dns/src/main/java/org/apache/camel/component/dns/policy/DnsActivationPolicy.java
@@ -38,7 +38,7 @@ public class DnsActivationPolicy extends RoutePolicySupport {
private DnsActivation dnsActivation;
private long ttl;
- private Map<String, Route> routes = new ConcurrentHashMap<String, Route>();
+ private Map<String, Route> routes = new ConcurrentHashMap<>();
private Timer timer;
public DnsActivationPolicy() {
diff --git a/components/camel-dns/src/main/java/org/apache/camel/component/dns/types/DnsConverter.java b/components/camel-dns/src/main/java/org/apache/camel/component/dns/types/DnsConverter.java
index 8ac458b..683ae80 100644
--- a/components/camel-dns/src/main/java/org/apache/camel/component/dns/types/DnsConverter.java
+++ b/components/camel-dns/src/main/java/org/apache/camel/component/dns/types/DnsConverter.java
@@ -42,7 +42,7 @@ public final class DnsConverter {
@Converter
public static List<String> toList(Record[] records) {
- List<String> list = new ArrayList<String>();
+ List<String> list = new ArrayList<>();
for (Record rec : records) {
list.add(toString(rec));
}
diff --git a/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsDigEndpointSpringTest.java b/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsDigEndpointSpringTest.java
index 30851e6..4c49a2b 100644
--- a/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsDigEndpointSpringTest.java
+++ b/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsDigEndpointSpringTest.java
@@ -64,7 +64,7 @@ public class DnsDigEndpointSpringTest extends CamelSpringTestSupport {
return RESPONSE_MONKEY.equals(str);
}
});
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put("dns.name", "monkey.wp.dg.cx");
headers.put("dns.type", "TXT");
template.sendBodyAndHeaders(null, headers);
diff --git a/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsDigEndpointTest.java b/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsDigEndpointTest.java
index 25a55d5..21270dc 100644
--- a/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsDigEndpointTest.java
+++ b/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsDigEndpointTest.java
@@ -69,7 +69,7 @@ public class DnsDigEndpointTest extends CamelTestSupport {
return RESPONSE_MONKEY.equals(str);
}
});
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put("dns.name", "monkey.wp.dg.cx");
headers.put("dns.type", "TXT");
template.sendBodyAndHeaders(null, headers);
diff --git a/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsLookupEndpointSpringTest.java b/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsLookupEndpointSpringTest.java
index 9faf378..a2bb90a 100644
--- a/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsLookupEndpointSpringTest.java
+++ b/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsLookupEndpointSpringTest.java
@@ -77,7 +77,7 @@ public class DnsLookupEndpointSpringTest extends CamelSpringTestSupport {
return record[0].getName().toString().equals("www.example.com.");
}
});
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put("dns.name", "www.example.com");
template.sendBodyAndHeaders("hello", headers);
resultEndpoint.assertIsSatisfied();
@@ -93,7 +93,7 @@ public class DnsLookupEndpointSpringTest extends CamelSpringTestSupport {
return record[0].getName().toString().equals("www.example.com.");
}
});
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put("dns.name", "www.example.com");
headers.put("dns.type", "A");
template.sendBodyAndHeaders("hello", headers);
diff --git a/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsLookupEndpointTest.java b/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsLookupEndpointTest.java
index f1a5c1a..29654ee 100644
--- a/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsLookupEndpointTest.java
+++ b/components/camel-dns/src/test/java/org/apache/camel/component/dns/DnsLookupEndpointTest.java
@@ -85,7 +85,7 @@ public class DnsLookupEndpointTest extends CamelTestSupport {
return record[0].getName().toString().equals("www.example.com.");
}
});
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put("dns.name", "www.example.com");
template.sendBodyAndHeaders("hello", headers);
resultEndpoint.assertIsSatisfied();
@@ -101,7 +101,7 @@ public class DnsLookupEndpointTest extends CamelTestSupport {
return record[0].getName().toString().equals("www.example.com.");
}
});
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put("dns.name", "www.example.com");
headers.put("dns.type", "A");
template.sendBodyAndHeaders("hello", headers);
diff --git a/components/camel-dns/src/test/java/org/apache/camel/component/dns/WikipediaEndpointSpringTest.java b/components/camel-dns/src/test/java/org/apache/camel/component/dns/WikipediaEndpointSpringTest.java
index 4829be8..c6853aa 100644
--- a/components/camel-dns/src/test/java/org/apache/camel/component/dns/WikipediaEndpointSpringTest.java
+++ b/components/camel-dns/src/test/java/org/apache/camel/component/dns/WikipediaEndpointSpringTest.java
@@ -56,7 +56,7 @@ public class WikipediaEndpointSpringTest extends CamelSpringTestSupport {
return RESPONSE_MONKEY.equals(str);
}
});
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put("term", "monkey");
template.sendBodyAndHeaders(null, headers);
resultEndpoint.assertIsSatisfied();
diff --git a/components/camel-dns/src/test/java/org/apache/camel/component/dns/WikipediaEndpointTest.java b/components/camel-dns/src/test/java/org/apache/camel/component/dns/WikipediaEndpointTest.java
index b6b9d7f..6602f97 100644
--- a/components/camel-dns/src/test/java/org/apache/camel/component/dns/WikipediaEndpointTest.java
+++ b/components/camel-dns/src/test/java/org/apache/camel/component/dns/WikipediaEndpointTest.java
@@ -64,7 +64,7 @@ public class WikipediaEndpointTest extends CamelTestSupport {
return RESPONSE_MONKEY.equals(str);
}
});
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put("term", "monkey");
template.sendBodyAndHeaders(null, headers);
resultEndpoint.assertIsSatisfied();
diff --git a/components/camel-dns/src/test/java/org/apache/camel/component/dns/policy/DnsActivationTest.java b/components/camel-dns/src/test/java/org/apache/camel/component/dns/policy/DnsActivationTest.java
index 8b120a6..11325ce 100644
--- a/components/camel-dns/src/test/java/org/apache/camel/component/dns/policy/DnsActivationTest.java
+++ b/components/camel-dns/src/test/java/org/apache/camel/component/dns/policy/DnsActivationTest.java
@@ -17,7 +17,6 @@
package org.apache.camel.component.dns.policy;
import java.util.Arrays;
-import java.util.List;
import org.junit.Ignore;
import org.junit.Test;
diff --git a/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerComponent.java b/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerComponent.java
index a41ffeb..75a169a 100644
--- a/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerComponent.java
+++ b/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerComponent.java
@@ -35,7 +35,7 @@ public class DockerComponent extends DefaultComponent {
@Metadata(label = "advanced")
private DockerConfiguration configuration = new DockerConfiguration();
- private Map<DockerClientProfile, DockerClient> clients = new HashMap<DockerClientProfile, DockerClient>();
+ private Map<DockerClientProfile, DockerClient> clients = new HashMap<>();
public DockerComponent() {
}
diff --git a/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerConfiguration.java b/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerConfiguration.java
index 9b92c0e..ec5b55f 100644
--- a/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerConfiguration.java
+++ b/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerConfiguration.java
@@ -66,7 +66,7 @@ public class DockerConfiguration implements Cloneable {
@UriParam(label = "advanced", defaultValue = "com.github.dockerjava.netty.NettyDockerCmdExecFactory")
private String cmdExecFactory = "com.github.dockerjava.netty.NettyDockerCmdExecFactory";
- private Map<String, Object> parameters = new HashMap<String, Object>();
+ private Map<String, Object> parameters = new HashMap<>();
public String getHost() {
return host;
diff --git a/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerConstants.java b/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerConstants.java
index acf5668..c86ea40 100644
--- a/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerConstants.java
+++ b/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerConstants.java
@@ -26,7 +26,7 @@ public final class DockerConstants {
public static final String DOCKER_PREFIX = "CamelDocker";
- public static final Map<String, Class<?>> DOCKER_DEFAULT_PARAMETERS = new HashMap<String, Class<?>>();
+ public static final Map<String, Class<?>> DOCKER_DEFAULT_PARAMETERS = new HashMap<>();
/**
* Endpoint configuration defaults
diff --git a/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerOperation.java b/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerOperation.java
index 3ce04b8..e51d0b9 100644
--- a/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerOperation.java
+++ b/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerOperation.java
@@ -219,7 +219,7 @@ public enum DockerOperation {
this.canProduce = canProduce;
this.async = async;
- parameters = new HashMap<String, Class<?>>();
+ parameters = new HashMap<>();
if (params.length > 0) {
diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/DockerConfigurationTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/DockerConfigurationTest.java
index e56dbad..494214e 100644
--- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/DockerConfigurationTest.java
+++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/DockerConfigurationTest.java
@@ -54,7 +54,7 @@ public class DockerConfigurationTest {
public void testPropertyfromEndpointProperties() {
String host = "camelhost";
- Map<String, Object> parameters = new HashMap<String, Object>();
+ Map<String, Object> parameters = new HashMap<>();
parameters.put(DockerHelper.transformFromHeaderName(DockerConstants.DOCKER_HOST), host);
configuration.setParameters(parameters);
diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/BaseDockerHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/BaseDockerHeaderTest.java
index aa11659..65d8a3b 100644
--- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/BaseDockerHeaderTest.java
+++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/BaseDockerHeaderTest.java
@@ -122,7 +122,7 @@ public abstract class BaseDockerHeaderTest<T> extends CamelTestSupport {
}
protected Map<String, Object> getDefaultParameters() {
- Map<String, Object> parameters = new HashMap<String, Object>();
+ Map<String, Object> parameters = new HashMap<>();
parameters.put(DockerConstants.DOCKER_HOST, getHost());
parameters.put(DockerConstants.DOCKER_PORT, getPort());
parameters.put(DockerConstants.DOCKER_EMAIL, getEmail());
diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/util/DockerTestUtils.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/util/DockerTestUtils.java
index 94d5bbf..e320b3f 100644
--- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/util/DockerTestUtils.java
+++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/util/DockerTestUtils.java
@@ -30,7 +30,7 @@ public final class DockerTestUtils {
}
public static Map<String, Object> getDefaultParameters(String host, Integer port, DockerConfiguration dockerConfiguration) {
- Map<String, Object> parameters = new HashMap<String, Object>();
+ Map<String, Object> parameters = new HashMap<>();
parameters.put(DockerConstants.DOCKER_HOST, host);
parameters.put(DockerConstants.DOCKER_PORT, port);
parameters.put(DockerConstants.DOCKER_EMAIL, dockerConfiguration.getEmail());
diff --git a/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/BaseConverter.java b/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/BaseConverter.java
index d57167d..0bdd51f 100644
--- a/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/BaseConverter.java
+++ b/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/BaseConverter.java
@@ -33,7 +33,7 @@ import org.dozer.ConfigurableCustomConverter;
*/
public abstract class BaseConverter implements ConfigurableCustomConverter {
- private ThreadLocal<String> localParameter = new ThreadLocal<String>();
+ private ThreadLocal<String> localParameter = new ThreadLocal<>();
@Override
public void setParameter(String parameter) {
diff --git a/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/DozerEndpoint.java b/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/DozerEndpoint.java
index c12cdaa..b3ac42b 100644
--- a/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/DozerEndpoint.java
+++ b/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/DozerEndpoint.java
@@ -148,7 +148,7 @@ public class DozerEndpoint extends DefaultEndpoint {
}
private Map<String, CustomConverter> getCustomConvertersWithId() {
- Map<String, CustomConverter> customConvertersWithId = new HashMap<String, CustomConverter>();
+ Map<String, CustomConverter> customConvertersWithId = new HashMap<>();
customConvertersWithId.put(CUSTOM_MAPPING_ID, customMapper);
customConvertersWithId.put(VARIABLE_MAPPING_ID, variableMapper);
customConvertersWithId.put(EXPRESSION_MAPPING_ID, expressionMapper);
diff --git a/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/ExpressionMapper.java b/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/ExpressionMapper.java
index 77e54ae..d127aae 100644
--- a/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/ExpressionMapper.java
+++ b/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/ExpressionMapper.java
@@ -34,7 +34,7 @@ import org.apache.camel.util.ResourceHelper;
*/
public class ExpressionMapper extends BaseConverter {
- private ThreadLocal<Exchange> currentExchange = new ThreadLocal<Exchange>();
+ private ThreadLocal<Exchange> currentExchange = new ThreadLocal<>();
@Override
public Object convert(Object existingDestinationFieldValue,
diff --git a/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerTypeConverterLoader.java b/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerTypeConverterLoader.java
index b967a68..1192016 100644
--- a/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerTypeConverterLoader.java
+++ b/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/DozerTypeConverterLoader.java
@@ -197,14 +197,14 @@ public class DozerTypeConverterLoader extends ServiceSupport implements CamelCon
* Lookup the dozer {@link Mapper} to be used.
*/
protected Map<String, Mapper> lookupDozerBeanMappers() {
- return new HashMap<String, Mapper>(camelContext.getRegistry().findByTypeWithName(Mapper.class));
+ return new HashMap<>(camelContext.getRegistry().findByTypeWithName(Mapper.class));
}
/**
* Lookup the dozer {@link DozerBeanMapperConfiguration} to be used.
*/
protected Map<String, DozerBeanMapperConfiguration> lookupDozerBeanMapperConfigurations() {
- return new HashMap<String, DozerBeanMapperConfiguration>(camelContext.getRegistry().findByTypeWithName(DozerBeanMapperConfiguration.class));
+ return new HashMap<>(camelContext.getRegistry().findByTypeWithName(DozerBeanMapperConfiguration.class));
}
protected void registerClassMaps(TypeConverterRegistry registry, String dozerId, Mapper dozer, List<ClassMappingMetadata> all) {
diff --git a/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/ExpressionMappingClasspathTest.java b/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/ExpressionMappingClasspathTest.java
index 37ddf59..dc0a2ab 100644
--- a/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/ExpressionMappingClasspathTest.java
+++ b/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/ExpressionMappingClasspathTest.java
@@ -55,7 +55,7 @@ public class ExpressionMappingClasspathTest {
@Test
public void testExpressionMappingScript() throws Exception {
resultEndpoint.expectedMessageCount(1);
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
final String customerNumber = "CAFE-345";
final String orderNumber = "ABC-001";
headers.put("customerNumber", customerNumber);
diff --git a/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/ExpressionMappingFileTest.java b/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/ExpressionMappingFileTest.java
index 6cec546..490e671 100644
--- a/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/ExpressionMappingFileTest.java
+++ b/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/ExpressionMappingFileTest.java
@@ -55,7 +55,7 @@ public class ExpressionMappingFileTest {
@Test
public void testExpressionMappingScriptFile() throws Exception {
resultEndpoint.expectedMessageCount(1);
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
final String customerNumber = "CAFE-678";
final String orderNumber = "ABC-002";
headers.put("customerNumber", customerNumber);
diff --git a/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/ExpressionMappingTest.java b/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/ExpressionMappingTest.java
index 669487a..21d488d 100644
--- a/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/ExpressionMappingTest.java
+++ b/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/ExpressionMappingTest.java
@@ -55,7 +55,7 @@ public class ExpressionMappingTest {
@Test
public void testExpressionMapping() throws Exception {
resultEndpoint.expectedMessageCount(1);
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
final String customerNumber = "CAFE-123";
final String orderNumber = "ABC-000";
headers.put("customerNumber", customerNumber);
diff --git a/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/example/abc/ABCOrder.java b/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/example/abc/ABCOrder.java
index 90e3a85..0ca3c63 100644
--- a/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/example/abc/ABCOrder.java
+++ b/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/example/abc/ABCOrder.java
@@ -316,7 +316,7 @@ public class ABCOrder {
*/
public List<ABCOrder.OrderItems.Item> getItem() {
if (item == null) {
- item = new ArrayList<ABCOrder.OrderItems.Item>();
+ item = new ArrayList<>();
}
return this.item;
}
diff --git a/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/example/xyz/XYZOrder.java b/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/example/xyz/XYZOrder.java
index 10351ae..32e976f 100644
--- a/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/example/xyz/XYZOrder.java
+++ b/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/example/xyz/XYZOrder.java
@@ -47,7 +47,7 @@ public class XYZOrder {
@JsonProperty("orderId")
private String orderId;
@JsonProperty("lineItems")
- private List<LineItem> lineItems = new ArrayList<LineItem>();
+ private List<LineItem> lineItems = new ArrayList<>();
/**
*
diff --git a/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/DozerTypeConverterTest.java b/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/DozerTypeConverterTest.java
index 8c97b06..89d1460 100644
--- a/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/DozerTypeConverterTest.java
+++ b/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/DozerTypeConverterTest.java
@@ -25,7 +25,6 @@ import org.apache.camel.test.junit4.CamelTestSupport;
import org.dozer.Mapper;
import org.junit.Test;
-import static org.apache.camel.converter.dozer.DozerTestArtifactsFactory.createMapper;
import static org.apache.camel.converter.dozer.DozerTestArtifactsFactory.createServiceCustomer;
public class DozerTypeConverterTest extends CamelTestSupport {
diff --git a/components/camel-drill/src/main/java/org/apache/camel/component/drill/DrillEndpoint.java b/components/camel-drill/src/main/java/org/apache/camel/component/drill/DrillEndpoint.java
index 5c2c159..7cac2ab 100644
--- a/components/camel-drill/src/main/java/org/apache/camel/component/drill/DrillEndpoint.java
+++ b/components/camel-drill/src/main/java/org/apache/camel/component/drill/DrillEndpoint.java
@@ -94,7 +94,7 @@ public class DrillEndpoint extends DefaultPollingEndpoint {
public List<?> queryForList(ResultSet rs) throws SQLException {
ColumnMapRowMapper rowMapper = new ColumnMapRowMapper();
- RowMapperResultSetExtractor<Map<String, Object>> mapper = new RowMapperResultSetExtractor<Map<String, Object>>(rowMapper);
+ RowMapperResultSetExtractor<Map<String, Object>> mapper = new RowMapperResultSetExtractor<>(rowMapper);
List<Map<String, Object>> data = mapper.extractData(rs);
return data;
}
--
To stop receiving notification emails like this one, please contact
bvahdat@apache.org.