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 12:41:41 UTC
[camel] 03/04: 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 bd73b0e7bbd9d8b0eb77aee5dbea9cc25dc51c02
Author: Babak Vahdat <bv...@apache.org>
AuthorDate: Tue Apr 17 14:39:58 2018 +0200
polish
---
.../cache/CacheEventListenerRegistry.java | 2 +-
.../camel/component/cache/CacheLoaderRegistry.java | 2 +-
.../cache/CacheConfigurationFileTest.java | 2 +-
.../camel/component/cache/CacheConsumerTest.java | 4 +--
.../cache/CacheBasedBodyReplacerTest.java | 2 +-
.../cache/CacheBasedTokenReplacerTest.java | 2 +-
.../cache/CacheBasedXPathElementReplacerTest.java | 2 +-
.../cassandra/ResultSetConversionStrategies.java | 2 +-
.../cassandra/CassandraAggregationRepository.java | 4 +--
.../cassandra/CassandraComponentProducerTest.java | 2 --
.../CassandraComponentProducerUnpreparedTest.java | 2 --
.../CassandraIdempotentRepositoryTest.java | 2 +-
.../NamedCassandraIdempotentRepositoryTest.java | 2 +-
.../apache/camel/component/cmis/CMISHelper.java | 4 +--
.../camel/component/cmis/CMISSessionFacade.java | 4 +--
.../camel/component/cmis/CMISTestSupport.java | 6 ++--
.../camel/component/cometd/CometdBinding.java | 2 +-
.../camel/component/cometd/CometdComponent.java | 6 ++--
.../camel/component/cometd/CometBindingTest.java | 2 +-
.../camel/component/cometd/CometdConsumerTest.java | 2 +-
...oducerConsumerInteractiveAuthenticatedMain.java | 2 +-
...tdProducerConsumerInteractiveExtensionMain.java | 2 +-
.../camel/component/consul/ConsulRegistryTest.java | 4 +--
.../component/context/LocalContextComponent.java | 2 +-
.../component/couchbase/CouchbaseEndpoint.java | 4 +--
.../component/couchdb/CouchDbComponentTest.java | 4 +--
.../crypt/EnvelopedDataEncryptorConfiguration.java | 4 +--
.../crypto/cms/sig/SignedDataCreator.java | 2 +-
.../cms/sig/SignedDataCreatorConfiguration.java | 2 +-
.../component/crypto/cms/EnvelopedDataTest.java | 2 +-
.../camel/component/crypto/cms/SignedDataTest.java | 2 +-
.../crypto/DefaultPGPSecretKeyAccessor.java | 6 ++--
.../camel/converter/crypto/PGPDataFormat.java | 2 +-
.../camel/converter/crypto/PGPDataFormatUtil.java | 6 ++--
.../converter/crypto/PGPKeyAccessDataFormat.java | 6 ++--
.../crypto/AbstractPGPDataFormatTest.java | 2 +-
.../converter/crypto/PGPDataFormatDynamicTest.java | 6 ++--
.../camel/converter/crypto/PGPDataFormatTest.java | 12 ++++----
.../apache/camel/dataformat/csv/CsvMarshaller.java | 4 +--
.../camel/dataformat/csv/CsvRecordConverters.java | 3 +-
.../camel/dataformat/csv/CsvUnmarshaller.java | 2 +-
.../CsvDataFormatCustomRecordConverterTest.java | 3 --
...svMarshalAutogenColumnsSpringQuoteModeTest.java | 6 ++--
.../csv/CsvMarshalAutogenColumnsSpringTest.java | 6 ++--
.../dataformat/csv/CsvMarshalCharsetTest.java | 2 +-
.../csv/CsvMarshalPipeDelimiterSpringTest.java | 6 ++--
.../csv/CsvMarshalPipeDelimiterTest.java | 6 ++--
.../apache/camel/dataformat/csv/CsvRouteTest.java | 10 +++----
.../cxf/common/header/CxfHeaderFilterStrategy.java | 2 +-
.../cxf/transport/CamelTransportFactory.java | 2 +-
.../blueprint/CamelTransportNameSpaceHandler.java | 2 +-
.../apache/camel/component/cxf/CxfConsumer.java | 2 +-
.../apache/camel/component/cxf/CxfEndpoint.java | 12 ++++----
.../org/apache/camel/component/cxf/CxfPayload.java | 2 +-
.../apache/camel/component/cxf/CxfProducer.java | 10 +++----
.../camel/component/cxf/DefaultCxfBinding.java | 20 ++++++-------
.../cxf/blueprint/CxfNamespaceHandler.java | 2 +-
.../component/cxf/converter/CachedCxfPayload.java | 6 ++--
.../cxf/converter/CxfPayloadConverter.java | 20 ++++++-------
.../component/cxf/cxfbean/CxfBeanComponent.java | 2 +-
.../component/cxf/cxfbean/CxfBeanEndpoint.java | 2 +-
.../cxf/feature/AbstractDataFormatFeature.java | 6 ++--
.../cxf/feature/CXFMessageDataFormatFeature.java | 4 +--
.../camel/component/cxf/jaxrs/CxfRsComponent.java | 2 +-
.../camel/component/cxf/jaxrs/CxfRsEndpoint.java | 6 ++--
.../camel/component/cxf/jaxrs/CxfRsProducer.java | 8 ++---
.../component/cxf/jaxrs/DataFormatProvider.java | 2 +-
.../component/cxf/jaxrs/SimpleCxfRsBinding.java | 8 ++---
.../spring/AbstractCxfBeanDefinitionParser.java | 2 +-
.../apache/camel/component/cxf/util/CxfUtils.java | 2 +-
.../component/cxf/AbstractCxfWsdlFirstTest.java | 14 ++++-----
...XFWsdlOnlyPayloadModeMultiPartNoSpringTest.java | 4 +--
.../cxf/CXFWsdlOnlyPayloadModeNoSpringTest.java | 12 ++++----
.../camel/component/cxf/CXFWsdlOnlyTest.java | 20 ++++++-------
.../cxf/CxfConsumerPayLoadFaultMessageTest.java | 4 +--
.../CxfConsumerPayloadFaultCauseEnabledTest.java | 6 ++--
.../component/cxf/CxfConsumerPayloadFaultTest.java | 6 ++--
.../component/cxf/CxfConsumerPayloadTest.java | 4 +--
.../CxfConsumerPayloadXPathClientServerTest.java | 4 +--
.../component/cxf/CxfConsumerResponseTest.java | 2 +-
.../camel/component/cxf/CxfConsumerTest.java | 2 +-
.../component/cxf/CxfMessageHeaderTimeoutTest.java | 4 +--
.../component/cxf/CxfMixedModeRouterTest.java | 6 ++--
.../CxfPayLoadSoapHeaderViaCamelHeaderTest.java | 2 +-
.../component/cxf/CxfProducerContextTest.java | 8 ++---
.../component/cxf/CxfProducerOperationTest.java | 10 +++----
.../cxf/CxfProducerProtocalHeaderTest.java | 2 +-
.../camel/component/cxf/CxfProducerRouterTest.java | 4 +--
.../component/cxf/CxfProducerSoapActionTest.java | 2 +-
.../component/cxf/CxfProducerSoapFaultTest.java | 2 +-
.../camel/component/cxf/CxfProducerTest.java | 4 +--
.../apache/camel/component/cxf/CxfTimeoutTest.java | 2 +-
.../camel/component/cxf/DefaultCxfBindingTest.java | 22 +++++++-------
.../camel/component/cxf/FailOverFeatureTest.java | 2 +-
.../component/cxf/LoadDistributorFeatureTest.java | 2 +-
.../component/cxf/converter/ConverterTest.java | 4 +--
.../cxf/converter/CxfPayloadConverterTest.java | 10 +++----
.../camel/component/cxf/cxfbean/CxfBeanTest.java | 6 ++--
.../cxf/holder/CxfHolderConsumerTest.java | 6 ++--
.../component/cxf/jaxrs/CxfRsEndpointTest.java | 2 +-
.../component/cxf/jaxrs/CxfRsProducerTest.java | 2 +-
.../cxf/jaxrs/DataFormatProviderTest.java | 12 ++++----
.../cxf/jaxrs/DefaultCxfRsBindingTest.java | 2 +-
.../CxfRsConsumerSimpleBindingTest.java | 2 +-
.../cxf/jaxrs/simplebinding/testbean/Order.java | 2 +-
.../cxf/jaxrs/testbean/CustomerService.java | 6 ++--
.../camel/component/cxf/jaxrs/testbean/Order.java | 2 +-
.../cxf/mtom/CxfJavaMtomProducerPayloadTest.java | 4 +--
.../cxf/mtom/CxfMtomConsumerPayloadModeTest.java | 10 +++----
.../component/cxf/mtom/CxfMtomConsumerTest.java | 4 +--
.../CxfMtomDisabledConsumerPayloadModeTest.java | 4 +--
.../CxfMtomDisabledProducerPayloadModeTest.java | 4 +--
.../cxf/mtom/CxfMtomPOJOProducerTest.java | 4 +--
.../cxf/mtom/CxfMtomProducerPayloadModeTest.java | 6 ++--
.../cxf/mtom/CxfMtomRouterPayloadModeTest.java | 4 +--
.../component/cxf/multipart/CXFMultiPartTest.java | 4 +--
.../soap/headers/CxfMessageHeadersRelayTest.java | 34 +++++++++++-----------
.../cxf/soap/headers/HeaderTesterImpl.java | 2 +-
.../cxf/spring/CxfEndpointBeansRouterTest.java | 2 +-
.../camel/component/cxf/ssl/SslGlobalTest.java | 2 +-
.../apache/camel/component/cxf/ssl/SslTest.java | 2 +-
.../component/cxf/wssecurity/client/Client.java | 4 +--
.../cxf/wssecurity/client/UTPasswordCallback.java | 2 +-
.../cxf/wssecurity/server/UTPasswordCallback.java | 2 +-
124 files changed, 295 insertions(+), 303 deletions(-)
diff --git a/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheEventListenerRegistry.java b/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheEventListenerRegistry.java
index 1c5a848..95947b3 100644
--- a/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheEventListenerRegistry.java
+++ b/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheEventListenerRegistry.java
@@ -38,7 +38,7 @@ public class CacheEventListenerRegistry {
public synchronized List<CacheEventListener> getEventListeners() {
if (eventListeners == null) {
- eventListeners = new ArrayList<CacheEventListener>();
+ eventListeners = new ArrayList<>();
}
return eventListeners;
}
diff --git a/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheLoaderRegistry.java b/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheLoaderRegistry.java
index f2fa001..5cd3a2c 100644
--- a/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheLoaderRegistry.java
+++ b/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheLoaderRegistry.java
@@ -36,7 +36,7 @@ public class CacheLoaderRegistry {
public synchronized List<CacheLoaderWrapper> getCacheLoaders() {
if (registeredCacheLoaders == null) {
- registeredCacheLoaders = new ArrayList<CacheLoaderWrapper>();
+ registeredCacheLoaders = new ArrayList<>();
}
return registeredCacheLoaders;
}
diff --git a/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheConfigurationFileTest.java b/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheConfigurationFileTest.java
index bac85ed..fc91ef5 100644
--- a/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheConfigurationFileTest.java
+++ b/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheConfigurationFileTest.java
@@ -32,7 +32,7 @@ public class CacheConfigurationFileTest extends CamelTestSupport {
public void testConfigurationFile() throws Exception {
getMockEndpoint("mock:foo").expectedMessageCount(1);
- Map<String, Object> map = new HashMap<String, Object>();
+ Map<String, Object> map = new HashMap<>();
map.put(CacheConstants.CACHE_KEY, "myKey");
map.put(CacheConstants.CACHE_OPERATION, "ADD");
template.sendBodyAndHeaders("direct:start", "Hello World", map);
diff --git a/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheConsumerTest.java b/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheConsumerTest.java
index 8c83549..84ed707 100644
--- a/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheConsumerTest.java
+++ b/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheConsumerTest.java
@@ -43,7 +43,7 @@ public class CacheConsumerTest extends BaseCacheTest {
resultEndpoint.expectedMessageCount(3);
- List<String> operations = new ArrayList<String>();
+ List<String> operations = new ArrayList<>();
operations.add(CacheConstants.CACHE_OPERATION_ADD);
operations.add(CacheConstants.CACHE_OPERATION_UPDATE);
operations.add(CacheConstants.CACHE_OPERATION_DELETE);
@@ -69,7 +69,7 @@ public class CacheConsumerTest extends BaseCacheTest {
resultEndpoint.expectedMessageCount(3);
- List<String> operations = new ArrayList<String>();
+ List<String> operations = new ArrayList<>();
operations.add(CacheConstants.CACHE_OPERATION_ADD);
operations.add(CacheConstants.CACHE_OPERATION_UPDATE);
operations.add(CacheConstants.CACHE_OPERATION_DELETE);
diff --git a/components/camel-cache/src/test/java/org/apache/camel/processor/cache/CacheBasedBodyReplacerTest.java b/components/camel-cache/src/test/java/org/apache/camel/processor/cache/CacheBasedBodyReplacerTest.java
index ebd9c10..481f7ef 100644
--- a/components/camel-cache/src/test/java/org/apache/camel/processor/cache/CacheBasedBodyReplacerTest.java
+++ b/components/camel-cache/src/test/java/org/apache/camel/processor/cache/CacheBasedBodyReplacerTest.java
@@ -45,7 +45,7 @@ public class CacheBasedBodyReplacerTest extends BaseCacheTest {
resultEndpoint.expectedMessageCount(1);
- List<String> keys = new ArrayList<String>();
+ List<String> keys = new ArrayList<>();
keys.add("farewell");
keys.add("greeting");
for (final String key : keys) {
diff --git a/components/camel-cache/src/test/java/org/apache/camel/processor/cache/CacheBasedTokenReplacerTest.java b/components/camel-cache/src/test/java/org/apache/camel/processor/cache/CacheBasedTokenReplacerTest.java
index 9d6c981..dfe671b 100644
--- a/components/camel-cache/src/test/java/org/apache/camel/processor/cache/CacheBasedTokenReplacerTest.java
+++ b/components/camel-cache/src/test/java/org/apache/camel/processor/cache/CacheBasedTokenReplacerTest.java
@@ -50,7 +50,7 @@ public class CacheBasedTokenReplacerTest extends BaseCacheTest {
resultEndpoint.expectedMessageCount(1);
- List<String> keys = new ArrayList<String>();
+ List<String> keys = new ArrayList<>();
keys.add("novel");
keys.add("author");
keys.add("number");
diff --git a/components/camel-cache/src/test/java/org/apache/camel/processor/cache/CacheBasedXPathElementReplacerTest.java b/components/camel-cache/src/test/java/org/apache/camel/processor/cache/CacheBasedXPathElementReplacerTest.java
index 8882cb4..8960afa 100644
--- a/components/camel-cache/src/test/java/org/apache/camel/processor/cache/CacheBasedXPathElementReplacerTest.java
+++ b/components/camel-cache/src/test/java/org/apache/camel/processor/cache/CacheBasedXPathElementReplacerTest.java
@@ -56,7 +56,7 @@ public class CacheBasedXPathElementReplacerTest extends BaseCacheTest {
resultEndpoint.expectedMessageCount(1);
- List<String> keys = new ArrayList<String>();
+ List<String> keys = new ArrayList<>();
keys.add("book1");
keys.add("book2");
keys.add("XML_FRAGMENT");
diff --git a/components/camel-cassandraql/src/main/java/org/apache/camel/component/cassandra/ResultSetConversionStrategies.java b/components/camel-cassandraql/src/main/java/org/apache/camel/component/cassandra/ResultSetConversionStrategies.java
index bda0234..eded894 100644
--- a/components/camel-cassandraql/src/main/java/org/apache/camel/component/cassandra/ResultSetConversionStrategies.java
+++ b/components/camel-cassandraql/src/main/java/org/apache/camel/component/cassandra/ResultSetConversionStrategies.java
@@ -74,7 +74,7 @@ public final class ResultSetConversionStrategies {
@Override
public Object getBody(ResultSet resultSet) {
- List<Row> rows = new ArrayList<Row>(rowMax);
+ List<Row> rows = new ArrayList<>(rowMax);
int rowCount = 0;
Iterator<Row> rowIter = resultSet.iterator();
while (rowIter.hasNext() && rowCount < rowMax) {
diff --git a/components/camel-cassandraql/src/main/java/org/apache/camel/processor/aggregate/cassandra/CassandraAggregationRepository.java b/components/camel-cassandraql/src/main/java/org/apache/camel/processor/aggregate/cassandra/CassandraAggregationRepository.java
index 751b70d..8345cb1 100644
--- a/components/camel-cassandraql/src/main/java/org/apache/camel/processor/aggregate/cassandra/CassandraAggregationRepository.java
+++ b/components/camel-cassandraql/src/main/java/org/apache/camel/processor/aggregate/cassandra/CassandraAggregationRepository.java
@@ -301,7 +301,7 @@ public class CassandraAggregationRepository extends ServiceSupport implements Re
@Override
public Set<String> getKeys() {
List<Row> rows = selectKeyIds();
- Set<String> keys = new HashSet<String>(rows.size());
+ Set<String> keys = new HashSet<>(rows.size());
String keyColumnName = getKeyColumn();
for (Row row : rows) {
keys.add(row.getString(keyColumnName));
@@ -318,7 +318,7 @@ public class CassandraAggregationRepository extends ServiceSupport implements Re
@Override
public Set<String> scan(CamelContext camelContext) {
List<Row> rows = selectKeyIds();
- Set<String> exchangeIds = new HashSet<String>(rows.size());
+ Set<String> exchangeIds = new HashSet<>(rows.size());
for (Row row : rows) {
exchangeIds.add(row.getString(exchangeIdColumn));
}
diff --git a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentProducerTest.java b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentProducerTest.java
index de318f3..9afee87 100644
--- a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentProducerTest.java
+++ b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentProducerTest.java
@@ -110,7 +110,6 @@ public class CassandraComponentProducerTest extends BaseCassandraTest {
assertNotNull(response);
assertIsInstanceOf(List.class, response);
- List<Row> rows = (List<Row>) response;
}
@Test
@@ -123,7 +122,6 @@ public class CassandraComponentProducerTest extends BaseCassandraTest {
assertNotNull(response);
assertIsInstanceOf(List.class, response);
- List<Row> rows = (List<Row>) response;
}
@Test
diff --git a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentProducerUnpreparedTest.java b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentProducerUnpreparedTest.java
index 402d6d0..c7024fe 100644
--- a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentProducerUnpreparedTest.java
+++ b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentProducerUnpreparedTest.java
@@ -83,7 +83,6 @@ public class CassandraComponentProducerUnpreparedTest extends BaseCassandraTest
assertNotNull(response);
assertIsInstanceOf(List.class, response);
- List<Row> rows = (List<Row>) response;
}
@Test
@@ -92,7 +91,6 @@ public class CassandraComponentProducerUnpreparedTest extends BaseCassandraTest
assertNotNull(response);
assertIsInstanceOf(List.class, response);
- List<Row> rows = (List<Row>) response;
}
@Test
diff --git a/components/camel-cassandraql/src/test/java/org/apache/camel/processor/idempotent/cassandra/CassandraIdempotentRepositoryTest.java b/components/camel-cassandraql/src/test/java/org/apache/camel/processor/idempotent/cassandra/CassandraIdempotentRepositoryTest.java
index 5bd044f..78206ca 100644
--- a/components/camel-cassandraql/src/test/java/org/apache/camel/processor/idempotent/cassandra/CassandraIdempotentRepositoryTest.java
+++ b/components/camel-cassandraql/src/test/java/org/apache/camel/processor/idempotent/cassandra/CassandraIdempotentRepositoryTest.java
@@ -43,7 +43,7 @@ public class CassandraIdempotentRepositoryTest extends BaseCassandraTest {
if (canTest()) {
cluster = CassandraUnitUtils.cassandraCluster();
session = cluster.connect(CassandraUnitUtils.KEYSPACE);
- idempotentRepository = new CassandraIdempotentRepository<String>(session);
+ idempotentRepository = new CassandraIdempotentRepository<>(session);
idempotentRepository.start();
}
}
diff --git a/components/camel-cassandraql/src/test/java/org/apache/camel/processor/idempotent/cassandra/NamedCassandraIdempotentRepositoryTest.java b/components/camel-cassandraql/src/test/java/org/apache/camel/processor/idempotent/cassandra/NamedCassandraIdempotentRepositoryTest.java
index d345025..4e53626 100644
--- a/components/camel-cassandraql/src/test/java/org/apache/camel/processor/idempotent/cassandra/NamedCassandraIdempotentRepositoryTest.java
+++ b/components/camel-cassandraql/src/test/java/org/apache/camel/processor/idempotent/cassandra/NamedCassandraIdempotentRepositoryTest.java
@@ -43,7 +43,7 @@ public class NamedCassandraIdempotentRepositoryTest extends BaseCassandraTest {
if (canTest()) {
cluster = CassandraUnitUtils.cassandraCluster();
session = cluster.connect(CassandraUnitUtils.KEYSPACE);
- idempotentRepository = new NamedCassandraIdempotentRepository<String>(session, "ID");
+ idempotentRepository = new NamedCassandraIdempotentRepository<>(session, "ID");
idempotentRepository.setTable("NAMED_CAMEL_IDEMPOTENT");
idempotentRepository.start();
}
diff --git a/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISHelper.java b/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISHelper.java
index 6d6a7bb..882c455 100644
--- a/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISHelper.java
+++ b/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISHelper.java
@@ -30,7 +30,7 @@ public final class CMISHelper {
}
public static Map<String, Object> filterCMISProperties(Map<String, Object> properties) {
- Map<String, Object> result = new HashMap<String, Object>(properties.size());
+ Map<String, Object> result = new HashMap<>(properties.size());
for (Map.Entry<String, Object> entry : properties.entrySet()) {
if (entry.getKey().startsWith("cmis:")) {
result.put(entry.getKey(), entry.getValue());
@@ -45,7 +45,7 @@ public final class CMISHelper {
}
public static Map<String, Object> propertyDataToMap(List<? extends PropertyData<?>> properties) {
- Map<String, Object> result = new HashMap<String, Object>();
+ Map<String, Object> result = new HashMap<>();
for (PropertyData<?> propertyData : properties) {
result.put(propertyData.getId(), propertyData.getFirstValue());
}
diff --git a/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISSessionFacade.java b/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISSessionFacade.java
index 70dc73f..4bc0adc 100644
--- a/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISSessionFacade.java
+++ b/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISSessionFacade.java
@@ -72,7 +72,7 @@ public class CMISSessionFacade {
}
void initSession() {
- Map<String, String> parameter = new HashMap<String, String>();
+ Map<String, String> parameter = new HashMap<>();
parameter.put(SessionParameter.BINDING_TYPE, BindingType.ATOMPUB.value());
parameter.put(SessionParameter.ATOMPUB_URL, this.url);
parameter.put(SessionParameter.USER, this.username);
@@ -133,7 +133,7 @@ public class CMISSessionFacade {
//some duplication
public List<Map<String, Object>> retrieveResult(Boolean retrieveContent, Integer readSize,
ItemIterable<QueryResult> itemIterable) {
- List<Map<String, Object>> result = new ArrayList<Map<String, Object>>();
+ List<Map<String, Object>> result = new ArrayList<>();
boolean queryForContent = retrieveContent != null ? retrieveContent : readContent;
int documentsToRead = readSize != null ? readSize : readCount;
int count = 0;
diff --git a/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISTestSupport.java b/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISTestSupport.java
index 6ac0cce..7b1e934 100644
--- a/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISTestSupport.java
+++ b/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISTestSupport.java
@@ -95,7 +95,7 @@ public class CMISTestSupport extends CamelTestSupport {
protected Session createSession() {
SessionFactory sessionFactory = SessionFactoryImpl.newInstance();
- Map<String, String> parameter = new HashMap<String, String>();
+ Map<String, String> parameter = new HashMap<>();
parameter.put(SessionParameter.ATOMPUB_URL, getUrl());
parameter.put(SessionParameter.BINDING_TYPE, BindingType.ATOMPUB.value());
@@ -128,7 +128,7 @@ public class CMISTestSupport extends CamelTestSupport {
}
protected Folder createChildFolderWithName(Folder parent, String childName) {
- Map<String, String> newFolderProps = new HashMap<String, String>();
+ Map<String, String> newFolderProps = new HashMap<>();
newFolderProps.put(PropertyIds.OBJECT_TYPE_ID, "cmis:folder");
newFolderProps.put(PropertyIds.NAME, childName);
return parent.createFolder(newFolderProps);
@@ -141,7 +141,7 @@ public class CMISTestSupport extends CamelTestSupport {
ContentStream contentStream = createSession().getObjectFactory()
.createContentStream(fileName, buf.length, "text/plain; charset=UTF-8", input);
- Map<String, Object> properties = new HashMap<String, Object>();
+ Map<String, Object> properties = new HashMap<>();
properties.put(PropertyIds.OBJECT_TYPE_ID, "cmis:document");
properties.put(PropertyIds.NAME, fileName);
newFolder.createDocument(properties, contentStream, VersioningState.NONE);
diff --git a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdBinding.java b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdBinding.java
index 5600490..2e8aeb7 100644
--- a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdBinding.java
+++ b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdBinding.java
@@ -121,7 +121,7 @@ public class CometdBinding {
//TODO: do something in the style of JMS where they have header Strategies?
private Object filterHeaders(Map<String, Object> headers) {
- Map<String, Object> map = new HashMap<String, Object>();
+ Map<String, Object> map = new HashMap<>();
for (Entry<String, Object> entry : headers.entrySet()) {
if (entry != null && entry.getKey() != null) {
map.put(entry.getKey(), entry.getValue());
diff --git a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
index b92611c..474d70b 100644
--- a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
+++ b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
@@ -54,7 +54,7 @@ import org.slf4j.LoggerFactory;
public class CometdComponent extends UriEndpointComponent implements SSLContextParametersAware {
private static final Logger LOG = LoggerFactory.getLogger(CometdComponent.class);
- private final Map<String, ConnectorRef> connectors = new LinkedHashMap<String, ConnectorRef>();
+ private final Map<String, ConnectorRef> connectors = new LinkedHashMap<>();
private List<BayeuxServer.BayeuxServerListener> serverListeners;
@@ -305,14 +305,14 @@ public class CometdComponent extends UriEndpointComponent implements SSLContextP
public void addExtension(BayeuxServer.Extension extension) {
if (extensions == null) {
- extensions = new ArrayList<BayeuxServer.Extension>();
+ extensions = new ArrayList<>();
}
extensions.add(extension);
}
public void addServerListener(BayeuxServer.BayeuxServerListener serverListener) {
if (serverListeners == null) {
- serverListeners = new ArrayList<BayeuxServer.BayeuxServerListener>();
+ serverListeners = new ArrayList<>();
}
serverListeners.add(serverListener);
}
diff --git a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometBindingTest.java b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometBindingTest.java
index a382b02..141617d 100644
--- a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometBindingTest.java
+++ b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometBindingTest.java
@@ -64,7 +64,7 @@ public class CometBindingTest {
public void before() {
testObj = new CometdBinding(bayeux);
- Set<String> attributeNames = new HashSet<String>(Arrays.asList(STRING_ATTR_NAME, INTEGER_ATTR_NAME,
+ Set<String> attributeNames = new HashSet<>(Arrays.asList(STRING_ATTR_NAME, INTEGER_ATTR_NAME,
LONG_ATTR_NAME, DOUBLE_ATTR_NAME,
FOO_ATTR_NAME, BOOLEAN_ATT_NAME));
when(remote.getAttributeNames()).thenReturn(attributeNames);
diff --git a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdConsumerTest.java b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdConsumerTest.java
index 85ca8ab..5035678 100644
--- a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdConsumerTest.java
+++ b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdConsumerTest.java
@@ -68,7 +68,7 @@ public class CometdConsumerTest {
testObj = new CometdConsumer(endpoint, processor);
testObj.setBayeux(bayeuxServerImpl);
- Set<String> attributeNames = new HashSet<String>();
+ Set<String> attributeNames = new HashSet<>();
String attributeKey = USER_NAME;
attributeNames.add(attributeKey);
}
diff --git a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInteractiveAuthenticatedMain.java b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInteractiveAuthenticatedMain.java
index 46d0b97..b23e21a 100644
--- a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInteractiveAuthenticatedMain.java
+++ b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInteractiveAuthenticatedMain.java
@@ -129,7 +129,7 @@ public class CometdProducerConsumerInteractiveAuthenticatedMain {
advice.put(Message.RECONNECT_FIELD, Message.RECONNECT_HANDSHAKE_VALUE);
Map<String, Object> ext = message.getExt(true);
- Map<String, Object> authentication = new HashMap<String, Object>();
+ Map<String, Object> authentication = new HashMap<>();
ext.put("authentication", authentication);
authentication.put("failed", true);
authentication.put("failureReason", "invalid_credentials");
diff --git a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInteractiveExtensionMain.java b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInteractiveExtensionMain.java
index bbd58c9..dacc410 100644
--- a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInteractiveExtensionMain.java
+++ b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInteractiveExtensionMain.java
@@ -75,7 +75,7 @@ public class CometdProducerConsumerInteractiveExtensionMain {
public static final class Censor implements BayeuxServer.Extension, ServerSession.RemoveListener {
- private HashSet<String> forbidden = new HashSet<String>(Arrays.asList("one", "two"));
+ private HashSet<String> forbidden = new HashSet<>(Arrays.asList("one", "two"));
public void removed(ServerSession session, boolean timeout) {
// called on remove of client
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulRegistryTest.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulRegistryTest.java
index ded99ee..4cd215f 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulRegistryTest.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulRegistryTest.java
@@ -119,7 +119,7 @@ public class ConsulRegistryTest implements Serializable {
.findByTypeWithName(consulTestClassOne.getClass());
registry.remove("testClassOne");
registry.remove("testClassTwo");
- HashMap<String, ConsulTestClass> emptyHashMap = new HashMap<String, ConsulTestClass>();
+ HashMap<String, ConsulTestClass> emptyHashMap = new HashMap<>();
assertNotNull(consulTestClassMap);
assertEquals(consulTestClassMap.getClass(), emptyHashMap.getClass());
assertEquals(2, consulTestClassMap.size());
@@ -146,7 +146,7 @@ public class ConsulRegistryTest implements Serializable {
registry.put("classTwo", classTwo);
Set<? extends ConsulTestClass> results = registry.findByType(classOne.getClass());
assertNotNull(results);
- HashSet<ConsulTestClass> hashSet = new HashSet<ConsulTestClass>();
+ HashSet<ConsulTestClass> hashSet = new HashSet<>();
registry.remove("classOne");
registry.remove("classTwo");
assertEquals(results.getClass(), hashSet.getClass());
diff --git a/components/camel-context/src/main/java/org/apache/camel/component/context/LocalContextComponent.java b/components/camel-context/src/main/java/org/apache/camel/component/context/LocalContextComponent.java
index 2a930f6..b4c434f 100644
--- a/components/camel-context/src/main/java/org/apache/camel/component/context/LocalContextComponent.java
+++ b/components/camel-context/src/main/java/org/apache/camel/component/context/LocalContextComponent.java
@@ -38,7 +38,7 @@ public class LocalContextComponent extends DefaultComponent {
private CamelContext localCamelContext;
@Metadata(label = "advanced", defaultValue = "direct,seda,mock")
- private List<String> localProtocolSchemes = new ArrayList<String>(Arrays.asList("direct", "seda", "mock"));
+ private List<String> localProtocolSchemes = new ArrayList<>(Arrays.asList("direct", "seda", "mock"));
public LocalContextComponent(CamelContext localCamelContext) {
ObjectHelper.notNull(localCamelContext, "localCamelContext");
diff --git a/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseEndpoint.java b/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseEndpoint.java
index 563c405..fd12ca6 100644
--- a/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseEndpoint.java
+++ b/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseEndpoint.java
@@ -545,10 +545,10 @@ public class CouchbaseEndpoint extends ScheduledPollEndpoint {
hosts[i] = hosts[i].trim();
}
- List<String> hostList = new ArrayList<String>();
+ List<String> hostList = new ArrayList<>();
hostList.add(hostname);
hostList.addAll(Arrays.asList(hosts));
- Set<String> hostSet = new LinkedHashSet<String>(hostList);
+ Set<String> hostSet = new LinkedHashSet<>(hostList);
hosts = hostSet.toArray(new String[hostSet.size()]);
URI[] uriArray = new URI[hosts.length];
diff --git a/components/camel-couchdb/src/test/java/org/apache/camel/component/couchdb/CouchDbComponentTest.java b/components/camel-couchdb/src/test/java/org/apache/camel/component/couchdb/CouchDbComponentTest.java
index 887cefc..9e99820 100644
--- a/components/camel-couchdb/src/test/java/org/apache/camel/component/couchdb/CouchDbComponentTest.java
+++ b/components/camel-couchdb/src/test/java/org/apache/camel/component/couchdb/CouchDbComponentTest.java
@@ -39,7 +39,7 @@ public class CouchDbComponentTest {
@Test
public void testEndpointCreated() throws Exception {
- Map<String, Object> params = new HashMap<String, Object>();
+ Map<String, Object> params = new HashMap<>();
String uri = "couchdb:http://localhost:5984/db";
String remaining = "http://localhost:5984/db";
@@ -50,7 +50,7 @@ public class CouchDbComponentTest {
@Test
public void testPropertiesSet() throws Exception {
- Map<String, Object> params = new HashMap<String, Object>();
+ Map<String, Object> params = new HashMap<>();
params.put("createDatabase", true);
params.put("username", "coldplay");
params.put("password", "chrism");
diff --git a/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/crypt/EnvelopedDataEncryptorConfiguration.java b/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/crypt/EnvelopedDataEncryptorConfiguration.java
index 50f3fc8..0418e3f 100644
--- a/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/crypt/EnvelopedDataEncryptorConfiguration.java
+++ b/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/crypt/EnvelopedDataEncryptorConfiguration.java
@@ -54,7 +54,7 @@ public class EnvelopedDataEncryptorConfiguration extends CryptoCmsMarshallerConf
private static final Logger LOG = LoggerFactory.getLogger(EnvelopedDataEncryptorConfiguration.class);
- private static final Map<String, List<Integer>> SUPPORTED_ENCRYPTION_ALGORITHMS = new HashMap<String, List<Integer>>(7);
+ private static final Map<String, List<Integer>> SUPPORTED_ENCRYPTION_ALGORITHMS = new HashMap<>(7);
static {
@@ -74,7 +74,7 @@ public class EnvelopedDataEncryptorConfiguration extends CryptoCmsMarshallerConf
}
@UriParam(label = "encrypt", multiValue = true, description = "Recipient Info: reference to a bean which implements the interface org.apache.camel.component.crypto.cms.api.TransRecipientInfo")
- private final List<RecipientInfo> recipient = new ArrayList<RecipientInfo>(3);
+ private final List<RecipientInfo> recipient = new ArrayList<>(3);
@UriParam(label = "encrypt", enums = "AES/CBC/PKCS5Padding,DESede/CBC/PKCS5Padding,Camellia/CBC/PKCS5Padding,CAST5/CBC/PKCS5Padding")
private String contentEncryptionAlgorithm;
diff --git a/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/sig/SignedDataCreator.java b/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/sig/SignedDataCreator.java
index 1369551..50a4913 100644
--- a/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/sig/SignedDataCreator.java
+++ b/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/sig/SignedDataCreator.java
@@ -105,7 +105,7 @@ public class SignedDataCreator extends CryptoCmsMarshallerAbstract {
gen.addSignerInfoGenerator(signerBuilder.build(contentSigner, signerCert));
- List<Certificate> certificateList = new ArrayList<Certificate>();
+ List<Certificate> certificateList = new ArrayList<>();
for (Certificate cert : signer.getCertificateChain(exchange)) {
if (!certificateList.contains(cert)) {
certificateList.add(cert);
diff --git a/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/sig/SignedDataCreatorConfiguration.java b/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/sig/SignedDataCreatorConfiguration.java
index 354aede..572ffab 100644
--- a/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/sig/SignedDataCreatorConfiguration.java
+++ b/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/sig/SignedDataCreatorConfiguration.java
@@ -36,7 +36,7 @@ public class SignedDataCreatorConfiguration extends CryptoCmsMarshallerConfigura
private Boolean includeContent = Boolean.TRUE;
@UriParam(label = "sign", multiValue = true, description = "Signer information: reference to a bean which implements org.apache.camel.component.crypto.cms.api.SignerInfo")
- private final List<SignerInfo> signer = new ArrayList<SignerInfo>(3);
+ private final List<SignerInfo> signer = new ArrayList<>(3);
public SignedDataCreatorConfiguration(CamelContext context) {
super(context);
diff --git a/components/camel-crypto-cms/src/test/java/org/apache/camel/component/crypto/cms/EnvelopedDataTest.java b/components/camel-crypto-cms/src/test/java/org/apache/camel/component/crypto/cms/EnvelopedDataTest.java
index 49579bd..90545da 100644
--- a/components/camel-crypto-cms/src/test/java/org/apache/camel/component/crypto/cms/EnvelopedDataTest.java
+++ b/components/camel-crypto-cms/src/test/java/org/apache/camel/component/crypto/cms/EnvelopedDataTest.java
@@ -384,7 +384,7 @@ public class EnvelopedDataTest {
throws UnsupportedEncodingException, Exception {
KeyStoreParameters keystorePas = KeystoreUtil.getKeyStoreParameters(keystoreName);
- List<RecipientInfo> recipients = new ArrayList<RecipientInfo>(aliases.length);
+ List<RecipientInfo> recipients = new ArrayList<>(aliases.length);
for (String alias : aliases) {
DefaultKeyTransRecipientInfo recipient = new DefaultKeyTransRecipientInfo();
recipient.setCertificateAlias(alias);
diff --git a/components/camel-crypto-cms/src/test/java/org/apache/camel/component/crypto/cms/SignedDataTest.java b/components/camel-crypto-cms/src/test/java/org/apache/camel/component/crypto/cms/SignedDataTest.java
index 9d4b448..30a3f78 100644
--- a/components/camel-crypto-cms/src/test/java/org/apache/camel/component/crypto/cms/SignedDataTest.java
+++ b/components/camel-crypto-cms/src/test/java/org/apache/camel/component/crypto/cms/SignedDataTest.java
@@ -112,7 +112,7 @@ public class SignedDataTest {
throws UnsupportedEncodingException, Exception {
KeyStoreParameters keystore = KeystoreUtil.getKeyStoreParameters(keystoreName);
- List<SignerInfo> signers = new ArrayList<SignerInfo>(aliases.length);
+ List<SignerInfo> signers = new ArrayList<>(aliases.length);
for (String alias : aliases) {
DefaultSignerInfo signerInfo = new DefaultSignerInfo();
signerInfo.setIncludeCertificates(includeCertificates); // without
diff --git a/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/DefaultPGPSecretKeyAccessor.java b/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/DefaultPGPSecretKeyAccessor.java
index cd1e14a..82d9c83 100644
--- a/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/DefaultPGPSecretKeyAccessor.java
+++ b/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/DefaultPGPSecretKeyAccessor.java
@@ -39,10 +39,10 @@ import org.bouncycastle.openpgp.operator.bc.BcKeyFingerprintCalculator;
*/
public class DefaultPGPSecretKeyAccessor implements PGPSecretKeyAccessor {
- private final Map<String, List<PGPSecretKeyAndPrivateKeyAndUserId>> userIdPart2SecretKeyList = new HashMap<String, List<PGPSecretKeyAndPrivateKeyAndUserId>>(
+ private final Map<String, List<PGPSecretKeyAndPrivateKeyAndUserId>> userIdPart2SecretKeyList = new HashMap<>(
3);
- private final Map<Long, PGPPrivateKey> keyId2PrivateKey = new HashMap<Long, PGPPrivateKey>(3);
+ private final Map<Long, PGPPrivateKey> keyId2PrivateKey = new HashMap<>(3);
private final PGPSecretKeyRingCollection pgpSecretKeyring;
@@ -74,7 +74,7 @@ public class DefaultPGPSecretKeyAccessor implements PGPSecretKeyAccessor {
@Override
public List<PGPSecretKeyAndPrivateKeyAndUserId> getSignerKeys(Exchange exchange, List<String> useridParts) throws Exception {
- List<PGPSecretKeyAndPrivateKeyAndUserId> result = new ArrayList<PGPSecretKeyAndPrivateKeyAndUserId>(3);
+ List<PGPSecretKeyAndPrivateKeyAndUserId> result = new ArrayList<>(3);
for (String useridPart : useridParts) {
List<PGPSecretKeyAndPrivateKeyAndUserId> partResult = userIdPart2SecretKeyList.get(useridPart);
if (partResult == null) {
diff --git a/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPDataFormat.java b/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPDataFormat.java
index 5b7521b..6819440 100644
--- a/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPDataFormat.java
+++ b/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPDataFormat.java
@@ -123,7 +123,7 @@ public class PGPDataFormat extends PGPKeyAccessDataFormat implements PGPPublicKe
public Map<String, String> determineSignatureKeyUserId2Password(List<String> sigKeyUserids, String sigKeyPassword) {
// we want to keep the order of the entries, therefore we use LinkedHashMap
- Map<String, String> sigKeyUserId2Password = new LinkedHashMap<String, String>(sigKeyUserids.size());
+ Map<String, String> sigKeyUserId2Password = new LinkedHashMap<>(sigKeyUserids.size());
for (String sigKeyUserid : sigKeyUserids) {
if (sigKeyPassword == null) {
sigKeyPassword = passphraseAccessor.getPassphrase(sigKeyUserid);
diff --git a/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPDataFormatUtil.java b/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPDataFormatUtil.java
index a46156e..822ca4d 100644
--- a/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPDataFormatUtil.java
+++ b/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPDataFormatUtil.java
@@ -208,7 +208,7 @@ public final class PGPDataFormatUtil {
}
public static List<PGPPublicKey> findPublicKeys(List<String> useridParts, boolean forEncryption, PGPPublicKeyRingCollection pgpPublicKeyringCollection) {
- List<PGPPublicKey> result = new ArrayList<PGPPublicKey>(useridParts.size());
+ List<PGPPublicKey> result = new ArrayList<>(useridParts.size());
for (Iterator<PGPPublicKeyRing> keyRingIter = pgpPublicKeyringCollection.getKeyRings(); keyRingIter.hasNext();) {
PGPPublicKeyRing keyRing = keyRingIter.next();
PGPPublicKey primaryKey = keyRing.getPublicKey();
@@ -405,13 +405,13 @@ public final class PGPDataFormatUtil {
public static List<PGPSecretKeyAndPrivateKeyAndUserId> findSecretKeysWithPrivateKeyAndUserId(Map<String, String> sigKeyUserId2Password,
String provider, PGPSecretKeyRingCollection pgpSec) throws PGPException {
- List<PGPSecretKeyAndPrivateKeyAndUserId> result = new ArrayList<PGPSecretKeyAndPrivateKeyAndUserId>(sigKeyUserId2Password.size());
+ List<PGPSecretKeyAndPrivateKeyAndUserId> result = new ArrayList<>(sigKeyUserId2Password.size());
for (Iterator<?> i = pgpSec.getKeyRings(); i.hasNext();) {
Object data = i.next();
if (data instanceof PGPSecretKeyRing) {
PGPSecretKeyRing keyring = (PGPSecretKeyRing) data;
PGPSecretKey primaryKey = keyring.getSecretKey();
- List<String> useridParts = new ArrayList<String>(sigKeyUserId2Password.keySet());
+ List<String> useridParts = new ArrayList<>(sigKeyUserId2Password.keySet());
String[] foundKeyUserIdForUserIdPart = findFirstKeyUserIdContainingOneOfTheParts(useridParts, primaryKey.getPublicKey());
if (foundKeyUserIdForUserIdPart == null) {
LOG.debug("No User ID found in primary key with key ID {} containing one of the parts {}", primaryKey.getKeyID(),
diff --git a/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPKeyAccessDataFormat.java b/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPKeyAccessDataFormat.java
index d3e17ad..76f495c 100644
--- a/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPKeyAccessDataFormat.java
+++ b/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPKeyAccessDataFormat.java
@@ -291,7 +291,7 @@ public class PGPKeyAccessDataFormat extends ServiceSupport implements DataFormat
if (userids == null || userids.isEmpty()) {
result = Collections.singletonList(userid);
} else {
- result = new ArrayList<String>(userids.size() + 1);
+ result = new ArrayList<>(userids.size() + 1);
result.add(userid);
result.addAll(userids);
}
@@ -313,7 +313,7 @@ public class PGPKeyAccessDataFormat extends ServiceSupport implements DataFormat
if (userids == null || userids.isEmpty()) {
result = Collections.singletonList(userid);
} else {
- result = new ArrayList<String>(userids.size() + 1);
+ result = new ArrayList<>(userids.size() + 1);
result.add(userid);
result.addAll(userids);
}
@@ -339,7 +339,7 @@ public class PGPKeyAccessDataFormat extends ServiceSupport implements DataFormat
exchange.getOut().setHeader(NUMBER_OF_SIGNING_KEYS, Integer.valueOf(sigSecretKeysWithPrivateKeyAndUserId.size()));
- List<PGPSignatureGenerator> sigGens = new ArrayList<PGPSignatureGenerator>();
+ List<PGPSignatureGenerator> sigGens = new ArrayList<>();
for (PGPSecretKeyAndPrivateKeyAndUserId sigSecretKeyWithPrivateKeyAndUserId : sigSecretKeysWithPrivateKeyAndUserId) {
PGPPrivateKey sigPrivateKey = sigSecretKeyWithPrivateKeyAndUserId.getPrivateKey();
diff --git a/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/AbstractPGPDataFormatTest.java b/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/AbstractPGPDataFormatTest.java
index e941ce7..28eb552 100644
--- a/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/AbstractPGPDataFormatTest.java
+++ b/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/AbstractPGPDataFormatTest.java
@@ -41,7 +41,7 @@ public abstract class AbstractPGPDataFormatTest extends CamelTestSupport {
}
protected Map<String, Object> getHeaders() {
- return new HashMap<String, Object>();
+ return new HashMap<>();
}
protected void assertMocksSatisfied(MockEndpoint encrypted, MockEndpoint unencrypted, String payload) throws Exception {
diff --git a/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPDataFormatDynamicTest.java b/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPDataFormatDynamicTest.java
index 0489086..d42a273 100644
--- a/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPDataFormatDynamicTest.java
+++ b/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPDataFormatDynamicTest.java
@@ -36,7 +36,7 @@ public class PGPDataFormatDynamicTest extends PGPDataFormatTest {
// setup a wrong userids
@Override
protected List<String> getKeyUserIds() {
- List<String> userids = new ArrayList<String>(2);
+ List<String> userids = new ArrayList<>(2);
userids.add("wrong1");
userids.add(getKeyUserId());
return userids;
@@ -45,7 +45,7 @@ public class PGPDataFormatDynamicTest extends PGPDataFormatTest {
// setup a wrong signature userids
@Override
protected List<String> getSignatureKeyUserIds() {
- List<String> userids = new ArrayList<String>(2);
+ List<String> userids = new ArrayList<>(2);
userids.add("wrong1");
userids.add(getKeyUserId());
return userids;
@@ -77,7 +77,7 @@ public class PGPDataFormatDynamicTest extends PGPDataFormatTest {
// override wrong userid and password with correct userid and password in the headers
protected Map<String, Object> getHeaders() {
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put(PGPKeyAccessDataFormat.KEY_USERID, "sdude@nowhere.net");
headers.put(PGPKeyAccessDataFormat.KEY_USERIDS, Collections.singletonList("second"));
headers.put(PGPKeyAccessDataFormat.SIGNATURE_KEY_USERID, "sdude@nowhere.net");
diff --git a/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPDataFormatTest.java b/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPDataFormatTest.java
index 565496b..304f467 100644
--- a/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPDataFormatTest.java
+++ b/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPDataFormatTest.java
@@ -109,14 +109,14 @@ public class PGPDataFormatTest extends AbstractPGPDataFormatTest {
}
protected List<String> getKeyUserIds() {
- List<String> userids = new ArrayList<String>(2);
+ List<String> userids = new ArrayList<>(2);
userids.add("second");
userids.add(getKeyUserId());
return userids;
}
protected List<String> getSignatureKeyUserIds() {
- List<String> userids = new ArrayList<String>(2);
+ List<String> userids = new ArrayList<>(2);
userids.add("second");
userids.add(getKeyUserId());
return userids;
@@ -206,7 +206,7 @@ public class PGPDataFormatTest extends AbstractPGPDataFormatTest {
MockEndpoint exception = setupExpectations(context, 1, "mock:exception");
String payload = "Hi Alice, Be careful Eve is listening, signed Bob";
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
// add signature user id which does not have a passphrase
headers.put(PGPKeyAccessDataFormat.SIGNATURE_KEY_USERID, "userIDWithNoPassphrase");
// the following entry is necessary for the dynamic test
@@ -614,12 +614,12 @@ public class PGPDataFormatTest extends AbstractPGPDataFormatTest {
pgpSignAndEncryptSeveralSignerKeys.setEncryptionKeyRing(getPublicKeyRing());
pgpSignAndEncryptSeveralSignerKeys.setSignatureKeyRing(getSecKeyRing());
- List<String> signerUserIds = new ArrayList<String>();
+ List<String> signerUserIds = new ArrayList<>();
signerUserIds.add("Third (comment third) <em...@third.com>");
signerUserIds.add("Second <em...@second.com>");
pgpSignAndEncryptSeveralSignerKeys.setSignatureKeyUserids(signerUserIds);
- Map<String, String> userId2Passphrase = new HashMap<String, String>();
+ Map<String, String> userId2Passphrase = new HashMap<>();
userId2Passphrase.put("Third (comment third) <em...@third.com>", "sdude");
userId2Passphrase.put("Second <em...@second.com>", "sdude");
PGPPassphraseAccessor passphraseAccessorSeveralKeys = new DefaultPGPPassphraseAccessor(userId2Passphrase);
@@ -631,7 +631,7 @@ public class PGPDataFormatTest extends AbstractPGPDataFormatTest {
pgpVerifyAndDecryptSeveralSignerKeys.setSignatureKeyRing(getPublicKeyRing());
pgpVerifyAndDecryptSeveralSignerKeys.setProvider(getProvider());
// only specify one expected signature
- List<String> expectedSigUserIds = new ArrayList<String>();
+ List<String> expectedSigUserIds = new ArrayList<>();
expectedSigUserIds.add("Second <em...@second.com>");
pgpVerifyAndDecryptSeveralSignerKeys.setSignatureKeyUserids(expectedSigUserIds);
from("direct:several-signer-keys").streamCaching().marshal(pgpSignAndEncryptSeveralSignerKeys).to("mock:encrypted")
diff --git a/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvMarshaller.java b/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvMarshaller.java
index 2d80616..6e6124b 100644
--- a/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvMarshaller.java
+++ b/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvMarshaller.java
@@ -117,7 +117,7 @@ abstract class CsvMarshaller {
@Override
protected Iterable<?> getMapRecordValues(Map<?, ?> map) {
- List<Object> result = new ArrayList<Object>(fixedColumns.length);
+ List<Object> result = new ArrayList<>(fixedColumns.length);
for (String key : fixedColumns) {
result.add(map.get(key));
}
@@ -135,7 +135,7 @@ abstract class CsvMarshaller {
@Override
protected Iterable<?> getMapRecordValues(Map<?, ?> map) {
- List<Object> result = new ArrayList<Object>(map.size());
+ List<Object> result = new ArrayList<>(map.size());
for (Object key : map.keySet()) {
result.add(map.get(key));
}
diff --git a/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvRecordConverters.java b/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvRecordConverters.java
index 4884cbc..0d94f38 100644
--- a/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvRecordConverters.java
+++ b/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvRecordConverters.java
@@ -18,7 +18,6 @@ package org.apache.camel.dataformat.csv;
import java.lang.reflect.Field;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -49,7 +48,7 @@ final class CsvRecordConverters {
@Override
public List<String> convertRecord(CSVRecord record) {
- List<String> answer = new ArrayList<String>(record.size());
+ List<String> answer = new ArrayList<>(record.size());
for (int i = 0; i < record.size(); i++) {
answer.add(record.get(i));
}
diff --git a/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvUnmarshaller.java b/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvUnmarshaller.java
index 9bde056..7fe5a98 100644
--- a/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvUnmarshaller.java
+++ b/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvUnmarshaller.java
@@ -101,7 +101,7 @@ abstract class CsvUnmarshaller {
}
private <T> List<T> asList(Iterator<CSVRecord> iterator, CsvRecordConverter<T> converter) {
- List<T> answer = new ArrayList<T>();
+ List<T> answer = new ArrayList<>();
while (iterator.hasNext()) {
answer.add(converter.convertRecord(iterator.next()));
}
diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvDataFormatCustomRecordConverterTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvDataFormatCustomRecordConverterTest.java
index b08ace4..9a092aa 100644
--- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvDataFormatCustomRecordConverterTest.java
+++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvDataFormatCustomRecordConverterTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.dataformat.csv;
-import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -28,8 +27,6 @@ import org.apache.camel.util.CastUtils;
import org.junit.Test;
import org.springframework.context.support.ClassPathXmlApplicationContext;
-import static org.junit.Assert.*;
-
/**
* Test cases for {@link CsvRecordConverter}.
*/
diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalAutogenColumnsSpringQuoteModeTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalAutogenColumnsSpringQuoteModeTest.java
index 290c20d..7cfa5f2 100644
--- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalAutogenColumnsSpringQuoteModeTest.java
+++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalAutogenColumnsSpringQuoteModeTest.java
@@ -71,15 +71,15 @@ public class CsvMarshalAutogenColumnsSpringQuoteModeTest extends CamelSpringTest
}
private static List<Map<String, Object>> createBody() {
- List<Map<String, Object>> data = new ArrayList<Map<String, Object>>();
+ List<Map<String, Object>> data = new ArrayList<>();
- Map<String, Object> row1 = new LinkedHashMap<String, Object>();
+ Map<String, Object> row1 = new LinkedHashMap<>();
row1.put("orderId", 123);
row1.put("item", "Camel in Action");
row1.put("amount", 1);
data.add(row1);
- Map<String, Object> row2 = new LinkedHashMap<String, Object>();
+ Map<String, Object> row2 = new LinkedHashMap<>();
row2.put("orderId", 124);
row2.put("item", "ActiveMQ in Action");
row2.put("amount", 2);
diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalAutogenColumnsSpringTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalAutogenColumnsSpringTest.java
index 4b4b6a3..5d0e367 100644
--- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalAutogenColumnsSpringTest.java
+++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalAutogenColumnsSpringTest.java
@@ -70,15 +70,15 @@ public class CsvMarshalAutogenColumnsSpringTest extends CamelSpringTestSupport {
}
private static List<Map<String, Object>> createBody() {
- List<Map<String, Object>> data = new ArrayList<Map<String, Object>>();
+ List<Map<String, Object>> data = new ArrayList<>();
- Map<String, Object> row1 = new LinkedHashMap<String, Object>();
+ Map<String, Object> row1 = new LinkedHashMap<>();
row1.put("orderId", 123);
row1.put("item", "Camel in Action");
row1.put("amount", 1);
data.add(row1);
- Map<String, Object> row2 = new LinkedHashMap<String, Object>();
+ Map<String, Object> row2 = new LinkedHashMap<>();
row2.put("orderId", 124);
row2.put("item", "ActiveMQ in Action");
row2.put("amount", 2);
diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalCharsetTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalCharsetTest.java
index 46684a5..fac5f2f 100644
--- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalCharsetTest.java
+++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalCharsetTest.java
@@ -34,7 +34,7 @@ public class CsvMarshalCharsetTest extends CamelTestSupport {
MockEndpoint endpoint = getMockEndpoint("mock:daltons");
endpoint.expectedMessageCount(1);
- List<List<String>> data = new ArrayList<List<String>>();
+ List<List<String>> data = new ArrayList<>();
data.add(0, new ArrayList<String>());
data.get(0).add(0, "L\u00fccky Luke");
Exchange in = createExchangeWithBody(data);
diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalPipeDelimiterSpringTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalPipeDelimiterSpringTest.java
index 1442f82..ac4df06 100644
--- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalPipeDelimiterSpringTest.java
+++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalPipeDelimiterSpringTest.java
@@ -51,15 +51,15 @@ public class CsvMarshalPipeDelimiterSpringTest extends CamelSpringTestSupport {
}
private List<Map<String, Object>> createBody() {
- List<Map<String, Object>> data = new ArrayList<Map<String, Object>>();
+ List<Map<String, Object>> data = new ArrayList<>();
- Map<String, Object> row1 = new LinkedHashMap<String, Object>();
+ Map<String, Object> row1 = new LinkedHashMap<>();
row1.put("orderId", 123);
row1.put("item", "Camel in Action");
row1.put("amount", 1);
data.add(row1);
- Map<String, Object> row2 = new LinkedHashMap<String, Object>();
+ Map<String, Object> row2 = new LinkedHashMap<>();
row2.put("orderId", 124);
row2.put("item", "ActiveMQ in Action");
row2.put("amount", 2);
diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalPipeDelimiterTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalPipeDelimiterTest.java
index f117f79..46c09f0 100644
--- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalPipeDelimiterTest.java
+++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalPipeDelimiterTest.java
@@ -48,15 +48,15 @@ public class CsvMarshalPipeDelimiterTest extends CamelTestSupport {
}
private List<Map<String, Object>> createBody() {
- List<Map<String, Object>> data = new ArrayList<Map<String, Object>>();
+ List<Map<String, Object>> data = new ArrayList<>();
- Map<String, Object> row1 = new LinkedHashMap<String, Object>();
+ Map<String, Object> row1 = new LinkedHashMap<>();
row1.put("orderId", 123);
row1.put("item", "Camel in Action");
row1.put("amount", 1);
data.add(row1);
- Map<String, Object> row2 = new LinkedHashMap<String, Object>();
+ Map<String, Object> row2 = new LinkedHashMap<>();
row2.put("orderId", 124);
row2.put("item", "ActiveMQ in Action");
row2.put("amount", 2);
diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvRouteTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvRouteTest.java
index 6dffc09..f17447d 100644
--- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvRouteTest.java
+++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvRouteTest.java
@@ -39,7 +39,7 @@ public class CsvRouteTest extends CamelTestSupport {
resultEndpoint.expectedMessageCount(1);
// START SNIPPET: marshalInput
- Map<String, Object> body = new LinkedHashMap<String, Object>();
+ Map<String, Object> body = new LinkedHashMap<>();
body.put("foo", "abc");
body.put("bar", 123);
// END SNIPPET: marshalInput
@@ -66,11 +66,11 @@ public class CsvRouteTest extends CamelTestSupport {
MockEndpoint resultEndpoint = resolveMandatoryEndpoint("mock:resultMulti",
MockEndpoint.class);
resultEndpoint.expectedMessageCount(2);
- Map<String, Object> body1 = new LinkedHashMap<String, Object>();
+ Map<String, Object> body1 = new LinkedHashMap<>();
body1.put("foo", "abc");
body1.put("bar", 123);
- Map<String, Object> body2 = new LinkedHashMap<String, Object>();
+ Map<String, Object> body2 = new LinkedHashMap<>();
body2.put("foo", "def");
body2.put("bar", 456);
body2.put("baz", 789);
@@ -107,11 +107,11 @@ public class CsvRouteTest extends CamelTestSupport {
MockEndpoint resultEndpoint = resolveMandatoryEndpoint("mock:resultMultiCustom",
MockEndpoint.class);
resultEndpoint.expectedMessageCount(2);
- Map<String, Object> body1 = new LinkedHashMap<String, Object>();
+ Map<String, Object> body1 = new LinkedHashMap<>();
body1.put("foo", "abc");
body1.put("bar", 123);
- Map<String, Object> body2 = new LinkedHashMap<String, Object>();
+ Map<String, Object> body2 = new LinkedHashMap<>();
body2.put("foo", "def");
body2.put("bar", 456);
body2.put("baz", 789);
diff --git a/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/header/CxfHeaderFilterStrategy.java b/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/header/CxfHeaderFilterStrategy.java
index 6d4edd0..acede34 100644
--- a/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/header/CxfHeaderFilterStrategy.java
+++ b/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/header/CxfHeaderFilterStrategy.java
@@ -94,7 +94,7 @@ public class CxfHeaderFilterStrategy extends DefaultHeaderFilterStrategy {
setLowerCase(true);
// initialize message header filter map with default SOAP filter
- messageHeaderFiltersMap = new HashMap<String, MessageHeaderFilter>();
+ messageHeaderFiltersMap = new HashMap<>();
addToMessageHeaderFilterMap(new SoapMessageHeaderFilter());
// filter headers begin with "Camel" or "org.apache.camel"
diff --git a/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelTransportFactory.java b/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelTransportFactory.java
index 5b38b45..3f30361 100644
--- a/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelTransportFactory.java
+++ b/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelTransportFactory.java
@@ -47,7 +47,7 @@ public class CamelTransportFactory extends AbstractTransportFactory implements C
public static final String TRANSPORT_ID = "http://cxf.apache.org/transports/camel";
public static final List<String> DEFAULT_NAMESPACES = Arrays.asList(TRANSPORT_ID);
- private static final Set<String> URI_PREFIXES = new HashSet<String>();
+ private static final Set<String> URI_PREFIXES = new HashSet<>();
private HeaderFilterStrategy headerFilterStrategy;
private boolean checkException;
diff --git a/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/blueprint/CamelTransportNameSpaceHandler.java b/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/blueprint/CamelTransportNameSpaceHandler.java
index 72672f2..f5688f9 100644
--- a/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/blueprint/CamelTransportNameSpaceHandler.java
+++ b/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/blueprint/CamelTransportNameSpaceHandler.java
@@ -42,7 +42,7 @@ public class CamelTransportNameSpaceHandler extends BaseNamespaceHandler {
@SuppressWarnings("rawtypes")
public Set<Class> getManagedClasses() {
- return new HashSet<Class>(Arrays.asList(CamelTransportNameSpaceHandler.class));
+ return new HashSet<>(Arrays.asList(CamelTransportNameSpaceHandler.class));
}
public URL getSchemaLocation(String s) {
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
index 7dd3f4c..ef5b4ec 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
@@ -315,7 +315,7 @@ public class CxfConsumer extends DefaultConsumer {
// bind the CXF request into a Camel exchange
binding.populateExchangeFromCxfRequest(cxfExchange, camelExchange);
// extract the javax.xml.ws header
- Map<String, Object> context = new HashMap<String, Object>();
+ Map<String, Object> context = new HashMap<>();
binding.extractJaxWsContext(cxfExchange, context);
// put the context into camelExchange
camelExchange.setProperty(CxfConstants.JAXWS_CONTEXT, context);
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
index 5a80cb1..372f672 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
@@ -133,11 +133,11 @@ public class CxfEndpoint extends DefaultEndpoint implements AsyncEndpoint, Heade
private BindingConfiguration bindingConfig;
private DataBinding dataBinding;
private Object serviceFactoryBean;
- private List<Interceptor<? extends Message>> in = new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>();
- private List<Interceptor<? extends Message>> out = new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>();
- private List<Interceptor<? extends Message>> outFault = new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>();
- private List<Interceptor<? extends Message>> inFault = new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>();
- private List<Feature> features = new ModCountCopyOnWriteArrayList<Feature>();
+ private List<Interceptor<? extends Message>> in = new ModCountCopyOnWriteArrayList<>();
+ private List<Interceptor<? extends Message>> out = new ModCountCopyOnWriteArrayList<>();
+ private List<Interceptor<? extends Message>> outFault = new ModCountCopyOnWriteArrayList<>();
+ private List<Interceptor<? extends Message>> inFault = new ModCountCopyOnWriteArrayList<>();
+ private List<Feature> features = new ModCountCopyOnWriteArrayList<>();
private List<Handler> handlers;
private List<String> schemaLocations;
private String transportId;
@@ -445,7 +445,7 @@ public class CxfEndpoint extends DefaultEndpoint implements AsyncEndpoint, Heade
Method m = factoryBean.getClass().getMethod("getServiceFactory");
JaxWsServiceFactoryBean sf = (JaxWsServiceFactoryBean)m.invoke(factoryBean);
@SuppressWarnings("rawtypes")
- List<Handler> chain = new ArrayList<Handler>(handlers);
+ List<Handler> chain = new ArrayList<>(handlers);
chain.addAll(builder.buildHandlerChainFromClass(sf.getServiceClass(),
sf.getEndpointInfo().getName(),
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfPayload.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfPayload.java
index 40c4be2..6f8ade4 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfPayload.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfPayload.java
@@ -51,7 +51,7 @@ public class CxfPayload<T> {
}
public CxfPayload(List<T> headers, List<Element> body) {
this.headers = headers;
- this.body = new ArrayList<Source>(body.size());
+ this.body = new ArrayList<>(body.size());
for (Element el : body) {
this.body.add(new DOMSource(el));
}
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java
index cf0e37b..eef9047 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java
@@ -123,8 +123,8 @@ public class CxfProducer extends DefaultProducer implements AsyncProcessor {
// prepare binding operation info
BindingOperationInfo boi = prepareBindingOperation(camelExchange, cxfExchange);
- Map<String, Object> invocationContext = new HashMap<String, Object>();
- Map<String, Object> responseContext = new HashMap<String, Object>();
+ Map<String, Object> invocationContext = new HashMap<>();
+ Map<String, Object> responseContext = new HashMap<>();
invocationContext.put(Client.RESPONSE_CONTEXT, responseContext);
invocationContext.put(Client.REQUEST_CONTEXT, prepareRequest(camelExchange, cxfExchange));
@@ -160,8 +160,8 @@ public class CxfProducer extends DefaultProducer implements AsyncProcessor {
// prepare binding operation info
BindingOperationInfo boi = prepareBindingOperation(camelExchange, cxfExchange);
- Map<String, Object> invocationContext = new HashMap<String, Object>();
- Map<String, Object> responseContext = new HashMap<String, Object>();
+ Map<String, Object> invocationContext = new HashMap<>();
+ Map<String, Object> responseContext = new HashMap<>();
invocationContext.put(Client.RESPONSE_CONTEXT, responseContext);
invocationContext.put(Client.REQUEST_CONTEXT, prepareRequest(camelExchange, cxfExchange));
@@ -229,7 +229,7 @@ public class CxfProducer extends DefaultProducer implements AsyncProcessor {
Map<String, List<String>> transportHeaders = CastUtils.cast((Map<?, ?>)requestContext.get(Message.PROTOCOL_HEADERS));
boolean added;
if (transportHeaders == null) {
- transportHeaders = new TreeMap<String, List<String>>(String.CASE_INSENSITIVE_ORDER);
+ transportHeaders = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
added = true;
} else {
added = false;
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
index 088ee71..75188b2 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
@@ -135,7 +135,7 @@ public class DefaultCxfBinding implements CxfBinding, HeaderFilterStrategyAware
if (!DataFormat.CXF_MESSAGE.equals(dataFormat)) {
for (Map.Entry<String, org.apache.camel.Attachment> entry : camelExchange.getIn().getAttachmentObjects().entrySet()) {
if (attachments == null) {
- attachments = new HashSet<Attachment>();
+ attachments = new HashSet<>();
}
AttachmentImpl attachment = new AttachmentImpl(entry.getKey());
org.apache.camel.Attachment camelAttachment = entry.getValue();
@@ -326,7 +326,7 @@ public class DefaultCxfBinding implements CxfBinding, HeaderFilterStrategyAware
}
// create response context
- Map<String, Object> responseContext = new HashMap<String, Object>();
+ Map<String, Object> responseContext = new HashMap<>();
org.apache.camel.Message response;
if (camelExchange.getPattern().isOutCapable()) {
@@ -414,7 +414,7 @@ public class DefaultCxfBinding implements CxfBinding, HeaderFilterStrategyAware
boolean isXop = Boolean.valueOf(camelExchange.getProperty(Message.MTOM_ENABLED, String.class));
for (Map.Entry<String, org.apache.camel.Attachment> entry : camelExchange.getOut().getAttachmentObjects().entrySet()) {
if (attachments == null) {
- attachments = new HashSet<Attachment>();
+ attachments = new HashSet<>();
}
AttachmentImpl attachment = new AttachmentImpl(entry.getKey());
org.apache.camel.Attachment camelAttachment = entry.getValue();
@@ -662,7 +662,7 @@ public class DefaultCxfBinding implements CxfBinding, HeaderFilterStrategyAware
// get cxf transport headers (if any) from camel exchange
// use a treemap to keep ordering and ignore key case
- Map<String, List<String>> transportHeaders = new TreeMap<String, List<String>>(String.CASE_INSENSITIVE_ORDER);
+ Map<String, List<String>> transportHeaders = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
if (camelExchange != null) {
Map<String, List<String>> h = CastUtils.cast((Map<?, ?>)camelExchange.getProperty(Message.PROTOCOL_HEADERS));
if (h != null) {
@@ -693,7 +693,7 @@ public class DefaultCxfBinding implements CxfBinding, HeaderFilterStrategyAware
// need to filter the User-Agent ignore the case, as CXF just check the header with "User-Agent"
if (entry.getKey().equalsIgnoreCase("User-Agent")) {
- List<String> listValue = new ArrayList<String>();
+ List<String> listValue = new ArrayList<>();
listValue.add(entry.getValue().toString());
transportHeaders.put("User-Agent", listValue);
}
@@ -723,7 +723,7 @@ public class DefaultCxfBinding implements CxfBinding, HeaderFilterStrategyAware
if (entry.getValue() instanceof List) {
transportHeaders.put(entry.getKey(), (List<String>)entry.getValue());
} else {
- List<String> listValue = new ArrayList<String>();
+ List<String> listValue = new ArrayList<>();
listValue.add(entry.getValue().toString());
transportHeaders.put(entry.getKey(), listValue);
}
@@ -766,8 +766,8 @@ public class DefaultCxfBinding implements CxfBinding, HeaderFilterStrategyAware
}
} else if (dataFormat == DataFormat.PAYLOAD) {
List<SoapHeader> headers = CastUtils.cast((List<?>)message.get(Header.HEADER_LIST));
- Map<String, String> nsMap = new HashMap<String, String>();
- answer = new CxfPayload<SoapHeader>(headers, getPayloadBodyElements(message, nsMap), nsMap);
+ Map<String, String> nsMap = new HashMap<>();
+ answer = new CxfPayload<>(headers, getPayloadBodyElements(message, nsMap), nsMap);
} else if (dataFormat.dealias() == DataFormat.RAW) {
answer = message.getContent(InputStream.class);
@@ -835,7 +835,7 @@ public class DefaultCxfBinding implements CxfBinding, HeaderFilterStrategyAware
}
MessageContentsList inObjects = MessageContentsList.getContentsList(message);
if (inObjects == null) {
- return new ArrayList<Source>(0);
+ return new ArrayList<>(0);
}
org.apache.cxf.message.Exchange exchange = message.getExchange();
BindingOperationInfo boi = exchange.getBindingOperationInfo();
@@ -857,7 +857,7 @@ public class DefaultCxfBinding implements CxfBinding, HeaderFilterStrategyAware
partInfos = op.getInput().getMessageParts();
}
- List<Source> answer = new ArrayList<Source>();
+ List<Source> answer = new ArrayList<>();
for (MessagePartInfo partInfo : partInfos) {
if (!inObjects.hasValue(partInfo)) {
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/CxfNamespaceHandler.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/CxfNamespaceHandler.java
index 89dee36..fbbec0c 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/CxfNamespaceHandler.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/CxfNamespaceHandler.java
@@ -46,7 +46,7 @@ public class CxfNamespaceHandler extends BaseNamespaceHandler {
@SuppressWarnings({"rawtypes"})
public Set<Class> getManagedClasses() {
- return new HashSet<Class>(Arrays.asList(CxfNamespaceHandler.class));
+ return new HashSet<>(Arrays.asList(CxfNamespaceHandler.class));
}
public Metadata parse(Element element, ParserContext context) {
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CachedCxfPayload.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CachedCxfPayload.java
index 5ea6dca..d82fcac 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CachedCxfPayload.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CachedCxfPayload.java
@@ -44,7 +44,7 @@ public class CachedCxfPayload<T> extends CxfPayload<T> implements StreamCache {
private static final Logger LOG = LoggerFactory.getLogger(CachedCxfPayload.class);
public CachedCxfPayload(CxfPayload<T> orig, Exchange exchange, XmlConverter xml) {
- super(orig.getHeaders(), new ArrayList<Source>(orig.getBodySources()), orig.getNsMap());
+ super(orig.getHeaders(), new ArrayList<>(orig.getBodySources()), orig.getNsMap());
ListIterator<Source> li = getBodySources().listIterator();
while (li.hasNext()) {
Source source = li.next();
@@ -95,7 +95,7 @@ public class CachedCxfPayload<T> extends CxfPayload<T> implements StreamCache {
}
private CachedCxfPayload(CachedCxfPayload<T> orig, Exchange exchange) throws IOException {
- super(orig.getHeaders(), new ArrayList<Source>(orig.getBodySources()), orig.getNsMap());
+ super(orig.getHeaders(), new ArrayList<>(orig.getBodySources()), orig.getNsMap());
ListIterator<Source> li = getBodySources().listIterator();
while (li.hasNext()) {
Source source = li.next();
@@ -150,6 +150,6 @@ public class CachedCxfPayload<T> extends CxfPayload<T> implements StreamCache {
@Override
public StreamCache copy(Exchange exchange) throws IOException {
- return new CachedCxfPayload<T>(this, exchange);
+ return new CachedCxfPayload<>(this, exchange);
}
}
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
index 29d3c10..65e911e 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
@@ -60,16 +60,16 @@ public final class CxfPayloadConverter {
@Converter
public static <T> CxfPayload<T> elementToCxfPayload(Element element, Exchange exchange) {
- List<T> headers = new ArrayList<T>();
- List<Element> body = new ArrayList<Element>();
+ List<T> headers = new ArrayList<>();
+ List<Element> body = new ArrayList<>();
body.add(element);
- return new CxfPayload<T>(headers, body);
+ return new CxfPayload<>(headers, body);
}
@Converter
public static <T> CxfPayload<T> nodeListToCxfPayload(NodeList nodeList, Exchange exchange) {
- List<T> headers = new ArrayList<T>();
- List<Element> body = new ArrayList<Element>();
+ List<T> headers = new ArrayList<>();
+ List<Element> body = new ArrayList<>();
for (int i = 0; i < nodeList.getLength(); i++) {
Node node = nodeList.item(i);
// add all nodes to the body that are elements
@@ -77,15 +77,15 @@ public final class CxfPayloadConverter {
body.add((Element) node);
}
}
- return new CxfPayload<T>(headers, body);
+ return new CxfPayload<>(headers, body);
}
@Converter
public static <T> CxfPayload<T> sourceToCxfPayload(Source src, Exchange exchange) {
- List<T> headers = new ArrayList<T>();
- List<Source> body = new ArrayList<Source>();
+ List<T> headers = new ArrayList<>();
+ List<Source> body = new ArrayList<>();
body.add(src);
- return new CxfPayload<T>(headers, body, null);
+ return new CxfPayload<>(headers, body, null);
}
@Converter
@@ -115,7 +115,7 @@ public final class CxfPayloadConverter {
@Converter
public static <T> StreamCache cxfPayLoadToStreamCache(CxfPayload<T> payload, Exchange exchange) {
- return new CachedCxfPayload<T>(payload, exchange, xml);
+ return new CachedCxfPayload<>(payload, exchange, xml);
}
@SuppressWarnings("unchecked")
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanComponent.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanComponent.java
index 67ac0b7..92974d9 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanComponent.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanComponent.java
@@ -33,7 +33,7 @@ import org.apache.camel.impl.HeaderFilterStrategyComponent;
@Deprecated
public class CxfBeanComponent extends HeaderFilterStrategyComponent {
- private Map<String, CxfBeanEndpoint> endpoints = new HashMap<String, CxfBeanEndpoint>();
+ private Map<String, CxfBeanEndpoint> endpoints = new HashMap<>();
public CxfBeanComponent() {
super(CxfBeanEndpoint.class);
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanEndpoint.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanEndpoint.java
index 31cd9bf..d0a7433 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanEndpoint.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanEndpoint.java
@@ -79,7 +79,7 @@ public class CxfBeanEndpoint extends ProcessorEndpoint implements HeaderFilterSt
if (obj instanceof List) {
serviceBeans = (List<Object>)obj;
} else {
- serviceBeans = new ArrayList<Object>(1);
+ serviceBeans = new ArrayList<>(1);
serviceBeans.add(obj);
}
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/AbstractDataFormatFeature.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/AbstractDataFormatFeature.java
index 857b532..8b40301 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/AbstractDataFormatFeature.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/AbstractDataFormatFeature.java
@@ -38,13 +38,13 @@ public abstract class AbstractDataFormatFeature extends AbstractFeature {
protected static final Collection<Class<?>> REMOVING_FAULT_IN_INTERCEPTORS;
static {
- REMOVING_FAULT_IN_INTERCEPTORS = new ArrayList<Class<?>>();
+ REMOVING_FAULT_IN_INTERCEPTORS = new ArrayList<>();
REMOVING_FAULT_IN_INTERCEPTORS.add(ClientFaultConverter.class);
}
// The interceptors which need to be keeped
- protected Set<String> inInterceptorNames = new HashSet<String>();
- protected Set<String> outInterceptorNames = new HashSet<String>();
+ protected Set<String> inInterceptorNames = new HashSet<>();
+ protected Set<String> outInterceptorNames = new HashSet<>();
protected abstract Logger getLogger();
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/CXFMessageDataFormatFeature.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/CXFMessageDataFormatFeature.java
index b585281..66d7ba8 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/CXFMessageDataFormatFeature.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/CXFMessageDataFormatFeature.java
@@ -58,11 +58,11 @@ public class CXFMessageDataFormatFeature extends AbstractDataFormatFeature {
private static final Collection<Class<?>> REMOVING_OUT_INTERCEPTORS;
static {
- REMOVING_IN_INTERCEPTORS = new ArrayList<Class<?>>();
+ REMOVING_IN_INTERCEPTORS = new ArrayList<>();
REMOVING_IN_INTERCEPTORS.add(HolderInInterceptor.class);
REMOVING_IN_INTERCEPTORS.add(WrapperClassInInterceptor.class);
- REMOVING_OUT_INTERCEPTORS = new ArrayList<Class<?>>();
+ REMOVING_OUT_INTERCEPTORS = new ArrayList<>();
REMOVING_OUT_INTERCEPTORS.add(HolderOutInterceptor.class);
REMOVING_OUT_INTERCEPTORS.add(WrapperClassOutInterceptor.class);
}
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsComponent.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsComponent.java
index abb61ee..6d0c74c 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsComponent.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsComponent.java
@@ -85,7 +85,7 @@ public class CxfRsComponent extends HeaderFilterStrategyComponent implements SSL
// The super class (DefaultComponent) will invoke "setProperties" after this method
// with to apply properties defined by URI query.
if (bean.getProperties() != null) {
- Map<String, Object> copy = new HashMap<String, Object>();
+ Map<String, Object> copy = new HashMap<>();
copy.putAll(bean.getProperties());
setProperties(answer, copy);
}
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
index 015918a..1daa8d1 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
@@ -95,12 +95,12 @@ public class CxfRsEndpoint extends DefaultEndpoint implements HeaderFilterStrate
@UriParam(label = "advanced")
private CxfRsBinding binding;
@UriParam(javaType = "java.lang.String")
- private List<Object> providers = new LinkedList<Object>();
+ private List<Object> providers = new LinkedList<>();
private String providersRef;
@UriParam
private List<String> schemaLocations;
@UriParam
- private List<Feature> features = new ModCountCopyOnWriteArrayList<Feature>();
+ private List<Feature> features = new ModCountCopyOnWriteArrayList<>();
@UriParam(label = "producer,advanced", defaultValue = "true")
private boolean httpClientAPI = true;
@UriParam(label = "producer,advanced")
@@ -422,7 +422,7 @@ public class CxfRsEndpoint extends DefaultEndpoint implements HeaderFilterStrate
public void addResourceClass(Class<?> resourceClass) {
if (resourceClasses == null) {
- resourceClasses = new ArrayList<Class<?>>();
+ resourceClasses = new ArrayList<>();
}
resourceClasses.add(resourceClass);
}
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java
index 7edd0ba..8799f1e 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java
@@ -479,7 +479,7 @@ public class CxfRsProducer extends DefaultProducer implements AsyncProcessor {
}
private Map<String, String> getQueryParametersFromQueryString(String queryString, String charset) throws UnsupportedEncodingException {
- Map<String, String> answer = new LinkedHashMap<String, String>();
+ Map<String, String> answer = new LinkedHashMap<>();
for (String param : queryString.split("&")) {
String[] pair = param.split("=", 2);
if (pair.length == 2) {
@@ -538,7 +538,7 @@ public class CxfRsProducer extends DefaultProducer implements AsyncProcessor {
}
private Map<String, String> getMatrixParametersFromMatrixString(String matrixString, String charset) throws UnsupportedEncodingException {
- Map<String, String> answer = new LinkedHashMap<String, String>();
+ Map<String, String> answer = new LinkedHashMap<>();
for (String param : matrixString.split(";")) {
String[] pair = param.split("=", 2);
if (pair.length == 2) {
@@ -616,7 +616,7 @@ public class CxfRsProducer extends DefaultProducer implements AsyncProcessor {
protected Map<String, String> parseResponseHeaders(Object response, Exchange camelExchange) {
- Map<String, String> answer = new HashMap<String, String>();
+ Map<String, String> answer = new HashMap<>();
if (response instanceof Response) {
for (Map.Entry<String, List<Object>> entry : ((Response) response).getMetadata().entrySet()) {
@@ -845,7 +845,7 @@ public class CxfRsProducer extends DefaultProducer implements AsyncProcessor {
private LRUSoftCache<String, JAXRSClientFactoryBean> cache;
ClientFactoryBeanCache(final int maxCacheSize) {
- this.cache = new LRUSoftCache<String, JAXRSClientFactoryBean>(maxCacheSize);
+ this.cache = new LRUSoftCache<>(maxCacheSize);
}
public void start() throws Exception {
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/DataFormatProvider.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/DataFormatProvider.java
index 73ef59a..0496547 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/DataFormatProvider.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/DataFormatProvider.java
@@ -37,7 +37,7 @@ import org.apache.cxf.jaxrs.utils.JAXRSUtils;
public class DataFormatProvider<T> implements MessageBodyWriter<T>, MessageBodyReader<T> {
- private Map<String, DataFormat> formats = new HashMap<String, DataFormat>();
+ private Map<String, DataFormat> formats = new HashMap<>();
@Override
public boolean isReadable(Class<?> cls, Type type, Annotation[] anns, MediaType mt) {
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/SimpleCxfRsBinding.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/SimpleCxfRsBinding.java
index 701b11c..e30471a 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/SimpleCxfRsBinding.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/SimpleCxfRsBinding.java
@@ -106,7 +106,7 @@ public class SimpleCxfRsBinding extends DefaultCxfRsBinding {
/** The JAX-RS annotations to be injected as headers in the IN message */
private static final Set<Class<?>> HEADER_ANNOTATIONS = Collections.unmodifiableSet(
- new HashSet<Class<?>>(Arrays.asList(new Class<?>[] {
+ new HashSet<>(Arrays.asList(new Class<?>[] {
CookieParam.class,
FormParam.class,
PathParam.class,
@@ -115,7 +115,7 @@ public class SimpleCxfRsBinding extends DefaultCxfRsBinding {
QueryParam.class})));
private static final Set<Class<?>> BINARY_ATTACHMENT_TYPES = Collections.unmodifiableSet(
- new HashSet<Class<?>>(Arrays.asList(new Class<?>[] {
+ new HashSet<>(Arrays.asList(new Class<?>[] {
Attachment.class,
DataHandler.class,
DataSource.class,
@@ -126,7 +126,7 @@ public class SimpleCxfRsBinding extends DefaultCxfRsBinding {
private static final Object[] NO_PARAMETERS = null;
/** Caches the Method to Parameters associations to avoid reflection with every request */
- private Map<Method, MethodSpec> methodSpecCache = new ConcurrentHashMap<Method, MethodSpec>();
+ private Map<Method, MethodSpec> methodSpecCache = new ConcurrentHashMap<>();
@Override
@@ -195,7 +195,7 @@ public class SimpleCxfRsBinding extends DefaultCxfRsBinding {
*/
protected Map<String, String> filterCamelHeadersForResponseHeaders(Map<String, Object> headers,
org.apache.camel.Exchange camelExchange) {
- Map<String, String> answer = new HashMap<String, String>();
+ Map<String, String> answer = new HashMap<>();
for (Map.Entry<String, Object> entry : headers.entrySet()) {
if (getHeaderFilterStrategy().applyFilterToCamelHeaders(entry.getKey(), entry.getValue(), camelExchange)) {
continue;
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/AbstractCxfBeanDefinitionParser.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/AbstractCxfBeanDefinitionParser.java
index 05bb947..b3d09d5 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/AbstractCxfBeanDefinitionParser.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/AbstractCxfBeanDefinitionParser.java
@@ -88,7 +88,7 @@ public abstract class AbstractCxfBeanDefinitionParser extends AbstractBeanDefini
Map<String, Object> map = null;
if (propertyValue == null) {
if (lazyInstantiation) {
- map = new HashMap<String, Object>();
+ map = new HashMap<>();
bean.addPropertyValue("properties", map);
}
} else {
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/CxfUtils.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/CxfUtils.java
index 45894fb..7e11d8a 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/CxfUtils.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/CxfUtils.java
@@ -52,7 +52,7 @@ public final class CxfUtils {
}
public static String elementToString(Element element) throws Exception {
- Map<String, String> namespaces = new HashMap<String, String>();
+ Map<String, String> namespaces = new HashMap<>();
visitNodesForNameSpace(element, namespaces);
W3CDOMStreamWriter writer = new W3CDOMStreamWriter();
writeElement(element, writer, namespaces);
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/AbstractCxfWsdlFirstTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/AbstractCxfWsdlFirstTest.java
index 4687b24..5ec794f 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/AbstractCxfWsdlFirstTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/AbstractCxfWsdlFirstTest.java
@@ -66,10 +66,10 @@ public abstract class AbstractCxfWsdlFirstTest extends CamelSpringTestSupport {
"http://localhost:" + getPort2() + "/" + getClass().getSimpleName()
+ "/PersonService/");
- Holder<String> personId = new Holder<String>();
+ Holder<String> personId = new Holder<>();
personId.value = "hello";
- Holder<String> ssn = new Holder<String>();
- Holder<String> name = new Holder<String>();
+ Holder<String> ssn = new Holder<>();
+ Holder<String> name = new Holder<>();
client.getPerson(personId, ssn, name);
assertEquals("we should get the right answer from router", "Bonjour", name.value);
@@ -123,12 +123,12 @@ public abstract class AbstractCxfWsdlFirstTest extends CamelSpringTestSupport {
protected Exchange sendJaxWsMessageWithHolders(final String personIdString) {
Exchange exchange = template.send("direct:producer", new Processor() {
public void process(final Exchange exchange) {
- final List<Object> params = new ArrayList<Object>();
- Holder<String> personId = new Holder<String>();
+ final List<Object> params = new ArrayList<>();
+ Holder<String> personId = new Holder<>();
personId.value = personIdString;
params.add(personId);
- Holder<String> ssn = new Holder<String>();
- Holder<String> name = new Holder<String>();
+ Holder<String> ssn = new Holder<>();
+ Holder<String> name = new Holder<>();
params.add(ssn);
params.add(name);
exchange.getIn().setBody(params);
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFWsdlOnlyPayloadModeMultiPartNoSpringTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFWsdlOnlyPayloadModeMultiPartNoSpringTest.java
index 844d051..1e386fd 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFWsdlOnlyPayloadModeMultiPartNoSpringTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFWsdlOnlyPayloadModeMultiPartNoSpringTest.java
@@ -93,10 +93,10 @@ public class CXFWsdlOnlyPayloadModeMultiPartNoSpringTest extends CamelTestSuppor
.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
"http://localhost:" + port2
+ "/CXFWsdlOnlyPayloadModeMultiPartNoSpringTest/PersonMultiPart");
- Holder<Integer> ssn = new Holder<Integer>();
+ Holder<Integer> ssn = new Holder<>();
ssn.value = 0;
- Holder<String> name = new Holder<String>();
+ Holder<String> name = new Holder<>();
name.value = "Unknown name";
client.getPersonMultiPartOperation("foo", 0, name, ssn);
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFWsdlOnlyPayloadModeNoSpringTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFWsdlOnlyPayloadModeNoSpringTest.java
index 20dab1e..1afadd3 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFWsdlOnlyPayloadModeNoSpringTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFWsdlOnlyPayloadModeNoSpringTest.java
@@ -114,10 +114,10 @@ public class CXFWsdlOnlyPayloadModeNoSpringTest extends CamelTestSupport {
c.getInInterceptors().add(new LoggingInInterceptor());
c.getOutInterceptors().add(new LoggingOutInterceptor());
- Holder<String> personId = new Holder<String>();
+ Holder<String> personId = new Holder<>();
personId.value = "hello";
- Holder<String> ssn = new Holder<String>();
- Holder<String> name = new Holder<String>();
+ Holder<String> ssn = new Holder<>();
+ Holder<String> name = new Holder<>();
client.getPerson(personId, ssn, name);
assertEquals("Bonjour", name.value);
@@ -138,10 +138,10 @@ public class CXFWsdlOnlyPayloadModeNoSpringTest extends CamelTestSupport {
c.getInInterceptors().add(new LoggingInInterceptor());
c.getOutInterceptors().add(new LoggingOutInterceptor());
- Holder<String> personId = new Holder<String>();
+ Holder<String> personId = new Holder<>();
personId.value = "";
- Holder<String> ssn = new Holder<String>();
- Holder<String> name = new Holder<String>();
+ Holder<String> ssn = new Holder<>();
+ Holder<String> name = new Holder<>();
Throwable t = null;
try {
client.getPerson(personId, ssn, name);
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFWsdlOnlyTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFWsdlOnlyTest.java
index 7dfc300..b03731e 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFWsdlOnlyTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFWsdlOnlyTest.java
@@ -94,16 +94,16 @@ public class CXFWsdlOnlyTest extends CamelSpringTestSupport {
((BindingProvider)client).getRequestContext()
.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
"http://localhost:" + port3 + "/CXFWsdlOnlyTest/PersonService/");
- Holder<String> personId = new Holder<String>();
+ Holder<String> personId = new Holder<>();
personId.value = "hello";
- Holder<String> ssn = new Holder<String>();
- Holder<String> name = new Holder<String>();
+ Holder<String> ssn = new Holder<>();
+ Holder<String> name = new Holder<>();
client.getPerson(personId, ssn, name);
assertEquals("Bonjour", name.value);
personId.value = "";
- ssn = new Holder<String>();
- name = new Holder<String>();
+ ssn = new Holder<>();
+ name = new Holder<>();
Throwable t = null;
try {
client.getPerson(personId, ssn, name);
@@ -117,16 +117,16 @@ public class CXFWsdlOnlyTest extends CamelSpringTestSupport {
((BindingProvider)client2).getRequestContext()
.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
"http://localhost:" + port4 + "/CXFWsdlOnlyTest/PersonService/");
- Holder<String> personId2 = new Holder<String>();
+ Holder<String> personId2 = new Holder<>();
personId2.value = "hello";
- Holder<String> ssn2 = new Holder<String>();
- Holder<String> name2 = new Holder<String>();
+ Holder<String> ssn2 = new Holder<>();
+ Holder<String> name2 = new Holder<>();
client2.getPerson(personId2, ssn2, name2);
assertEquals("Bonjour", name2.value);
personId2.value = "";
- ssn2 = new Holder<String>();
- name2 = new Holder<String>();
+ ssn2 = new Holder<>();
+ name2 = new Holder<>();
try {
client2.getPerson(personId2, ssn2, name2);
fail("Expect exception");
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayLoadFaultMessageTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayLoadFaultMessageTest.java
index 348fb32..83bf5a9 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayLoadFaultMessageTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayLoadFaultMessageTest.java
@@ -42,9 +42,9 @@ public class CxfConsumerPayLoadFaultMessageTest extends CxfConsumerPayloadFaultT
from(fromURI).process(new Processor() {
public void process(final Exchange exchange) throws Exception {
Element details = StaxUtils.read(new StringReader(FAULTS)).getDocumentElement();
- List<Element> outElements = new ArrayList<Element>();
+ List<Element> outElements = new ArrayList<>();
outElements.add(details);
- CxfPayload<SoapHeader> responsePayload = new CxfPayload<SoapHeader>(null, outElements);
+ CxfPayload<SoapHeader> responsePayload = new CxfPayload<>(null, outElements);
exchange.getOut().setBody(responsePayload);
exchange.getOut().setFault(true);
}
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayloadFaultCauseEnabledTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayloadFaultCauseEnabledTest.java
index 4828a78..5193e2c 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayloadFaultCauseEnabledTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayloadFaultCauseEnabledTest.java
@@ -95,10 +95,10 @@ public class CxfConsumerPayloadFaultCauseEnabledTest extends CamelTestSupport {
((BindingProvider)client).getRequestContext()
.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, serviceAddress);
- Holder<String> personId = new Holder<String>();
+ Holder<String> personId = new Holder<>();
personId.value = "";
- Holder<String> ssn = new Holder<String>();
- Holder<String> name = new Holder<String>();
+ Holder<String> ssn = new Holder<>();
+ Holder<String> name = new Holder<>();
try {
client.getPerson(personId, ssn, name);
fail("SOAPFault expected!");
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayloadFaultTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayloadFaultTest.java
index 96ebff6..031a8a3 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayloadFaultTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayloadFaultTest.java
@@ -100,10 +100,10 @@ public class CxfConsumerPayloadFaultTest extends CamelTestSupport {
((BindingProvider)client).getRequestContext()
.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, serviceAddress);
- Holder<String> personId = new Holder<String>();
+ Holder<String> personId = new Holder<>();
personId.value = "";
- Holder<String> ssn = new Holder<String>();
- Holder<String> name = new Holder<String>();
+ Holder<String> ssn = new Holder<>();
+ Holder<String> name = new Holder<>();
Throwable t = null;
try {
client.getPerson(personId, ssn, name);
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayloadTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayloadTest.java
index a981839..67364cd 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayloadTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayloadTest.java
@@ -66,7 +66,7 @@ public class CxfConsumerPayloadTest extends CxfConsumerMessageTest {
public void process(final Exchange exchange) throws Exception {
CxfPayload<SoapHeader> requestPayload = exchange.getIn().getBody(CxfPayload.class);
List<Source> inElements = requestPayload.getBodySources();
- List<Source> outElements = new ArrayList<Source>();
+ List<Source> outElements = new ArrayList<>();
// You can use a customer toStringConverter to turn a CxfPayLoad message into String as you want
String request = exchange.getIn().getBody(String.class);
XmlConverter converter = new XmlConverter();
@@ -87,7 +87,7 @@ public class CxfConsumerPayloadTest extends CxfConsumerMessageTest {
Document outDocument = converter.toDOMDocument(documentString, exchange);
outElements.add(new DOMSource(outDocument.getDocumentElement()));
// set the payload header with null
- CxfPayload<SoapHeader> responsePayload = new CxfPayload<SoapHeader>(null, outElements, null);
+ CxfPayload<SoapHeader> responsePayload = new CxfPayload<>(null, outElements, null);
exchange.getOut().setBody(responsePayload);
}
});
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayloadXPathClientServerTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayloadXPathClientServerTest.java
index 01a3c5c..83eec85 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayloadXPathClientServerTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayloadXPathClientServerTest.java
@@ -94,10 +94,10 @@ public class CxfConsumerPayloadXPathClientServerTest extends CamelTestSupport {
//build some dummy response
XmlConverter converter = new XmlConverter();
Document outDocument = converter.toDOMDocument(ECHO_RESPONSE, exchange);
- List<Source> outElements = new ArrayList<Source>();
+ List<Source> outElements = new ArrayList<>();
outElements.add(new DOMSource(outDocument.getDocumentElement()));
// set the payload header with null
- CxfPayload<SoapHeader> responsePayload = new CxfPayload<SoapHeader>(null, outElements, null);
+ CxfPayload<SoapHeader> responsePayload = new CxfPayload<>(null, outElements, null);
exchange.getOut().setBody(responsePayload);
}
});
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerResponseTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerResponseTest.java
index 2899a22..684c571 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerResponseTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerResponseTest.java
@@ -78,7 +78,7 @@ public class CxfConsumerResponseTest extends CamelTestSupport {
// Put the result back
exchange.getIn().setBody(result);
// set up the response context which force start document
- Map<String, Object> map = new HashMap<String, Object>();
+ Map<String, Object> map = new HashMap<>();
map.put("org.apache.cxf.stax.force-start-document", Boolean.TRUE);
exchange.getIn().setHeader(Client.RESPONSE_CONTEXT, map);
}
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerTest.java
index 28cee98..7b51d25 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerTest.java
@@ -82,7 +82,7 @@ public class CxfConsumerTest extends CamelTestSupport {
// Put the result back
exchange.getOut().setBody(result);
// set up the response context which force start document
- Map<String, Object> map = new HashMap<String, Object>();
+ Map<String, Object> map = new HashMap<>();
map.put("org.apache.cxf.stax.force-start-document", Boolean.TRUE);
exchange.getOut().setHeader(Client.RESPONSE_CONTEXT, map);
}
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMessageHeaderTimeoutTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMessageHeaderTimeoutTest.java
index 3eceb4d..8676989 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMessageHeaderTimeoutTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMessageHeaderTimeoutTest.java
@@ -68,12 +68,12 @@ public class CxfMessageHeaderTimeoutTest extends CamelSpringTestSupport {
protected Exchange sendJaxWsMessage(String endpointUri) throws InterruptedException {
Exchange exchange = template.send(endpointUri, new Processor() {
public void process(final Exchange exchange) {
- final List<String> params = new ArrayList<String>();
+ final List<String> params = new ArrayList<>();
params.add(TEST_MESSAGE);
exchange.getIn().setBody(params);
exchange.getIn().setHeader(CxfConstants.OPERATION_NAME, GREET_ME_OPERATION);
// setup the receive timeout dynamically
- Map<String, Object> requestContext = new HashMap<String, Object>();
+ Map<String, Object> requestContext = new HashMap<>();
HTTPClientPolicy clientPolicy = new HTTPClientPolicy();
clientPolicy.setReceiveTimeout(100);
requestContext.put(HTTPClientPolicy.class.getName(), clientPolicy);
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMixedModeRouterTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMixedModeRouterTest.java
index 017730c..ebd170c 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMixedModeRouterTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMixedModeRouterTest.java
@@ -90,7 +90,7 @@ public class CxfMixedModeRouterTest extends CamelTestSupport {
public void process(Exchange exchange) throws Exception {
CxfPayload<?> message = exchange.getIn().getBody(CxfPayload.class);
- List<String> params = new ArrayList<String>();
+ List<String> params = new ArrayList<>();
if (message != null) {
// convert CxfPayload to list of objects any way you like
@@ -121,10 +121,10 @@ public class CxfMixedModeRouterTest extends CamelTestSupport {
+ "<return xmlns=\"http://cxf.component.camel.apache.org/\">"
+ list.get(0)
+ "</return></ns1:echoResponse>";
- List<Element> body = new ArrayList<Element>();
+ List<Element> body = new ArrayList<>();
body.add(StaxUtils.read(new StringReader(s)).getDocumentElement());
- message = new CxfPayload<SoapHeader>(new ArrayList<SoapHeader>(), body);
+ message = new CxfPayload<>(new ArrayList<SoapHeader>(), body);
}
exchange.getIn().setBody(message);
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadSoapHeaderViaCamelHeaderTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadSoapHeaderViaCamelHeaderTest.java
index b368f18..c09a8bf 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadSoapHeaderViaCamelHeaderTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadSoapHeaderViaCamelHeaderTest.java
@@ -49,7 +49,7 @@ public class CxfPayLoadSoapHeaderViaCamelHeaderTest extends CxfPayLoadSoapHeader
callerId.setPhoneNumber("108");
SoapHeader soapHeader = new SoapHeader(new QName("http://camel.apache.org/pizza/types", "CallerIDHeader"),
callerId, new JAXBDataBinding(CallerIDHeaderType.class));
- List<SoapHeader> soapHeaders = new ArrayList<SoapHeader>(1);
+ List<SoapHeader> soapHeaders = new ArrayList<>(1);
soapHeaders.add(soapHeader);
// sets the SOAP header via a camel header
exchange.getIn().setHeader(Header.HEADER_LIST, soapHeaders);
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerContextTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerContextTest.java
index 072e921..c4a64cb 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerContextTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerContextTest.java
@@ -67,9 +67,9 @@ public class CxfProducerContextTest extends CxfProducerTest {
protected Exchange sendSimpleMessage() {
Exchange exchange = template.send(getSimpleEndpointUri(), new Processor() {
public void process(final Exchange exchange) {
- final List<String> params = new ArrayList<String>();
+ final List<String> params = new ArrayList<>();
params.add(TEST_MESSAGE);
- Map<String, Object> requestContext = new HashMap<String, Object>();
+ Map<String, Object> requestContext = new HashMap<>();
requestContext.put(Message.ENDPOINT_ADDRESS, getSimpleServerAddress());
exchange.getIn().setBody(params);
exchange.getIn().setHeader(Client.REQUEST_CONTEXT, requestContext);
@@ -87,9 +87,9 @@ public class CxfProducerContextTest extends CxfProducerTest {
protected Exchange sendJaxWsMessage() {
Exchange exchange = template.send(getJaxwsEndpointUri(), new Processor() {
public void process(final Exchange exchange) {
- final List<String> params = new ArrayList<String>();
+ final List<String> params = new ArrayList<>();
params.add(TEST_MESSAGE);
- Map<String, Object> requestContext = new HashMap<String, Object>();
+ Map<String, Object> requestContext = new HashMap<>();
requestContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, getJaxWsServerAddress());
exchange.getIn().setBody(params);
exchange.getIn().setHeader(Client.REQUEST_CONTEXT, requestContext);
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerOperationTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerOperationTest.java
index 985e949..dc5aa9b 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerOperationTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerOperationTest.java
@@ -51,7 +51,7 @@ public class CxfProducerOperationTest extends CxfProducerTest {
private Exchange sendSimpleMessage(String endpointUri) {
Exchange exchange = template.send(endpointUri, new Processor() {
public void process(final Exchange exchange) {
- final List<String> params = new ArrayList<String>();
+ final List<String> params = new ArrayList<>();
params.add(TEST_MESSAGE);
exchange.getIn().setBody(params);
exchange.getIn().setHeader(Exchange.FILE_NAME, "testFile");
@@ -65,7 +65,7 @@ public class CxfProducerOperationTest extends CxfProducerTest {
protected Exchange sendJaxWsMessage() {
Exchange exchange = template.send(getJaxwsEndpointUri(), new Processor() {
public void process(final Exchange exchange) {
- final List<String> params = new ArrayList<String>();
+ final List<String> params = new ArrayList<>();
params.add(TEST_MESSAGE);
exchange.getIn().setBody(params);
exchange.getIn().setHeader(Exchange.FILE_NAME, "testFile");
@@ -79,11 +79,11 @@ public class CxfProducerOperationTest extends CxfProducerTest {
Exchange exchange = template.send(getSimpleEndpointUri(), new Processor() {
public void process(final Exchange exchange) {
// we need to override the operation name first
- final List<String> para1 = new ArrayList<String>();
+ final List<String> para1 = new ArrayList<>();
para1.add("para1");
- final List<String> para2 = new ArrayList<String>();
+ final List<String> para2 = new ArrayList<>();
para2.add("para2");
- List<List<String>> parameters = new ArrayList<List<String>>();
+ List<List<String>> parameters = new ArrayList<>();
parameters.add(para1);
parameters.add(para2);
// The object array version is working too
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerProtocalHeaderTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerProtocalHeaderTest.java
index 72c2d3d..53c4da3 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerProtocalHeaderTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerProtocalHeaderTest.java
@@ -66,7 +66,7 @@ public class CxfProducerProtocalHeaderTest extends CamelTestSupport {
private Exchange sendSimpleMessage(String endpointUri) {
Exchange exchange = template.send(endpointUri, new Processor() {
public void process(final Exchange exchange) {
- final List<String> params = new ArrayList<String>();
+ final List<String> params = new ArrayList<>();
params.add("Hello World!");
exchange.getIn().setBody(params);
exchange.getIn().setHeader(CxfConstants.OPERATION_NAME, "echo");
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerRouterTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerRouterTest.java
index 1b4d281..84480e3e 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerRouterTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerRouterTest.java
@@ -89,7 +89,7 @@ public class CxfProducerRouterTest extends CamelTestSupport {
error.expectedMessageCount(1);
Exchange senderExchange = new DefaultExchange(context, ExchangePattern.InOut);
- final List<String> params = new ArrayList<String>();
+ final List<String> params = new ArrayList<>();
// Prepare the request message for the camel-cxf procedure
params.add(TEST_MESSAGE);
senderExchange.getIn().setBody(params);
@@ -112,7 +112,7 @@ public class CxfProducerRouterTest extends CamelTestSupport {
public void testInvokingSimpleServerWithParams() throws Exception {
// START SNIPPET: sending
Exchange senderExchange = new DefaultExchange(context, ExchangePattern.InOut);
- final List<String> params = new ArrayList<String>();
+ final List<String> params = new ArrayList<>();
// Prepare the request message for the camel-cxf procedure
params.add(TEST_MESSAGE);
senderExchange.getIn().setBody(params);
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerSoapActionTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerSoapActionTest.java
index bcb589e..19c48b3 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerSoapActionTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerSoapActionTest.java
@@ -55,7 +55,7 @@ public class CxfProducerSoapActionTest extends CamelTestSupport {
@Override
public void process(Exchange exchange) throws Exception {
- final List<Object> params = new ArrayList<Object>();
+ final List<Object> params = new ArrayList<>();
params.add("foo");
params.add(10);
params.add("bar");
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerSoapFaultTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerSoapFaultTest.java
index 9650074..752aafe 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerSoapFaultTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerSoapFaultTest.java
@@ -90,7 +90,7 @@ public class CxfProducerSoapFaultTest extends Assert {
private Exchange sendJaxWsMessage(final String uri, final String message, final String operation) {
Exchange exchange = template.request(uri, new Processor() {
public void process(final Exchange exchange) {
- final List<String> params = new ArrayList<String>();
+ final List<String> params = new ArrayList<>();
params.add(message);
exchange.getIn().setBody(params);
exchange.getIn().setHeader(CxfConstants.OPERATION_NAME, operation);
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerTest.java
index d28177a..7b0a4f1 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerTest.java
@@ -183,7 +183,7 @@ public class CxfProducerTest extends Assert {
private Exchange sendSimpleMessage(String endpointUri) {
Exchange exchange = template.request(endpointUri, new Processor() {
public void process(final Exchange exchange) {
- final List<String> params = new ArrayList<String>();
+ final List<String> params = new ArrayList<>();
params.add(TEST_MESSAGE);
exchange.getIn().setBody(params);
exchange.getIn().setHeader(CxfConstants.OPERATION_NAME, ECHO_OPERATION);
@@ -224,7 +224,7 @@ public class CxfProducerTest extends Assert {
protected Exchange sendJaxWsMessage() {
Exchange exchange = template.request(getJaxwsEndpointUri(), new Processor() {
public void process(final Exchange exchange) {
- final List<String> params = new ArrayList<String>();
+ final List<String> params = new ArrayList<>();
params.add(TEST_MESSAGE);
exchange.getIn().setBody(params);
exchange.getIn().setHeader(CxfConstants.OPERATION_NAME, GREET_ME_OPERATION);
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfTimeoutTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfTimeoutTest.java
index 1e2efe3..aa076f9 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfTimeoutTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfTimeoutTest.java
@@ -102,7 +102,7 @@ public class CxfTimeoutTest extends CamelSpringTestSupport {
protected Exchange sendJaxWsMessage(String endpointUri) throws InterruptedException {
Exchange exchange = template.send(endpointUri, new Processor() {
public void process(final Exchange exchange) {
- final List<String> params = new ArrayList<String>();
+ final List<String> params = new ArrayList<>();
params.add(TEST_MESSAGE);
exchange.getIn().setBody(params);
exchange.getIn().setHeader(CxfConstants.OPERATION_NAME, GREET_ME_OPERATION);
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/DefaultCxfBindingTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/DefaultCxfBindingTest.java
index 8b07634..7f688dc 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/DefaultCxfBindingTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/DefaultCxfBindingTest.java
@@ -98,7 +98,7 @@ public class DefaultCxfBindingTest extends Assert {
@Test
public void testPayloadBodyNamespace() throws Exception {
MessageImpl message = new MessageImpl();
- Map<String, String> nsMap = new HashMap<String, String>();
+ Map<String, String> nsMap = new HashMap<>();
Document document = getDocument(SOAP_MESSAGE_1);
message.setContent(Node.class, document);
DefaultCxfBinding.getPayloadBodyElements(message, nsMap);
@@ -115,7 +115,7 @@ public class DefaultCxfBindingTest extends Assert {
@Test
public void testOverridePayloadBodyNamespace() throws Exception {
MessageImpl message = new MessageImpl();
- Map<String, String> nsMap = new HashMap<String, String>();
+ Map<String, String> nsMap = new HashMap<>();
Document document = getDocument(SOAP_MESSAGE_2);
message.setContent(Node.class, document);
DefaultCxfBinding.getPayloadBodyElements(message, nsMap);
@@ -155,7 +155,7 @@ public class DefaultCxfBindingTest extends Assert {
Exchange exchange = new DefaultExchange(context);
org.apache.cxf.message.Exchange cxfExchange = new org.apache.cxf.message.ExchangeImpl();
exchange.setProperty(CxfConstants.DATA_FORMAT_PROPERTY, DataFormat.PAYLOAD);
- Map<String, Object> requestContext = new HashMap<String, Object>();
+ Map<String, Object> requestContext = new HashMap<>();
exchange.getIn().setHeader("soapAction", "urn:hello:world");
exchange.getIn().setHeader("MyFruitHeader", "peach");
@@ -211,16 +211,16 @@ public class DefaultCxfBindingTest extends Assert {
Exchange exchange = new DefaultExchange(context);
org.apache.cxf.message.Exchange cxfExchange = new org.apache.cxf.message.ExchangeImpl();
exchange.setProperty(CxfConstants.DATA_FORMAT_PROPERTY, DataFormat.PAYLOAD);
- Map<String, Object> responseContext = new HashMap<String, Object>();
+ Map<String, Object> responseContext = new HashMap<>();
responseContext.put(org.apache.cxf.message.Message.RESPONSE_CODE, Integer.valueOf(200));
- Map<String, List<String>> headers = new TreeMap<String, List<String>>(String.CASE_INSENSITIVE_ORDER);
+ Map<String, List<String>> headers = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
headers.put("content-type", Arrays.asList("text/xml;charset=UTF-8"));
headers.put("Content-Length", Arrays.asList("241"));
responseContext.put(org.apache.cxf.message.Message.PROTOCOL_HEADERS, headers);
org.apache.cxf.message.Message cxfMessage = new org.apache.cxf.message.MessageImpl();
cxfExchange.setInMessage(cxfMessage);
- Set<Attachment> attachments = new HashSet<Attachment>();
+ Set<Attachment> attachments = new HashSet<>();
AttachmentImpl attachment = new AttachmentImpl("att-1", new DataHandler(new FileDataSource("pom.xml")));
attachment.setHeader("additional-header", "value 1");
attachments.add(attachment);
@@ -245,9 +245,9 @@ public class DefaultCxfBindingTest extends Assert {
Exchange exchange = new DefaultExchange(context);
org.apache.cxf.message.Exchange cxfExchange = new org.apache.cxf.message.ExchangeImpl();
exchange.setProperty(CxfConstants.DATA_FORMAT_PROPERTY, DataFormat.PAYLOAD);
- Map<String, Object> responseContext = new HashMap<String, Object>();
+ Map<String, Object> responseContext = new HashMap<>();
responseContext.put(org.apache.cxf.message.Message.RESPONSE_CODE, Integer.valueOf(200));
- Map<String, List<String>> headers = new TreeMap<String, List<String>>(String.CASE_INSENSITIVE_ORDER);
+ Map<String, List<String>> headers = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
responseContext.put(org.apache.cxf.message.Message.PROTOCOL_HEADERS, headers);
org.apache.cxf.message.Message cxfMessage = new org.apache.cxf.message.MessageImpl();
cxfExchange.setInMessage(cxfMessage);
@@ -314,7 +314,7 @@ public class DefaultCxfBindingTest extends Assert {
org.apache.cxf.message.Exchange cxfExchange = new org.apache.cxf.message.ExchangeImpl();
exchange.setProperty(CxfConstants.DATA_FORMAT_PROPERTY, DataFormat.PAYLOAD);
org.apache.cxf.message.Message cxfMessage = new org.apache.cxf.message.MessageImpl();
- Map<String, List<String>> headers = new TreeMap<String, List<String>>(String.CASE_INSENSITIVE_ORDER);
+ Map<String, List<String>> headers = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
headers.put("content-type", Arrays.asList("text/xml;charset=UTF-8"));
headers.put("Content-Length", Arrays.asList("241"));
headers.put("soapAction", Arrays.asList("urn:hello:world"));
@@ -322,7 +322,7 @@ public class DefaultCxfBindingTest extends Assert {
headers.put("mybrewheader", Arrays.asList("cappuccino", "espresso"));
cxfMessage.put(org.apache.cxf.message.Message.PROTOCOL_HEADERS, headers);
- Set<Attachment> attachments = new HashSet<Attachment>();
+ Set<Attachment> attachments = new HashSet<>();
AttachmentImpl attachment = new AttachmentImpl("att-1", new DataHandler(new FileDataSource("pom.xml")));
attachment.setHeader("attachment-header", "value 1");
attachments.add(attachment);
@@ -356,7 +356,7 @@ public class DefaultCxfBindingTest extends Assert {
org.apache.cxf.message.Exchange cxfExchange = new org.apache.cxf.message.ExchangeImpl();
exchange.setProperty(CxfConstants.DATA_FORMAT_PROPERTY, DataFormat.PAYLOAD);
org.apache.cxf.message.Message cxfMessage = new org.apache.cxf.message.MessageImpl();
- Map<String, List<String>> headers = new TreeMap<String, List<String>>(String.CASE_INSENSITIVE_ORDER);
+ Map<String, List<String>> headers = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
headers.put("myfruitheader", Arrays.asList("peach"));
headers.put("mybrewheader", Arrays.asList("cappuccino", "espresso"));
cxfMessage.put(org.apache.cxf.message.Message.PROTOCOL_HEADERS, headers);
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/FailOverFeatureTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/FailOverFeatureTest.java
index 6c9b1be..6d1f74b 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/FailOverFeatureTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/FailOverFeatureTest.java
@@ -105,7 +105,7 @@ public class FailOverFeatureTest {
public void configure() {
String alt = SERVICE_ADDRESS;
- List<String> serviceList = new ArrayList<String>();
+ List<String> serviceList = new ArrayList<>();
serviceList.add(alt);
RandomStrategy strategy = new RandomStrategy();
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/LoadDistributorFeatureTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/LoadDistributorFeatureTest.java
index 461aa30..d8dd722 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/LoadDistributorFeatureTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/LoadDistributorFeatureTest.java
@@ -109,7 +109,7 @@ public class LoadDistributorFeatureTest {
ctx.addRoutes(new RouteBuilder() {
public void configure() {
- List<String> serviceList = new ArrayList<String>();
+ List<String> serviceList = new ArrayList<>();
serviceList.add(SERVICE_ADDRESS_1);
serviceList.add(SERVICE_ADDRESS_2);
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/converter/ConverterTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/converter/ConverterTest.java
index b3a7d09..d94aa8d 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/converter/ConverterTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/converter/ConverterTest.java
@@ -46,7 +46,7 @@ public class ConverterTest extends Assert {
@Test
public void testToArray() throws Exception {
- List<String> testList = new ArrayList<String>();
+ List<String> testList = new ArrayList<>();
testList.add("string 1");
testList.add("string 2");
@@ -91,7 +91,7 @@ public class ConverterTest extends Assert {
DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder();
Document document = documentBuilder.parse(file);
document.getDocumentElement().normalize();
- List<Element> elements = new ArrayList<Element>();
+ List<Element> elements = new ArrayList<>();
elements.add(document.getDocumentElement());
nl = new NodeListWrapper(elements);
list.clear();
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/converter/CxfPayloadConverterTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/converter/CxfPayloadConverterTest.java
index 7ec06a2..43155d1 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/converter/CxfPayloadConverterTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/converter/CxfPayloadConverterTest.java
@@ -63,13 +63,13 @@ public class CxfPayloadConverterTest extends ExchangeTestSupport {
DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder();
document = documentBuilder.parse(file);
document.getDocumentElement().normalize();
- List<Source> body = new ArrayList<Source>();
+ List<Source> body = new ArrayList<>();
body.add(new DOMSource(document.getDocumentElement()));
- List<Source> staxbody = new ArrayList<Source>();
+ List<Source> staxbody = new ArrayList<>();
staxbody.add(new StAXSource(StaxUtils.createXMLStreamReader(new FileInputStream(file), "utf-8")));
- payload = new CxfPayload<String[]>(new ArrayList<String[]>(), body, null);
- emptyPayload = new CxfPayload<String[]>(new ArrayList<String[]>(), new ArrayList<Source>(), null);
- staxpayload = new CxfPayload<String[]>(new ArrayList<String[]>(), staxbody, null);
+ payload = new CxfPayload<>(new ArrayList<String[]>(), body, null);
+ emptyPayload = new CxfPayload<>(new ArrayList<String[]>(), new ArrayList<Source>(), null);
+ staxpayload = new CxfPayload<>(new ArrayList<String[]>(), staxbody, null);
inputStream = new FileInputStream(file);
}
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/cxfbean/CxfBeanTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/cxfbean/CxfBeanTest.java
index 0c3a4ac..0ea7790 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/cxfbean/CxfBeanTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/cxfbean/CxfBeanTest.java
@@ -261,10 +261,10 @@ public class CxfBeanTest extends AbstractJUnit4SpringContextTests {
.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
"http://localhost:" + CXFTestSupport.getPort1() + "/CxfBeanTest/PersonService/");
- Holder<String> personId = new Holder<String>();
+ Holder<String> personId = new Holder<>();
personId.value = "hello";
- Holder<String> ssn = new Holder<String>();
- Holder<String> name = new Holder<String>();
+ Holder<String> ssn = new Holder<>();
+ Holder<String> name = new Holder<>();
client.getPerson(personId, ssn, name);
assertEquals("Get a wrong personId", "hello", personId.value);
assertEquals("Get a wrong SSN", "000-000-0000", ssn.value);
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/holder/CxfHolderConsumerTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/holder/CxfHolderConsumerTest.java
index dca697a..a7a183e 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/holder/CxfHolderConsumerTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/holder/CxfHolderConsumerTest.java
@@ -51,9 +51,9 @@ public class CxfHolderConsumerTest extends CamelTestSupport {
MyOrderEndpoint client = (MyOrderEndpoint) proxyFactory.create();
- Holder<String> strPart = new Holder<String>();
+ Holder<String> strPart = new Holder<>();
strPart.value = "parts";
- Holder<String> strCustomer = new Holder<String>();
+ Holder<String> strCustomer = new Holder<>();
strCustomer.value = "";
String result = client.myOrder(strPart, 2, strCustomer);
@@ -72,7 +72,7 @@ public class CxfHolderConsumerTest extends CamelTestSupport {
MyOrderEndpoint client = (MyOrderEndpoint) proxyFactory.create();
- Holder<String> header = new Holder<String>();
+ Holder<String> header = new Holder<>();
header.value = "parts";
String result = client.mySecureOrder(1, header);
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpointTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpointTest.java
index 0ae208e..91a3415 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpointTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpointTest.java
@@ -86,7 +86,7 @@ public class CxfRsEndpointTest extends CamelTestSupport {
CxfRsComponent component = new CxfRsComponent(context);
CxfRsEndpoint endpoint = (CxfRsEndpoint)component.createEndpoint(endpointUri);
- JSONProvider<?> jsonProvider = new JSONProvider<Object>();
+ JSONProvider<?> jsonProvider = new JSONProvider<>();
jsonProvider.setDropRootElement(true);
jsonProvider.setSupportUnwrapped(true);
endpoint.setProvider(jsonProvider);
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerTest.java
index 7ec6f9d..b21b0db 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerTest.java
@@ -393,7 +393,7 @@ public class CxfRsProducerTest extends CamelSpringTestSupport {
inMessage.setHeader(CxfConstants.CAMEL_CXF_RS_RESPONSE_CLASS, InputStream.class);
// override the parameter setting from URI
// START SNIPPET: QueryMapExample
- Map<String, String> queryMap = new LinkedHashMap<String, String>();
+ Map<String, String> queryMap = new LinkedHashMap<>();
queryMap.put("q1", "new");
queryMap.put("q2", "world");
inMessage.setHeader(CxfConstants.CAMEL_CXF_RS_QUERY_MAP, queryMap);
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/DataFormatProviderTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/DataFormatProviderTest.java
index b591ce5..805b472 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/DataFormatProviderTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/DataFormatProviderTest.java
@@ -37,7 +37,7 @@ public class DataFormatProviderTest extends Assert {
@Test
public void testIsReadableWriteableSpecificMatch() {
- DataFormatProvider<Book> p = new DataFormatProvider<Book>();
+ DataFormatProvider<Book> p = new DataFormatProvider<>();
p.setFormat("text/plain", new TestDataFormat());
assertTrue(p.isReadable(Book.class, Book.class, new Annotation[] {}, MediaType.TEXT_PLAIN_TYPE));
assertTrue(p.isWriteable(Book.class, Book.class, new Annotation[] {}, MediaType.TEXT_PLAIN_TYPE));
@@ -45,7 +45,7 @@ public class DataFormatProviderTest extends Assert {
@Test
public void testIsReadableWriteableComplexSubMatch() {
- DataFormatProvider<Book> p = new DataFormatProvider<Book>();
+ DataFormatProvider<Book> p = new DataFormatProvider<>();
p.setFormat("text/plain", new TestDataFormat());
assertTrue(p.isReadable(Book.class, Book.class, new Annotation[] {},
MediaType.valueOf("text/plain+v2")));
@@ -55,7 +55,7 @@ public class DataFormatProviderTest extends Assert {
@Test
public void testIsReadableWriteableStarMatch() {
- DataFormatProvider<Book> p = new DataFormatProvider<Book>();
+ DataFormatProvider<Book> p = new DataFormatProvider<>();
p.setFormat(new TestDataFormat());
assertTrue(p.isReadable(Book.class, Book.class, new Annotation[] {}, MediaType.TEXT_PLAIN_TYPE));
assertTrue(p.isWriteable(Book.class, Book.class, new Annotation[] {}, MediaType.TEXT_PLAIN_TYPE));
@@ -63,7 +63,7 @@ public class DataFormatProviderTest extends Assert {
@Test
public void testNotReadableWriteable() {
- DataFormatProvider<Book> p = new DataFormatProvider<Book>();
+ DataFormatProvider<Book> p = new DataFormatProvider<>();
p.setFormat("application/json", new TestDataFormat());
assertFalse(p.isReadable(Book.class, Book.class, new Annotation[] {}, MediaType.TEXT_PLAIN_TYPE));
assertFalse(p.isWriteable(Book.class, Book.class, new Annotation[] {}, MediaType.TEXT_PLAIN_TYPE));
@@ -71,7 +71,7 @@ public class DataFormatProviderTest extends Assert {
@Test
public void testReadFrom() throws Exception {
- DataFormatProvider<Book> p = new DataFormatProvider<Book>();
+ DataFormatProvider<Book> p = new DataFormatProvider<>();
p.setFormat("text/plain", new TestDataFormat());
ByteArrayInputStream bis = new ByteArrayInputStream("dataformat".getBytes());
@@ -82,7 +82,7 @@ public class DataFormatProviderTest extends Assert {
@Test
public void testWriteTo() throws Exception {
- DataFormatProvider<Book> p = new DataFormatProvider<Book>();
+ DataFormatProvider<Book> p = new DataFormatProvider<>();
p.setFormat("text/plain", new TestDataFormat());
ByteArrayOutputStream bos = new ByteArrayOutputStream();
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBindingTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBindingTest.java
index a14900e..265bae2 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBindingTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBindingTest.java
@@ -59,7 +59,7 @@ public class DefaultCxfRsBindingTest extends Assert {
Exchange exchange = new DefaultExchange(context);
Message camelMessage = new DefaultMessage(context);
org.apache.cxf.message.Message cxfMessage = new MessageImpl();
- Map<String, List<String>> headers = new HashMap<String, List<String>>();
+ Map<String, List<String>> headers = new HashMap<>();
headers.put("emptyList", Collections.<String>emptyList());
headers.put("zeroSizeList", new ArrayList<String>(0));
cxfMessage.put(org.apache.cxf.message.Message.PROTOCOL_HEADERS, headers);
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingTest.java
index be3c9d8..ec3a4a2 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingTest.java
@@ -120,7 +120,7 @@ public class CxfRsConsumerSimpleBindingTest extends CamelTestSupport {
assertEquals(MessageContentsList.class, exchange.getIn().getBody().getClass());
assertEquals(0, exchange.getIn().getBody(MessageContentsList.class).size());
CustomerList response = new CustomerList();
- List<Customer> list = new ArrayList<Customer>(2);
+ List<Customer> list = new ArrayList<>(2);
list.add(new Customer(123, "Raul"));
list.add(new Customer(456, "Raul2"));
response.setCustomers(list);
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/Order.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/Order.java
index 1ed7e1c..ecb090b 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/Order.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/Order.java
@@ -32,7 +32,7 @@ import javax.xml.bind.annotation.XmlRootElement;
public class Order {
private long id;
private String description;
- private Map<Long, Product> products = new HashMap<Long, Product>();
+ private Map<Long, Product> products = new HashMap<>();
public Order() {
init();
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerService.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerService.java
index c051948..86fe90d 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerService.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerService.java
@@ -40,8 +40,8 @@ import org.apache.cxf.common.util.StringUtils;
@Path("/customerservice/")
public class CustomerService {
private final AtomicLong currentId = new AtomicLong(123L);
- private final Map<Long, Customer> customers = new ConcurrentHashMap<Long, Customer>();
- private final Map<Long, Order> orders = new ConcurrentHashMap<Long, Order>();
+ private final Map<Long, Customer> customers = new ConcurrentHashMap<>();
+ private final Map<Long, Order> orders = new ConcurrentHashMap<>();
public CustomerService() {
init();
@@ -67,7 +67,7 @@ public class CustomerService {
@Path("/customers/")
@Produces("application/xml")
public List<Customer> getCustomers() {
- List<Customer> list = new ArrayList<Customer>(customers.values());
+ List<Customer> list = new ArrayList<>(customers.values());
return list;
}
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Order.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Order.java
index 2e2728c..d10046a 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Order.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Order.java
@@ -32,7 +32,7 @@ import javax.xml.bind.annotation.XmlRootElement;
public class Order {
private long id;
private String description;
- private Map<Long, Product> products = new HashMap<Long, Product>();
+ private Map<Long, Product> products = new HashMap<>();
public Order() {
init();
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfJavaMtomProducerPayloadTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfJavaMtomProducerPayloadTest.java
index eb66996..3a9ca27 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfJavaMtomProducerPayloadTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfJavaMtomProducerPayloadTest.java
@@ -36,8 +36,8 @@ public class CxfJavaMtomProducerPayloadTest extends CxfMtomConsumerTest {
return;
}
- final Holder<byte[]> photo = new Holder<byte[]>("RequestFromCXF".getBytes("UTF-8"));
- final Holder<Image> image = new Holder<Image>(getImage("/java.jpg"));
+ final Holder<byte[]> photo = new Holder<>("RequestFromCXF".getBytes("UTF-8"));
+ final Holder<Image> image = new Holder<>(getImage("/java.jpg"));
Exchange exchange = context.createProducerTemplate().send(MTOM_ENDPOINT_URI_MTOM_ENABLE, new Processor() {
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerPayloadModeTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerPayloadModeTest.java
index de49ff1..3d52e64 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerPayloadModeTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerPayloadModeTest.java
@@ -71,9 +71,9 @@ public class CxfMtomConsumerPayloadModeTest extends AbstractJUnit4SpringContextT
public void process(Exchange exchange) throws Exception {
exchange.setPattern(ExchangePattern.InOut);
assertEquals("Get a wrong Content-Type header", "application/xop+xml", exchange.getIn().getHeader("Content-Type"));
- List<Source> elements = new ArrayList<Source>();
+ List<Source> elements = new ArrayList<>();
elements.add(new DOMSource(StaxUtils.read(new StringReader(getRequestMessage())).getDocumentElement()));
- CxfPayload<SoapHeader> body = new CxfPayload<SoapHeader>(new ArrayList<SoapHeader>(),
+ CxfPayload<SoapHeader> body = new CxfPayload<>(new ArrayList<SoapHeader>(),
elements, null);
exchange.getIn().setBody(body);
exchange.getIn().addAttachment(MtomTestHelper.REQ_PHOTO_CID,
@@ -95,7 +95,7 @@ public class CxfMtomConsumerPayloadModeTest extends AbstractJUnit4SpringContextT
// verify request
assertEquals(1, in.getBody().size());
- Map<String, String> ns = new HashMap<String, String>();
+ Map<String, String> ns = new HashMap<>();
ns.put("ns", MtomTestHelper.SERVICE_TYPES_NS);
ns.put("xop", MtomTestHelper.XOP_NS);
@@ -120,9 +120,9 @@ public class CxfMtomConsumerPayloadModeTest extends AbstractJUnit4SpringContextT
MtomTestHelper.assertEquals(MtomTestHelper.requestJpeg, IOUtils.readBytesFromStream(dr.getInputStream()));
// create response
- List<Source> elements = new ArrayList<Source>();
+ List<Source> elements = new ArrayList<>();
elements.add(new DOMSource(StaxUtils.read(new StringReader(MtomTestHelper.RESP_MESSAGE)).getDocumentElement()));
- CxfPayload<SoapHeader> sbody = new CxfPayload<SoapHeader>(new ArrayList<SoapHeader>(),
+ CxfPayload<SoapHeader> sbody = new CxfPayload<>(new ArrayList<SoapHeader>(),
elements, null);
exchange.getOut().setBody(sbody);
exchange.getOut().addAttachment(MtomTestHelper.RESP_PHOTO_CID,
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerTest.java
index 6503c80..5e09516 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerTest.java
@@ -99,8 +99,8 @@ public class CxfMtomConsumerTest extends CamelTestSupport {
return;
}
- Holder<byte[]> photo = new Holder<byte[]>("RequestFromCXF".getBytes("UTF-8"));
- Holder<Image> image = new Holder<Image>(getImage("/java.jpg"));
+ Holder<byte[]> photo = new Holder<>("RequestFromCXF".getBytes("UTF-8"));
+ Holder<Image> image = new Holder<>(getImage("/java.jpg"));
Hello port = getPort();
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledConsumerPayloadModeTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledConsumerPayloadModeTest.java
index f681de6..78083c6 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledConsumerPayloadModeTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledConsumerPayloadModeTest.java
@@ -68,9 +68,9 @@ public class CxfMtomDisabledConsumerPayloadModeTest extends CxfMtomConsumerPaylo
MtomTestHelper.assertEquals(MtomTestHelper.requestJpeg, IOUtils.readBytesFromStream(dr.getInputStream()));
// create response
- List<Source> elements = new ArrayList<Source>();
+ List<Source> elements = new ArrayList<>();
elements.add(new DOMSource(StaxUtils.read(new StringReader(MtomTestHelper.MTOM_DISABLED_RESP_MESSAGE)).getDocumentElement()));
- CxfPayload<SoapHeader> body = new CxfPayload<SoapHeader>(new ArrayList<SoapHeader>(),
+ CxfPayload<SoapHeader> body = new CxfPayload<>(new ArrayList<SoapHeader>(),
elements, null);
exchange.getOut().setBody(body);
exchange.getOut().addAttachment(MtomTestHelper.RESP_PHOTO_CID,
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledProducerPayloadModeTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledProducerPayloadModeTest.java
index 2ec2b24..4c24d08 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledProducerPayloadModeTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledProducerPayloadModeTest.java
@@ -80,9 +80,9 @@ public class CxfMtomDisabledProducerPayloadModeTest extends CxfMtomProducerPaylo
public void process(Exchange exchange) throws Exception {
exchange.setPattern(ExchangePattern.InOut);
- List<Source> elements = new ArrayList<Source>();
+ List<Source> elements = new ArrayList<>();
elements.add(new DOMSource(StaxUtils.read(new StringReader(MtomTestHelper.MTOM_DISABLED_REQ_MESSAGE)).getDocumentElement()));
- CxfPayload<SoapHeader> body = new CxfPayload<SoapHeader>(new ArrayList<SoapHeader>(),
+ CxfPayload<SoapHeader> body = new CxfPayload<>(new ArrayList<SoapHeader>(),
elements, null);
exchange.getIn().setBody(body);
exchange.getIn().addAttachment(MtomTestHelper.REQ_PHOTO_CID,
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomPOJOProducerTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomPOJOProducerTest.java
index a8e0f0d..22cc34f 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomPOJOProducerTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomPOJOProducerTest.java
@@ -74,8 +74,8 @@ public class CxfMtomPOJOProducerTest extends AbstractJUnit4SpringContextTests {
return;
}
- final Holder<byte[]> photo = new Holder<byte[]>(MtomTestHelper.REQ_PHOTO_DATA);
- final Holder<Image> image = new Holder<Image>(getImage("/java.jpg"));
+ final Holder<byte[]> photo = new Holder<>(MtomTestHelper.REQ_PHOTO_DATA);
+ final Holder<Image> image = new Holder<>(getImage("/java.jpg"));
Exchange exchange = context.createProducerTemplate().send("direct://testEndpoint", new Processor() {
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java
index 794e39e..3b18e09 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java
@@ -96,9 +96,9 @@ public class CxfMtomProducerPayloadModeTest extends AbstractJUnit4SpringContextT
public void process(Exchange exchange) throws Exception {
exchange.setPattern(ExchangePattern.InOut);
- List<Source> elements = new ArrayList<Source>();
+ List<Source> elements = new ArrayList<>();
elements.add(new DOMSource(StaxUtils.read(new StringReader(MtomTestHelper.REQ_MESSAGE)).getDocumentElement()));
- CxfPayload<SoapHeader> body = new CxfPayload<SoapHeader>(new ArrayList<SoapHeader>(),
+ CxfPayload<SoapHeader> body = new CxfPayload<>(new ArrayList<SoapHeader>(),
elements, null);
exchange.getIn().setBody(body);
exchange.getIn().addAttachment(MtomTestHelper.REQ_PHOTO_CID,
@@ -116,7 +116,7 @@ public class CxfMtomProducerPayloadModeTest extends AbstractJUnit4SpringContextT
CxfPayload<SoapHeader> out = exchange.getOut().getBody(CxfPayload.class);
Assert.assertEquals(1, out.getBody().size());
- Map<String, String> ns = new HashMap<String, String>();
+ Map<String, String> ns = new HashMap<>();
ns.put("ns", MtomTestHelper.SERVICE_TYPES_NS);
ns.put("xop", MtomTestHelper.XOP_NS);
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterPayloadModeTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterPayloadModeTest.java
index 04fd568..7c141e1 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterPayloadModeTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterPayloadModeTest.java
@@ -76,8 +76,8 @@ public class CxfMtomRouterPayloadModeTest extends AbstractJUnit4SpringContextTes
return;
}
- Holder<byte[]> photo = new Holder<byte[]>(MtomTestHelper.REQ_PHOTO_DATA);
- Holder<Image> image = new Holder<Image>(getImage("/java.jpg"));
+ Holder<byte[]> photo = new Holder<>(MtomTestHelper.REQ_PHOTO_DATA);
+ Holder<Image> image = new Holder<>(getImage("/java.jpg"));
Hello port = getPort();
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/multipart/CXFMultiPartTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/multipart/CXFMultiPartTest.java
index 34b3570..17b7635 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/multipart/CXFMultiPartTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/multipart/CXFMultiPartTest.java
@@ -97,8 +97,8 @@ public class CXFMultiPartTest extends CamelTestSupport {
e0.setV(in0);
e1.setV(in1);
- javax.xml.ws.Holder<InE> h = new javax.xml.ws.Holder<InE>();
- javax.xml.ws.Holder<InE> h1 = new javax.xml.ws.Holder<InE>();
+ javax.xml.ws.Holder<InE> h = new javax.xml.ws.Holder<>();
+ javax.xml.ws.Holder<InE> h1 = new javax.xml.ws.Holder<>();
multiPartClient.foo(e0, e1, h, h1);
return h.value.getV() + " " + h1.value.getV();
}
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java
index 696eadd..d5d7e0a 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java
@@ -165,8 +165,8 @@ public class CxfMessageHeadersRelayTest extends AbstractJUnit4SpringContextTests
OutHeader me = new OutHeader();
me.setRequestType("CXF user");
- Holder<OutHeaderResponse> result = new Holder<OutHeaderResponse>(new OutHeaderResponse());
- Holder<SOAPHeaderData> header = new Holder<SOAPHeaderData>(new SOAPHeaderData());
+ Holder<OutHeaderResponse> result = new Holder<>(new OutHeaderResponse());
+ Holder<SOAPHeaderData> header = new Holder<>(new SOAPHeaderData());
proxy.outHeader(me, result, header);
assertTrue("Expected in band header to propagate but it didn't",
result.value.getResponseType().equals("pass"));
@@ -185,7 +185,7 @@ public class CxfMessageHeadersRelayTest extends AbstractJUnit4SpringContextTests
"http://localhost:" + portE1 + "/CxfMessageHeadersRelayTest/HeaderService/");
InoutHeader me = new InoutHeader();
me.setRequestType("CXF user");
- Holder<SOAPHeaderData> header = new Holder<SOAPHeaderData>(Constants.IN_OUT_REQUEST_HEADER_DATA);
+ Holder<SOAPHeaderData> header = new Holder<>(Constants.IN_OUT_REQUEST_HEADER_DATA);
InoutHeaderResponse result = proxy.inoutHeader(me, header);
assertTrue("Expected in band header to propagate but it didn't",
result.getResponseType().equals("pass"));
@@ -365,8 +365,8 @@ public class CxfMessageHeadersRelayTest extends AbstractJUnit4SpringContextTests
"http://localhost:" + portE3 + "/CxfMessageHeadersRelayTest/HeaderService/");
OutHeader me = new OutHeader();
me.setRequestType("CXF user");
- Holder<OutHeaderResponse> result = new Holder<OutHeaderResponse>(new OutHeaderResponse());
- Holder<SOAPHeaderData> header = new Holder<SOAPHeaderData>(new SOAPHeaderData());
+ Holder<OutHeaderResponse> result = new Holder<>(new OutHeaderResponse());
+ Holder<SOAPHeaderData> header = new Holder<>(new SOAPHeaderData());
try {
proxy.outHeader(me, result, header);
} catch (Exception e) {
@@ -388,7 +388,7 @@ public class CxfMessageHeadersRelayTest extends AbstractJUnit4SpringContextTests
"http://localhost:" + portE3 + "/CxfMessageHeadersRelayTest/HeaderService/");
InoutHeader me = new InoutHeader();
me.setRequestType("CXF user");
- Holder<SOAPHeaderData> header = new Holder<SOAPHeaderData>(Constants.IN_OUT_REQUEST_HEADER_DATA);
+ Holder<SOAPHeaderData> header = new Holder<>(Constants.IN_OUT_REQUEST_HEADER_DATA);
InoutHeaderResponse result = null;
try {
result = proxy.inoutHeader(me, header);
@@ -413,12 +413,12 @@ public class CxfMessageHeadersRelayTest extends AbstractJUnit4SpringContextTests
+ "</message></ns2:SOAPHeaderInfo>";
String requestBody = "<ns2:inoutHeader xmlns:ns2=\"http://apache.org/camel/component/cxf/soap/headers\">"
+ "<requestType>CXF user</requestType></ns2:inoutHeader>";
- List<Source> elements = new ArrayList<Source>();
+ List<Source> elements = new ArrayList<>();
elements.add(new DOMSource(StaxUtils.read(new StringReader(requestBody)).getDocumentElement()));
- final List<SoapHeader> headers = new ArrayList<SoapHeader>();
+ final List<SoapHeader> headers = new ArrayList<>();
headers.add(new SoapHeader(qname,
StaxUtils.read(new StringReader(requestHeader)).getDocumentElement()));
- final CxfPayload<SoapHeader> cxfPayload = new CxfPayload<SoapHeader>(headers, elements, null);
+ final CxfPayload<SoapHeader> cxfPayload = new CxfPayload<>(headers, elements, null);
Exchange exchange = template.request(uri, new Processor() {
public void process(Exchange exchange) throws Exception {
@@ -491,7 +491,7 @@ public class CxfMessageHeadersRelayTest extends AbstractJUnit4SpringContextTests
protected void doTestInOutOfBandHeaderCamelTemplate(String producerUri) throws Exception {
// START SNIPPET: sending
Exchange senderExchange = new DefaultExchange(context, ExchangePattern.InOut);
- final List<Object> params = new ArrayList<Object>();
+ final List<Object> params = new ArrayList<>();
Me me = new Me();
me.setFirstName("john");
me.setLastName("Doh");
@@ -501,7 +501,7 @@ public class CxfMessageHeadersRelayTest extends AbstractJUnit4SpringContextTests
senderExchange.getIn().setHeader(CxfConstants.OPERATION_NAME, "inOutOfBandHeader");
List<Header> headers = buildOutOfBandHeaderList(false);
- Map<String, Object> requestContext = new HashMap<String, Object>();
+ Map<String, Object> requestContext = new HashMap<>();
requestContext.put(Header.HEADER_LIST, headers);
senderExchange.getIn().setHeader(Client.REQUEST_CONTEXT, requestContext);
@@ -519,7 +519,7 @@ public class CxfMessageHeadersRelayTest extends AbstractJUnit4SpringContextTests
protected void doTestOutOutOfBandHeaderCamelTemplate(String producerUri) throws Exception {
// START SNIPPET: sending
Exchange senderExchange = new DefaultExchange(context, ExchangePattern.InOut);
- final List<Object> params = new ArrayList<Object>();
+ final List<Object> params = new ArrayList<>();
Me me = new Me();
me.setFirstName("john");
me.setLastName("Doh");
@@ -543,7 +543,7 @@ public class CxfMessageHeadersRelayTest extends AbstractJUnit4SpringContextTests
public void doTestInOutOutOfBandHeaderCamelTemplate(String producerUri) throws Exception {
// START SNIPPET: sending
Exchange senderExchange = new DefaultExchange(context, ExchangePattern.InOut);
- final List<Object> params = new ArrayList<Object>();
+ final List<Object> params = new ArrayList<>();
Me me = new Me();
me.setFirstName("john");
me.setLastName("Doh");
@@ -553,7 +553,7 @@ public class CxfMessageHeadersRelayTest extends AbstractJUnit4SpringContextTests
senderExchange.getIn().setHeader(CxfConstants.OPERATION_NAME, "inoutOutOfBandHeader");
List<Header> inHeaders = buildOutOfBandHeaderList(false);
- Map<String, Object> requestContext = new HashMap<String, Object>();
+ Map<String, Object> requestContext = new HashMap<>();
requestContext.put(Header.HEADER_LIST, inHeaders);
senderExchange.getIn().setHeader(Client.REQUEST_CONTEXT, requestContext);
@@ -640,13 +640,13 @@ public class CxfMessageHeadersRelayTest extends AbstractJUnit4SpringContextTests
hdr.setMustUnderstand(invalid);
- List<Header> headers = new ArrayList<Header>();
+ List<Header> headers = new ArrayList<>();
headers.add(hdr);
return headers;
}
protected static void validateReturnedOutOfBandHeaderWithInsertion(Map<String, Object> responseContext, boolean expect) {
- List<OutofBandHeader> hdrToTest = new ArrayList<OutofBandHeader>();
+ List<OutofBandHeader> hdrToTest = new ArrayList<>();
List<Header> oobHdr = CastUtils.cast((List<?>)responseContext.get(Header.HEADER_LIST));
if (!expect) {
if (oobHdr == null || (oobHdr != null && oobHdr.size() == 0)) {
@@ -723,7 +723,7 @@ public class CxfMessageHeadersRelayTest extends AbstractJUnit4SpringContextTests
List<SoapHeader> soapHeaders = CastUtils.cast((List<?>)exchange.getIn().getHeader(Header.HEADER_LIST));
if (soapHeaders == null) {
// we just create a new soap headers in case the header is null
- soapHeaders = new ArrayList<SoapHeader>();
+ soapHeaders = new ArrayList<>();
}
// Insert a new header
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterImpl.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterImpl.java
index 085115a..e9aa325 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterImpl.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterImpl.java
@@ -161,7 +161,7 @@ public class HeaderTesterImpl implements HeaderTester {
ob.setName("testOobReturnHeaderName");
ob.setValue("testOobReturnHeaderValue");
ob.setHdrAttribute("testReturnHdrAttribute");
- JAXBElement<OutofBandHeader> job = new JAXBElement<OutofBandHeader>(
+ JAXBElement<OutofBandHeader> job = new JAXBElement<>(
new QName(Constants.TEST_HDR_NS, Constants.TEST_HDR_RESPONSE_ELEM),
OutofBandHeader.class, null, ob);
Header hdr = new Header(
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeansRouterTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeansRouterTest.java
index b834a6d..abd3553 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeansRouterTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeansRouterTest.java
@@ -74,7 +74,7 @@ public class CxfEndpointBeansRouterTest extends AbstractSpringBeanTestSupport {
Exchange reply = template.request("cxf:bean:serviceEndpoint", new Processor() {
public void process(final Exchange exchange) {
- final List<String> params = new ArrayList<String>();
+ final List<String> params = new ArrayList<>();
params.add("hello");
exchange.getIn().setBody(params);
exchange.getIn().setHeader(CxfConstants.OPERATION_NAME, "echo");
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/ssl/SslGlobalTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/ssl/SslGlobalTest.java
index 67b6f5b..ee75796 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/ssl/SslGlobalTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/ssl/SslGlobalTest.java
@@ -71,7 +71,7 @@ public class SslGlobalTest extends CamelSpringTestSupport {
protected Exchange sendJaxWsMessage(String endpointUri) throws InterruptedException {
Exchange exchange = template.send(endpointUri, new Processor() {
public void process(final Exchange exchange) {
- final List<String> params = new ArrayList<String>();
+ final List<String> params = new ArrayList<>();
params.add(TEST_MESSAGE);
exchange.getIn().setBody(params);
exchange.getIn().setHeader(CxfConstants.OPERATION_NAME, GREET_ME_OPERATION);
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/ssl/SslTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/ssl/SslTest.java
index bb73c7e..2c4c746 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/ssl/SslTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/ssl/SslTest.java
@@ -80,7 +80,7 @@ public class SslTest extends CamelSpringTestSupport {
protected Exchange sendJaxWsMessage(String endpointUri) throws InterruptedException {
Exchange exchange = template.send(endpointUri, new Processor() {
public void process(final Exchange exchange) {
- final List<String> params = new ArrayList<String>();
+ final List<String> params = new ArrayList<>();
params.add(TEST_MESSAGE);
exchange.getIn().setBody(params);
exchange.getIn().setHeader(CxfConstants.OPERATION_NAME, GREET_ME_OPERATION);
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/client/Client.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/client/Client.java
index 27d24fd..3b71410 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/client/Client.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/client/Client.java
@@ -46,7 +46,7 @@ public final class Client {
public static WSS4JOutInterceptor getWSS4JOutInterceptor() throws Exception {
- Map<String, Object> outProps = new HashMap<String, Object>();
+ Map<String, Object> outProps = new HashMap<>();
outProps.put("action", "Signature");
// outProps.put("action", "UsernameToken Timestamp Signature Encrypt");
@@ -80,7 +80,7 @@ public final class Client {
public static WSS4JInInterceptor getWSS4JInInterceptor() throws Exception {
- Map<String, Object> inProps = new HashMap<String, Object>();
+ Map<String, Object> inProps = new HashMap<>();
inProps.put("action", "Signature");
// inProps.put("action", "UsernameToken Timestamp Signature Encrypt");
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/client/UTPasswordCallback.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/client/UTPasswordCallback.java
index cf97dde..98b48ec 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/client/UTPasswordCallback.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/client/UTPasswordCallback.java
@@ -31,7 +31,7 @@ import javax.security.auth.callback.UnsupportedCallbackException;
public class UTPasswordCallback implements CallbackHandler {
private Map<String, String> passwords =
- new HashMap<String, String>();
+ new HashMap<>();
public UTPasswordCallback() {
passwords.put("Alice", "ecilA");
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/server/UTPasswordCallback.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/server/UTPasswordCallback.java
index 91764d6..acdd8b2 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/server/UTPasswordCallback.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wssecurity/server/UTPasswordCallback.java
@@ -31,7 +31,7 @@ import javax.security.auth.callback.UnsupportedCallbackException;
public class UTPasswordCallback implements CallbackHandler {
private Map<String, String> passwords =
- new HashMap<String, String>();
+ new HashMap<>();
public UTPasswordCallback() {
passwords.put("Alice", "ecilA");
--
To stop receiving notification emails like this one, please contact
bvahdat@apache.org.