This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
commit 926a02dc0636524deb186778d941412f0c58915e Author: Andrea Cosentino <[email protected]> AuthorDate: Fri Jan 31 16:46:43 2020 +0100 CAMEL-14463 - Create an AWS-MQ component based on SDK v2, fixed CS --- .../src/main/docs/aws2-mq-component.adoc | 5 +- .../camel/component/aws2/mq/MQ2Component.java | 14 ++-- .../aws2/mq/MQ2ComponentVerifierExtension.java | 1 - .../camel/component/aws2/mq/MQ2Configuration.java | 9 +-- .../camel/component/aws2/mq/MQ2Constants.java | 20 +++--- .../camel/component/aws2/mq/MQ2Endpoint.java | 3 +- .../camel/component/aws2/mq/MQ2Operations.java | 7 +- .../camel/component/aws2/mq/MQ2Producer.java | 11 ++- .../component/aws2/mq/AmazonMQClientMock.java | 32 ++++----- .../aws2/mq/MQComponentClientRegistryTest.java | 8 +-- .../aws2/mq/MQComponentConfigurationTest.java | 15 ++-- .../aws2/mq/MQComponentVerifierExtensionTest.java | 1 - .../component/aws2/mq/MQProducerSpringTest.java | 43 ++++++----- .../camel/component/aws2/mq/MQProducerTest.java | 83 +++++++++------------- 14 files changed, 112 insertions(+), 140 deletions(-) diff --git a/components/camel-aws2-mq/src/main/docs/aws2-mq-component.adoc b/components/camel-aws2-mq/src/main/docs/aws2-mq-component.adoc index 961fd20..eaf3147 100644 --- a/components/camel-aws2-mq/src/main/docs/aws2-mq-component.adoc +++ b/components/camel-aws2-mq/src/main/docs/aws2-mq-component.adoc @@ -1,5 +1,8 @@ +[[aws2-mq-component]] = AWS 2 MQ Component +*Since Camel 3.1* + // HEADER START *Only producer is supported* // HEADER END @@ -168,4 +171,4 @@ Maven users will need to add the following dependency to their pom.xml. </dependency> --------------------------------------- -where `$\{camel-version\}` must be replaced by the actual version of Camel. +where `$\{camel-version\}` must be replaced by the actual version of Camel. \ No newline at end of file diff --git a/components/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/MQ2Component.java b/components/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/MQ2Component.java index 5567aa9..e6b1a97 100644 --- a/components/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/MQ2Component.java +++ b/components/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/MQ2Component.java @@ -38,16 +38,16 @@ public class MQ2Component extends DefaultComponent { private String secretKey; @Metadata private String region; - @Metadata(label = "advanced") + @Metadata(label = "advanced") private MQ2Configuration configuration; - + public MQ2Component() { this(null); } - + public MQ2Component(CamelContext context) { super(context); - + registerExtension(new MQ2ComponentVerifierExtension()); } @@ -63,10 +63,10 @@ public class MQ2Component extends DefaultComponent { if (configuration.getAmazonMqClient() == null && (configuration.getAccessKey() == null || configuration.getSecretKey() == null)) { throw new IllegalArgumentException("amazonMQClient or accessKey and secretKey must be specified"); } - + return endpoint; } - + public MQ2Configuration getConfiguration() { return configuration; } @@ -99,7 +99,7 @@ public class MQ2Component extends DefaultComponent { public void setSecretKey(String secretKey) { this.secretKey = secretKey; } - + public String getRegion() { return region; } diff --git a/components/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/MQ2ComponentVerifierExtension.java b/components/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/MQ2ComponentVerifierExtension.java index 340edb7..d3e41bc 100644 --- a/components/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/MQ2ComponentVerifierExtension.java +++ b/components/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/MQ2ComponentVerifierExtension.java @@ -22,7 +22,6 @@ import org.apache.camel.component.extension.verifier.DefaultComponentVerifierExt import org.apache.camel.component.extension.verifier.ResultBuilder; import org.apache.camel.component.extension.verifier.ResultErrorBuilder; import org.apache.camel.component.extension.verifier.ResultErrorHelper; - import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider; import software.amazon.awssdk.core.exception.SdkClientException; diff --git a/components/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/MQ2Configuration.java b/components/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/MQ2Configuration.java index 42cf19d..fd1c230 100644 --- a/components/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/MQ2Configuration.java +++ b/components/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/MQ2Configuration.java @@ -91,7 +91,7 @@ public class MQ2Configuration implements Cloneable { public void setOperation(MQ2Operations operation) { this.operation = operation; } - + public Protocol getProxyProtocol() { return proxyProtocol; } @@ -130,13 +130,14 @@ public class MQ2Configuration implements Cloneable { } /** - * The region in which MQ client needs to work. When using this parameter, the configuration will expect the capitalized name of the region (for example AP_EAST_1) - * You'll need to use the name Regions.EU_WEST_1.name() + * The region in which MQ client needs to work. When using this parameter, + * the configuration will expect the capitalized name of the region (for + * example AP_EAST_1) You'll need to use the name Regions.EU_WEST_1.name() */ public void setRegion(String region) { this.region = region; } - + // ************************************************* // // ************************************************* diff --git a/components/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/MQ2Constants.java b/components/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/MQ2Constants.java index be8f46e..37fea9d 100644 --- a/components/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/MQ2Constants.java +++ b/components/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/MQ2Constants.java @@ -20,15 +20,15 @@ package org.apache.camel.component.aws2.mq; * Constants used in Camel AWS MQ module */ public interface MQ2Constants { - String OPERATION = "CamelAwsMQOperation"; - String MAX_RESULTS = "CamelAwsMQMaxResults"; - String BROKER_NAME = "CamelAwsMQBrokerName"; - String BROKER_ENGINE = "CamelAwsMQBrokerEngine"; - String BROKER_ENGINE_VERSION = "CamelAwsMQBrokerEngineVersion"; - String BROKER_ID = "CamelAwsMQBrokerID"; - String CONFIGURATION_ID = "CamelAwsMQConfigurationID"; - String BROKER_DEPLOYMENT_MODE = "CamelAwsMQBrokerDeploymentMode"; - String BROKER_INSTANCE_TYPE = "CamelAwsMQBrokerInstanceType"; - String BROKER_USERS = "CamelAwsMQBrokerUsers"; + String OPERATION = "CamelAwsMQOperation"; + String MAX_RESULTS = "CamelAwsMQMaxResults"; + String BROKER_NAME = "CamelAwsMQBrokerName"; + String BROKER_ENGINE = "CamelAwsMQBrokerEngine"; + String BROKER_ENGINE_VERSION = "CamelAwsMQBrokerEngineVersion"; + String BROKER_ID = "CamelAwsMQBrokerID"; + String CONFIGURATION_ID = "CamelAwsMQConfigurationID"; + String BROKER_DEPLOYMENT_MODE = "CamelAwsMQBrokerDeploymentMode"; + String BROKER_INSTANCE_TYPE = "CamelAwsMQBrokerInstanceType"; + String BROKER_USERS = "CamelAwsMQBrokerUsers"; String BROKER_PUBLICLY_ACCESSIBLE = "CamelAwsMQBrokerPubliclyAccessible"; } diff --git a/components/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/MQ2Endpoint.java b/components/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/MQ2Endpoint.java index a145644..8477247 100644 --- a/components/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/MQ2Endpoint.java +++ b/components/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/MQ2Endpoint.java @@ -26,7 +26,6 @@ import org.apache.camel.spi.UriEndpoint; import org.apache.camel.spi.UriParam; import org.apache.camel.support.ScheduledPollEndpoint; import org.apache.camel.util.ObjectHelper; - import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider; import software.amazon.awssdk.http.apache.ApacheHttpClient; @@ -67,7 +66,7 @@ public class MQ2Endpoint extends ScheduledPollEndpoint { mqClient = configuration.getAmazonMqClient() != null ? configuration.getAmazonMqClient() : (MqClient)createMQClient(); } - + @Override public void doStop() throws Exception { if (ObjectHelper.isEmpty(configuration.getAmazonMqClient())) { diff --git a/components/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/MQ2Operations.java b/components/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/MQ2Operations.java index cb42a2d..e22e592 100644 --- a/components/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/MQ2Operations.java +++ b/components/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/MQ2Operations.java @@ -18,10 +18,5 @@ package org.apache.camel.component.aws2.mq; public enum MQ2Operations { - listBrokers, - createBroker, - deleteBroker, - rebootBroker, - updateBroker, - describeBroker + listBrokers, createBroker, deleteBroker, rebootBroker, updateBroker, describeBroker } diff --git a/components/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/MQ2Producer.java b/components/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/MQ2Producer.java index 1b539f0..1e3f620 100644 --- a/components/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/MQ2Producer.java +++ b/components/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/MQ2Producer.java @@ -26,7 +26,6 @@ import org.apache.camel.util.ObjectHelper; import org.apache.camel.util.URISupport; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - import software.amazon.awssdk.awscore.exception.AwsServiceException; import software.amazon.awssdk.services.mq.MqClient; import software.amazon.awssdk.services.mq.model.ConfigurationId; @@ -177,7 +176,7 @@ public class MQ2Producer extends DefaultProducer { publiclyAccessible = exchange.getIn().getHeader(MQ2Constants.BROKER_PUBLICLY_ACCESSIBLE, Boolean.class); builder.publiclyAccessible(publiclyAccessible); } else { - builder.publiclyAccessible(false); + builder.publiclyAccessible(false); } CreateBrokerResponse result; try { @@ -209,7 +208,7 @@ public class MQ2Producer extends DefaultProducer { Message message = getMessageForResponse(exchange); message.setBody(result); } - + private void rebootBroker(MqClient mqClient, Exchange exchange) { String brokerId; RebootBrokerRequest.Builder builder = RebootBrokerRequest.builder(); @@ -229,7 +228,7 @@ public class MQ2Producer extends DefaultProducer { Message message = getMessageForResponse(exchange); message.setBody(result); } - + private void updateBroker(MqClient mqClient, Exchange exchange) { String brokerId; ConfigurationId configurationId; @@ -256,7 +255,7 @@ public class MQ2Producer extends DefaultProducer { Message message = getMessageForResponse(exchange); message.setBody(result); } - + private void describeBroker(MqClient mqClient, Exchange exchange) { String brokerId; DescribeBrokerRequest.Builder builder = DescribeBrokerRequest.builder(); @@ -276,7 +275,7 @@ public class MQ2Producer extends DefaultProducer { Message message = getMessageForResponse(exchange); message.setBody(result); } - + public static Message getMessageForResponse(final Exchange exchange) { return exchange.getMessage(); } diff --git a/components/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/AmazonMQClientMock.java b/components/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/AmazonMQClientMock.java index 2e461c0..bb1c162 100644 --- a/components/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/AmazonMQClientMock.java +++ b/components/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/AmazonMQClientMock.java @@ -50,21 +50,21 @@ public class AmazonMQClientMock implements MqClient { @Override public DeleteBrokerResponse deleteBroker(DeleteBrokerRequest deleteBrokerRequest) { - DeleteBrokerResponse.Builder builder = DeleteBrokerResponse.builder(); - builder.brokerId("1"); + DeleteBrokerResponse.Builder builder = DeleteBrokerResponse.builder(); + builder.brokerId("1"); return builder.build(); } @Override public DescribeBrokerResponse describeBroker(DescribeBrokerRequest describeBrokerRequest) { - DescribeBrokerResponse.Builder builder = DescribeBrokerResponse.builder(); + DescribeBrokerResponse.Builder builder = DescribeBrokerResponse.builder(); builder.brokerId("1").brokerName("Test").brokerState(BrokerState.RUNNING.toString()); return builder.build(); } @Override public ListBrokersResponse listBrokers(ListBrokersRequest listBrokersRequest) { - ListBrokersResponse.Builder builder = ListBrokersResponse.builder(); + ListBrokersResponse.Builder builder = ListBrokersResponse.builder(); BrokerSummary.Builder bs = BrokerSummary.builder(); bs.brokerArn("aws:test"); bs.brokerId("1"); @@ -78,13 +78,13 @@ public class AmazonMQClientMock implements MqClient { @Override public RebootBrokerResponse rebootBroker(RebootBrokerRequest rebootBrokerRequest) { - RebootBrokerResponse.Builder builder = RebootBrokerResponse.builder(); + RebootBrokerResponse.Builder builder = RebootBrokerResponse.builder(); return builder.build(); } @Override public UpdateBrokerResponse updateBroker(UpdateBrokerRequest updateBrokerRequest) { - UpdateBrokerResponse.Builder builder = UpdateBrokerResponse.builder(); + UpdateBrokerResponse.Builder builder = UpdateBrokerResponse.builder(); ConfigurationId.Builder cId = ConfigurationId.builder(); cId.id("1"); cId.revision(12); @@ -92,16 +92,16 @@ public class AmazonMQClientMock implements MqClient { return builder.build(); } - @Override - public String serviceName() { - // TODO Auto-generated method stub - return null; - } + @Override + public String serviceName() { + // TODO Auto-generated method stub + return null; + } - @Override - public void close() { - // TODO Auto-generated method stub - - } + @Override + public void close() { + // TODO Auto-generated method stub + + } } diff --git a/components/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQComponentClientRegistryTest.java b/components/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQComponentClientRegistryTest.java index 39bdf97..9c942bb 100644 --- a/components/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQComponentClientRegistryTest.java +++ b/components/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQComponentClientRegistryTest.java @@ -16,8 +16,6 @@ */ package org.apache.camel.component.aws2.mq; -import org.apache.camel.component.aws2.mq.MQ2Component; -import org.apache.camel.component.aws2.mq.MQ2Endpoint; import org.apache.camel.test.junit4.CamelTestSupport; import org.junit.Test; @@ -29,15 +27,15 @@ public class MQComponentClientRegistryTest extends CamelTestSupport { AmazonMQClientMock awsMQClient = new AmazonMQClientMock(); context.getRegistry().bind("awsMQClient", awsMQClient); MQ2Component component = context.getComponent("aws2-mq", MQ2Component.class); - MQ2Endpoint endpoint = (MQ2Endpoint) component.createEndpoint("aws2-mq://MyQueue"); + MQ2Endpoint endpoint = (MQ2Endpoint)component.createEndpoint("aws2-mq://MyQueue"); assertNotNull(endpoint.getConfiguration().getAmazonMqClient()); } - + @Test(expected = IllegalArgumentException.class) public void createEndpointWithMinimalMQClientMisconfiguration() throws Exception { MQ2Component component = context.getComponent("aws2-mq", MQ2Component.class); - MQ2Endpoint endpoint = (MQ2Endpoint) component.createEndpoint("aws2-mq://MyQueue"); + MQ2Endpoint endpoint = (MQ2Endpoint)component.createEndpoint("aws2-mq://MyQueue"); } } diff --git a/components/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQComponentConfigurationTest.java b/components/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQComponentConfigurationTest.java index 0dcaf4a..2308107 100644 --- a/components/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQComponentConfigurationTest.java +++ b/components/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQComponentConfigurationTest.java @@ -16,28 +16,24 @@ */ package org.apache.camel.component.aws2.mq; -import org.apache.camel.component.aws2.mq.MQ2Component; -import org.apache.camel.component.aws2.mq.MQ2Endpoint; import org.apache.camel.test.junit4.CamelTestSupport; import org.junit.Test; - import software.amazon.awssdk.core.Protocol; import software.amazon.awssdk.regions.Region; public class MQComponentConfigurationTest extends CamelTestSupport { - @Test public void createEndpointWithComponentElements() throws Exception { MQ2Component component = context.getComponent("aws2-mq", MQ2Component.class); component.setAccessKey("XXX"); component.setSecretKey("YYY"); MQ2Endpoint endpoint = (MQ2Endpoint)component.createEndpoint("aws2-mq://MyQueue"); - + assertEquals("XXX", endpoint.getConfiguration().getAccessKey()); assertEquals("YYY", endpoint.getConfiguration().getSecretKey()); } - + @Test public void createEndpointWithComponentAndEndpointElements() throws Exception { MQ2Component component = context.getComponent("aws2-mq", MQ2Component.class); @@ -45,7 +41,7 @@ public class MQComponentConfigurationTest extends CamelTestSupport { component.setSecretKey("YYY"); component.setRegion(Region.US_WEST_1.toString()); MQ2Endpoint endpoint = (MQ2Endpoint)component.createEndpoint("aws2-mq://MyQueue?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()); @@ -57,8 +53,9 @@ public class MQComponentConfigurationTest extends CamelTestSupport { component.setAccessKey("XXX"); component.setSecretKey("YYY"); component.setRegion(Region.US_WEST_1.toString()); - MQ2Endpoint endpoint = (MQ2Endpoint)component.createEndpoint("aws2-mq://label?accessKey=xxxxxx&secretKey=yyyyy®ion=US_EAST_1&proxyHost=localhost&proxyPort=9000&proxyProtocol=HTTP"); - + MQ2Endpoint endpoint = (MQ2Endpoint)component + .createEndpoint("aws2-mq://label?accessKey=xxxxxx&secretKey=yyyyy®ion=US_EAST_1&proxyHost=localhost&proxyPort=9000&proxyProtocol=HTTP"); + assertEquals("xxxxxx", endpoint.getConfiguration().getAccessKey()); assertEquals("yyyyy", endpoint.getConfiguration().getSecretKey()); assertEquals("US_EAST_1", endpoint.getConfiguration().getRegion()); diff --git a/components/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQComponentVerifierExtensionTest.java b/components/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQComponentVerifierExtensionTest.java index aa9817f..477da02 100644 --- a/components/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQComponentVerifierExtensionTest.java +++ b/components/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQComponentVerifierExtensionTest.java @@ -20,7 +20,6 @@ import java.util.HashMap; import java.util.Map; import org.apache.camel.Component; -import org.apache.camel.component.aws2.mq.MQ2Operations; import org.apache.camel.component.extension.ComponentVerifierExtension; import org.apache.camel.test.junit4.CamelTestSupport; import org.junit.Assert; diff --git a/components/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQProducerSpringTest.java b/components/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQProducerSpringTest.java index 8337fec..4239209 100644 --- a/components/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQProducerSpringTest.java +++ b/components/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQProducerSpringTest.java @@ -22,13 +22,10 @@ import java.util.List; import org.apache.camel.EndpointInject; import org.apache.camel.Exchange; import org.apache.camel.Processor; -import org.apache.camel.component.aws2.mq.MQ2Constants; -import org.apache.camel.component.aws2.mq.MQ2Operations; 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 software.amazon.awssdk.services.mq.model.BrokerState; import software.amazon.awssdk.services.mq.model.ConfigurationId; import software.amazon.awssdk.services.mq.model.CreateBrokerResponse; @@ -41,10 +38,10 @@ import software.amazon.awssdk.services.mq.model.UpdateBrokerResponse; import software.amazon.awssdk.services.mq.model.User; public class MQProducerSpringTest extends CamelSpringTestSupport { - + @EndpointInject("mock:result") private MockEndpoint mock; - + @Test public void mqListBrokersTest() throws Exception { @@ -57,13 +54,13 @@ public class MQProducerSpringTest extends CamelSpringTestSupport { }); assertMockEndpointsSatisfied(); - - ListBrokersResponse resultGet = (ListBrokersResponse) exchange.getIn().getBody(); + + ListBrokersResponse resultGet = (ListBrokersResponse)exchange.getIn().getBody(); assertEquals(1, resultGet.brokerSummaries().size()); assertEquals("mybroker", resultGet.brokerSummaries().get(0).brokerName()); assertEquals(BrokerState.RUNNING.toString(), resultGet.brokerSummaries().get(0).brokerState().toString()); } - + @Test public void mqCreateBrokerTest() throws Exception { @@ -86,14 +83,14 @@ public class MQProducerSpringTest extends CamelSpringTestSupport { exchange.getIn().setHeader(MQ2Constants.BROKER_USERS, users); } }); - + assertMockEndpointsSatisfied(); - - CreateBrokerResponse resultGet = (CreateBrokerResponse) exchange.getIn().getBody(); + + CreateBrokerResponse resultGet = (CreateBrokerResponse)exchange.getIn().getBody(); assertEquals(resultGet.brokerId(), "1"); assertEquals(resultGet.brokerArn(), "test"); } - + @Test public void mqDeleteBrokerTest() throws Exception { @@ -105,13 +102,13 @@ public class MQProducerSpringTest extends CamelSpringTestSupport { exchange.getIn().setHeader(MQ2Constants.BROKER_ID, "1"); } }); - + assertMockEndpointsSatisfied(); - - DeleteBrokerResponse resultGet = (DeleteBrokerResponse) exchange.getIn().getBody(); + + DeleteBrokerResponse resultGet = (DeleteBrokerResponse)exchange.getIn().getBody(); assertEquals(resultGet.brokerId(), "1"); } - + @Test public void mqRebootBrokerTest() throws Exception { @@ -123,10 +120,10 @@ public class MQProducerSpringTest extends CamelSpringTestSupport { exchange.getIn().setHeader(MQ2Constants.BROKER_ID, "1"); } }); - + assertMockEndpointsSatisfied(); } - + @Test public void mqUpdateBrokerTest() throws Exception { @@ -142,12 +139,12 @@ public class MQProducerSpringTest extends CamelSpringTestSupport { exchange.getIn().setHeader(MQ2Constants.CONFIGURATION_ID, cId.build()); } }); - + assertMockEndpointsSatisfied(); - UpdateBrokerResponse resultGet = (UpdateBrokerResponse) exchange.getIn().getBody(); + UpdateBrokerResponse resultGet = (UpdateBrokerResponse)exchange.getIn().getBody(); assertEquals(resultGet.brokerId(), "1"); } - + @Test public void mqDescribeBrokerTest() throws Exception { @@ -163,9 +160,9 @@ public class MQProducerSpringTest extends CamelSpringTestSupport { exchange.getIn().setHeader(MQ2Constants.CONFIGURATION_ID, cId.build()); } }); - + assertMockEndpointsSatisfied(); - DescribeBrokerResponse resultGet = (DescribeBrokerResponse) exchange.getIn().getBody(); + DescribeBrokerResponse resultGet = (DescribeBrokerResponse)exchange.getIn().getBody(); assertEquals(resultGet.brokerId(), "1"); } diff --git a/components/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQProducerTest.java b/components/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQProducerTest.java index 7332b3a..ec369dc 100644 --- a/components/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQProducerTest.java +++ b/components/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQProducerTest.java @@ -19,6 +19,14 @@ package org.apache.camel.component.aws2.mq; import java.util.ArrayList; import java.util.List; +import org.apache.camel.BindToRegistry; +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.mock.MockEndpoint; +import org.apache.camel.test.junit4.CamelTestSupport; +import org.junit.Test; import software.amazon.awssdk.services.mq.model.BrokerState; import software.amazon.awssdk.services.mq.model.ConfigurationId; import software.amazon.awssdk.services.mq.model.CreateBrokerResponse; @@ -30,25 +38,14 @@ import software.amazon.awssdk.services.mq.model.ListBrokersResponse; import software.amazon.awssdk.services.mq.model.UpdateBrokerResponse; import software.amazon.awssdk.services.mq.model.User; -import org.apache.camel.BindToRegistry; -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.aws2.mq.MQ2Constants; -import org.apache.camel.component.aws2.mq.MQ2Operations; -import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; - public class MQProducerTest extends CamelTestSupport { @BindToRegistry("amazonMqClient") AmazonMQClientMock clientMock = new AmazonMQClientMock(); - + @EndpointInject("mock:result") private MockEndpoint mock; - + @Test public void mqListBrokersTest() throws Exception { @@ -61,13 +58,13 @@ public class MQProducerTest extends CamelTestSupport { }); assertMockEndpointsSatisfied(); - - ListBrokersResponse resultGet = (ListBrokersResponse) exchange.getIn().getBody(); + + ListBrokersResponse resultGet = (ListBrokersResponse)exchange.getIn().getBody(); assertEquals(1, resultGet.brokerSummaries().size()); assertEquals("mybroker", resultGet.brokerSummaries().get(0).brokerName()); assertEquals(BrokerState.RUNNING.toString(), resultGet.brokerSummaries().get(0).brokerState().toString()); } - + @Test public void mqCreateBrokerTest() throws Exception { @@ -90,14 +87,14 @@ public class MQProducerTest extends CamelTestSupport { exchange.getIn().setHeader(MQ2Constants.BROKER_USERS, users); } }); - + assertMockEndpointsSatisfied(); - - CreateBrokerResponse resultGet = (CreateBrokerResponse) exchange.getIn().getBody(); + + CreateBrokerResponse resultGet = (CreateBrokerResponse)exchange.getIn().getBody(); assertEquals(resultGet.brokerId(), "1"); assertEquals(resultGet.brokerArn(), "test"); } - + @Test public void mqDeleteBrokerTest() throws Exception { @@ -109,13 +106,13 @@ public class MQProducerTest extends CamelTestSupport { exchange.getIn().setHeader(MQ2Constants.BROKER_ID, "1"); } }); - + assertMockEndpointsSatisfied(); - - DeleteBrokerResponse resultGet = (DeleteBrokerResponse) exchange.getIn().getBody(); + + DeleteBrokerResponse resultGet = (DeleteBrokerResponse)exchange.getIn().getBody(); assertEquals(resultGet.brokerId(), "1"); } - + @Test public void mqRebootBrokerTest() throws Exception { @@ -127,10 +124,10 @@ public class MQProducerTest extends CamelTestSupport { exchange.getIn().setHeader(MQ2Constants.BROKER_ID, "1"); } }); - + assertMockEndpointsSatisfied(); } - + @Test public void mqUpdateBrokerTest() throws Exception { @@ -146,12 +143,12 @@ public class MQProducerTest extends CamelTestSupport { exchange.getIn().setHeader(MQ2Constants.CONFIGURATION_ID, cId.build()); } }); - + assertMockEndpointsSatisfied(); - UpdateBrokerResponse resultGet = (UpdateBrokerResponse) exchange.getIn().getBody(); + UpdateBrokerResponse resultGet = (UpdateBrokerResponse)exchange.getIn().getBody(); assertEquals(resultGet.brokerId(), "1"); } - + @Test public void mqDescribeBrokerTest() throws Exception { @@ -167,9 +164,9 @@ public class MQProducerTest extends CamelTestSupport { exchange.getIn().setHeader(MQ2Constants.CONFIGURATION_ID, cId.build()); } }); - + assertMockEndpointsSatisfied(); - DescribeBrokerResponse resultGet = (DescribeBrokerResponse) exchange.getIn().getBody(); + DescribeBrokerResponse resultGet = (DescribeBrokerResponse)exchange.getIn().getBody(); assertEquals(resultGet.brokerId(), "1"); } @@ -178,24 +175,12 @@ public class MQProducerTest extends CamelTestSupport { return new RouteBuilder() { @Override public void configure() throws Exception { - from("direct:listBrokers") - .to("aws2-mq://test?amazonMqClient=#amazonMqClient&operation=listBrokers") - .to("mock:result"); - from("direct:createBroker") - .to("aws2-mq://test?amazonMqClient=#amazonMqClient&operation=createBroker") - .to("mock:result"); - from("direct:deleteBroker") - .to("aws2-mq://test?amazonMqClient=#amazonMqClient&operation=deleteBroker") - .to("mock:result"); - from("direct:rebootBroker") - .to("aws2-mq://test?amazonMqClient=#amazonMqClient&operation=rebootBroker") - .to("mock:result"); - from("direct:updateBroker") - .to("aws2-mq://test?amazonMqClient=#amazonMqClient&operation=updateBroker") - .to("mock:result"); - from("direct:describeBroker") - .to("aws2-mq://test?amazonMqClient=#amazonMqClient&operation=describeBroker") - .to("mock:result"); + from("direct:listBrokers").to("aws2-mq://test?amazonMqClient=#amazonMqClient&operation=listBrokers").to("mock:result"); + from("direct:createBroker").to("aws2-mq://test?amazonMqClient=#amazonMqClient&operation=createBroker").to("mock:result"); + from("direct:deleteBroker").to("aws2-mq://test?amazonMqClient=#amazonMqClient&operation=deleteBroker").to("mock:result"); + from("direct:rebootBroker").to("aws2-mq://test?amazonMqClient=#amazonMqClient&operation=rebootBroker").to("mock:result"); + from("direct:updateBroker").to("aws2-mq://test?amazonMqClient=#amazonMqClient&operation=updateBroker").to("mock:result"); + from("direct:describeBroker").to("aws2-mq://test?amazonMqClient=#amazonMqClient&operation=describeBroker").to("mock:result"); } }; }
