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 17b86bb0f1d29164caeedbbf8c3e03693e124c1d
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Wed Jan 10 10:23:58 2018 +0100
CAMEL-12053 - Fixed CS and Javadoc
---
.../camel/component/aws/mq/MQConfiguration.java | 37 +++---
.../apache/camel/component/aws/mq/MQEndpoint.java | 10 +-
.../apache/camel/component/aws/mq/MQProducer.java | 18 +--
.../camel/component/aws/mq/AmazonMQClientMock.java | 142 ++++++++++-----------
4 files changed, 101 insertions(+), 106 deletions(-)
diff --git
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/mq/MQConfiguration.java
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/mq/MQConfiguration.java
index 1665ca7..93b9168 100644
---
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/mq/MQConfiguration.java
+++
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/mq/MQConfiguration.java
@@ -26,7 +26,8 @@ import org.apache.camel.spi.UriPath;
@UriParams
public class MQConfiguration {
- @UriPath(description = "Logical name") @Metadata(required = "true")
+ @UriPath(description = "Logical name")
+ @Metadata(required = "true")
private String label;
@UriParam(label = "producer")
private AmazonMQ amazonMqClient;
@@ -44,16 +45,16 @@ public class MQConfiguration {
@UriParam
private String region;
- public AmazonMQ getAmazonMqClient() {
- return amazonMqClient;
- }
+ public AmazonMQ getAmazonMqClient() {
+ return amazonMqClient;
+ }
- /**
+ /**
* To use a existing configured AmazonMQClient as client
*/
- public void setAmazonMqClient(AmazonMQ amazonMqClient) {
- this.amazonMqClient = amazonMqClient;
- }
+ public void setAmazonMqClient(AmazonMQ amazonMqClient) {
+ this.amazonMqClient = amazonMqClient;
+ }
public String getAccessKey() {
return accessKey;
@@ -65,7 +66,7 @@ public class MQConfiguration {
public void setAccessKey(String accessKey) {
this.accessKey = accessKey;
}
-
+
public String getSecretKey() {
return secretKey;
}
@@ -76,22 +77,20 @@ public class MQConfiguration {
public void setSecretKey(String secretKey) {
this.secretKey = secretKey;
}
-
+
public MQOperations getOperation() {
return operation;
}
/**
- * The operation to perform. It can be createAndRunInstances,
startInstances, stopInstances, terminateInstances,
- * describeInstances, describeInstancesStatus, rebootInstances,
monitorInstances, unmonitorInstances,
- * createTags or deleteTags
+ * The operation to perform. It can be
listBrokers,createBroker,deleteBroker
*/
public void setOperation(MQOperations operation) {
this.operation = operation;
- }
-
+ }
+
/**
- * To define a proxy host when instantiating the SQS client
+ * To define a proxy host when instantiating the MQ client
*/
public String getProxyHost() {
return proxyHost;
@@ -102,7 +101,7 @@ public class MQConfiguration {
}
/**
- * To define a proxy port when instantiating the SQS client
+ * To define a proxy port when instantiating the MQ client
*/
public Integer getProxyPort() {
return proxyPort;
@@ -111,9 +110,9 @@ public class MQConfiguration {
public void setProxyPort(Integer proxyPort) {
this.proxyPort = proxyPort;
}
-
+
/**
- * The region in which EC2 client needs to work
+ * The region in which MQ client needs to work
*/
public String getRegion() {
return region;
diff --git
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/mq/MQEndpoint.java
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/mq/MQEndpoint.java
index ce27c36..67a2d31 100644
---
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/mq/MQEndpoint.java
+++
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/mq/MQEndpoint.java
@@ -39,12 +39,12 @@ import org.apache.camel.util.ObjectHelper;
*/
@UriEndpoint(firstVersion = "2.21.0", scheme = "aws-mq", title = "AWS MQ",
syntax = "aws-mq:label", producerOnly = true, label = "cloud,management")
public class MQEndpoint extends ScheduledPollEndpoint {
-
+
private AmazonMQ mqClient;
@UriParam
private MQConfiguration configuration;
-
+
public MQEndpoint(String uri, Component component, MQConfiguration
configuration) {
super(uri, component);
this.configuration = configuration;
@@ -65,8 +65,8 @@ public class MQEndpoint extends ScheduledPollEndpoint {
@Override
public void doStart() throws Exception {
super.doStart();
-
- mqClient = configuration.getAmazonMqClient() != null ?
configuration.getAmazonMqClient() : (AmazonMQClient) createMQClient();
+
+ mqClient = configuration.getAmazonMqClient() != null ?
configuration.getAmazonMqClient() : (AmazonMQClient)createMQClient();
}
public MQConfiguration getConfiguration() {
@@ -78,7 +78,7 @@ public class MQEndpoint extends ScheduledPollEndpoint {
}
AmazonMQ createMQClient() {
- AmazonMQ client = null;
+ AmazonMQ client = null;
ClientConfiguration clientConfiguration = null;
AmazonMQClientBuilder clientBuilder = null;
boolean isClientConfigFound = false;
diff --git
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/mq/MQProducer.java
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/mq/MQProducer.java
index f0d1d19..40ef053 100644
---
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/mq/MQProducer.java
+++
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/mq/MQProducer.java
@@ -41,9 +41,9 @@ import static
org.apache.camel.component.aws.common.AwsExchangeUtil.getMessageFo
* <a href="http://aws.amazon.com/mq/";>AWS MQ</a>
*/
public class MQProducer extends DefaultProducer {
-
+
private static final Logger LOG =
LoggerFactory.getLogger(MQProducer.class);
-
+
private transient String mqProducerToString;
public MQProducer(Endpoint endpoint) {
@@ -67,7 +67,7 @@ public class MQProducer extends DefaultProducer {
}
private MQOperations determineOperation(Exchange exchange) {
- MQOperations operation =
exchange.getIn().getHeader(MQConstants.OPERATION, MQOperations.class);
+ MQOperations operation =
exchange.getIn().getHeader(MQConstants.OPERATION, MQOperations.class);
if (operation == null) {
operation = getConfiguration().getOperation();
}
@@ -81,16 +81,16 @@ public class MQProducer extends DefaultProducer {
@Override
public String toString() {
if (mqProducerToString == null) {
- mqProducerToString = "MQProducer[" +
URISupport.sanitizeUri(getEndpoint().getEndpointUri()) + "]";
+ mqProducerToString = "MQProducer[" +
URISupport.sanitizeUri(getEndpoint().getEndpointUri()) + "]";
}
return mqProducerToString;
}
@Override
public MQEndpoint getEndpoint() {
- return (MQEndpoint) super.getEndpoint();
+ return (MQEndpoint)super.getEndpoint();
}
-
+
private void listBrokers(AmazonMQ mqClient, Exchange exchange) {
ListBrokersRequest request = new ListBrokersRequest();
if
(ObjectHelper.isNotEmpty(exchange.getIn().getHeader(MQConstants.MAX_RESULTS))) {
@@ -107,7 +107,7 @@ public class MQProducer extends DefaultProducer {
Message message = getMessageForResponse(exchange);
message.setBody(result);
}
-
+
private void createBroker(AmazonMQ mqClient, Exchange exchange) {
String brokerName;
String deploymentMode;
@@ -121,7 +121,7 @@ public class MQProducer extends DefaultProducer {
if
(ObjectHelper.isNotEmpty(exchange.getIn().getHeader(MQConstants.BROKER_DEPLOYMENT_MODE)))
{
deploymentMode =
exchange.getIn().getHeader(MQConstants.BROKER_DEPLOYMENT_MODE, String.class);
request.withDeploymentMode(deploymentMode);
- }
+ }
CreateBrokerResult result;
try {
result = mqClient.createBroker(request);
@@ -132,7 +132,7 @@ public class MQProducer extends DefaultProducer {
Message message = getMessageForResponse(exchange);
message.setBody(result);
}
-
+
private void deleteBroker(AmazonMQ mqClient, Exchange exchange) {
String brokerId;
DeleteBrokerRequest request = new DeleteBrokerRequest();
diff --git
a/components/camel-aws/src/test/java/org/apache/camel/component/aws/mq/AmazonMQClientMock.java
b/components/camel-aws/src/test/java/org/apache/camel/component/aws/mq/AmazonMQClientMock.java
index e9d3a9a..21516be 100644
---
a/components/camel-aws/src/test/java/org/apache/camel/component/aws/mq/AmazonMQClientMock.java
+++
b/components/camel-aws/src/test/java/org/apache/camel/component/aws/mq/AmazonMQClientMock.java
@@ -65,117 +65,113 @@ public class AmazonMQClientMock implements AmazonMQ {
super();
}
- @Override
- public CreateBrokerResult createBroker(CreateBrokerRequest
createBrokerRequest) {
+ @Override
+ public CreateBrokerResult createBroker(CreateBrokerRequest
createBrokerRequest) {
CreateBrokerResult result = new CreateBrokerResult();
result.setBrokerArn("test");
result.setBrokerId("1");
return result;
- }
+ }
- @Override
- public CreateConfigurationResult
createConfiguration(CreateConfigurationRequest createConfigurationRequest) {
+ @Override
+ public CreateConfigurationResult
createConfiguration(CreateConfigurationRequest createConfigurationRequest) {
throw new UnsupportedOperationException();
- }
+ }
- @Override
- public CreateUserResult createUser(CreateUserRequest createUserRequest)
{
+ @Override
+ public CreateUserResult createUser(CreateUserRequest createUserRequest) {
throw new UnsupportedOperationException();
- }
+ }
- @Override
- public DeleteBrokerResult deleteBroker(DeleteBrokerRequest
deleteBrokerRequest) {
+ @Override
+ public DeleteBrokerResult deleteBroker(DeleteBrokerRequest
deleteBrokerRequest) {
DeleteBrokerResult result = new DeleteBrokerResult();
result.setBrokerId("1");
return result;
- }
+ }
- @Override
- public DeleteUserResult deleteUser(DeleteUserRequest deleteUserRequest)
{
+ @Override
+ public DeleteUserResult deleteUser(DeleteUserRequest deleteUserRequest) {
throw new UnsupportedOperationException();
- }
+ }
- @Override
- public DescribeBrokerResult describeBroker(DescribeBrokerRequest
describeBrokerRequest) {
+ @Override
+ public DescribeBrokerResult describeBroker(DescribeBrokerRequest
describeBrokerRequest) {
throw new UnsupportedOperationException();
- }
+ }
- @Override
- public DescribeConfigurationResult describeConfiguration(
- DescribeConfigurationRequest
describeConfigurationRequest) {
+ @Override
+ public DescribeConfigurationResult
describeConfiguration(DescribeConfigurationRequest
describeConfigurationRequest) {
throw new UnsupportedOperationException();
- }
+ }
- @Override
- public DescribeConfigurationRevisionResult
describeConfigurationRevision(
- DescribeConfigurationRevisionRequest
describeConfigurationRevisionRequest) {
+ @Override
+ public DescribeConfigurationRevisionResult
describeConfigurationRevision(DescribeConfigurationRevisionRequest
describeConfigurationRevisionRequest) {
throw new UnsupportedOperationException();
- }
+ }
- @Override
- public DescribeUserResult describeUser(DescribeUserRequest
describeUserRequest) {
+ @Override
+ public DescribeUserResult describeUser(DescribeUserRequest
describeUserRequest) {
throw new UnsupportedOperationException();
- }
+ }
- @Override
- public ListBrokersResult listBrokers(ListBrokersRequest
listBrokersRequest) {
- ListBrokersResult result = new ListBrokersResult();
- BrokerSummary bs = new BrokerSummary();
- bs.setBrokerArn("aws:test");
- bs.setBrokerId("1");
- bs.setBrokerName("mybroker");
- bs.setBrokerState(BrokerState.RUNNING.toString());
- List<BrokerSummary> list = new ArrayList<>();
- list.add(bs);
- result.setBrokerSummaries(list);
- return result;
- }
+ @Override
+ public ListBrokersResult listBrokers(ListBrokersRequest
listBrokersRequest) {
+ ListBrokersResult result = new ListBrokersResult();
+ BrokerSummary bs = new BrokerSummary();
+ bs.setBrokerArn("aws:test");
+ bs.setBrokerId("1");
+ bs.setBrokerName("mybroker");
+ bs.setBrokerState(BrokerState.RUNNING.toString());
+ List<BrokerSummary> list = new ArrayList<>();
+ list.add(bs);
+ result.setBrokerSummaries(list);
+ return result;
+ }
- @Override
- public ListConfigurationRevisionsResult listConfigurationRevisions(
- ListConfigurationRevisionsRequest
listConfigurationRevisionsRequest) {
+ @Override
+ public ListConfigurationRevisionsResult
listConfigurationRevisions(ListConfigurationRevisionsRequest
listConfigurationRevisionsRequest) {
throw new UnsupportedOperationException();
- }
+ }
- @Override
- public ListConfigurationsResult
listConfigurations(ListConfigurationsRequest listConfigurationsRequest) {
+ @Override
+ public ListConfigurationsResult
listConfigurations(ListConfigurationsRequest listConfigurationsRequest) {
throw new UnsupportedOperationException();
- }
+ }
- @Override
- public ListUsersResult listUsers(ListUsersRequest listUsersRequest) {
+ @Override
+ public ListUsersResult listUsers(ListUsersRequest listUsersRequest) {
throw new UnsupportedOperationException();
- }
+ }
- @Override
- public RebootBrokerResult rebootBroker(RebootBrokerRequest
rebootBrokerRequest) {
+ @Override
+ public RebootBrokerResult rebootBroker(RebootBrokerRequest
rebootBrokerRequest) {
throw new UnsupportedOperationException();
- }
+ }
- @Override
- public UpdateBrokerResult updateBroker(UpdateBrokerRequest
updateBrokerRequest) {
+ @Override
+ public UpdateBrokerResult updateBroker(UpdateBrokerRequest
updateBrokerRequest) {
throw new UnsupportedOperationException();
- }
+ }
- @Override
- public UpdateConfigurationResult
updateConfiguration(UpdateConfigurationRequest updateConfigurationRequest) {
+ @Override
+ public UpdateConfigurationResult
updateConfiguration(UpdateConfigurationRequest updateConfigurationRequest) {
throw new UnsupportedOperationException();
- }
+ }
- @Override
- public UpdateUserResult updateUser(UpdateUserRequest updateUserRequest)
{
+ @Override
+ public UpdateUserResult updateUser(UpdateUserRequest updateUserRequest) {
throw new UnsupportedOperationException();
- }
+ }
- @Override
- public void shutdown() {
- throw new UnsupportedOperationException();
- }
+ @Override
+ public void shutdown() {
+ throw new UnsupportedOperationException();
+ }
- @Override
- public ResponseMetadata
getCachedResponseMetadata(AmazonWebServiceRequest request) {
+ @Override
+ public ResponseMetadata getCachedResponseMetadata(AmazonWebServiceRequest
request) {
throw new UnsupportedOperationException();
- }
-
+ }
-}
\ No newline at end of file
+}
--
To stop receiving notification emails like this one, please contact
"commits@camel.apache.org" <commits@camel.apache.org>.
