You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bv...@apache.org on 2018/06/10 12:20:50 UTC
[camel] branch master updated: polish
This is an automated email from the ASF dual-hosted git repository.
bvahdat pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 5179543 polish
5179543 is described below
commit 517954375d4d29188d63418b60eb9d945124bcbd
Author: Babak Vahdat <bv...@apache.org>
AuthorDate: Sun Jun 10 14:20:15 2018 +0200
polish
---
.../management/DefaultManagementLifecycleStrategy.java | 3 +--
.../org/apache/camel/management/ManagedThrottlerTest.java | 8 --------
.../apache/camel/util/jsse/SSLContextParametersTest.java | 3 ---
.../camel/component/as2/api/AS2SignedDataGenerator.java | 14 ++++++--------
.../entity/AS2MessageDispositionNotificationEntity.java | 2 +-
.../api/entity/DispositionNotificationOptionsParser.java | 2 +-
.../component/as2/api/entity/MultipartMimeEntity.java | 2 +-
.../camel/component/as2/api/util/AS2HeaderUtils.java | 2 +-
.../as2/api/util/DispositionNotificationContentUtils.java | 12 ++++++------
.../org/apache/camel/component/as2/api/AS2MessageTest.java | 6 +++---
.../java/org/apache/camel/component/as2/AS2Consumer.java | 2 +-
.../camel/component/as2/internal/AS2ConnectionHelper.java | 2 +-
.../component/as2/AS2ClientManagerIntegrationTest.java | 8 ++++----
.../component/as2/AS2ServerManagerIntegrationTest.java | 2 +-
.../apache/camel/component/as2/AbstractAS2TestSupport.java | 2 +-
.../asn1/ASN1DataFormatWithStreamIteratorClassTest.java | 1 -
.../dataformat/asn1/SpringASN1DataFormatRouteTest.java | 1 -
.../java/org/apache/camel/component/cxf/CxfProducer.java | 3 +--
.../camel/component/disruptor/DisruptorEndpoint.java | 3 +--
.../google/mail/stream/GoogleMailStreamConsumer.java | 11 +++++------
.../camel/component/jms/JmsStreamMessageTypeTest.java | 4 ++--
.../kubernetes/cloud/ServiceCallEnvironmentRouteTest.java | 3 ---
.../component/micrometer/AbstractMicrometerProducer.java | 4 ++--
.../component/micrometer/MicrometerComponentTest.java | 1 -
.../salesforce/internal/streaming/SubscriptionHelper.java | 3 +--
.../component/salesforce/HttpProxyIntegrationTest.java | 2 --
.../apache/camel/component/undertow/UndertowComponent.java | 2 --
.../org/apache/camel/component/web3j/Web3jConsumer.java | 2 +-
.../org/apache/camel/component/web3j/Web3jEndpoint.java | 2 --
.../org/apache/camel/component/web3j/Web3jProducer.java | 6 +++---
.../apache/camel/component/web3j/Web3jMockTestSupport.java | 1 -
.../component/websocket/WebsocketComponentServletTest.java | 1 -
32 files changed, 44 insertions(+), 76 deletions(-)
diff --git a/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java b/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java
index 6cd29ac..ecb4580 100644
--- a/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java
+++ b/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java
@@ -767,8 +767,7 @@ public class DefaultManagementLifecycleStrategy extends ServiceSupport implement
// Create a map (ProcessorType -> PerformanceCounter)
// to be passed to InstrumentationInterceptStrategy.
- Map<ProcessorDefinition<?>, PerformanceCounter> registeredCounters =
- new HashMap<>();
+ Map<ProcessorDefinition<?>, PerformanceCounter> registeredCounters = new HashMap<>();
// Each processor in a route will have its own performance counter.
// These performance counter will be embedded to InstrumentationProcessor
diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedThrottlerTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedThrottlerTest.java
index 90f9477..f63add7 100644
--- a/camel-core/src/test/java/org/apache/camel/management/ManagedThrottlerTest.java
+++ b/camel-core/src/test/java/org/apache/camel/management/ManagedThrottlerTest.java
@@ -116,8 +116,6 @@ public class ManagedThrottlerTest extends ManagementTestSupport {
// get the stats for the route
MBeanServer mbeanServer = getMBeanServer();
- // get the object name for the delayer
- ObjectName throttlerName = ObjectName.getInstance("org.apache.camel:context=camel-1,type=processors,name=\"mythrottler2\"");
// use route to get the total time
ObjectName routeName = ObjectName.getInstance("org.apache.camel:context=camel-1,type=routes,name=\"route2\"");
@@ -153,8 +151,6 @@ public class ManagedThrottlerTest extends ManagementTestSupport {
// get the stats for the route
MBeanServer mbeanServer = getMBeanServer();
- // get the object name for the delayer
- ObjectName throttlerName = ObjectName.getInstance("org.apache.camel:context=camel-1,type=processors,name=\"mythrottler3\"");
// use route to get the total time
ObjectName routeName = ObjectName.getInstance("org.apache.camel:context=camel-1,type=routes,name=\"route3\"");
@@ -231,8 +227,6 @@ public class ManagedThrottlerTest extends ManagementTestSupport {
// get the stats for the route
MBeanServer mbeanServer = getMBeanServer();
- // get the object name for the delayer
- ObjectName throttlerName = ObjectName.getInstance("org.apache.camel:context=camel-1,type=processors,name=\"mythrottler2\"");
// use route to get the total time
ObjectName routeName = ObjectName.getInstance("org.apache.camel:context=camel-1,type=routes,name=\"route2\"");
@@ -266,8 +260,6 @@ public class ManagedThrottlerTest extends ManagementTestSupport {
// get the stats for the route
MBeanServer mbeanServer = getMBeanServer();
- // get the object name for the delayer
- ObjectName throttlerName = ObjectName.getInstance("org.apache.camel:context=camel-1,type=processors,name=\"mythrottler2\"");
// use route to get the total time
ObjectName routeName = ObjectName.getInstance("org.apache.camel:context=camel-1,type=routes,name=\"route2\"");
diff --git a/camel-core/src/test/java/org/apache/camel/util/jsse/SSLContextParametersTest.java b/camel-core/src/test/java/org/apache/camel/util/jsse/SSLContextParametersTest.java
index d0cc0a1..b901383 100644
--- a/camel-core/src/test/java/org/apache/camel/util/jsse/SSLContextParametersTest.java
+++ b/camel-core/src/test/java/org/apache/camel/util/jsse/SSLContextParametersTest.java
@@ -583,9 +583,6 @@ public class SSLContextParametersTest extends AbstractJsseParametersTest {
public void testSecureSocketProtocols() throws Exception {
SSLContext controlContext = SSLContext.getInstance("TLS");
controlContext.init(null, null, null);
- SSLEngine controlEngine = controlContext.createSSLEngine();
- SSLSocket controlSocket = (SSLSocket) controlContext.getSocketFactory().createSocket();
- SSLServerSocket controlServerSocket = (SSLServerSocket) controlContext.getServerSocketFactory().createServerSocket();
// default
SSLContextParameters scp = new SSLContextParameters();
diff --git a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2SignedDataGenerator.java b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2SignedDataGenerator.java
index 9441c17..f52429a 100644
--- a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2SignedDataGenerator.java
+++ b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2SignedDataGenerator.java
@@ -52,7 +52,7 @@ public class AS2SignedDataGenerator extends CMSSignedDataGenerator {
public static final Map<ASN1ObjectIdentifier, String> STANDARD_MICALGS;
static {
- Map<ASN1ObjectIdentifier, String> stdMicAlgs = new HashMap<ASN1ObjectIdentifier, String>();
+ Map<ASN1ObjectIdentifier, String> stdMicAlgs = new HashMap<>();
stdMicAlgs.put(CMSAlgorithm.MD5, "md5");
stdMicAlgs.put(CMSAlgorithm.SHA1, "sha-1");
@@ -113,7 +113,7 @@ public class AS2SignedDataGenerator extends CMSSignedDataGenerator {
public ContentType createMultipartSignedContentType(String boundary) {
StringBuffer header = new StringBuffer(AS2MediaType.MULTIPART_SIGNED);
header.append("; boundary=" + boundary);
- Set<String> micAlgSet = new HashSet<String>();
+ Set<String> micAlgSet = new HashSet<>();
// Collect algorithm names used by pre-calculated signers
for (@SuppressWarnings("rawtypes")
@@ -121,7 +121,7 @@ public class AS2SignedDataGenerator extends CMSSignedDataGenerator {
SignerInformation signer = (SignerInformation) it.next();
ASN1ObjectIdentifier digestOID = signer.getDigestAlgorithmID().getAlgorithm();
- String micAlg = (String) STANDARD_MICALGS.get(digestOID);
+ String micAlg = STANDARD_MICALGS.get(digestOID);
if (micAlg == null) {
micAlgSet.add("unknown");
@@ -136,7 +136,7 @@ public class AS2SignedDataGenerator extends CMSSignedDataGenerator {
SignerInfoGenerator signerInfoGen = (SignerInfoGenerator) it.next();
ASN1ObjectIdentifier digestOID = signerInfoGen.getDigestAlgorithm().getAlgorithm();
- String micAlg = (String) STANDARD_MICALGS.get(digestOID);
+ String micAlg = STANDARD_MICALGS.get(digestOID);
if (micAlg == null) {
micAlgSet.add("unknown");
@@ -147,9 +147,7 @@ public class AS2SignedDataGenerator extends CMSSignedDataGenerator {
// Add algorithm names to multipart signed header.
int count = 0;
- for (Iterator<String> it = micAlgSet.iterator(); it.hasNext();) {
- String alg = it.next();
-
+ for (String micAlg : micAlgSet) {
if (count == 0) {
if (micAlgSet.size() != 1) {
header.append("; micalg=\"");
@@ -160,7 +158,7 @@ public class AS2SignedDataGenerator extends CMSSignedDataGenerator {
header.append(',');
}
- header.append(alg);
+ header.append(micAlg);
count++;
}
diff --git a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/AS2MessageDispositionNotificationEntity.java b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/AS2MessageDispositionNotificationEntity.java
index 1f984ba..71e323c 100644
--- a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/AS2MessageDispositionNotificationEntity.java
+++ b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/AS2MessageDispositionNotificationEntity.java
@@ -63,7 +63,7 @@ public class AS2MessageDispositionNotificationEntity extends MimeEntity {
private String[] failureFields;
private String[] errorFields;
private String[] warningFields;
- private Map<String, String> extensionFields = new HashMap<String, String>();
+ private Map<String, String> extensionFields = new HashMap<>();
private ReceivedContentMic receivedContentMic;
public AS2MessageDispositionNotificationEntity(HttpEntityEnclosingRequest request,
diff --git a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/DispositionNotificationOptionsParser.java b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/DispositionNotificationOptionsParser.java
index dd4d6f0..293c514 100644
--- a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/DispositionNotificationOptionsParser.java
+++ b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/DispositionNotificationOptionsParser.java
@@ -52,7 +52,7 @@ public class DispositionNotificationOptionsParser {
Args.notNull(buffer, "buffer");
Args.notNull(cursor, "cursor");
- Map<String, Parameter> parameters = new HashMap<String, Parameter>();
+ Map<String, Parameter> parameters = new HashMap<>();
while (!cursor.atEnd()) {
Parameter parameter = AS2HeaderUtils.parseParameter(buffer, cursor);
parameters.put(parameter.getAttribute(), parameter);
diff --git a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/MultipartMimeEntity.java b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/MultipartMimeEntity.java
index b7390c2..2b206f3 100644
--- a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/MultipartMimeEntity.java
+++ b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/MultipartMimeEntity.java
@@ -31,7 +31,7 @@ public abstract class MultipartMimeEntity extends MimeEntity {
protected String boundary;
- private final List<MimeEntity> parts = new ArrayList<MimeEntity>();
+ private final List<MimeEntity> parts = new ArrayList<>();
public MultipartMimeEntity(ContentType contentType) {
this(contentType, false, null);
diff --git a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/util/AS2HeaderUtils.java b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/util/AS2HeaderUtils.java
index deac117..213183b 100644
--- a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/util/AS2HeaderUtils.java
+++ b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/util/AS2HeaderUtils.java
@@ -126,7 +126,7 @@ public final class AS2HeaderUtils {
cursor.updatePos(cursor.getPos() + 1);
}
- List<String> values = new ArrayList<String>();
+ List<String> values = new ArrayList<>();
while (!cursor.atEnd()) {
String value = TOKEN_PARSER.parseValue(buffer, cursor, VALUE_DELIMS);
values.add(value);
diff --git a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/util/DispositionNotificationContentUtils.java b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/util/DispositionNotificationContentUtils.java
index 599f107..e313e87 100644
--- a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/util/DispositionNotificationContentUtils.java
+++ b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/util/DispositionNotificationContentUtils.java
@@ -146,10 +146,10 @@ public final class DispositionNotificationContentUtils {
DispositionMode dispositionMode = null;
AS2DispositionType dispositionType = null;
AS2DispositionModifier dispositionModifier = null;
- List<String> failures = new ArrayList<String>();
- List<String> errors = new ArrayList<String>();
- List<String> warnings = new ArrayList<String>();
- Map<String, String> extensionFields = new HashMap<String, String>();
+ List<String> failures = new ArrayList<>();
+ List<String> errors = new ArrayList<>();
+ List<String> warnings = new ArrayList<>();
+ Map<String, String> extensionFields = new HashMap<>();
ReceivedContentMic receivedContentMic = null;
for (int i = 0; i < dispositionNotificationFields.size(); i++) {
@@ -255,7 +255,7 @@ public final class DispositionNotificationContentUtils {
ParserCursor cursor = new ParserCursor(colon + 1, fieldLine.length());
- final List<Element> elements = new ArrayList<Element>();
+ final List<Element> elements = new ArrayList<>();
while (!cursor.atEnd()) {
final Element element = parseDispositionFieldElement(fieldLine, cursor);
if (element.getValue() != null) {
@@ -279,7 +279,7 @@ public final class DispositionNotificationContentUtils {
return new Element(value, null);
}
- final List<String> parameters = new ArrayList<String>();
+ final List<String> parameters = new ArrayList<>();
while (!cursor.atEnd()) {
final String parameter = TOKEN_PARSER.parseToken(fieldLine, cursor, TOKEN_DELIMS);
parameters.add(parameter);
diff --git a/components/camel-as2/camel-as2-api/src/test/java/org/apache/camel/component/as2/api/AS2MessageTest.java b/components/camel-as2/camel-as2-api/src/test/java/org/apache/camel/component/as2/api/AS2MessageTest.java
index 8ec8a54..60d9081 100644
--- a/components/camel-as2/camel-as2-api/src/test/java/org/apache/camel/component/as2/api/AS2MessageTest.java
+++ b/components/camel-as2/camel-as2-api/src/test/java/org/apache/camel/component/as2/api/AS2MessageTest.java
@@ -163,7 +163,7 @@ public class AS2MessageTest {
signingKP = kpg.generateKeyPair();
signingCert = Utils.makeCertificate(signingKP, signingDN, issueKP, issueDN);
- certList = new ArrayList<X509Certificate>();
+ certList = new ArrayList<>();
certList.add(signingCert);
certList.add(issueCert);
@@ -192,7 +192,7 @@ public class AS2MessageTest {
KeyPair signingKP = kpg.generateKeyPair();
X509Certificate signingCert = Utils.makeCertificate(signingKP, signingDN, issueKP, issueDN);
- List<X509Certificate> certList = new ArrayList<X509Certificate>();
+ List<X509Certificate> certList = new ArrayList<>();
certList.add(signingCert);
certList.add(issueCert);
@@ -460,7 +460,7 @@ public class AS2MessageTest {
response.setHeader(AS2Header.SERVER, REPORTING_UA);
// Create a receipt for edi message
- Map<String, String> extensionFields = new HashMap<String, String>();
+ Map<String, String> extensionFields = new HashMap<>();
extensionFields.put("Original-Recipient", "rfc822;" + AS2_NAME);
AS2DispositionModifier dispositionModifier = AS2DispositionModifier.createWarning("AS2 is cool!");
String[] failureFields = new String[] {"failure-field-1"};
diff --git a/components/camel-as2/camel-as2-component/src/main/java/org/apache/camel/component/as2/AS2Consumer.java b/components/camel-as2/camel-as2-component/src/main/java/org/apache/camel/component/as2/AS2Consumer.java
index b5e579e..dc52ad3 100644
--- a/components/camel-as2/camel-as2-component/src/main/java/org/apache/camel/component/as2/AS2Consumer.java
+++ b/components/camel-as2/camel-as2-component/src/main/java/org/apache/camel/component/as2/AS2Consumer.java
@@ -60,7 +60,7 @@ public class AS2Consumer extends AbstractApiConsumer<AS2ApiName, AS2Configuratio
// Add listener property to register this consumer as listener for
// events.
- properties = new HashMap<String, Object>();
+ properties = new HashMap<>();
properties.putAll(endpoint.getEndpointProperties());
properties.put(HANDLER_PROPERTY, this);
diff --git a/components/camel-as2/camel-as2-component/src/main/java/org/apache/camel/component/as2/internal/AS2ConnectionHelper.java b/components/camel-as2/camel-as2-component/src/main/java/org/apache/camel/component/as2/internal/AS2ConnectionHelper.java
index 2ebdf9a..ad9ee1b 100644
--- a/components/camel-as2/camel-as2-component/src/main/java/org/apache/camel/component/as2/internal/AS2ConnectionHelper.java
+++ b/components/camel-as2/camel-as2-component/src/main/java/org/apache/camel/component/as2/internal/AS2ConnectionHelper.java
@@ -30,7 +30,7 @@ import org.apache.camel.component.as2.api.AS2ServerConnection;
*/
public final class AS2ConnectionHelper {
- private static Map<Integer, AS2ServerConnection> serverConnections = new HashMap<Integer, AS2ServerConnection>();
+ private static Map<Integer, AS2ServerConnection> serverConnections = new HashMap<>();
/**
* Prevent instantiation
diff --git a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ClientManagerIntegrationTest.java b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ClientManagerIntegrationTest.java
index 3c1459b..c2bae4e 100644
--- a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ClientManagerIntegrationTest.java
+++ b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ClientManagerIntegrationTest.java
@@ -183,7 +183,7 @@ public class AS2ClientManagerIntegrationTest extends AbstractAS2TestSupport {
@Test
public void plainMessageSendTest() throws Exception {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelAS2.requestUri", REQUEST_URI);
// parameter type is String
@@ -257,7 +257,7 @@ public class AS2ClientManagerIntegrationTest extends AbstractAS2TestSupport {
@Test
public void multipartSignedMessageTest() throws Exception {
- final Map<String, Object> headers = new HashMap<String, Object>();
+ final Map<String, Object> headers = new HashMap<>();
// parameter type is String
headers.put("CamelAS2.requestUri", REQUEST_URI);
// parameter type is String
@@ -403,7 +403,7 @@ public class AS2ClientManagerIntegrationTest extends AbstractAS2TestSupport {
X509Certificate signingCert = Utils.makeCertificate(
serverSigningKP, signingDN, issueKP, issueDN);
- serverCertList = new ArrayList<X509Certificate>();
+ serverCertList = new ArrayList<>();
serverCertList.add(signingCert);
serverCertList.add(issueCert);
@@ -436,7 +436,7 @@ public class AS2ClientManagerIntegrationTest extends AbstractAS2TestSupport {
signingCert = Utils.makeCertificate(
signingKP, signingDN, issueKP, issueDN);
- certList = new ArrayList<X509Certificate>();
+ certList = new ArrayList<>();
certList.add(signingCert);
certList.add(issueCert);
diff --git a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ServerManagerIntegrationTest.java b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ServerManagerIntegrationTest.java
index fda7aa0..e199217 100644
--- a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ServerManagerIntegrationTest.java
+++ b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ServerManagerIntegrationTest.java
@@ -290,7 +290,7 @@ public class AS2ServerManagerIntegrationTest extends AbstractAS2TestSupport {
signingCert = Utils.makeCertificate(
signingKP, signingDN, issueKP, issueDN);
- certList = new ArrayList<X509Certificate>();
+ certList = new ArrayList<>();
certList.add(signingCert);
certList.add(issueCert);
diff --git a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AbstractAS2TestSupport.java b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AbstractAS2TestSupport.java
index 691bf0c..325c728 100644
--- a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AbstractAS2TestSupport.java
+++ b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AbstractAS2TestSupport.java
@@ -47,7 +47,7 @@ public class AbstractAS2TestSupport 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-asn1/src/test/java/org/apache/camel/dataformat/asn1/ASN1DataFormatWithStreamIteratorClassTest.java b/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/ASN1DataFormatWithStreamIteratorClassTest.java
index c2a9756..3db5d7f 100644
--- a/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/ASN1DataFormatWithStreamIteratorClassTest.java
+++ b/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/ASN1DataFormatWithStreamIteratorClassTest.java
@@ -23,7 +23,6 @@ import java.util.List;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.dataformat.asn1.model.testsmscbercdr.SmsCdr;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Ignore;
import org.junit.Test;
diff --git a/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/SpringASN1DataFormatRouteTest.java b/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/SpringASN1DataFormatRouteTest.java
index aba9702..0db7335 100644
--- a/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/SpringASN1DataFormatRouteTest.java
+++ b/components/camel-asn1/src/test/java/org/apache/camel/dataformat/asn1/SpringASN1DataFormatRouteTest.java
@@ -21,7 +21,6 @@ import java.io.File;
import java.util.List;
import org.apache.camel.Exchange;
-import org.apache.camel.dataformat.asn1.model.testsmscbercdr.SmsCdr;
import org.apache.camel.test.spring.CamelSpringTestSupport;
import org.junit.Test;
import org.springframework.context.support.AbstractApplicationContext;
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java
index 58e58e7..e51ebd0 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java
@@ -196,8 +196,7 @@ public class CxfProducer extends DefaultProducer implements AsyncProcessor {
protected Map<String, Object> prepareRequest(Exchange camelExchange, org.apache.cxf.message.Exchange cxfExchange) throws Exception {
// create invocation context
- WrappedMessageContext requestContext = new WrappedMessageContext(
- new HashMap<String, Object>(), null, Scope.APPLICATION);
+ WrappedMessageContext requestContext = new WrappedMessageContext(new HashMap<String, Object>(), null, Scope.APPLICATION);
camelExchange.setProperty(Message.MTOM_ENABLED, String.valueOf(endpoint.isMtomEnabled()));
diff --git a/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/DisruptorEndpoint.java b/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/DisruptorEndpoint.java
index 3efcde0..b92c339 100644
--- a/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/DisruptorEndpoint.java
+++ b/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/DisruptorEndpoint.java
@@ -315,8 +315,7 @@ public class DisruptorEndpoint extends DefaultEndpoint implements AsyncEndpoint,
}
Map<DisruptorConsumer, Collection<LifecycleAwareExchangeEventHandler>> createConsumerEventHandlers() {
- Map<DisruptorConsumer, Collection<LifecycleAwareExchangeEventHandler>> result =
- new HashMap<>();
+ Map<DisruptorConsumer, Collection<LifecycleAwareExchangeEventHandler>> result = new HashMap<>();
for (final DisruptorConsumer consumer : consumers) {
result.put(consumer, consumer.createEventHandlers(concurrentConsumers));
diff --git a/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamConsumer.java b/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamConsumer.java
index d344193..a7319c1 100644
--- a/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamConsumer.java
+++ b/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamConsumer.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.google.mail.stream;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Queue;
@@ -84,10 +83,10 @@ public class GoogleMailStreamConsumer extends ScheduledBatchPollingConsumer {
ListMessagesResponse c = request.execute();
if (c.getMessages() != null) {
- for (Iterator iterator = c.getMessages().iterator(); iterator.hasNext();) {
- Message message = (Message)iterator.next();
+ for (Object element : c.getMessages()) {
+ Message message = (Message)element;
Message mess = getClient().users().messages().get("me", message.getId()).setFormat("FULL").execute();
- Exchange exchange = ((GoogleMailStreamEndpoint)getEndpoint()).createExchange(getEndpoint().getExchangePattern(), mess);
+ Exchange exchange = getEndpoint().createExchange(getEndpoint().getExchangePattern(), mess);
answer.add(exchange);
}
}
@@ -150,7 +149,7 @@ public class GoogleMailStreamConsumer extends ScheduledBatchPollingConsumer {
LOG.trace("Marking email {} as read", id);
- List<String> remove = new ArrayList<String>();
+ List<String> remove = new ArrayList<>();
remove.add(unreadLabelId);
ModifyMessageRequest mods = new ModifyMessageRequest().setRemoveLabelIds(remove);
getClient().users().messages().modify("me", exchange.getIn().getHeader(GoogleMailStreamConstants.MAIL_ID, String.class), mods).execute();
@@ -173,7 +172,7 @@ public class GoogleMailStreamConsumer extends ScheduledBatchPollingConsumer {
try {
LOG.warn("Exchange failed, so rolling back mail {} to un " + exchange);
- List<String> add = new ArrayList<String>();
+ List<String> add = new ArrayList<>();
add.add(unreadLabelId);
ModifyMessageRequest mods = new ModifyMessageRequest().setAddLabelIds(add);
getClient().users().messages().modify("me", exchange.getIn().getHeader(GoogleMailStreamConstants.MAIL_ID, String.class), mods).execute();
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsStreamMessageTypeTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsStreamMessageTypeTest.java
index 0e4aa05..5321f62 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsStreamMessageTypeTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsStreamMessageTypeTest.java
@@ -55,8 +55,8 @@ public class JmsStreamMessageTypeTest extends CamelTestSupport {
assertMockEndpointsSatisfied();
- StreamMessageInputStream is = getMockEndpoint("mock:result").getReceivedExchanges().get(0).getIn().getBody(StreamMessageInputStream.class);
- assertNotNull(is);
+ Object body = getMockEndpoint("mock:result").getReceivedExchanges().get(0).getIn().getBody();
+ StreamMessageInputStream is = assertIsInstanceOf(StreamMessageInputStream.class, body);
// no more bytes should be available on the inputstream
assertEquals(0, is.available());
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cloud/ServiceCallEnvironmentRouteTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cloud/ServiceCallEnvironmentRouteTest.java
index c4ccd51..429e2b7 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cloud/ServiceCallEnvironmentRouteTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cloud/ServiceCallEnvironmentRouteTest.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.kubernetes.cloud;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.kubernetes.KubernetesConfiguration;
import org.apache.camel.model.cloud.ServiceCallConfigurationDefinition;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Ignore;
@@ -42,8 +41,6 @@ public class ServiceCallEnvironmentRouteTest extends CamelTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- KubernetesConfiguration kubernetesConfiguration = new KubernetesConfiguration();
-
ServiceCallConfigurationDefinition config = new ServiceCallConfigurationDefinition();
config.kubernetesEnvServiceDiscovery();
diff --git a/components/camel-micrometer/src/main/java/org/apache/camel/component/micrometer/AbstractMicrometerProducer.java b/components/camel-micrometer/src/main/java/org/apache/camel/component/micrometer/AbstractMicrometerProducer.java
index 2579ae4..bfbbebc 100644
--- a/components/camel-micrometer/src/main/java/org/apache/camel/component/micrometer/AbstractMicrometerProducer.java
+++ b/components/camel-micrometer/src/main/java/org/apache/camel/component/micrometer/AbstractMicrometerProducer.java
@@ -32,7 +32,6 @@ import static org.apache.camel.component.micrometer.MicrometerConstants.HEADER_M
import static org.apache.camel.component.micrometer.MicrometerConstants.HEADER_METRIC_TAGS;
import static org.apache.camel.component.micrometer.MicrometerConstants.HEADER_PREFIX;
-
public abstract class AbstractMicrometerProducer<T extends Meter> extends DefaultProducer {
private static final String HEADER_PATTERN = HEADER_PREFIX + "*";
@@ -102,8 +101,9 @@ public abstract class AbstractMicrometerProducer<T extends Meter> extends Defaul
return in.getHeader(header, defaultValue, Double.class);
}
+ @SuppressWarnings("unchecked")
protected Iterable<Tag> getTagHeader(Message in, String header, Iterable<Tag> defaultTags) {
- return (Iterable<Tag>) in.getHeader(header, defaultTags, Iterable.class);
+ return in.getHeader(header, defaultTags, Iterable.class);
}
protected boolean clearMetricsHeaders(Message in) {
diff --git a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/MicrometerComponentTest.java b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/MicrometerComponentTest.java
index 92dcfb5..c99c7d1 100644
--- a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/MicrometerComponentTest.java
+++ b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/MicrometerComponentTest.java
@@ -17,7 +17,6 @@
package org.apache.camel.component.micrometer;
import java.util.Collections;
-import java.util.EnumSet;
import java.util.HashMap;
import java.util.Map;
import io.micrometer.core.instrument.Meter;
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
index 8c2960b..d62020f 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
@@ -175,8 +175,7 @@ public class SubscriptionHelper extends ServiceSupport {
LOG.debug("Refreshing subscriptions to {} channels on reconnect", listenerMap.size());
// reconnected to Salesforce, subscribe to existing channels
- final Map<SalesforceConsumer, ClientSessionChannel.MessageListener> map =
- new HashMap<>();
+ final Map<SalesforceConsumer, ClientSessionChannel.MessageListener> map = new HashMap<>();
map.putAll(listenerMap);
listenerMap.clear();
for (Map.Entry<SalesforceConsumer, ClientSessionChannel.MessageListener> entry : map.entrySet()) {
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/HttpProxyIntegrationTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/HttpProxyIntegrationTest.java
index 0effb78..c1bc94e 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/HttpProxyIntegrationTest.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/HttpProxyIntegrationTest.java
@@ -29,13 +29,11 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.salesforce.api.dto.Version;
import org.apache.camel.component.salesforce.api.dto.Versions;
-import org.apache.camel.test.junit4.CamelTestSupport;
import org.eclipse.jetty.proxy.ConnectHandler;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.util.B64Code;
import org.eclipse.jetty.util.StringUtil;
-import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowComponent.java b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowComponent.java
index 4da4188..f2d42ce 100644
--- a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowComponent.java
+++ b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowComponent.java
@@ -83,8 +83,6 @@ public class UndertowComponent extends DefaultComponent implements RestConsumerF
@Override
protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
- new HashMap<>(parameters);
-
URI uriHttpUriAddress = new URI(UnsafeUriCharactersEncoder.encodeHttpURI(remaining));
URI endpointUri = URISupport.createRemainingURI(uriHttpUriAddress, parameters);
diff --git a/components/camel-web3j/src/main/java/org/apache/camel/component/web3j/Web3jConsumer.java b/components/camel-web3j/src/main/java/org/apache/camel/component/web3j/Web3jConsumer.java
index f283151..f432f16 100644
--- a/components/camel-web3j/src/main/java/org/apache/camel/component/web3j/Web3jConsumer.java
+++ b/components/camel-web3j/src/main/java/org/apache/camel/component/web3j/Web3jConsumer.java
@@ -56,7 +56,7 @@ public class Web3jConsumer extends DefaultConsumer {
LOG.info("Subscribing to: " + endpoint.getNodeAddress());
switch (configuration.getOperation()) {
case Web3jConstants.ETH_LOG_OBSERVABLE:
- EthFilter ethFilter = endpoint.buildEthFilter(configuration.getFromBlock(), configuration.getToBlock(), configuration.getAddresses(), configuration.getTopics());
+ EthFilter ethFilter = Web3jEndpoint.buildEthFilter(configuration.getFromBlock(), configuration.getToBlock(), configuration.getAddresses(), configuration.getTopics());
subscription = web3j.ethLogObservable(ethFilter).subscribe(
x -> ethLogObservable(x),
t -> processError(t, Web3jConstants.ETH_LOG_OBSERVABLE),
diff --git a/components/camel-web3j/src/main/java/org/apache/camel/component/web3j/Web3jEndpoint.java b/components/camel-web3j/src/main/java/org/apache/camel/component/web3j/Web3jEndpoint.java
index 83e2c0a..6eb171b 100644
--- a/components/camel-web3j/src/main/java/org/apache/camel/component/web3j/Web3jEndpoint.java
+++ b/components/camel-web3j/src/main/java/org/apache/camel/component/web3j/Web3jEndpoint.java
@@ -25,7 +25,6 @@ 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.UriParams;
import org.apache.camel.spi.UriPath;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -35,7 +34,6 @@ import org.web3j.protocol.core.DefaultBlockParameter;
import org.web3j.protocol.core.methods.request.EthFilter;
import org.web3j.protocol.core.methods.request.Filter;
import org.web3j.protocol.core.methods.request.ShhFilter;
-import org.web3j.protocol.core.methods.request.ShhPost;
import org.web3j.protocol.http.HttpService;
import org.web3j.protocol.ipc.UnixIpcService;
import org.web3j.protocol.ipc.WindowsIpcService;
diff --git a/components/camel-web3j/src/main/java/org/apache/camel/component/web3j/Web3jProducer.java b/components/camel-web3j/src/main/java/org/apache/camel/component/web3j/Web3jProducer.java
index 6312394..b784eed 100644
--- a/components/camel-web3j/src/main/java/org/apache/camel/component/web3j/Web3jProducer.java
+++ b/components/camel-web3j/src/main/java/org/apache/camel/component/web3j/Web3jProducer.java
@@ -605,7 +605,7 @@ public class Web3jProducer extends HeaderSelectorProducer {
List<String> addresses = message.getHeader(Web3jConstants.ADDRESSES, configuration::getAddresses, List.class);
List<String> topics = message.getHeader(Web3jConstants.TOPICS, configuration::getTopics, List.class);
- org.web3j.protocol.core.methods.request.EthFilter ethFilter = endpoint.buildEthFilter(fromBlock, toBlock, addresses, topics);
+ org.web3j.protocol.core.methods.request.EthFilter ethFilter = Web3jEndpoint.buildEthFilter(fromBlock, toBlock, addresses, topics);
Request<?, EthFilter> request = web3j.ethNewFilter(ethFilter);
setRequestId(message, request);
@@ -680,7 +680,7 @@ public class Web3jProducer extends HeaderSelectorProducer {
DefaultBlockParameter toBlock = toBlockParameter(message.getHeader(Web3jConstants.TO_BLOCK, configuration::getToBlock, Object.class));
List<String> addresses = message.getHeader(Web3jConstants.ADDRESSES, configuration::getAddresses, List.class);
List<String> topics = message.getHeader(Web3jConstants.TOPICS, configuration::getTopics, List.class);
- org.web3j.protocol.core.methods.request.EthFilter ethFilter = endpoint.buildEthFilter(fromBlock, toBlock, addresses, topics);
+ org.web3j.protocol.core.methods.request.EthFilter ethFilter = Web3jEndpoint.buildEthFilter(fromBlock, toBlock, addresses, topics);
Request<?, EthLog> request = web3j.ethGetLogs(ethFilter);
setRequestId(message, request);
@@ -862,7 +862,7 @@ public class Web3jProducer extends HeaderSelectorProducer {
void shhNewFilter(Message message) throws IOException {
String data = message.getHeader(Web3jConstants.DATA, configuration::getData, String.class);
List<String> topics = message.getHeader(Web3jConstants.TOPICS, configuration::getTopics, List.class);
- org.web3j.protocol.core.methods.request.ShhFilter shhFilter = endpoint.buildShhFilter(data, topics);
+ org.web3j.protocol.core.methods.request.ShhFilter shhFilter = Web3jEndpoint.buildShhFilter(data, topics);
Request<?, ShhNewFilter> request = web3j.shhNewFilter(shhFilter);
setRequestId(message, request);
diff --git a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jMockTestSupport.java b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jMockTestSupport.java
index 688dfea..ec4070d 100755
--- a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jMockTestSupport.java
+++ b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jMockTestSupport.java
@@ -21,7 +21,6 @@ import org.apache.camel.Exchange;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.impl.DefaultExchange;
import org.apache.camel.impl.JndiRegistry;
-import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.AfterClass;
import org.junit.Before;
diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentServletTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentServletTest.java
index 5871ad4..9ab6230 100644
--- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentServletTest.java
+++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentServletTest.java
@@ -32,7 +32,6 @@ import org.mockito.junit.MockitoJUnitRunner;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
-import static org.mockito.Matchers.any;
import static org.mockito.Mockito.inOrder;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.when;
--
To stop receiving notification emails like this one, please contact
bvahdat@apache.org.