You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2019/02/28 12:28:33 UTC
[camel] 03/05: CAMEL-13165 - Fixed CS
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch camel-aws-msk-stuff
in repository https://gitbox.apache.org/repos/asf/camel.git
commit ab58f30786c6c542a9c3b7b20ff2ed8766ed79b6
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Feb 28 13:10:10 2019 +0100
CAMEL-13165 - Fixed CS
---
.../camel/component/aws/msk/MSKConfiguration.java | 4 +-
.../camel/component/aws/msk/MSKProducer.java | 12 ++---
.../component/aws/msk/AmazonMSKClientMock.java | 13 +++--
.../aws/msk/MSKComponentConfigurationTest.java | 11 ++---
.../aws/msk/MSKComponentVerifierExtensionTest.java | 1 -
.../component/aws/msk/MSKProducerSpringTest.java | 36 +++++++-------
.../camel/component/aws/msk/MSKProducerTest.java | 56 ++++++++++------------
7 files changed, 59 insertions(+), 74 deletions(-)
diff --git a/components/camel-aws-msk/src/main/java/org/apache/camel/component/aws/msk/MSKConfiguration.java b/components/camel-aws-msk/src/main/java/org/apache/camel/component/aws/msk/MSKConfiguration.java
index 93e86bd..aa7a3ff 100644
--- a/components/camel-aws-msk/src/main/java/org/apache/camel/component/aws/msk/MSKConfiguration.java
+++ b/components/camel-aws-msk/src/main/java/org/apache/camel/component/aws/msk/MSKConfiguration.java
@@ -16,14 +16,14 @@
*/
package org.apache.camel.component.aws.msk;
+import com.amazonaws.services.kafka.AWSKafka;
+
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriParams;
import org.apache.camel.spi.UriPath;
-import com.amazonaws.services.kafka.AWSKafka;
-
@UriParams
public class MSKConfiguration implements Cloneable {
diff --git a/components/camel-aws-msk/src/main/java/org/apache/camel/component/aws/msk/MSKProducer.java b/components/camel-aws-msk/src/main/java/org/apache/camel/component/aws/msk/MSKProducer.java
index b59b9e1..900d10c 100644
--- a/components/camel-aws-msk/src/main/java/org/apache/camel/component/aws/msk/MSKProducer.java
+++ b/components/camel-aws-msk/src/main/java/org/apache/camel/component/aws/msk/MSKProducer.java
@@ -102,7 +102,7 @@ public class MSKProducer extends DefaultProducer {
Message message = getMessageForResponse(exchange);
message.setBody(result);
}
-
+
private void createCluster(AWSKafka mskClient, Exchange exchange) {
CreateClusterRequest request = new CreateClusterRequest();
if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(MSKConstants.CLUSTER_NAME))) {
@@ -124,8 +124,8 @@ public class MSKProducer extends DefaultProducer {
throw new IllegalArgumentException("Kafka Version must be specified");
}
if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(MSKConstants.BROKER_NODES_GROUP_INFO))) {
- BrokerNodeGroupInfo brokerNodesGroupInfo = exchange.getIn().getHeader(MSKConstants.BROKER_NODES_GROUP_INFO, BrokerNodeGroupInfo.class);
- request.withBrokerNodeGroupInfo(brokerNodesGroupInfo);
+ BrokerNodeGroupInfo brokerNodesGroupInfo = exchange.getIn().getHeader(MSKConstants.BROKER_NODES_GROUP_INFO, BrokerNodeGroupInfo.class);
+ request.withBrokerNodeGroupInfo(brokerNodesGroupInfo);
} else {
throw new IllegalArgumentException("BrokerNodeGroupInfo must be specified");
}
@@ -139,7 +139,7 @@ public class MSKProducer extends DefaultProducer {
Message message = getMessageForResponse(exchange);
message.setBody(result);
}
-
+
private void deleteCluster(AWSKafka mskClient, Exchange exchange) {
DeleteClusterRequest request = new DeleteClusterRequest();
if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(MSKConstants.CLUSTER_ARN))) {
@@ -158,7 +158,7 @@ public class MSKProducer extends DefaultProducer {
Message message = getMessageForResponse(exchange);
message.setBody(result);
}
-
+
public static Message getMessageForResponse(final Exchange exchange) {
if (exchange.getPattern().isOutCapable()) {
Message out = exchange.getOut();
@@ -167,4 +167,4 @@ public class MSKProducer extends DefaultProducer {
}
return exchange.getIn();
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-msk/src/test/java/org/apache/camel/component/aws/msk/AmazonMSKClientMock.java b/components/camel-aws-msk/src/test/java/org/apache/camel/component/aws/msk/AmazonMSKClientMock.java
index b70c979..7924bf3 100644
--- a/components/camel-aws-msk/src/test/java/org/apache/camel/component/aws/msk/AmazonMSKClientMock.java
+++ b/components/camel-aws-msk/src/test/java/org/apache/camel/component/aws/msk/AmazonMSKClientMock.java
@@ -29,7 +29,6 @@ import com.amazonaws.services.kafka.model.DeleteClusterResult;
import com.amazonaws.services.kafka.model.ListClustersRequest;
import com.amazonaws.services.kafka.model.ListClustersResult;
-
public class AmazonMSKClientMock extends AbstractAWSKafka {
public AmazonMSKClientMock() {
@@ -46,7 +45,7 @@ public class AmazonMSKClientMock extends AbstractAWSKafka {
result.setClusterInfoList(info);
return result;
}
-
+
@Override
public CreateClusterResult createCluster(CreateClusterRequest request) {
CreateClusterResult result = new CreateClusterResult();
@@ -54,12 +53,12 @@ public class AmazonMSKClientMock extends AbstractAWSKafka {
result.setState(ClusterState.CREATING.name());
return result;
}
-
+
@Override
public DeleteClusterResult deleteCluster(DeleteClusterRequest request) {
- DeleteClusterResult res = new DeleteClusterResult();
- res.setClusterArn(request.getClusterArn());
- res.setState(ClusterState.DELETING.name());
- return res;
+ DeleteClusterResult res = new DeleteClusterResult();
+ res.setClusterArn(request.getClusterArn());
+ res.setState(ClusterState.DELETING.name());
+ return res;
}
}
diff --git a/components/camel-aws-msk/src/test/java/org/apache/camel/component/aws/msk/MSKComponentConfigurationTest.java b/components/camel-aws-msk/src/test/java/org/apache/camel/component/aws/msk/MSKComponentConfigurationTest.java
index ec81a5e..ac6cd8d 100644
--- a/components/camel-aws-msk/src/test/java/org/apache/camel/component/aws/msk/MSKComponentConfigurationTest.java
+++ b/components/camel-aws-msk/src/test/java/org/apache/camel/component/aws/msk/MSKComponentConfigurationTest.java
@@ -18,25 +18,22 @@ package org.apache.camel.component.aws.msk;
import com.amazonaws.regions.Regions;
-import org.apache.camel.component.aws.msk.MSKComponent;
-import org.apache.camel.component.aws.msk.MSKEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
public class MSKComponentConfigurationTest extends CamelTestSupport {
-
@Test
public void createEndpointWithComponentElements() throws Exception {
MSKComponent component = new MSKComponent(context);
component.setAccessKey("XXX");
component.setSecretKey("YYY");
MSKEndpoint endpoint = (MSKEndpoint)component.createEndpoint("aws-msk://label");
-
+
assertEquals("XXX", endpoint.getConfiguration().getAccessKey());
assertEquals("YYY", endpoint.getConfiguration().getSecretKey());
}
-
+
@Test
public void createEndpointWithComponentAndEndpointElements() throws Exception {
MSKComponent component = new MSKComponent(context);
@@ -44,10 +41,10 @@ public class MSKComponentConfigurationTest extends CamelTestSupport {
component.setSecretKey("YYY");
component.setRegion(Regions.US_WEST_1.toString());
MSKEndpoint endpoint = (MSKEndpoint)component.createEndpoint("aws-msk://label?accessKey=xxxxxx&secretKey=yyyyy®ion=US_EAST_1");
-
+
assertEquals("xxxxxx", endpoint.getConfiguration().getAccessKey());
assertEquals("yyyyy", endpoint.getConfiguration().getSecretKey());
assertEquals("US_EAST_1", endpoint.getConfiguration().getRegion());
}
-
+
}
diff --git a/components/camel-aws-msk/src/test/java/org/apache/camel/component/aws/msk/MSKComponentVerifierExtensionTest.java b/components/camel-aws-msk/src/test/java/org/apache/camel/component/aws/msk/MSKComponentVerifierExtensionTest.java
index cf57117..e02a791 100644
--- a/components/camel-aws-msk/src/test/java/org/apache/camel/component/aws/msk/MSKComponentVerifierExtensionTest.java
+++ b/components/camel-aws-msk/src/test/java/org/apache/camel/component/aws/msk/MSKComponentVerifierExtensionTest.java
@@ -20,7 +20,6 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.camel.Component;
-import org.apache.camel.component.aws.msk.MSKOperations;
import org.apache.camel.component.extension.ComponentVerifierExtension;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Assert;
diff --git a/components/camel-aws-msk/src/test/java/org/apache/camel/component/aws/msk/MSKProducerSpringTest.java b/components/camel-aws-msk/src/test/java/org/apache/camel/component/aws/msk/MSKProducerSpringTest.java
index 50a26f2..861e888 100644
--- a/components/camel-aws-msk/src/test/java/org/apache/camel/component/aws/msk/MSKProducerSpringTest.java
+++ b/components/camel-aws-msk/src/test/java/org/apache/camel/component/aws/msk/MSKProducerSpringTest.java
@@ -16,27 +16,25 @@
*/
package org.apache.camel.component.aws.msk;
+import com.amazonaws.services.kafka.model.BrokerNodeGroupInfo;
+import com.amazonaws.services.kafka.model.ClusterState;
+import com.amazonaws.services.kafka.model.CreateClusterResult;
+import com.amazonaws.services.kafka.model.DeleteClusterResult;
+import com.amazonaws.services.kafka.model.ListClustersResult;
+
import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
-import org.apache.camel.component.aws.msk.MSKConstants;
-import org.apache.camel.component.aws.msk.MSKOperations;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.spring.CamelSpringTestSupport;
import org.junit.Test;
import org.springframework.context.support.ClassPathXmlApplicationContext;
-import com.amazonaws.services.kafka.model.BrokerNodeGroupInfo;
-import com.amazonaws.services.kafka.model.ClusterState;
-import com.amazonaws.services.kafka.model.CreateClusterResult;
-import com.amazonaws.services.kafka.model.DeleteClusterResult;
-import com.amazonaws.services.kafka.model.ListClustersResult;
-
public class MSKProducerSpringTest extends CamelSpringTestSupport {
-
+
@EndpointInject(uri = "mock:result")
private MockEndpoint mock;
-
+
@Test
public void kmsListKeysTest() throws Exception {
@@ -49,12 +47,12 @@ public class MSKProducerSpringTest extends CamelSpringTestSupport {
});
assertMockEndpointsSatisfied();
-
- ListClustersResult resultGet = (ListClustersResult) exchange.getIn().getBody();
+
+ ListClustersResult resultGet = (ListClustersResult)exchange.getIn().getBody();
assertEquals(1, resultGet.getClusterInfoList().size());
assertEquals("test-kafka", resultGet.getClusterInfoList().get(0).getClusterName());
}
-
+
@Test
public void mskCreateClusterTest() throws Exception {
@@ -72,12 +70,12 @@ public class MSKProducerSpringTest extends CamelSpringTestSupport {
});
assertMockEndpointsSatisfied();
-
- CreateClusterResult resultGet = (CreateClusterResult) exchange.getIn().getBody();
+
+ CreateClusterResult resultGet = (CreateClusterResult)exchange.getIn().getBody();
assertEquals("test-kafka", resultGet.getClusterName());
assertEquals(ClusterState.CREATING.name(), resultGet.getState());
}
-
+
@Test
public void mskDeleteClusterTest() throws Exception {
@@ -91,8 +89,8 @@ public class MSKProducerSpringTest extends CamelSpringTestSupport {
});
assertMockEndpointsSatisfied();
-
- DeleteClusterResult resultGet = (DeleteClusterResult) exchange.getIn().getBody();
+
+ DeleteClusterResult resultGet = (DeleteClusterResult)exchange.getIn().getBody();
assertEquals("test-kafka", resultGet.getClusterArn());
assertEquals(ClusterState.DELETING.name(), resultGet.getState());
}
@@ -101,4 +99,4 @@ public class MSKProducerSpringTest extends CamelSpringTestSupport {
protected ClassPathXmlApplicationContext createApplicationContext() {
return new ClassPathXmlApplicationContext("org/apache/camel/component/aws/msk/MSKComponentSpringTest-context.xml");
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-aws-msk/src/test/java/org/apache/camel/component/aws/msk/MSKProducerTest.java b/components/camel-aws-msk/src/test/java/org/apache/camel/component/aws/msk/MSKProducerTest.java
index 23d3ada..84a5854 100644
--- a/components/camel-aws-msk/src/test/java/org/apache/camel/component/aws/msk/MSKProducerTest.java
+++ b/components/camel-aws-msk/src/test/java/org/apache/camel/component/aws/msk/MSKProducerTest.java
@@ -16,28 +16,26 @@
*/
package org.apache.camel.component.aws.msk;
+import com.amazonaws.services.kafka.model.BrokerNodeGroupInfo;
+import com.amazonaws.services.kafka.model.ClusterState;
+import com.amazonaws.services.kafka.model.CreateClusterResult;
+import com.amazonaws.services.kafka.model.DeleteClusterResult;
+import com.amazonaws.services.kafka.model.ListClustersResult;
+
import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.aws.msk.MSKConstants;
-import org.apache.camel.component.aws.msk.MSKOperations;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
-import com.amazonaws.services.kafka.model.BrokerNodeGroupInfo;
-import com.amazonaws.services.kafka.model.ClusterState;
-import com.amazonaws.services.kafka.model.CreateClusterResult;
-import com.amazonaws.services.kafka.model.DeleteClusterResult;
-import com.amazonaws.services.kafka.model.ListClustersResult;
-
public class MSKProducerTest extends CamelTestSupport {
-
+
@EndpointInject(uri = "mock:result")
private MockEndpoint mock;
-
+
@Test
public void kmsListClustersTest() throws Exception {
@@ -50,12 +48,12 @@ public class MSKProducerTest extends CamelTestSupport {
});
assertMockEndpointsSatisfied();
-
- ListClustersResult resultGet = (ListClustersResult) exchange.getIn().getBody();
+
+ ListClustersResult resultGet = (ListClustersResult)exchange.getIn().getBody();
assertEquals(1, resultGet.getClusterInfoList().size());
assertEquals("test-kafka", resultGet.getClusterInfoList().get(0).getClusterName());
}
-
+
@Test
public void mskCreateClusterTest() throws Exception {
@@ -73,12 +71,12 @@ public class MSKProducerTest extends CamelTestSupport {
});
assertMockEndpointsSatisfied();
-
- CreateClusterResult resultGet = (CreateClusterResult) exchange.getIn().getBody();
+
+ CreateClusterResult resultGet = (CreateClusterResult)exchange.getIn().getBody();
assertEquals("test-kafka", resultGet.getClusterName());
assertEquals(ClusterState.CREATING.name(), resultGet.getState());
}
-
+
@Test
public void mskDeleteClusterTest() throws Exception {
@@ -92,20 +90,20 @@ public class MSKProducerTest extends CamelTestSupport {
});
assertMockEndpointsSatisfied();
-
- DeleteClusterResult resultGet = (DeleteClusterResult) exchange.getIn().getBody();
+
+ DeleteClusterResult resultGet = (DeleteClusterResult)exchange.getIn().getBody();
assertEquals("test-kafka", resultGet.getClusterArn());
assertEquals(ClusterState.DELETING.name(), resultGet.getState());
}
-
+
@Override
protected JndiRegistry createRegistry() throws Exception {
JndiRegistry registry = super.createRegistry();
-
+
AmazonMSKClientMock clientMock = new AmazonMSKClientMock();
-
+
registry.bind("amazonMskClient", clientMock);
-
+
return registry;
}
@@ -114,16 +112,10 @@ public class MSKProducerTest extends CamelTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("direct:listClusters")
- .to("aws-msk://test?mskClient=#amazonMskClient&operation=listClusters")
- .to("mock:result");
- from("direct:createCluster")
- .to("aws-msk://test?mskClient=#amazonMskClient&operation=createCluster")
- .to("mock:result");
- from("direct:deleteCluster")
- .to("aws-msk://test?mskClient=#amazonMskClient&operation=deleteCluster")
- .to("mock:result");
+ from("direct:listClusters").to("aws-msk://test?mskClient=#amazonMskClient&operation=listClusters").to("mock:result");
+ from("direct:createCluster").to("aws-msk://test?mskClient=#amazonMskClient&operation=createCluster").to("mock:result");
+ from("direct:deleteCluster").to("aws-msk://test?mskClient=#amazonMskClient&operation=deleteCluster").to("mock:result");
}
};
}
-}
\ No newline at end of file
+}