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 90580cc9e43e13e1f2aa50bc48f188e3bdc440d4
Author: Babak Vahdat <bvah...@apache.org>
AuthorDate: Wed Apr 18 16:51:46 2018 +0200
polish
---
.../apache/camel/component/ldap/LdapProducer.java | 4 +--
.../apache/camel/component/ldif/LdifProducer.java | 2 +-
.../leveldb/LevelDBAggregationRepository.java | 4 +--
.../camel/component/leveldb/LevelDBCamelCodec.java | 2 +-
.../LevelDBAggregateForceCompletionHeaderTest.java | 2 +-
.../LevelDBAggregateLoadAndRecoverTest.java | 2 +-
.../LevelDBAggregateSerializedHeadersTest.java | 2 +-
.../linkedin/api/LinkedInOAuthRequestFilter.java | 2 +-
.../api/AbstractResourceIntegrationTest.java | 2 +-
.../linkedin/AbstractLinkedInTestSupport.java | 2 +-
.../linkedin/CommentsResourceIntegrationTest.java | 2 +-
.../linkedin/CompaniesResourceIntegrationTest.java | 22 +++++++-------
.../ComponentConfigurationIntegrationTest.java | 2 +-
.../linkedin/GroupsResourceIntegrationTest.java | 2 +-
.../linkedin/JobsResourceIntegrationTest.java | 4 +--
.../linkedin/PeopleResourceIntegrationTest.java | 34 +++++++++++-----------
.../linkedin/PostsResourceIntegrationTest.java | 12 ++++----
.../linkedin/SearchResourceIntegrationTest.java | 6 ++--
.../camel/processor/lucene/support/Hits.java | 2 +-
.../lucene/LuceneIndexAndQueryProducerTest.java | 2 +-
.../apache/camel/component/mail/MailBinding.java | 6 ++--
.../apache/camel/component/mail/MailComponent.java | 2 +-
.../camel/component/mail/MailConfiguration.java | 4 +--
.../apache/camel/component/mail/MailConsumer.java | 4 +--
.../camel/component/mail/MailConverters.java | 2 +-
.../apache/camel/component/mail/MailSorter.java | 2 +-
.../component/mail/SplitAttachmentsExpression.java | 2 +-
.../mime/multipart/MimeMultipartDataFormat.java | 2 +-
.../mail/MailAttachmentRedeliveryTest.java | 2 +-
.../camel/component/mail/MailContentTypeTest.java | 2 +-
...aderOverrulePreConfigurationRecipientsTest.java | 2 +-
.../component/mail/MailMimeDecodeHeadersTest.java | 2 +-
.../component/mail/MailMultipleRecipientsTest.java | 2 +-
.../MailMultipleRecipientsUsingHeadersTest.java | 2 +-
.../mail/MailNameAndEmailInRecipientTest.java | 2 +-
.../component/mail/MailProducerConcurrentTest.java | 2 +-
.../mail/MailProducerUnsupportedCharsetTest.java | 4 +--
.../apache/camel/component/mail/MailRouteTest.java | 2 +-
.../camel/component/mail/MailUsingHeadersTest.java | 4 +--
.../camel/component/mail/RawMailMessageTest.java | 2 +-
.../camel/component/mail/mock/MyMockStore.java | 2 +-
.../SslContextParametersMailRouteTest.java | 4 +--
.../multipart/MimeMultipartDataFormatTest.java | 4 +--
.../camel/component/metrics/MetricsType.java | 2 +-
.../camel/component/metrics/CounterRouteTest.java | 2 +-
.../metrics/MetricsComponentRouteTest.java | 4 +--
.../component/metrics/MetricsComponentTest.java | 6 ++--
.../apache/camel/component/mina/MinaEndpoint.java | 2 +-
.../camel/component/mina/MinaFiltersTest.java | 2 +-
.../mina/MinaProducerAnotherConcurrentTest.java | 2 +-
.../component/mina/MinaProducerConcurrentTest.java | 4 +--
.../camel/component/mina2/Mina2FiltersTest.java | 2 +-
.../mina2/Mina2ProducerAnotherConcurrentTest.java | 2 +-
.../mina2/Mina2ProducerConcurrentTest.java | 4 +--
.../camel/component/mllp/MllpConfiguration.java | 5 +++-
.../apache/camel/component/mllp/MllpEndpoint.java | 8 +----
.../component/mllp/MllpTcpClientProducer.java | 2 +-
.../component/mllp/MllpTcpServerConsumer.java | 1 -
.../camel/component/mllp/internal/Hl7Util.java | 1 -
.../component/mllp/internal/MllpSocketBuffer.java | 3 --
.../TcpServerConsumerValidationRunnable.java | 2 --
.../mllp/internal/TcpSocketConsumerRunnable.java | 17 ++---------
.../mllp/Hl7AcknowledgementGenerator.java | 1 -
.../MllpTcpServerConsumerLenientBindTest.java | 2 --
.../MllpAcknowledgementTimeoutExceptionTest.java | 1 -
.../camel/component/mllp/MllpComponentTest.java | 15 ++++------
.../camel/component/mllp/MllpEndpointTest.java | 6 ----
.../camel/component/mllp/MllpExceptionTest.java | 4 ---
...oAcknowledgementWithBridgeErrorHandlerTest.java | 2 --
.../mllp/MllpTcpServerConsumerConnectionTest.java | 2 --
...knowledgementWithoutBridgeErrorHandlerTest.java | 3 --
...umerOptionalEndOfDataWithoutValidationTest.java | 2 --
...rConsumerEndOfDataAndValidationTestSupport.java | 2 +-
.../internal/MllpSocketBufferReadFromTest.java | 2 --
.../mllp/internal/MllpSocketBufferWriteTest.java | 16 +++++-----
.../apache/camel/test/executor/TestExecutor.java | 1 -
.../test/junit/rule/mllp/MllpClientResource.java | 6 ++--
.../test/junit/rule/mllp/MllpServerResource.java | 2 --
.../org/apache/camel/test/tcp/JavaSocketTests.java | 6 ----
.../mongodb/gridfs/GridFsConsumerTest.java | 2 +-
.../gridfs/GridFsProducerOperationsTest.java | 2 +-
.../camel/component/mongodb/MongoDbComponent.java | 2 +-
.../camel/component/mongodb/MongoDbProducer.java | 2 +-
.../component/mongodb/MongoDbConversionsTest.java | 4 +--
.../component/mongodb/MongoDbDynamicityTest.java | 8 ++---
.../mongodb/MongoDbFindOperationTest.java | 2 +-
.../mongodb/MongoDbHeaderHandlingTest.java | 2 +-
.../camel/component/mongodb/MongoDbIndexTest.java | 12 ++++----
.../component/mongodb/MongoDbOutputTypeTest.java | 2 +-
.../camel/component/mongodb3/MongoDbProducer.java | 4 +--
.../MongoDbIdempotentRepositoryTest.java | 2 +-
.../apache/camel/component/mqtt/MQTTEndpoint.java | 4 +--
.../camel/component/mqtt/MQTTDuplicatesTest.java | 4 +--
.../camel/component/mybatis/MyBatisConsumer.java | 2 +-
.../camel/component/mybatis/MyBatisEndpoint.java | 5 ----
.../mybatis/MyBatisConsumerIsolatedTest.java | 2 +-
.../component/mybatis/MyBatisInsertListTest.java | 2 +-
.../camel/component/mybatis/MyBatisInsertTest.java | 4 ---
.../component/mybatis/MyBatisUpdateListTest.java | 2 +-
99 files changed, 159 insertions(+), 228 deletions(-)
diff --git
a/components/camel-ldap/src/main/java/org/apache/camel/component/ldap/LdapProducer.java
b/components/camel-ldap/src/main/java/org/apache/camel/component/ldap/LdapProducer.java
index 8e1e67b..2f47fe9 100644
---
a/components/camel-ldap/src/main/java/org/apache/camel/component/ldap/LdapProducer.java
+++
b/components/camel-ldap/src/main/java/org/apache/camel/component/ldap/LdapProducer.java
@@ -116,7 +116,7 @@ public class LdapProducer extends DefaultProducer {
}
private List<SearchResult> simpleSearch(DirContext ldapContext, String
searchFilter) throws NamingException {
- List<SearchResult> data = new ArrayList<SearchResult>();
+ List<SearchResult> data = new ArrayList<>();
NamingEnumeration<SearchResult> namingEnumeration =
ldapContext.search(searchBase, searchFilter, searchControls);
while (namingEnumeration != null && namingEnumeration.hasMore()) {
data.add(namingEnumeration.next());
@@ -125,7 +125,7 @@ public class LdapProducer extends DefaultProducer {
}
private List<SearchResult> pagedSearch(LdapContext ldapContext, String
searchFilter) throws Exception {
- List<SearchResult> data = new ArrayList<SearchResult>();
+ List<SearchResult> data = new ArrayList<>();
log.trace("Using paged ldap search, pageSize={}", pageSize);
diff --git
a/components/camel-ldif/src/main/java/org/apache/camel/component/ldif/LdifProducer.java
b/components/camel-ldif/src/main/java/org/apache/camel/component/ldif/LdifProducer.java
index c718492..9a76cff 100644
---
a/components/camel-ldif/src/main/java/org/apache/camel/component/ldif/LdifProducer.java
+++
b/components/camel-ldif/src/main/java/org/apache/camel/component/ldif/LdifProducer.java
@@ -106,7 +106,7 @@ public class LdifProducer extends DefaultProducer {
LdapConnection conn = getLdapConnection();
LdifReader ldifReader;
- List<String> results = new ArrayList<String>();
+ List<String> results = new ArrayList<>();
// Create the reader
try {
diff --git
a/components/camel-leveldb/src/main/java/org/apache/camel/component/leveldb/LevelDBAggregationRepository.java
b/components/camel-leveldb/src/main/java/org/apache/camel/component/leveldb/LevelDBAggregationRepository.java
index eea1ad2..633b3e3 100644
---
a/components/camel-leveldb/src/main/java/org/apache/camel/component/leveldb/LevelDBAggregationRepository.java
+++
b/components/camel-leveldb/src/main/java/org/apache/camel/component/leveldb/LevelDBAggregationRepository.java
@@ -193,7 +193,7 @@ public class LevelDBAggregationRepository extends
ServiceSupport implements Reco
}
public Set<String> getKeys() {
- final Set<String> keys = new LinkedHashSet<String>();
+ final Set<String> keys = new LinkedHashSet<>();
// interval task could potentially be running while we are shutting
down so check for that
if (!isRunAllowed()) {
@@ -229,7 +229,7 @@ public class LevelDBAggregationRepository extends
ServiceSupport implements Reco
}
public Set<String> scan(CamelContext camelContext) {
- final Set<String> answer = new LinkedHashSet<String>();
+ final Set<String> answer = new LinkedHashSet<>();
if (!isRunAllowed()) {
return null;
diff --git
a/components/camel-leveldb/src/main/java/org/apache/camel/component/leveldb/LevelDBCamelCodec.java
b/components/camel-leveldb/src/main/java/org/apache/camel/component/leveldb/LevelDBCamelCodec.java
index 4ccf049..f4b55a5 100644
---
a/components/camel-leveldb/src/main/java/org/apache/camel/component/leveldb/LevelDBCamelCodec.java
+++
b/components/camel-leveldb/src/main/java/org/apache/camel/component/leveldb/LevelDBCamelCodec.java
@@ -36,7 +36,7 @@ import org.fusesource.hawtbuf.codec.StringCodec;
public final class LevelDBCamelCodec {
private Codec<String> keyCodec = new StringCodec();
- private Codec<DefaultExchangeHolder> exchangeCodec = new
ObjectCodec<DefaultExchangeHolder>();
+ private Codec<DefaultExchangeHolder> exchangeCodec = new ObjectCodec<>();
public Buffer marshallKey(String key) throws IOException {
DataByteArrayOutputStream baos = new DataByteArrayOutputStream();
diff --git
a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateForceCompletionHeaderTest.java
b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateForceCompletionHeaderTest.java
index 699c7eb..860c628 100644
---
a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateForceCompletionHeaderTest.java
+++
b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateForceCompletionHeaderTest.java
@@ -75,7 +75,7 @@ public class LevelDBAggregateForceCompletionHeaderTest
extends CamelTestSupport
getMockEndpoint("mock:aggregated").expectedPropertyReceived(Exchange.AGGREGATED_COMPLETED_BY,
"force");
//now send a message to trigger completion of all groups, message
should be aggregated
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put("id", "3");
headers.put(Exchange.AGGREGATION_COMPLETE_ALL_GROUPS_INCLUSIVE, true);
template.sendBodyAndHeaders("direct:start", "test5", headers);
diff --git
a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateLoadAndRecoverTest.java
b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateLoadAndRecoverTest.java
index 0f27aa8..1dee396 100644
---
a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateLoadAndRecoverTest.java
+++
b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateLoadAndRecoverTest.java
@@ -55,7 +55,7 @@ public class LevelDBAggregateLoadAndRecoverTest extends
CamelTestSupport {
for (int i = 0; i < SIZE; i++) {
final int value = 1;
char id = 'A';
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put("id", id);
headers.put("seq", i);
LOG.debug("Sending {} with id {}", value, id);
diff --git
a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateSerializedHeadersTest.java
b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateSerializedHeadersTest.java
index 493e922..67f3cec 100644
---
a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateSerializedHeadersTest.java
+++
b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateSerializedHeadersTest.java
@@ -58,7 +58,7 @@ public class LevelDBAggregateSerializedHeadersTest extends
CamelTestSupport {
HeaderDto headerDto = new HeaderDto("test", "company", 1);
char id = 'A';
LOG.debug("Sending {} with id {}", value, id);
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put("id", headerDto);
template.sendBodyAndHeaders("seda:start?size=" + SIZE, value,
headers);
}
diff --git
a/components/camel-linkedin/camel-linkedin-api/src/main/java/org/apache/camel/component/linkedin/api/LinkedInOAuthRequestFilter.java
b/components/camel-linkedin/camel-linkedin-api/src/main/java/org/apache/camel/component/linkedin/api/LinkedInOAuthRequestFilter.java
index d78f095..1a04f30 100644
---
a/components/camel-linkedin/camel-linkedin-api/src/main/java/org/apache/camel/component/linkedin/api/LinkedInOAuthRequestFilter.java
+++
b/components/camel-linkedin/camel-linkedin-api/src/main/java/org/apache/camel/component/linkedin/api/LinkedInOAuthRequestFilter.java
@@ -207,7 +207,7 @@ public final class LinkedInOAuthRequestFilter implements
ClientRequestFilter {
if (redirectQuery == null) {
throw new IllegalArgumentException("Redirect response query is
null, check username, password and permissions");
}
- final Map<String, String> params = new HashMap<String, String>();
+ final Map<String, String> params = new HashMap<>();
final Matcher matcher = QUERY_PARAM_PATTERN.matcher(redirectQuery);
while (matcher.find()) {
params.put(matcher.group(1), matcher.group(2));
diff --git
a/components/camel-linkedin/camel-linkedin-api/src/test/java/org/apache/camel/component/linkedin/api/AbstractResourceIntegrationTest.java
b/components/camel-linkedin/camel-linkedin-api/src/test/java/org/apache/camel/component/linkedin/api/AbstractResourceIntegrationTest.java
index 49b2921..814edb6 100644
---
a/components/camel-linkedin/camel-linkedin-api/src/test/java/org/apache/camel/component/linkedin/api/AbstractResourceIntegrationTest.java
+++
b/components/camel-linkedin/camel-linkedin-api/src/test/java/org/apache/camel/component/linkedin/api/AbstractResourceIntegrationTest.java
@@ -43,7 +43,7 @@ public abstract class AbstractResourceIntegrationTest extends
Assert {
protected static LinkedInOAuthRequestFilter requestFilter;
private static Properties properties;
private static OAuthToken token;
- private static List<Object> resourceList = new ArrayList<Object>();
+ private static List<Object> resourceList = new ArrayList<>();
@BeforeClass
public static void beforeClass() throws Exception {
diff --git
a/components/camel-linkedin/camel-linkedin-component/src/test/java/org/apache/camel/component/linkedin/AbstractLinkedInTestSupport.java
b/components/camel-linkedin/camel-linkedin-component/src/test/java/org/apache/camel/component/linkedin/AbstractLinkedInTestSupport.java
index 4a0ea70..f3e9e16 100644
---
a/components/camel-linkedin/camel-linkedin-component/src/test/java/org/apache/camel/component/linkedin/AbstractLinkedInTestSupport.java
+++
b/components/camel-linkedin/camel-linkedin-component/src/test/java/org/apache/camel/component/linkedin/AbstractLinkedInTestSupport.java
@@ -48,7 +48,7 @@ public class AbstractLinkedInTestSupport extends
CamelTestSupport {
e);
}
- Map<String, Object> options = new HashMap<String, Object>();
+ Map<String, Object> options = new HashMap<>();
for (Map.Entry<Object, Object> entry : properties.entrySet()) {
options.put(entry.getKey().toString(), entry.getValue());
}
diff --git
a/components/camel-linkedin/camel-linkedin-component/src/test/java/org/apache/camel/component/linkedin/CommentsResourceIntegrationTest.java
b/components/camel-linkedin/camel-linkedin-component/src/test/java/org/apache/camel/component/linkedin/CommentsResourceIntegrationTest.java
index e18eb2c..e06faa1 100644
---
a/components/camel-linkedin/camel-linkedin-component/src/test/java/org/apache/camel/component/linkedin/CommentsResourceIntegrationTest.java
+++
b/components/camel-linkedin/camel-linkedin-component/src/test/java/org/apache/camel/component/linkedin/CommentsResourceIntegrationTest.java
@@ -42,7 +42,7 @@ public class CommentsResourceIntegrationTest extends
AbstractLinkedInTestSupport
@Ignore
@Test
public void testGetComment() throws Exception {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelLinkedIn.comment_id", null);
// parameter type is String
diff --git
a/components/camel-linkedin/camel-linkedin-component/src/test/java/org/apache/camel/component/linkedin/CompaniesResourceIntegrationTest.java
b/components/camel-linkedin/camel-linkedin-component/src/test/java/org/apache/camel/component/linkedin/CompaniesResourceIntegrationTest.java
index 604bea7..bbe1a45 100644
---
a/components/camel-linkedin/camel-linkedin-component/src/test/java/org/apache/camel/component/linkedin/CompaniesResourceIntegrationTest.java
+++
b/components/camel-linkedin/camel-linkedin-component/src/test/java/org/apache/camel/component/linkedin/CompaniesResourceIntegrationTest.java
@@ -44,7 +44,7 @@ public class CompaniesResourceIntegrationTest extends
AbstractLinkedInTestSuppor
@Ignore
@Test
public void testAddCompanyUpdateCommentAsCompany() throws Exception {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
headers.put("CamelLinkedIn.company_id", 0L);
// parameter type is String
headers.put("CamelLinkedIn.update_key", null);
@@ -58,7 +58,7 @@ public class CompaniesResourceIntegrationTest extends
AbstractLinkedInTestSuppor
@Ignore
@Test
public void testAddShare() throws Exception {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
headers.put("CamelLinkedIn.company_id", 0L);
// parameter type is
org.apache.camel.component.linkedin.api.model.Share
headers.put("CamelLinkedIn.share", null);
@@ -68,7 +68,7 @@ public class CompaniesResourceIntegrationTest extends
AbstractLinkedInTestSuppor
@Test
public void testGetCompanies() throws Exception {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// use defaults
// parameter type is String
// headers.put("CamelLinkedIn.fields", null);
@@ -85,7 +85,7 @@ public class CompaniesResourceIntegrationTest extends
AbstractLinkedInTestSuppor
@Test
public void testGetCompanyById() throws Exception {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
headers.put("CamelLinkedIn.company_id", TEST_COMPANY_ID);
// use default value
/*
@@ -101,7 +101,7 @@ public class CompaniesResourceIntegrationTest extends
AbstractLinkedInTestSuppor
@Test
public void testGetCompanyByName() throws Exception {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelLinkedIn.universal_name", "linkedin");
// use default fields
@@ -120,7 +120,7 @@ public class CompaniesResourceIntegrationTest extends
AbstractLinkedInTestSuppor
@Ignore
@Test
public void testGetCompanyUpdateComments() throws Exception {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
headers.put("CamelLinkedIn.company_id", 0L);
// parameter type is String
headers.put("CamelLinkedIn.update_key", null);
@@ -139,7 +139,7 @@ public class CompaniesResourceIntegrationTest extends
AbstractLinkedInTestSuppor
@Ignore
@Test
public void testGetCompanyUpdateLikes() throws Exception {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
headers.put("CamelLinkedIn.company_id", 0L);
// parameter type is String
headers.put("CamelLinkedIn.update_key", null);
@@ -156,7 +156,7 @@ public class CompaniesResourceIntegrationTest extends
AbstractLinkedInTestSuppor
@Test
public void testGetCompanyUpdates() throws Exception {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
headers.put("CamelLinkedIn.company_id", TEST_COMPANY_ID);
// parameter type is String
// headers.put("CamelLinkedIn.fields", null);
@@ -179,7 +179,7 @@ public class CompaniesResourceIntegrationTest extends
AbstractLinkedInTestSuppor
@Ignore
@Test
public void testGetHistoricalFollowStatistics() throws Exception {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
headers.put("CamelLinkedIn.company_id", 0L);
// parameter type is Long
headers.put("CamelLinkedIn.start_timestamp", null);
@@ -198,7 +198,7 @@ public class CompaniesResourceIntegrationTest extends
AbstractLinkedInTestSuppor
@Ignore
@Test
public void testGetHistoricalStatusUpdateStatistics() throws Exception {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
headers.put("CamelLinkedIn.company_id", TEST_COMPANY_ID);
// parameter type is Long
headers.put("CamelLinkedIn.start_timestamp", null);
@@ -217,7 +217,7 @@ public class CompaniesResourceIntegrationTest extends
AbstractLinkedInTestSuppor
@Test
public void testGetNumberOfFollowers() throws Exception {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
headers.put("CamelLinkedIn.company_id", TEST_COMPANY_ID);
// parameter type is java.util.List
headers.put("CamelLinkedIn.geos", null);
diff --git
a/components/camel-linkedin/camel-linkedin-component/src/test/java/org/apache/camel/component/linkedin/ComponentConfigurationIntegrationTest.java
b/components/camel-linkedin/camel-linkedin-component/src/test/java/org/apache/camel/component/linkedin/ComponentConfigurationIntegrationTest.java
index a6d2403..04c836f 100644
---
a/components/camel-linkedin/camel-linkedin-component/src/test/java/org/apache/camel/component/linkedin/ComponentConfigurationIntegrationTest.java
+++
b/components/camel-linkedin/camel-linkedin-component/src/test/java/org/apache/camel/component/linkedin/ComponentConfigurationIntegrationTest.java
@@ -48,7 +48,7 @@ public class ComponentConfigurationIntegrationTest extends
AbstractLinkedInTestS
@Test
public void testGetComment() throws Exception {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelLinkedIn.comment_id", "123");
// parameter type is String
diff --git
a/components/camel-linkedin/camel-linkedin-component/src/test/java/org/apache/camel/component/linkedin/GroupsResourceIntegrationTest.java
b/components/camel-linkedin/camel-linkedin-component/src/test/java/org/apache/camel/component/linkedin/GroupsResourceIntegrationTest.java
index 40f4cfb..dcf43e7 100644
---
a/components/camel-linkedin/camel-linkedin-component/src/test/java/org/apache/camel/component/linkedin/GroupsResourceIntegrationTest.java
+++
b/components/camel-linkedin/camel-linkedin-component/src/test/java/org/apache/camel/component/linkedin/GroupsResourceIntegrationTest.java
@@ -42,7 +42,7 @@ public class GroupsResourceIntegrationTest extends
AbstractLinkedInTestSupport {
@Ignore
@Test
public void testAddPost() throws Exception {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
headers.put("CamelLinkedIn.group_id", 0L);
// parameter type is org.apache.camel.component.linkedin.api.model.Post
headers.put("CamelLinkedIn.post", null);
diff --git
a/components/camel-linkedin/camel-linkedin-component/src/test/java/org/apache/camel/component/linkedin/JobsResourceIntegrationTest.java
b/components/camel-linkedin/camel-linkedin-component/src/test/java/org/apache/camel/component/linkedin/JobsResourceIntegrationTest.java
index 472dd58..b69f8d8 100644
---
a/components/camel-linkedin/camel-linkedin-component/src/test/java/org/apache/camel/component/linkedin/JobsResourceIntegrationTest.java
+++
b/components/camel-linkedin/camel-linkedin-component/src/test/java/org/apache/camel/component/linkedin/JobsResourceIntegrationTest.java
@@ -49,7 +49,7 @@ public class JobsResourceIntegrationTest extends
AbstractLinkedInTestSupport {
@Ignore
@Test
public void testEditJob() throws Exception {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
headers.put("CamelLinkedIn.partner_job_id", 0L);
// parameter type is org.apache.camel.component.linkedin.api.model.Job
headers.put("CamelLinkedIn.job", null);
@@ -61,7 +61,7 @@ public class JobsResourceIntegrationTest extends
AbstractLinkedInTestSupport {
@Ignore
@Test
public void testGetJob() throws Exception {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
headers.put("CamelLinkedIn.job_id", 0L);
// parameter type is String
headers.put("CamelLinkedIn.fields", null);
diff --git
a/components/camel-linkedin/camel-linkedin-component/src/test/java/org/apache/camel/component/linkedin/PeopleResourceIntegrationTest.java
b/components/camel-linkedin/camel-linkedin-component/src/test/java/org/apache/camel/component/linkedin/PeopleResourceIntegrationTest.java
index 324b248..005578d 100644
---
a/components/camel-linkedin/camel-linkedin-component/src/test/java/org/apache/camel/component/linkedin/PeopleResourceIntegrationTest.java
+++
b/components/camel-linkedin/camel-linkedin-component/src/test/java/org/apache/camel/component/linkedin/PeopleResourceIntegrationTest.java
@@ -75,7 +75,7 @@ public class PeopleResourceIntegrationTest extends
AbstractLinkedInTestSupport {
@Ignore
@Test
public void testAddUpdateComment() throws Exception {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelLinkedIn.update_key", null);
// parameter type is
org.apache.camel.component.linkedin.api.model.UpdateComment
@@ -94,7 +94,7 @@ public class PeopleResourceIntegrationTest extends
AbstractLinkedInTestSupport {
@Test
public void testGetConnections() throws Exception {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// use defaults
/*
// parameter type is String
@@ -113,7 +113,7 @@ public class PeopleResourceIntegrationTest extends
AbstractLinkedInTestSupport {
@Ignore
@Test
public void testGetConnectionsById() throws Exception {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelLinkedIn.person_id", null);
// parameter type is String
@@ -131,7 +131,7 @@ public class PeopleResourceIntegrationTest extends
AbstractLinkedInTestSupport {
@Ignore
@Test
public void testGetConnectionsByUrl() throws Exception {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelLinkedIn.public_profile_url", null);
// parameter type is String
@@ -158,7 +158,7 @@ public class PeopleResourceIntegrationTest extends
AbstractLinkedInTestSupport {
@Ignore
@Test
public void testGetGroupMembershipSettings() throws Exception {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
headers.put("CamelLinkedIn.group_id", 0L);
// parameter type is String
headers.put("CamelLinkedIn.fields", null);
@@ -175,7 +175,7 @@ public class PeopleResourceIntegrationTest extends
AbstractLinkedInTestSupport {
@Test
public void testGetGroupMemberships() throws Exception {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// use defaults
/*
// parameter type is
org.apache.camel.component.linkedin.api.model.MembershipState
@@ -212,7 +212,7 @@ public class PeopleResourceIntegrationTest extends
AbstractLinkedInTestSupport {
@Test
public void testGetNetworkUpdates() throws Exception {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// use defaults
/*
// parameter type is String
@@ -245,7 +245,7 @@ public class PeopleResourceIntegrationTest extends
AbstractLinkedInTestSupport {
@Ignore
@Test
public void testGetNetworkUpdatesById() throws Exception {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelLinkedIn.scope", null);
// parameter type is org.apache.camel.component.linkedin.api.Type
@@ -275,7 +275,7 @@ public class PeopleResourceIntegrationTest extends
AbstractLinkedInTestSupport {
@Test
public void testGetPerson() throws Exception {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelLinkedIn.fields", "");
// parameter type is Boolean
@@ -291,7 +291,7 @@ public class PeopleResourceIntegrationTest extends
AbstractLinkedInTestSupport {
@Ignore
@Test
public void testGetPersonById() throws Exception {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelLinkedIn.person_id", null);
// parameter type is String
@@ -309,7 +309,7 @@ public class PeopleResourceIntegrationTest extends
AbstractLinkedInTestSupport {
@Ignore
@Test
public void testGetPersonByUrl() throws Exception {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelLinkedIn.public_profile_url", null);
// parameter type is String
@@ -327,7 +327,7 @@ public class PeopleResourceIntegrationTest extends
AbstractLinkedInTestSupport {
@Ignore
@Test
public void testGetPosts() throws Exception {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
headers.put("CamelLinkedIn.group_id", 0L);
// parameter type is Long
headers.put("CamelLinkedIn.start", null);
@@ -363,7 +363,7 @@ public class PeopleResourceIntegrationTest extends
AbstractLinkedInTestSupport {
@Ignore
@Test
public void testGetSuggestedGroupPosts() throws Exception {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
headers.put("CamelLinkedIn.group_id", 0L);
// parameter type is Long
headers.put("CamelLinkedIn.start", null);
@@ -408,7 +408,7 @@ public class PeopleResourceIntegrationTest extends
AbstractLinkedInTestSupport {
@Ignore
@Test
public void testGetUpdateComments() throws Exception {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelLinkedIn.update_key", null);
// parameter type is String
@@ -426,7 +426,7 @@ public class PeopleResourceIntegrationTest extends
AbstractLinkedInTestSupport {
@Ignore
@Test
public void testGetUpdateLikes() throws Exception {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelLinkedIn.update_key", null);
// parameter type is String
@@ -444,7 +444,7 @@ public class PeopleResourceIntegrationTest extends
AbstractLinkedInTestSupport {
@Ignore
@Test
public void testLikeUpdate() throws Exception {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelLinkedIn.update_key", null);
// parameter type is
org.apache.camel.component.linkedin.api.model.IsLiked
@@ -500,7 +500,7 @@ public class PeopleResourceIntegrationTest extends
AbstractLinkedInTestSupport {
@Ignore
@Test
public void testUpdateGroupMembership() throws Exception {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
headers.put("CamelLinkedIn.group_id", 0L);
// parameter type is
org.apache.camel.component.linkedin.api.model.GroupMembership
headers.put("CamelLinkedIn.groupmembership", null);
diff --git
a/components/camel-linkedin/camel-linkedin-component/src/test/java/org/apache/camel/component/linkedin/PostsResourceIntegrationTest.java
b/components/camel-linkedin/camel-linkedin-component/src/test/java/org/apache/camel/component/linkedin/PostsResourceIntegrationTest.java
index 56426ad..6a2c757 100644
---
a/components/camel-linkedin/camel-linkedin-component/src/test/java/org/apache/camel/component/linkedin/PostsResourceIntegrationTest.java
+++
b/components/camel-linkedin/camel-linkedin-component/src/test/java/org/apache/camel/component/linkedin/PostsResourceIntegrationTest.java
@@ -42,7 +42,7 @@ public class PostsResourceIntegrationTest extends
AbstractLinkedInTestSupport {
@Ignore
@Test
public void testAddComment() throws Exception {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelLinkedIn.post_id", null);
// parameter type is
org.apache.camel.component.linkedin.api.model.Comment
@@ -55,7 +55,7 @@ public class PostsResourceIntegrationTest extends
AbstractLinkedInTestSupport {
@Ignore
@Test
public void testFlagCategory() throws Exception {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelLinkedIn.post_id", null);
// parameter type is
org.apache.camel.component.linkedin.api.model.PostCategoryCode
@@ -68,7 +68,7 @@ public class PostsResourceIntegrationTest extends
AbstractLinkedInTestSupport {
@Ignore
@Test
public void testFollowPost() throws Exception {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelLinkedIn.post_id", null);
// parameter type is
org.apache.camel.component.linkedin.api.model.IsFollowing
@@ -81,7 +81,7 @@ public class PostsResourceIntegrationTest extends
AbstractLinkedInTestSupport {
@Ignore
@Test
public void testGetPost() throws Exception {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelLinkedIn.post_id", null);
// parameter type is Long
@@ -101,7 +101,7 @@ public class PostsResourceIntegrationTest extends
AbstractLinkedInTestSupport {
@Ignore
@Test
public void testGetPostComments() throws Exception {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelLinkedIn.post_id", null);
// parameter type is Long
@@ -121,7 +121,7 @@ public class PostsResourceIntegrationTest extends
AbstractLinkedInTestSupport {
@Ignore
@Test
public void testLikePost() throws Exception {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelLinkedIn.post_id", null);
// parameter type is
org.apache.camel.component.linkedin.api.model.IsLiked
diff --git
a/components/camel-linkedin/camel-linkedin-component/src/test/java/org/apache/camel/component/linkedin/SearchResourceIntegrationTest.java
b/components/camel-linkedin/camel-linkedin-component/src/test/java/org/apache/camel/component/linkedin/SearchResourceIntegrationTest.java
index de4d6f5..b6b9637 100644
---
a/components/camel-linkedin/camel-linkedin-component/src/test/java/org/apache/camel/component/linkedin/SearchResourceIntegrationTest.java
+++
b/components/camel-linkedin/camel-linkedin-component/src/test/java/org/apache/camel/component/linkedin/SearchResourceIntegrationTest.java
@@ -40,7 +40,7 @@ public class SearchResourceIntegrationTest extends
AbstractLinkedInTestSupport {
@Test
public void testSearchCompanies() throws Exception {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelLinkedIn.fields", "");
// parameter type is String
@@ -70,7 +70,7 @@ public class SearchResourceIntegrationTest extends
AbstractLinkedInTestSupport {
@Ignore("Requires vetted API Access Program")
@Test
public void testSearchJobs() throws Exception {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelLinkedIn.fields", "");
/*
@@ -107,7 +107,7 @@ public class SearchResourceIntegrationTest extends
AbstractLinkedInTestSupport {
@Ignore("Requires vetted API Access Program")
@Test
public void testSearchPeople() throws Exception {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelLinkedIn.fields", "");
/*
diff --git
a/components/camel-lucene/src/main/java/org/apache/camel/processor/lucene/support/Hits.java
b/components/camel-lucene/src/main/java/org/apache/camel/processor/lucene/support/Hits.java
index 8cbfe54..481d92f 100644
---
a/components/camel-lucene/src/main/java/org/apache/camel/processor/lucene/support/Hits.java
+++
b/components/camel-lucene/src/main/java/org/apache/camel/processor/lucene/support/Hits.java
@@ -36,7 +36,7 @@ public class Hits implements Serializable {
public List<Hit> getHit() {
if (hit == null) {
- hit = new ArrayList<Hit>();
+ hit = new ArrayList<>();
}
return hit;
}
diff --git
a/components/camel-lucene/src/test/java/org/apache/camel/component/lucene/LuceneIndexAndQueryProducerTest.java
b/components/camel-lucene/src/test/java/org/apache/camel/component/lucene/LuceneIndexAndQueryProducerTest.java
index 96fe2d5..373d5e4 100644
---
a/components/camel-lucene/src/test/java/org/apache/camel/component/lucene/LuceneIndexAndQueryProducerTest.java
+++
b/components/camel-lucene/src/test/java/org/apache/camel/component/lucene/LuceneIndexAndQueryProducerTest.java
@@ -237,7 +237,7 @@ public class LuceneIndexAndQueryProducerTest extends
CamelTestSupport {
public void process(Exchange exchange) throws Exception {
Hits hits = exchange.getIn().getBody(Hits.class);
if (hits == null) {
- HashMap<String, String> map = new HashMap<String,
String>();
+ HashMap<String, String> map = new HashMap<>();
map.put("NO_LUCENE_DOCS_ERROR", "NO LUCENE DOCS
FOUND");
exchange.getContext().setProperties(map);
}
diff --git
a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java
b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java
index 0d4348e..4b1fd39 100644
---
a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java
+++
b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java
@@ -94,7 +94,7 @@ public class MailBinding {
replyTo = endpoint.getConfiguration().getReplyTo();
}
if (replyTo != null) {
- List<InternetAddress> replyToAddresses = new
ArrayList<InternetAddress>();
+ List<InternetAddress> replyToAddresses = new ArrayList<>();
for (String reply : splitRecipients(replyTo)) {
replyToAddresses.add(asEncodedInternetAddress(reply.trim(),
determineCharSet(endpoint.getConfiguration(), exchange)));
}
@@ -596,7 +596,7 @@ public class MailBinding {
}
protected Map<String, Object> extractHeadersFromMail(Message mailMessage,
Exchange exchange) throws MessagingException, IOException {
- Map<String, Object> answer = new TreeMap<String,
Object>(String.CASE_INSENSITIVE_ORDER);
+ Map<String, Object> answer = new
TreeMap<>(String.CASE_INSENSITIVE_ORDER);
Enumeration<?> names = mailMessage.getAllHeaders();
MailConfiguration mailConfiguration = ((MailEndpoint)
exchange.getFromEndpoint()).getConfiguration();
@@ -642,7 +642,7 @@ public class MailBinding {
private static void appendRecipientToMimeMessage(MimeMessage mimeMessage,
MailConfiguration configuration, Exchange exchange,
String type, String
recipient) throws MessagingException, IOException {
- List<InternetAddress> recipientsAddresses = new
ArrayList<InternetAddress>();
+ List<InternetAddress> recipientsAddresses = new ArrayList<>();
for (String line : splitRecipients(recipient)) {
String address = line.trim();
// Only add the address which is not empty
diff --git
a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailComponent.java
b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailComponent.java
index efc5c7b..2a51481 100644
---
a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailComponent.java
+++
b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailComponent.java
@@ -111,7 +111,7 @@ public class MailComponent extends UriEndpointComponent
implements SSLContextPar
private void configureAdditionalJavaMailProperties(MailConfiguration
config, Map<String, Object> parameters) {
// we cannot remove while iterating, as we will get a modification
exception
- Set<Object> toRemove = new HashSet<Object>();
+ Set<Object> toRemove = new HashSet<>();
for (Map.Entry<String, Object> entry : parameters.entrySet()) {
if (entry.getKey().toString().startsWith("mail.")) {
diff --git
a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java
b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java
index bb6c9ae..0e48865 100644
---
a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java
+++
b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java
@@ -43,7 +43,7 @@ public class MailConfiguration implements Cloneable {
private ClassLoader applicationClassLoader;
private Properties javaMailProperties;
- private Map<Message.RecipientType, String> recipients = new
HashMap<Message.RecipientType, String>();
+ private Map<Message.RecipientType, String> recipients = new HashMap<>();
// protocol is implied by component name so it should not be in UriPath
private String protocol;
@@ -132,7 +132,7 @@ public class MailConfiguration implements Cloneable {
try {
MailConfiguration copy = (MailConfiguration) clone();
// must set a new recipients map as clone just reuse the same
reference
- copy.recipients = new HashMap<Message.RecipientType, String>();
+ copy.recipients = new HashMap<>();
copy.recipients.putAll(this.recipients);
return copy;
} catch (CloneNotSupportedException e) {
diff --git
a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java
b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java
index aabac55..fe13271 100644
---
a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java
+++
b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java
@@ -280,7 +280,7 @@ public class MailConsumer extends
ScheduledBatchPollingConsumer {
private Message[] retrieveAllMessages() throws MessagingException {
int total = folder.getMessageCount();
- List<Message> msgs = new ArrayList<Message>();
+ List<Message> msgs = new ArrayList<>();
// Note that message * numbers start at 1, not 0
for (int i = 1; i <= total; i++) {
@@ -327,7 +327,7 @@ public class MailConsumer extends
ScheduledBatchPollingConsumer {
}
protected Queue<Exchange> createExchanges(List<KeyValueHolder<String,
Message>> messages) throws MessagingException {
- Queue<Exchange> answer = new LinkedList<Exchange>();
+ Queue<Exchange> answer = new LinkedList<>();
int fetchSize = getEndpoint().getConfiguration().getFetchSize();
int count = fetchSize == -1 ? messages.size() : Math.min(fetchSize,
messages.size());
diff --git
a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConverters.java
b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConverters.java
index 1c959f6..de1a56f 100644
---
a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConverters.java
+++
b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConverters.java
@@ -218,7 +218,7 @@ public final class MailConverters {
*/
@Converter
public static SortTerm[] toSortTerm(String sortTerm) {
- ArrayList<SortTerm> result = new ArrayList<SortTerm>();
+ ArrayList<SortTerm> result = new ArrayList<>();
if (sortTerm == null) {
return null;
diff --git
a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailSorter.java
b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailSorter.java
index 27ff8d9..9d91189 100644
---
a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailSorter.java
+++
b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailSorter.java
@@ -60,7 +60,7 @@ public final class MailSorter {
*/
private static List<SortTermWithDescending>
getSortTermsWithDescending(SortTerm[] sortTerm) {
// List of reversable sort terms. If the boolean is true the
respective sort term is descending
- final List<SortTermWithDescending> sortTermsWithDescending = new
ArrayList<SortTermWithDescending>(sortTerm.length);
+ final List<SortTermWithDescending> sortTermsWithDescending = new
ArrayList<>(sortTerm.length);
// Descending next item in input because the last item was a
"descending"
boolean descendingNext = false;
for (SortTerm term : sortTerm) {
diff --git
a/components/camel-mail/src/main/java/org/apache/camel/component/mail/SplitAttachmentsExpression.java
b/components/camel-mail/src/main/java/org/apache/camel/component/mail/SplitAttachmentsExpression.java
index 569b99c..f625047 100644
---
a/components/camel-mail/src/main/java/org/apache/camel/component/mail/SplitAttachmentsExpression.java
+++
b/components/camel-mail/src/main/java/org/apache/camel/component/mail/SplitAttachmentsExpression.java
@@ -76,7 +76,7 @@ public class SplitAttachmentsExpression extends
ExpressionAdapter {
}
try {
- List<Message> answer = new ArrayList<Message>();
+ List<Message> answer = new ArrayList<>();
Message inMessage = exchange.getIn();
for (Map.Entry<String, Attachment> entry :
inMessage.getAttachmentObjects().entrySet()) {
Message attachmentMessage;
diff --git
a/components/camel-mail/src/main/java/org/apache/camel/dataformat/mime/multipart/MimeMultipartDataFormat.java
b/components/camel-mail/src/main/java/org/apache/camel/dataformat/mime/multipart/MimeMultipartDataFormat.java
index 2e31d34..836c728 100644
---
a/components/camel-mail/src/main/java/org/apache/camel/dataformat/mime/multipart/MimeMultipartDataFormat.java
+++
b/components/camel-mail/src/main/java/org/apache/camel/dataformat/mime/multipart/MimeMultipartDataFormat.java
@@ -139,7 +139,7 @@ public class MimeMultipartDataFormat implements DataFormat {
}
mm.saveChanges();
Enumeration<?> hl = mm.getAllHeaders();
- List<String> headers = new ArrayList<String>();
+ List<String> headers = new ArrayList<>();
if (!headersInline) {
while (hl.hasMoreElements()) {
Object ho = hl.nextElement();
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentRedeliveryTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentRedeliveryTest.java
index c83191c..7927afe 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentRedeliveryTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentRedeliveryTest.java
@@ -38,7 +38,7 @@ import org.jvnet.mock_javamail.Mailbox;
*/
public class MailAttachmentRedeliveryTest extends CamelTestSupport {
- private final List<String> names = new ArrayList<String>();
+ private final List<String> names = new ArrayList<>();
@Test
public void testSendAndReceiveMailWithAttachmentsRedelivery() throws
Exception {
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailContentTypeTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailContentTypeTest.java
index 7acc078..a70d0be 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailContentTypeTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailContentTypeTest.java
@@ -61,7 +61,7 @@ public class MailContentTypeTest extends CamelTestSupport {
public void testSendMultipartMail() throws Exception {
Mailbox.clearAll();
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put(MailConstants.MAIL_ALTERNATIVE_BODY, "Hello World");
sendBody("direct:c", "<html><body><h1>Hello</h1>World</body></html>",
headers);
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHeaderOverrulePreConfigurationRecipientsTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHeaderOverrulePreConfigurationRecipientsTest.java
index e8d7bfa..07da6f6 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHeaderOverrulePreConfigurationRecipientsTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHeaderOverrulePreConfigurationRecipientsTest.java
@@ -41,7 +41,7 @@ public class MailHeaderOverrulePreConfigurationRecipientsTest
extends CamelTestS
mock.expectedHeaderReceived("cc", "willem@localhost");
mock.expectedHeaderReceived("bcc", "hadrian@localhost");
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put("to", "claus@localhost");
headers.put("cc", "willem@localhost");
headers.put("bcc", "hadrian@localhost");
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMimeDecodeHeadersTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMimeDecodeHeadersTest.java
index 426d537..4c4fb04 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMimeDecodeHeadersTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMimeDecodeHeadersTest.java
@@ -37,7 +37,7 @@ public class MailMimeDecodeHeadersTest extends
CamelTestSupport {
int mimeFoldingLimit = 76;
int headerLength = "subject: ".length();
- for (int i = 0; headerLength + sb.length() <= mimeFoldingLimit; i++) {
+ while (sb.length() <= mimeFoldingLimit) {
sb.insert(7, "o");
}
longSubject = sb.toString();
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsTest.java
index cf96989..ed97b66 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsTest.java
@@ -35,7 +35,7 @@ public class MailMultipleRecipientsTest extends
CamelTestSupport {
Mailbox.clearAll();
// START SNIPPET: e1
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
// test with both comma and semi colon as Camel supports both kind of
separators
headers.put("to", "claus@localhost, willem@localhost ;
hadrian@localhost, \"Snell, Tracy\" <tracy@localhost>");
headers.put("cc", "james@localhost");
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsUsingHeadersTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsUsingHeadersTest.java
index 87f1ecc..e267f9c 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsUsingHeadersTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsUsingHeadersTest.java
@@ -35,7 +35,7 @@ public class MailMultipleRecipientsUsingHeadersTest extends
CamelTestSupport {
Mailbox.clearAll();
// START SNIPPET: e1
- Map<String, Object> map = new HashMap<String, Object>();
+ Map<String, Object> map = new HashMap<>();
map.put("To", new String[] {"davscl...@apache.org",
"jans...@apache.org"});
map.put("From", "jstrac...@apache.org");
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailNameAndEmailInRecipientTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailNameAndEmailInRecipientTest.java
index 8c3fbf4..e5672b0 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailNameAndEmailInRecipientTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailNameAndEmailInRecipientTest.java
@@ -32,7 +32,7 @@ public class MailNameAndEmailInRecipientTest extends
CamelTestSupport {
Mailbox.clearAll();
// START SNIPPET: e1
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put("to", "Claus Ibsen <davsclaus@localhost>");
headers.put("cc", "James Strachan <jstrachan@localhost>");
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerConcurrentTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerConcurrentTest.java
index ab28118..add560f 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerConcurrentTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerConcurrentTest.java
@@ -78,7 +78,7 @@ public class MailProducerConcurrentTest extends
CamelTestSupport {
assertEquals(files, box.size());
// as we use concurrent producers the mails can arrive out of order
- Set<Object> bodies = new HashSet<Object>();
+ Set<Object> bodies = new HashSet<>();
for (int i = 0; i < files; i++) {
bodies.add(box.get(i).getContent());
}
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerUnsupportedCharsetTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerUnsupportedCharsetTest.java
index 2f1491a..d9c09fe 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerUnsupportedCharsetTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerUnsupportedCharsetTest.java
@@ -53,7 +53,7 @@ public class MailProducerUnsupportedCharsetTest extends
CamelTestSupport {
mock.expectedBodiesReceived("Hello World", "Bye World");
mock.allMessages().header("Content-Type").isEqualTo("text/plain");
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put("To", "jones@localhost");
headers.put("Content-Type", "text/plain");
template.sendBodyAndHeaders("smtp://localhost?ignoreUnsupportedCharset=true",
"Hello World", headers);
@@ -82,7 +82,7 @@ public class MailProducerUnsupportedCharsetTest extends
CamelTestSupport {
mock.expectedBodiesReceived("Hello World");
mock.allMessages().header("Content-Type").isEqualTo("text/plain");
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put("To", "jones@localhost");
headers.put("Content-Type", "text/plain");
template.sendBodyAndHeaders("smtp://localhost?ignoreUnsupportedCharset=false",
"Hello World", headers);
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRouteTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRouteTest.java
index 69ad5c8..af58754 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRouteTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRouteTest.java
@@ -45,7 +45,7 @@ public class MailRouteTest extends CamelTestSupport {
MockEndpoint resultEndpoint = getMockEndpoint("mock:result");
resultEndpoint.expectedBodiesReceived("hello world!");
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put("reply-to", "route-test-reply@localhost");
template.sendBodyAndHeaders("smtp://route-test-james@localhost",
"hello world!", headers);
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingHeadersTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingHeadersTest.java
index ad0fbb6..f3aee1d 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingHeadersTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingHeadersTest.java
@@ -36,7 +36,7 @@ public class MailUsingHeadersTest extends CamelTestSupport {
Mailbox.clearAll();
// START SNIPPET: e1
- Map<String, Object> map = new HashMap<String, Object>();
+ Map<String, Object> map = new HashMap<>();
map.put("To", "davscl...@apache.org");
map.put("From", "jstrac...@apache.org");
map.put("Subject", "Camel rocks");
@@ -61,7 +61,7 @@ public class MailUsingHeadersTest extends CamelTestSupport {
public void testMailWithFromInEndpoint() throws Exception {
Mailbox.clearAll();
- Map<String, Object> map = new HashMap<String, Object>();
+ Map<String, Object> map = new HashMap<>();
map.put("Subject", "Camel rocks");
String body = "Hello Claus.\nYes it does.\n\nRegards James.";
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/RawMailMessageTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/RawMailMessageTest.java
index f3cd445..c3edf51 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/RawMailMessageTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/RawMailMessageTest.java
@@ -51,7 +51,7 @@ public class RawMailMessageTest extends CamelTestSupport {
public void testGetRawJavaMailMessage() throws Exception {
Mailbox.clearAll();
- Map<String, Object> map = new HashMap<String, Object>();
+ Map<String, Object> map = new HashMap<>();
map.put("To", "davscl...@apache.org");
map.put("From", "jstrac...@apache.org");
map.put("Subject", "Camel rocks");
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/mock/MyMockStore.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/mock/MyMockStore.java
index 75a02e6..c68f958 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/mock/MyMockStore.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/mock/MyMockStore.java
@@ -29,7 +29,7 @@ import org.jvnet.mock_javamail.MockStore;
public class MyMockStore extends MockStore {
- private Map<String, Folder> folders = new HashMap<String, Folder>();
+ private Map<String, Folder> folders = new HashMap<>();
private String address;
public MyMockStore(Session session, URLName urlname) {
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/security/SslContextParametersMailRouteTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/security/SslContextParametersMailRouteTest.java
index e68630f..f590763 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/security/SslContextParametersMailRouteTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/security/SslContextParametersMailRouteTest.java
@@ -63,7 +63,7 @@ public class SslContextParametersMailRouteTest extends
CamelTestSupport {
MockEndpoint resultEndpoint = getMockEndpoint("mock:in");
resultEndpoint.expectedBodiesReceived("Test Email Body\r\n");
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put("To", email);
headers.put("From", email);
headers.put("Reply-to", email);
@@ -88,7 +88,7 @@ public class SslContextParametersMailRouteTest extends
CamelTestSupport {
context.start();
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put("To", email);
headers.put("From", email);
headers.put("Reply-to", email);
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/dataformat/mime/multipart/MimeMultipartDataFormatTest.java
b/components/camel-mail/src/test/java/org/apache/camel/dataformat/mime/multipart/MimeMultipartDataFormatTest.java
index ada79c0..989c6c7 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/dataformat/mime/multipart/MimeMultipartDataFormatTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/dataformat/mime/multipart/MimeMultipartDataFormatTest.java
@@ -65,7 +65,7 @@ public class MimeMultipartDataFormatTest extends
CamelTestSupport {
in.setBody("Body text");
in.setHeader(Exchange.CONTENT_TYPE,
"text/plain;charset=iso8859-1;other-parameter=true");
in.setHeader(Exchange.CONTENT_ENCODING, "UTF8");
- Map<String, String> headers = new HashMap<String, String>();
+ Map<String, String> headers = new HashMap<>();
headers.put("Content-Description", "Sample Attachment Data");
headers.put("X-AdditionalData", "additional data");
addAttachment(attContentType, attText, attFileName, headers);
@@ -255,7 +255,7 @@ public class MimeMultipartDataFormatTest extends
CamelTestSupport {
public void marhsalOnlyMixed() throws IOException {
in.setBody("Body text");
in.setHeader("Content-Type", "text/plain");
- Map<String, String> headers = new HashMap<String, String>();
+ Map<String, String> headers = new HashMap<>();
headers.put("Content-Description", "Sample Attachment Data");
headers.put("X-AdditionalData", "additional data");
addAttachment("application/octet-stream", "foobar", "attachment.bin",
headers);
diff --git
a/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/MetricsType.java
b/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/MetricsType.java
index 970da79..bf41618 100644
---
a/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/MetricsType.java
+++
b/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/MetricsType.java
@@ -28,7 +28,7 @@ public enum MetricsType {
METER("meter"),
TIMER("timer");
- private static final Map<String, MetricsType> MAP = new HashMap<String,
MetricsType>();
+ private static final Map<String, MetricsType> MAP = new HashMap<>();
private final String name;
diff --git
a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/CounterRouteTest.java
b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/CounterRouteTest.java
index 4804a2c..fcff3c0 100644
---
a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/CounterRouteTest.java
+++
b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/CounterRouteTest.java
@@ -154,7 +154,7 @@ public class CounterRouteTest {
public void testOverrideIncrementAndDecrement() throws Exception {
when(mockRegistry.counter("A")).thenReturn(mockCounter);
endpoint.expectedMessageCount(1);
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put(HEADER_COUNTER_INCREMENT, 912L);
headers.put(HEADER_COUNTER_DECREMENT, 43219L);
producer1.sendBodyAndHeaders(new Object(), headers);
diff --git
a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsComponentRouteTest.java
b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsComponentRouteTest.java
index 26fadb8..0d50e9e 100644
---
a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsComponentRouteTest.java
+++
b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsComponentRouteTest.java
@@ -58,7 +58,7 @@ public class MetricsComponentRouteTest extends
CamelTestSupport {
mock.expectedBodiesReceived(body);
mock.expectedHeaderReceived(header1, value1);
mock.expectedHeaderReceived(header2, value2);
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put(header1, value1);
headers.put(header2, value2);
template1.sendBodyAndHeaders(body, headers);
@@ -75,7 +75,7 @@ public class MetricsComponentRouteTest extends
CamelTestSupport {
mock.expectedHeaderReceived("." + HEADER_PREFIX, "value");
mock.expectedHeaderReceived("date", now);
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put(HEADER_METRIC_NAME, "a name");
headers.put(HEADER_HISTOGRAM_VALUE, 34L);
headers.put(HEADER_PREFIX + "notExistingHeader", "?");
diff --git
a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsComponentTest.java
b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsComponentTest.java
index 906960e..e5bee00 100644
---
a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsComponentTest.java
+++
b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsComponentTest.java
@@ -69,7 +69,7 @@ public class MetricsComponentTest {
component.setCamelContext(camelContext);
when(camelContext.getRegistry()).thenReturn(camelRegistry);
when(camelRegistry.lookupByNameAndType(MetricsComponent.METRIC_REGISTRY_NAME,
MetricRegistry.class)).thenReturn(metricRegistry);
- Map<String, Object> params = new HashMap<String, Object>();
+ Map<String, Object> params = new HashMap<>();
Long value = System.currentTimeMillis();
params.put("mark", value);
Endpoint result = component.createEndpoint("metrics:meter:long.meter",
"meter:long.meter", params);
@@ -90,7 +90,7 @@ public class MetricsComponentTest {
component.setCamelContext(camelContext);
when(camelContext.getRegistry()).thenReturn(camelRegistry);
when(camelRegistry.lookupByNameAndType(MetricsComponent.METRIC_REGISTRY_NAME,
MetricRegistry.class)).thenReturn(metricRegistry);
- Map<String, Object> params = new HashMap<String, Object>();
+ Map<String, Object> params = new HashMap<>();
Long value = System.currentTimeMillis();
params.put("mark", value);
Endpoint result = component.createEndpoint("metrics:meter:long.meter",
"meter:long.meter", params);
@@ -101,7 +101,7 @@ public class MetricsComponentTest {
assertThat(me.getMetricsName(), is("long.meter"));
assertThat(me.getRegistry(), is(metricRegistry));
- params = new HashMap<String, Object>();
+ params = new HashMap<>();
params.put("increment", value + 1);
params.put("decrement", value - 1);
diff --git
a/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaEndpoint.java
b/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaEndpoint.java
index 55954f6..23a4d4a 100644
---
a/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaEndpoint.java
+++
b/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaEndpoint.java
@@ -59,7 +59,7 @@ public class MinaEndpoint extends DefaultEndpoint implements
MultipleConsumersSu
private IoConnectorConfig connectorConfig;
@UriParam
private MinaConfiguration configuration;
- private final List<ExecutorService> executors = new
ArrayList<ExecutorService>();
+ private final List<ExecutorService> executors = new ArrayList<>();
public MinaEndpoint() {
}
diff --git
a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaFiltersTest.java
b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaFiltersTest.java
index c05d84e..ade20a1 100644
---
a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaFiltersTest.java
+++
b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaFiltersTest.java
@@ -83,7 +83,7 @@ public class MinaFiltersTest extends BaseMinaTest {
protected Context createJndiContext() throws Exception {
JndiContext answer = new JndiContext();
IoFilter myFilter = new TestFilter();
- List<IoFilter> myFilters = new ArrayList<IoFilter>();
+ List<IoFilter> myFilters = new ArrayList<>();
myFilters.add(myFilter);
answer.bind("myFilters", myFilters);
diff --git
a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaProducerAnotherConcurrentTest.java
b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaProducerAnotherConcurrentTest.java
index 5f29c8c..3d69900 100644
---
a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaProducerAnotherConcurrentTest.java
+++
b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaProducerAnotherConcurrentTest.java
@@ -55,7 +55,7 @@ public class MinaProducerAnotherConcurrentTest extends
BaseMinaTest {
ExecutorService executor = Executors.newFixedThreadPool(poolSize);
// we access the responses Map below only inside the main thread,
// so no need for a thread-safe Map implementation
- Map<Integer, Future<String>> responses = new HashMap<Integer,
Future<String>>();
+ Map<Integer, Future<String>> responses = new HashMap<>();
for (int i = 0; i < files; i++) {
final int index = i;
Future<String> out = executor.submit(new Callable<String>() {
diff --git
a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaProducerConcurrentTest.java
b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaProducerConcurrentTest.java
index 9b9d7fc..e99561d 100644
---
a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaProducerConcurrentTest.java
+++
b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaProducerConcurrentTest.java
@@ -51,7 +51,7 @@ public class MinaProducerConcurrentTest extends BaseMinaTest {
ExecutorService executor = Executors.newFixedThreadPool(poolSize);
// we access the responses Map below only inside the main thread,
// so no need for a thread-safe Map implementation
- Map<Integer, Future<String>> responses = new HashMap<Integer,
Future<String>>();
+ Map<Integer, Future<String>> responses = new HashMap<>();
for (int i = 0; i < files; i++) {
final int index = i;
Future<String> out = executor.submit(new Callable<String>() {
@@ -66,7 +66,7 @@ public class MinaProducerConcurrentTest extends BaseMinaTest {
assertEquals(files, responses.size());
// get all responses
- Set<String> unique = new HashSet<String>();
+ Set<String> unique = new HashSet<>();
for (Future<String> future : responses.values()) {
unique.add(future.get());
}
diff --git
a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2FiltersTest.java
b/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2FiltersTest.java
index 0f8233b..9fa87ef 100644
---
a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2FiltersTest.java
+++
b/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2FiltersTest.java
@@ -83,7 +83,7 @@ public class Mina2FiltersTest extends BaseMina2Test {
protected Context createJndiContext() throws Exception {
JndiContext answer = new JndiContext();
IoFilter myFilter = new TestFilter();
- List<IoFilter> myFilters = new ArrayList<IoFilter>();
+ List<IoFilter> myFilters = new ArrayList<>();
myFilters.add(myFilter);
answer.bind("myFilters", myFilters);
diff --git
a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2ProducerAnotherConcurrentTest.java
b/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2ProducerAnotherConcurrentTest.java
index c2f2f7e..dd8890c 100644
---
a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2ProducerAnotherConcurrentTest.java
+++
b/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2ProducerAnotherConcurrentTest.java
@@ -55,7 +55,7 @@ public class Mina2ProducerAnotherConcurrentTest extends
BaseMina2Test {
ExecutorService executor = Executors.newFixedThreadPool(poolSize);
// we access the responses Map below only inside the main thread,
// so no need for a thread-safe Map implementation
- Map<Integer, Future<String>> responses = new HashMap<Integer,
Future<String>>();
+ Map<Integer, Future<String>> responses = new HashMap<>();
for (int i = 0; i < files; i++) {
final int index = i;
Future<String> out = executor.submit(new Callable<String>() {
diff --git
a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2ProducerConcurrentTest.java
b/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2ProducerConcurrentTest.java
index 7c0910f..d47d146 100644
---
a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2ProducerConcurrentTest.java
+++
b/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2ProducerConcurrentTest.java
@@ -51,7 +51,7 @@ public class Mina2ProducerConcurrentTest extends
BaseMina2Test {
ExecutorService executor = Executors.newFixedThreadPool(poolSize);
// we access the responses Map below only inside the main thread,
// so no need for a thread-safe Map implementation
- Map<Integer, Future<String>> responses = new HashMap<Integer,
Future<String>>();
+ Map<Integer, Future<String>> responses = new HashMap<>();
for (int i = 0; i < files; i++) {
final int index = i;
Future<String> out = executor.submit(new Callable<String>() {
@@ -66,7 +66,7 @@ public class Mina2ProducerConcurrentTest extends
BaseMina2Test {
assertEquals(files, responses.size());
// get all responses
- Set<String> unique = new HashSet<String>();
+ Set<String> unique = new HashSet<>();
for (Future<String> future : responses.values()) {
unique.add(future.get());
}
diff --git
a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpConfiguration.java
b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpConfiguration.java
index 3bce5be..94a9d5b 100644
---
a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpConfiguration.java
+++
b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpConfiguration.java
@@ -23,7 +23,6 @@ import java.util.Objects;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.component.mllp.internal.Hl7Util;
-import org.apache.camel.spi.ExceptionHandler;
import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriParams;
import org.apache.camel.util.IOHelper;
@@ -436,6 +435,7 @@ public class MllpConfiguration implements Cloneable {
*
* @deprecated Use the idleTimeout URI parameter
*/
+ @Deprecated
public boolean hasMaxReceiveTimeouts() {
return maxReceiveTimeouts != null;
}
@@ -447,6 +447,7 @@ public class MllpConfiguration implements Cloneable {
*
* @deprecated Use the idleTimeout URI parameter
*/
+ @Deprecated
public Integer getMaxReceiveTimeouts() {
return maxReceiveTimeouts;
}
@@ -459,6 +460,7 @@ public class MllpConfiguration implements Cloneable {
* @deprecated Use the idleTimeout URI parameter. For backward
compibility, setting this parameter will result in an
* idle timeout of maxReceiveTimeouts * receiveTimeout. If idleTimeout is
also specified, this parameter will be ignored.
*/
+ @Deprecated
public void setMaxReceiveTimeouts(Integer maxReceiveTimeouts) {
this.maxReceiveTimeouts = maxReceiveTimeouts;
}
@@ -677,6 +679,7 @@ public class MllpConfiguration implements Cloneable {
*
* @param bufferWrites enabled if true, otherwise disabled
*/
+ @Deprecated
public void setBufferWrites(boolean bufferWrites) {
this.bufferWrites = bufferWrites;
}
diff --git
a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpEndpoint.java
b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpEndpoint.java
index c05b8b6..5cbde6d 100644
---
a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpEndpoint.java
+++
b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpEndpoint.java
@@ -21,11 +21,7 @@ import java.io.IOException;
import java.net.Socket;
import java.net.SocketAddress;
import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
import java.util.Date;
-import java.util.List;
-
import org.apache.camel.Consumer;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
@@ -33,14 +29,11 @@ import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.api.management.ManagedAttribute;
import org.apache.camel.api.management.ManagedResource;
-import org.apache.camel.component.mllp.internal.Hl7Util;
-import org.apache.camel.component.mllp.internal.MllpSocketBuffer;
import org.apache.camel.impl.DefaultEndpoint;
import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriPath;
-import org.apache.camel.util.IOHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -313,6 +306,7 @@ public class MllpEndpoint extends DefaultEndpoint {
*
* @param bufferWrites
*/
+ @Deprecated
public void setBufferWrites(Boolean bufferWrites) {
configuration.setBufferWrites(bufferWrites);
}
diff --git
a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpClientProducer.java
b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpClientProducer.java
index 8b4c303..a9085c3 100644
---
a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpClientProducer.java
+++
b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpClientProducer.java
@@ -503,6 +503,6 @@ public class MllpTcpClientProducer extends DefaultProducer
implements Runnable {
}
public MllpConfiguration getConfiguration() {
- return ((MllpEndpoint)this.getEndpoint()).getConfiguration();
+ return this.getEndpoint().getConfiguration();
}
}
diff --git
a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java
b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java
index 06136f7..dcd32d8 100644
---
a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java
+++
b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java
@@ -51,7 +51,6 @@ import
org.apache.camel.component.mllp.internal.TcpSocketConsumerRunnable;
import org.apache.camel.converter.IOConverter;
import org.apache.camel.impl.DefaultConsumer;
import org.apache.camel.processor.mllp.Hl7AcknowledgementGenerationException;
-import org.apache.camel.util.IOHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/internal/Hl7Util.java
b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/internal/Hl7Util.java
index 3766290..9bf4fea 100644
---
a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/internal/Hl7Util.java
+++
b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/internal/Hl7Util.java
@@ -27,7 +27,6 @@ import java.util.Map;
import org.apache.camel.component.mllp.MllpAcknowledgementGenerationException;
import org.apache.camel.component.mllp.MllpComponent;
import org.apache.camel.component.mllp.MllpProtocolConstants;
-import org.apache.camel.processor.mllp.Hl7AcknowledgementGenerationException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/internal/MllpSocketBuffer.java
b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/internal/MllpSocketBuffer.java
index 3071351..244d77a 100644
---
a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/internal/MllpSocketBuffer.java
+++
b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/internal/MllpSocketBuffer.java
@@ -20,13 +20,10 @@ package org.apache.camel.component.mllp.internal;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
import java.net.Socket;
import java.net.SocketAddress;
-import java.net.SocketException;
import java.net.SocketTimeoutException;
import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import org.apache.camel.component.mllp.MllpComponent;
diff --git
a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/internal/TcpServerConsumerValidationRunnable.java
b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/internal/TcpServerConsumerValidationRunnable.java
index 10a9448..264627b 100644
---
a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/internal/TcpServerConsumerValidationRunnable.java
+++
b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/internal/TcpServerConsumerValidationRunnable.java
@@ -18,10 +18,8 @@
package org.apache.camel.component.mllp.internal;
import java.io.IOException;
-import java.net.ServerSocket;
import java.net.Socket;
import java.net.SocketAddress;
-import java.net.SocketException;
import java.net.SocketTimeoutException;
import org.apache.camel.Route;
diff --git
a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/internal/TcpSocketConsumerRunnable.java
b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/internal/TcpSocketConsumerRunnable.java
index fb54754..709f083 100644
---
a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/internal/TcpSocketConsumerRunnable.java
+++
b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/internal/TcpSocketConsumerRunnable.java
@@ -18,30 +18,17 @@
package org.apache.camel.component.mllp.internal;
import java.io.IOException;
-import java.io.UnsupportedEncodingException;
+
import java.net.Socket;
import java.net.SocketAddress;
import java.net.SocketTimeoutException;
-import java.nio.charset.Charset;
-import java.util.ArrayList;
-import java.util.List;
-import org.apache.camel.Exchange;
-import org.apache.camel.ExchangePattern;
-import org.apache.camel.Message;
import org.apache.camel.Route;
-import org.apache.camel.component.mllp.MllpAcknowledgementDeliveryException;
-import org.apache.camel.component.mllp.MllpConstants;
-import org.apache.camel.component.mllp.MllpInvalidAcknowledgementException;
import org.apache.camel.component.mllp.MllpInvalidMessageException;
-import org.apache.camel.component.mllp.MllpProtocolConstants;
-import org.apache.camel.component.mllp.MllpReceiveException;
import org.apache.camel.component.mllp.MllpSocketException;
import org.apache.camel.component.mllp.MllpTcpServerConsumer;
-import org.apache.camel.converter.IOConverter;
import org.apache.camel.impl.MDCUnitOfWork;
-import org.apache.camel.processor.mllp.Hl7AcknowledgementGenerationException;
-import org.apache.camel.util.IOHelper;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.MDC;
diff --git
a/components/camel-mllp/src/main/java/org/apache/camel/processor/mllp/Hl7AcknowledgementGenerator.java
b/components/camel-mllp/src/main/java/org/apache/camel/processor/mllp/Hl7AcknowledgementGenerator.java
index ea89307..9fba2f7 100644
---
a/components/camel-mllp/src/main/java/org/apache/camel/processor/mllp/Hl7AcknowledgementGenerator.java
+++
b/components/camel-mllp/src/main/java/org/apache/camel/processor/mllp/Hl7AcknowledgementGenerator.java
@@ -26,7 +26,6 @@ import org.apache.camel.Message;
import org.apache.camel.Processor;
import org.apache.camel.component.mllp.MllpConstants;
import org.apache.camel.component.mllp.MllpProtocolConstants;
-import org.apache.camel.component.mllp.internal.MllpSocketBuffer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/components/camel-mllp/src/test/java/org/apache/camel/MllpTcpServerConsumerLenientBindTest.java
b/components/camel-mllp/src/test/java/org/apache/camel/MllpTcpServerConsumerLenientBindTest.java
index d0a681a..d8a389c 100644
---
a/components/camel-mllp/src/test/java/org/apache/camel/MllpTcpServerConsumerLenientBindTest.java
+++
b/components/camel-mllp/src/test/java/org/apache/camel/MllpTcpServerConsumerLenientBindTest.java
@@ -19,13 +19,11 @@ package org.apache.camel;
import java.net.ServerSocket;
import java.net.SocketTimeoutException;
-import java.util.concurrent.TimeUnit;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit.rule.mllp.MllpClientResource;
-import org.apache.camel.test.junit.rule.mllp.MllpJUnitResourceException;
import org.apache.camel.test.junit.rule.mllp.MllpJUnitResourceTimeoutException;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.camel.test.mllp.Hl7TestMessageGenerator;
diff --git
a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpAcknowledgementTimeoutExceptionTest.java
b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpAcknowledgementTimeoutExceptionTest.java
index 9fb85cd..3b2de75 100644
---
a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpAcknowledgementTimeoutExceptionTest.java
+++
b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpAcknowledgementTimeoutExceptionTest.java
@@ -20,7 +20,6 @@ package org.apache.camel.component.mllp;
import org.junit.Test;
import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
diff --git
a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpComponentTest.java
b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpComponentTest.java
index c3dfc3f..167b749 100644
---
a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpComponentTest.java
+++
b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpComponentTest.java
@@ -17,9 +17,6 @@
package org.apache.camel.component.mllp;
-import java.util.HashMap;
-import java.util.Map;
-
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -79,13 +76,13 @@ public class MllpComponentTest {
@Test
public void testSetLogPhi() throws Exception {
MllpComponent.setLogPhi(null);
- assertNull(instance.logPhi);
+ assertNull(MllpComponent.logPhi);
MllpComponent.setLogPhi(true);
- assertEquals(Boolean.TRUE, instance.logPhi);
+ assertEquals(Boolean.TRUE, MllpComponent.logPhi);
MllpComponent.setLogPhi(false);
- assertEquals(Boolean.FALSE, instance.logPhi);
+ assertEquals(Boolean.FALSE, MllpComponent.logPhi);
}
@@ -119,14 +116,14 @@ public class MllpComponentTest {
public void testSetLogPhiMaxBytes() throws Exception {
Integer expected = null;
MllpComponent.setLogPhiMaxBytes(expected);
- assertEquals(expected, instance.logPhiMaxBytes);
+ assertEquals(expected, MllpComponent.logPhiMaxBytes);
expected = -1;
MllpComponent.setLogPhiMaxBytes(expected);
- assertEquals(expected, instance.logPhiMaxBytes);
+ assertEquals(expected, MllpComponent.logPhiMaxBytes);
expected = 1024;
MllpComponent.setLogPhiMaxBytes(expected);
- assertEquals(expected, instance.logPhiMaxBytes);
+ assertEquals(expected, MllpComponent.logPhiMaxBytes);
}
}
\ No newline at end of file
diff --git
a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpEndpointTest.java
b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpEndpointTest.java
index 2c68e7e..ad8371b 100644
---
a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpEndpointTest.java
+++
b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpEndpointTest.java
@@ -17,13 +17,7 @@
package org.apache.camel.component.mllp;
-import java.nio.charset.StandardCharsets;
-
import org.junit.Before;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
/**
* Tests for the MllpEndpoint class.
diff --git
a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpExceptionTest.java
b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpExceptionTest.java
index 6348ba6..b7ec168 100644
---
a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpExceptionTest.java
+++
b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpExceptionTest.java
@@ -17,10 +17,6 @@
package org.apache.camel.component.mllp;
-import java.lang.ref.WeakReference;
-
-import org.apache.camel.component.mllp.internal.Hl7Util;
-
import org.junit.Before;
import org.junit.Test;
diff --git
a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerAutoAcknowledgementWithBridgeErrorHandlerTest.java
b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerAutoAcknowledgementWithBridgeErrorHandlerTest.java
index 6dafbd6..dc6a60a 100644
---
a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerAutoAcknowledgementWithBridgeErrorHandlerTest.java
+++
b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerAutoAcknowledgementWithBridgeErrorHandlerTest.java
@@ -16,8 +16,6 @@
*/
package org.apache.camel.component.mllp;
-import java.util.concurrent.TimeUnit;
-
import org.apache.camel.Exchange;
import org.junit.Test;
diff --git
a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerConnectionTest.java
b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerConnectionTest.java
index 0a07c1b..a14d0c3 100644
---
a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerConnectionTest.java
+++
b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerConnectionTest.java
@@ -34,8 +34,6 @@ import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Rule;
import org.junit.Test;
-import static org.hamcrest.CoreMatchers.anyOf;
-
public class MllpTcpServerConsumerConnectionTest extends CamelTestSupport {
static final int RECEIVE_TIMEOUT = 1000;
static final int READ_TIMEOUT = 500;
diff --git
a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerManualAcknowledgementWithoutBridgeErrorHandlerTest.java
b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerManualAcknowledgementWithoutBridgeErrorHandlerTest.java
index 440a052..355348f 100644
---
a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerManualAcknowledgementWithoutBridgeErrorHandlerTest.java
+++
b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerManualAcknowledgementWithoutBridgeErrorHandlerTest.java
@@ -19,9 +19,6 @@ package org.apache.camel.component.mllp;
import org.apache.camel.Exchange;
import org.junit.Test;
-import static org.hamcrest.CoreMatchers.endsWith;
-import static org.hamcrest.CoreMatchers.startsWith;
-
public class
MllpTcpServerConsumerManualAcknowledgementWithoutBridgeErrorHandlerTest extends
TcpServerConsumerAcknowledgementTestSupport {
@Override
diff --git
a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerOptionalEndOfDataWithoutValidationTest.java
b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerOptionalEndOfDataWithoutValidationTest.java
index 492574e..183403b 100644
---
a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerOptionalEndOfDataWithoutValidationTest.java
+++
b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerOptionalEndOfDataWithoutValidationTest.java
@@ -20,8 +20,6 @@ package org.apache.camel.component.mllp;
import java.util.concurrent.TimeUnit;
import org.apache.camel.builder.NotifyBuilder;
-import org.apache.camel.component.mllp.internal.Hl7Util;
-
import org.apache.camel.test.mllp.Hl7TestMessageGenerator;
import org.junit.Test;
diff --git
a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/TcpServerConsumerEndOfDataAndValidationTestSupport.java
b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/TcpServerConsumerEndOfDataAndValidationTestSupport.java
index ed2a56e..b421b83 100644
---
a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/TcpServerConsumerEndOfDataAndValidationTestSupport.java
+++
b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/TcpServerConsumerEndOfDataAndValidationTestSupport.java
@@ -259,7 +259,7 @@ public abstract class
TcpServerConsumerEndOfDataAndValidationTestSupport extends
mllpClient.connect();
log.info("Sending third message");
- String acknowledgement =
mllpClient.sendMessageAndWaitForAcknowledgement(Hl7TestMessageGenerator.generateMessage(10003));
+
mllpClient.sendMessageAndWaitForAcknowledgement(Hl7TestMessageGenerator.generateMessage(10003));
}
@Test
diff --git
a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/internal/MllpSocketBufferReadFromTest.java
b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/internal/MllpSocketBufferReadFromTest.java
index ddf1974..a383187 100644
---
a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/internal/MllpSocketBufferReadFromTest.java
+++
b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/internal/MllpSocketBufferReadFromTest.java
@@ -25,8 +25,6 @@ import org.apache.camel.test.stub.tcp.SocketStub;
import org.junit.Before;
import org.junit.Test;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.fail;
diff --git
a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/internal/MllpSocketBufferWriteTest.java
b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/internal/MllpSocketBufferWriteTest.java
index ae097ac..54f0139 100644
---
a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/internal/MllpSocketBufferWriteTest.java
+++
b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/internal/MllpSocketBufferWriteTest.java
@@ -303,11 +303,11 @@ public class MllpSocketBufferWriteTest extends
SocketBufferTestSupport {
*/
@Test
public void testEnsureCapacityWithNegativeRequiredAvailability() throws
Exception {
- assertEquals(instance.MIN_BUFFER_SIZE, instance.capacity());
+ assertEquals(MllpSocketBuffer.MIN_BUFFER_SIZE, instance.capacity());
instance.ensureCapacity(-1);
- assertEquals(instance.MIN_BUFFER_SIZE, instance.capacity());
+ assertEquals(MllpSocketBuffer.MIN_BUFFER_SIZE, instance.capacity());
}
/**
@@ -317,7 +317,7 @@ public class MllpSocketBufferWriteTest extends
SocketBufferTestSupport {
*/
@Test
public void testEnsureCapacityWithOutOfRangeRequiredAvailability() throws
Exception {
- assertEquals(instance.MIN_BUFFER_SIZE, instance.capacity());
+ assertEquals(MllpSocketBuffer.MIN_BUFFER_SIZE, instance.capacity());
try {
instance.ensureCapacity(Integer.MAX_VALUE);
@@ -329,7 +329,7 @@ public class MllpSocketBufferWriteTest extends
SocketBufferTestSupport {
}
try {
- instance.ensureCapacity(instance.MAX_BUFFER_SIZE + 1);
+ instance.ensureCapacity(MllpSocketBuffer.MAX_BUFFER_SIZE + 1);
fail("Should have thrown an exception");
} catch (IllegalStateException expectedEx) {
String expectedMessage = "Cannot increase the buffer size <2048>
in order to increase the available capacity from <2048> to <1073741825>"
@@ -339,7 +339,7 @@ public class MllpSocketBufferWriteTest extends
SocketBufferTestSupport {
try {
instance.write("BLAH".getBytes());
- instance.ensureCapacity(instance.MAX_BUFFER_SIZE);
+ instance.ensureCapacity(MllpSocketBuffer.MAX_BUFFER_SIZE);
fail("Should have thrown an exception");
} catch (IllegalStateException expectedEx) {
String expectedMessage = "Cannot increase the buffer size <2048>
in order to increase the available capacity from <2044> to <1073741824>"
@@ -355,12 +355,12 @@ public class MllpSocketBufferWriteTest extends
SocketBufferTestSupport {
*/
@Test
public void testEnsureCapacityWithAlreadyAllocateMaxBufferSize() throws
Exception {
- assertEquals(instance.MIN_BUFFER_SIZE, instance.capacity());
+ assertEquals(MllpSocketBuffer.MIN_BUFFER_SIZE, instance.capacity());
- instance.ensureCapacity(instance.MAX_BUFFER_SIZE);
+ instance.ensureCapacity(MllpSocketBuffer.MAX_BUFFER_SIZE);
try {
- instance.ensureCapacity(instance.MAX_BUFFER_SIZE + 1);
+ instance.ensureCapacity(MllpSocketBuffer.MAX_BUFFER_SIZE + 1);
fail("Should have thrown an exception");
} catch (IllegalStateException expectedEx) {
String expectedMessage = "Cannot increase the buffer size from
<1073741824> to <1073741825> in order to increase the available capacity"
diff --git
a/components/camel-mllp/src/test/java/org/apache/camel/test/executor/TestExecutor.java
b/components/camel-mllp/src/test/java/org/apache/camel/test/executor/TestExecutor.java
index 0f80657..5181737 100644
---
a/components/camel-mllp/src/test/java/org/apache/camel/test/executor/TestExecutor.java
+++
b/components/camel-mllp/src/test/java/org/apache/camel/test/executor/TestExecutor.java
@@ -18,7 +18,6 @@
package org.apache.camel.test.executor;
import java.util.List;
-import java.util.concurrent.BlockingDeque;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.SynchronousQueue;
diff --git
a/components/camel-mllp/src/test/java/org/apache/camel/test/junit/rule/mllp/MllpClientResource.java
b/components/camel-mllp/src/test/java/org/apache/camel/test/junit/rule/mllp/MllpClientResource.java
index bcaa03b..b576a7b 100644
---
a/components/camel-mllp/src/test/java/org/apache/camel/test/junit/rule/mllp/MllpClientResource.java
+++
b/components/camel-mllp/src/test/java/org/apache/camel/test/junit/rule/mllp/MllpClientResource.java
@@ -282,9 +282,9 @@ public class MllpClientResource extends ExternalResource {
} else {
log.warn("Not sending START_OF_BLOCK");
}
- for (int i = 0; i < payloadBytes.length; ++i) {
- outputStream.write(payloadBytes[i]);
- if (flushByte == payloadBytes[i]) {
+ for (byte payloadByte : payloadBytes) {
+ outputStream.write(payloadByte);
+ if (flushByte == payloadByte) {
outputStream.flush();
}
}
diff --git
a/components/camel-mllp/src/test/java/org/apache/camel/test/junit/rule/mllp/MllpServerResource.java
b/components/camel-mllp/src/test/java/org/apache/camel/test/junit/rule/mllp/MllpServerResource.java
index 656280d..f76ab91 100644
---
a/components/camel-mllp/src/test/java/org/apache/camel/test/junit/rule/mllp/MllpServerResource.java
+++
b/components/camel-mllp/src/test/java/org/apache/camel/test/junit/rule/mllp/MllpServerResource.java
@@ -562,8 +562,6 @@ public class MllpServerResource extends ExternalResource {
throw new IllegalArgumentException("Acknowledgemnt Code must be
AA, AE or AR: " + acknowledgementCode);
}
- String messageControlId;
-
int endOfMshSegment =
hl7Message.indexOf(MllpProtocolConstants.SEGMENT_DELIMITER);
if (-1 != endOfMshSegment) {
String mshSegment = hl7Message.substring(0, endOfMshSegment);
diff --git
a/components/camel-mllp/src/test/java/org/apache/camel/test/tcp/JavaSocketTests.java
b/components/camel-mllp/src/test/java/org/apache/camel/test/tcp/JavaSocketTests.java
index b3e9ce6..a6b8bcc 100644
---
a/components/camel-mllp/src/test/java/org/apache/camel/test/tcp/JavaSocketTests.java
+++
b/components/camel-mllp/src/test/java/org/apache/camel/test/tcp/JavaSocketTests.java
@@ -77,7 +77,6 @@ public class JavaSocketTests {
@Override
public void run() {
- boolean running = true;
try {
Socket echoSocket = serverSocket.accept();
@@ -109,7 +108,6 @@ public class JavaSocketTests {
log.warn("Exception encountered
closing echoSocket after END_OF_STREAM received", ex);
}
}
- running = false;
break;
case 10:
log.info("Complete Message - Sending
Response");
@@ -184,7 +182,6 @@ public class JavaSocketTests {
@Override
public void run() {
- boolean running = true;
try {
Socket echoSocket = serverSocket.accept();
@@ -216,7 +213,6 @@ public class JavaSocketTests {
log.warn("Exception encountered
closing echoSocket after END_OF_STREAM received", ex);
}
}
- running = false;
break;
case 27: // Escape
log.info("Received Escape - closing
connection");
@@ -278,7 +274,6 @@ public class JavaSocketTests {
log.info("Message send loop complete - closing connection");
log.info("Client Socket available() returned {} before close",
clientSocket.getInputStream().available());
- byte[] buffer = new byte[0];
try {
clientSocket.getInputStream().read();
fail("read should have timed-out");
@@ -288,7 +283,6 @@ public class JavaSocketTests {
clientSocket.getOutputStream().write(27);
Thread.sleep(1000);
log.info("Client Socket available() returned {} after close",
clientSocket.getInputStream().available());
- buffer = new byte[0];
log.info("Client Socket read() returned {} after close",
clientSocket.getInputStream().read());
// Javadoc for Socket says closing the InputStream will close the
connection
clientSocket.getInputStream().close();
diff --git
a/components/camel-mongodb-gridfs/src/test/java/org/apache/camel/component/mongodb/gridfs/GridFsConsumerTest.java
b/components/camel-mongodb-gridfs/src/test/java/org/apache/camel/component/mongodb/gridfs/GridFsConsumerTest.java
index b2d4ea8..3ac2670 100644
---
a/components/camel-mongodb-gridfs/src/test/java/org/apache/camel/component/mongodb/gridfs/GridFsConsumerTest.java
+++
b/components/camel-mongodb-gridfs/src/test/java/org/apache/camel/component/mongodb/gridfs/GridFsConsumerTest.java
@@ -72,7 +72,7 @@ public class GridFsConsumerTest extends AbstractMongoDbTest {
mock.expectedMessageCount(1);
mock.expectedBodiesReceived(data);
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
String fn = "filename.for.db.txt";
assertEquals(0, gridfs.find(fn).size());
diff --git
a/components/camel-mongodb-gridfs/src/test/java/org/apache/camel/component/mongodb/gridfs/GridFsProducerOperationsTest.java
b/components/camel-mongodb-gridfs/src/test/java/org/apache/camel/component/mongodb/gridfs/GridFsProducerOperationsTest.java
index b7203bc..237b562 100644
---
a/components/camel-mongodb-gridfs/src/test/java/org/apache/camel/component/mongodb/gridfs/GridFsProducerOperationsTest.java
+++
b/components/camel-mongodb-gridfs/src/test/java/org/apache/camel/component/mongodb/gridfs/GridFsProducerOperationsTest.java
@@ -42,7 +42,7 @@ public class GridFsProducerOperationsTest extends
AbstractMongoDbTest {
@Test
public void testOperations() throws Exception {
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
String fn = "filename.for.db.txt";
assertEquals(0, gridfs.find(fn).size());
diff --git
a/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbComponent.java
b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbComponent.java
index dee4340..e31ed97 100644
---
a/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbComponent.java
+++
b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbComponent.java
@@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory;
public class MongoDbComponent extends UriEndpointComponent {
public static final Set<MongoDbOperation> WRITE_OPERATIONS =
- new
HashSet<MongoDbOperation>(Arrays.asList(MongoDbOperation.insert,
MongoDbOperation.save,
+ new HashSet<>(Arrays.asList(MongoDbOperation.insert,
MongoDbOperation.save,
MongoDbOperation.update, MongoDbOperation.remove,
MongoDbOperation.bulkWrite));
private static final Logger LOG =
LoggerFactory.getLogger(MongoDbComponent.class);
diff --git
a/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbProducer.java
b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbProducer.java
index d6944a3..772ea6e 100644
---
a/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbProducer.java
+++
b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbProducer.java
@@ -214,7 +214,7 @@ public class MongoDbProducer extends DefaultProducer {
@SuppressWarnings("rawtypes")
private List<DBObject> attemptConvertToList(List insertList, Exchange
exchange) throws CamelMongoDbException {
- List<DBObject> dbObjectList = new
ArrayList<DBObject>(insertList.size());
+ List<DBObject> dbObjectList = new ArrayList<>(insertList.size());
TypeConverter converter = exchange.getContext().getTypeConverter();
for (Object item : insertList) {
try {
diff --git
a/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbConversionsTest.java
b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbConversionsTest.java
index 743cc12..08f3a36 100644
---
a/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbConversionsTest.java
+++
b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbConversionsTest.java
@@ -34,8 +34,8 @@ public class MongoDbConversionsTest extends
AbstractMongoDbTest {
public void testInsertMap() throws InterruptedException {
assertEquals(0, testCollection.count());
- Map<String, Object> m1 = new HashMap<String, Object>();
- Map<String, String> m1Nested = new HashMap<String, String>();
+ Map<String, Object> m1 = new HashMap<>();
+ Map<String, String> m1Nested = new HashMap<>();
m1Nested.put("nested1", "nestedValue1");
m1Nested.put("nested2", "nestedValue2");
diff --git
a/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbDynamicityTest.java
b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbDynamicityTest.java
index a3aae8e..61ca54a 100644
---
a/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbDynamicityTest.java
+++
b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbDynamicityTest.java
@@ -40,7 +40,7 @@ public class MongoDbDynamicityTest extends
AbstractMongoDbTest {
.anyMatch("otherDB"::equals));
String body = "{\"_id\": \"testInsertDynamicityDisabled\", \"a\" :
\"1\"}";
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put(MongoDbConstants.DATABASE, "otherDB");
headers.put(MongoDbConstants.COLLECTION, "otherCollection");
template.requestBodyAndHeaders("direct:noDynamicity", body, headers);
@@ -70,7 +70,7 @@ public class MongoDbDynamicityTest extends
AbstractMongoDbTest {
.anyMatch("otherDB"::equals));
String body = "{\"_id\": \"testInsertDynamicityEnabledDBOnly\", \"a\"
: \"1\"}";
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put(MongoDbConstants.DATABASE, "otherDB");
template.requestBodyAndHeaders("direct:dynamicityEnabled", body,
headers);
@@ -98,7 +98,7 @@ public class MongoDbDynamicityTest extends
AbstractMongoDbTest {
.anyMatch("otherDB"::equals));
String body = "{\"_id\":
\"testInsertDynamicityEnabledCollectionOnly\", \"a\" : \"1\"}";
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put(MongoDbConstants.COLLECTION, "otherCollection");
template.requestBodyAndHeaders("direct:dynamicityEnabled", body,
headers);
@@ -125,7 +125,7 @@ public class MongoDbDynamicityTest extends
AbstractMongoDbTest {
.anyMatch("otherDB"::equals));
String body = "{\"_id\":
\"testInsertDynamicityEnabledDBAndCollection\", \"a\" : \"1\"}";
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put(MongoDbConstants.DATABASE, "otherDB");
headers.put(MongoDbConstants.COLLECTION, "otherCollection");
template.requestBodyAndHeaders("direct:dynamicityEnabled", body,
headers);
diff --git
a/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbFindOperationTest.java
b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbFindOperationTest.java
index 9aa7bc2..07eca89 100644
---
a/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbFindOperationTest.java
+++
b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbFindOperationTest.java
@@ -154,7 +154,7 @@ public class MongoDbFindOperationTest extends
AbstractMongoDbTest {
int numToSkip = 0;
final int limit = 100;
for (int i = 0; i < 10; i++) {
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put(MongoDbConstants.NUM_TO_SKIP, numToSkip);
headers.put(MongoDbConstants.LIMIT, 100);
Object result = template.requestBodyAndHeaders("direct:findAll",
(Object) null, headers);
diff --git
a/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbHeaderHandlingTest.java
b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbHeaderHandlingTest.java
index e006309..8e69960 100644
---
a/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbHeaderHandlingTest.java
+++
b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbHeaderHandlingTest.java
@@ -66,7 +66,7 @@ public class MongoDbHeaderHandlingTest extends
AbstractMongoDbTest {
// Prepare test
assertEquals(0, testCollection.count());
Object[] req = new Object[] {"{\"_id\":\"testSave1\",
\"scientist\":\"Einstein\"}", "{\"_id\":\"testSave2\",
\"scientist\":\"Copernicus\"}"};
- Object result = template.requestBody("direct:insert", req);
+ template.requestBody("direct:insert", req);
//assertTrue(result instanceof WriteResult);
assertEquals("Number of records persisted must be 2", 2,
testCollection.count());
diff --git
a/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbIndexTest.java
b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbIndexTest.java
index 689c8cc..1450826 100644
---
a/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbIndexTest.java
+++
b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbIndexTest.java
@@ -46,11 +46,11 @@ public class MongoDbIndexTest extends AbstractMongoDbTest {
.anyMatch("otherDB"::equals));
String body = "{\"_id\":
\"testInsertDynamicityEnabledDBAndCollection\", \"a\" : 1, \"b\" : 2}";
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put(MongoDbConstants.DATABASE, "otherDB");
headers.put(MongoDbConstants.COLLECTION, "otherCollection");
- List<DBObject> objIndex = new ArrayList<DBObject>();
+ List<DBObject> objIndex = new ArrayList<>();
DBObject index1 = new BasicDBObject();
index1.put("a", 1);
DBObject index2 = new BasicDBObject();
@@ -97,10 +97,10 @@ public class MongoDbIndexTest extends AbstractMongoDbTest {
.anyMatch("otherDB"::equals));
String body = "{\"_id\":
\"testInsertDynamicityEnabledCollectionAndIndex\", \"a\" : 1, \"b\" : 2}";
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put(MongoDbConstants.COLLECTION, "otherCollection");
- List<DBObject> objIndex = new ArrayList<DBObject>();
+ List<DBObject> objIndex = new ArrayList<>();
DBObject index1 = new BasicDBObject();
index1.put("a", 1);
DBObject index2 = new BasicDBObject();
@@ -143,7 +143,7 @@ public class MongoDbIndexTest extends AbstractMongoDbTest {
.anyMatch("otherDB"::equals));
String body = "{\"_id\":
\"testInsertDynamicityEnabledCollectionOnlyAndURIIndex\", \"a\" : 1, \"b\" :
2}";
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put(MongoDbConstants.COLLECTION, "otherCollection");
Object result =
template.requestBodyAndHeaders("direct:dynamicityEnabledWithIndexUri", body,
headers);
@@ -176,7 +176,7 @@ public class MongoDbIndexTest extends AbstractMongoDbTest {
db.getCollection("otherCollection").deleteOne(new BasicDBObject());
String body = "{\"_id\":
\"testInsertAutoCreateCollectionAndURIIndex\", \"a\" : 1, \"b\" : 2}";
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
Object result =
template.requestBodyAndHeaders("direct:dynamicityDisabled", body, headers);
assertEquals("Response isn't of type WriteResult", WriteResult.class,
result.getClass());
diff --git
a/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbOutputTypeTest.java
b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbOutputTypeTest.java
index d77a2e0..09c3ca4 100644
---
a/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbOutputTypeTest.java
+++
b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbOutputTypeTest.java
@@ -40,7 +40,7 @@ public class MongoDbOutputTypeTest extends
AbstractMongoDbTest {
int numToSkip = 0;
final int limit = 100;
for (int i = 0; i < 10; i++) {
- Map<String, Object> headers = new HashMap<String, Object>();
+ Map<String, Object> headers = new HashMap<>();
headers.put(MongoDbConstants.NUM_TO_SKIP, numToSkip);
headers.put(MongoDbConstants.LIMIT, 100);
Object result =
template.requestBodyAndHeaders("direct:findAllDBCursor", (Object) null,
headers);
diff --git
a/components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbProducer.java
b/components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbProducer.java
index a507df7..b185f08 100644
---
a/components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbProducer.java
+++
b/components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbProducer.java
@@ -520,7 +520,7 @@ public class MongoDbProducer extends DefaultProducer {
// @see http://docs.mongodb.org/manual/core/aggregation/
List<Bson> queryList;
if (query != null) {
- queryList = query.stream().map(o ->
(Bson)o).collect(Collectors.toList());
+ queryList = query.stream().collect(Collectors.toList());
} else {
queryList =
Arrays.asList(Bson.class.cast(exchange.getIn().getMandatoryBody(Bson.class)));
}
@@ -625,7 +625,7 @@ public class MongoDbProducer extends DefaultProducer {
BulkWriteOptions options = new
BulkWriteOptions().ordered(ordered);
@SuppressWarnings("unchecked")
- List<WriteModel<Document>> requests =
(List<WriteModel<Document>>)
exchange.getIn().getMandatoryBody((Class<List<WriteModel<Document>>>)Class.class.cast(List.class));
+ List<WriteModel<Document>> requests =
exchange.getIn().getMandatoryBody((Class<List<WriteModel<Document>>>)Class.class.cast(List.class));
BulkWriteResult result = dbCol.bulkWrite(requests, options);
return result;
diff --git
a/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/processor/idempotent/MongoDbIdempotentRepositoryTest.java
b/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/processor/idempotent/MongoDbIdempotentRepositoryTest.java
index d98c19b..4a9d427 100644
---
a/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/processor/idempotent/MongoDbIdempotentRepositoryTest.java
+++
b/components/camel-mongodb3/src/test/java/org/apache/camel/component/mongodb3/processor/idempotent/MongoDbIdempotentRepositoryTest.java
@@ -39,7 +39,7 @@ public class MongoDbIdempotentRepositoryTest extends
AbstractMongoDbTest {
@Override
public void doPostSetup() {
super.doPostSetup();
- repo = new MongoDbIdempotentRepository<>((MongoClient)mongo,
testCollectionName, dbName);
+ repo = new MongoDbIdempotentRepository<>(mongo, testCollectionName,
dbName);
}
@Test
diff --git
a/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTEndpoint.java
b/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTEndpoint.java
index 72a8e61..5b70097 100644
---
a/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTEndpoint.java
+++
b/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/MQTTEndpoint.java
@@ -69,7 +69,7 @@ public class MQTTEndpoint extends DefaultEndpoint implements
AsyncEndpoint {
private CallbackConnection connection;
private volatile boolean connected;
- private final List<MQTTConsumer> consumers = new
CopyOnWriteArrayList<MQTTConsumer>();
+ private final List<MQTTConsumer> consumers = new CopyOnWriteArrayList<>();
@UriPath @Metadata(required = "true")
private String name;
@@ -310,7 +310,7 @@ public class MQTTEndpoint extends DefaultEndpoint
implements AsyncEndpoint {
}
void connect() throws Exception {
- final Promise<Object> promise = new Promise<Object>();
+ final Promise<Object> promise = new Promise<>();
connection.connect(new Callback<Void>() {
public void onSuccess(Void value) {
LOG.debug("Connected to {}", configuration.getHost());
diff --git
a/components/camel-mqtt/src/test/java/org/apache/camel/component/mqtt/MQTTDuplicatesTest.java
b/components/camel-mqtt/src/test/java/org/apache/camel/component/mqtt/MQTTDuplicatesTest.java
index 800c65e..4736002 100644
---
a/components/camel-mqtt/src/test/java/org/apache/camel/component/mqtt/MQTTDuplicatesTest.java
+++
b/components/camel-mqtt/src/test/java/org/apache/camel/component/mqtt/MQTTDuplicatesTest.java
@@ -110,8 +110,8 @@ public class MQTTDuplicatesTest extends MQTTBaseTest {
private void assertNoDuplicates() {
List<Exchange> exchanges = resultEndpoint.getExchanges();
Assert.assertTrue("No message was delivered - something wrong
happened", exchanges.size() > 0);
- Set<String> values = new HashSet<String>();
- List<String> duplicates = new ArrayList<String>();
+ Set<String> values = new HashSet<>();
+ List<String> duplicates = new ArrayList<>();
for (Exchange e : exchanges) {
String body = e.getIn().getBody(String.class);
if (values.contains(body)) {
diff --git
a/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisConsumer.java
b/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisConsumer.java
index 9cdce3e..9018409 100644
---
a/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisConsumer.java
+++
b/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisConsumer.java
@@ -77,7 +77,7 @@ public class MyBatisConsumer extends
ScheduledBatchPollingConsumer {
List<?> data = endpoint.getProcessingStrategy().poll(this,
getEndpoint());
// create a list of exchange objects with the data
- Queue<DataHolder> answer = new LinkedList<DataHolder>();
+ Queue<DataHolder> answer = new LinkedList<>();
if (useIterator) {
for (Object item : data) {
Exchange exchange = createExchange(item);
diff --git
a/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisEndpoint.java
b/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisEndpoint.java
index ca7dcc5..6f83e74 100644
---
a/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisEndpoint.java
+++
b/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisEndpoint.java
@@ -16,20 +16,15 @@
*/
package org.apache.camel.component.mybatis;
-import java.io.IOException;
-
import org.apache.camel.Component;
import org.apache.camel.Consumer;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
-import org.apache.camel.impl.DefaultPollingEndpoint;
import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriPath;
import org.apache.camel.util.ObjectHelper;
-import org.apache.ibatis.session.ExecutorType;
-import org.apache.ibatis.session.SqlSessionFactory;
/**
* Performs a query, poll, insert, update or delete in a relational database
using MyBatis.
diff --git
a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisConsumerIsolatedTest.java
b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisConsumerIsolatedTest.java
index 5daf531..185a492 100644
---
a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisConsumerIsolatedTest.java
+++
b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisConsumerIsolatedTest.java
@@ -36,7 +36,7 @@ public class MyBatisConsumerIsolatedTest extends Assert {
MyBatisConsumer consumer = new
MyBatisConsumer(mock(MyBatisEndpoint.class), mock(Processor.class));
consumer.setMaxMessagesPerPoll(batchSize);
- Queue<Object> emptyMessageQueue = new ArrayDeque<Object>();
+ Queue<Object> emptyMessageQueue = new ArrayDeque<>();
for (int i = 0; i < 10; i++) {
MyBatisConsumer.DataHolder dataHolder = new
MyBatisConsumer.DataHolder();
dataHolder.exchange = new
DefaultExchange(mock(CamelContext.class));
diff --git
a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisInsertListTest.java
b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisInsertListTest.java
index d5c9f36..2ef9679 100644
---
a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisInsertListTest.java
+++
b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisInsertListTest.java
@@ -42,7 +42,7 @@ public class MyBatisInsertListTest extends MyBatisTestSupport
{
account2.setLastName("Daubman");
account2.setEmailAddress("readthedevl...@gmail.com");
- List<Account> accountList = new ArrayList<Account>(2);
+ List<Account> accountList = new ArrayList<>(2);
accountList.add(account1);
accountList.add(account2);
diff --git
a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisInsertTest.java
b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisInsertTest.java
index 61a9520..ff365a1 100644
---
a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisInsertTest.java
+++
b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisInsertTest.java
@@ -16,10 +16,6 @@
*/
package org.apache.camel.component.mybatis;
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.Statement;
-
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
diff --git
a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisUpdateListTest.java
b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisUpdateListTest.java
index ff9a784..0c35db1 100644
---
a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisUpdateListTest.java
+++
b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisUpdateListTest.java
@@ -43,7 +43,7 @@ public class MyBatisUpdateListTest extends MyBatisTestSupport
{
account2.setLastName("Ibsen");
account2.setEmailAddress("non...@gmail.com");
- Map<String, Object> params = new HashMap<String, Object>();
+ Map<String, Object> params = new HashMap<>();
params.put("list", Arrays.asList(account1, account2));
params.put("emailAddress", "ot...@gmail.com");
template.sendBody("direct:start", params);
--
To stop receiving notification emails like this one, please contact
bvah...@apache.org.
