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 2016/12/18 16:18:00 UTC
[3/5] camel git commit: Polish
Polish
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/769a5709
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/769a5709
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/769a5709
Branch: refs/heads/master
Commit: 769a57094b7c5054d5b88f79995aff85195a9f83
Parents: 5b66536
Author: Babak Vahdat <bv...@apache.org>
Authored: Sun Dec 18 17:15:48 2016 +0100
Committer: Babak Vahdat <bv...@apache.org>
Committed: Sun Dec 18 17:15:48 2016 +0100
----------------------------------------------------------------------
.../camel/impl/MappedEndpointConfiguration.java | 1 -
.../management/mbean/ManagedCamelContext.java | 1 -
.../apache/camel/util/IntrospectionSupport.java | 4 ++--
.../headers/LogContainerCmdHeaderTest.java | 2 +-
.../google/pubsub/GooglePubsubConsumer.java | 3 ---
.../InfinispanLocalAggregationRepository.java | 4 ++--
.../InfinispanRemoteAggregationRepository.java | 4 ++--
.../camel/component/ironmq/IronMQConsumer.java | 4 ++--
...MarshalUnmarshalTypeHeaderNotAllowedTest.java | 2 --
.../camel/component/jcache/JCacheProducer.java | 6 +++---
.../camel/component/jms/JmsPollingConsumer.java | 5 +++--
.../camel/component/kafka/KafkaProducerTest.java | 6 +++---
.../test/junit/rule/mllp/MllpClientResource.java | 6 +++---
.../keystone/producer/GroupProducer.java | 19 ++++++++++---------
.../openstack/nova/producer/KeypairProducer.java | 15 ++++++++-------
.../openstack/glance/GlanceProducerTest.java | 19 ++++++++++---------
.../openstack/keystone/GroupProducerTest.java | 17 +++++++++--------
.../openstack/nova/KeypairProducerTest.java | 11 ++++++-----
.../org/apache/camel/test/blueprint/Main.java | 1 -
19 files changed, 64 insertions(+), 66 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/769a5709/camel-core/src/main/java/org/apache/camel/impl/MappedEndpointConfiguration.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/MappedEndpointConfiguration.java b/camel-core/src/main/java/org/apache/camel/impl/MappedEndpointConfiguration.java
index b0147d2..10e94ee 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/MappedEndpointConfiguration.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/MappedEndpointConfiguration.java
@@ -17,7 +17,6 @@
package org.apache.camel.impl;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
http://git-wip-us.apache.org/repos/asf/camel/blob/769a5709/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
index c4e7c4a..c5ff800 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
@@ -22,7 +22,6 @@ import java.io.InputStream;
import java.net.URLDecoder;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.Map;
http://git-wip-us.apache.org/repos/asf/camel/blob/769a5709/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java b/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java
index 46fd82e..37d0edc 100755
--- a/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java
+++ b/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java
@@ -34,6 +34,7 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Locale;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Set;
import java.util.regex.Pattern;
@@ -453,8 +454,7 @@ public final class IntrospectionSupport {
Map<String, String> rc = new LinkedHashMap<String, String>(properties.size());
- for (Iterator<Map.Entry<String, Object>> it = properties.entrySet().iterator(); it.hasNext();) {
- Map.Entry<String, Object> entry = it.next();
+ for (Entry<String, Object> entry : properties.entrySet()) {
String name = entry.getKey();
String value = entry.getValue().toString();
rc.put(name, value);
http://git-wip-us.apache.org/repos/asf/camel/blob/769a5709/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/LogContainerCmdHeaderTest.java
----------------------------------------------------------------------
diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/LogContainerCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/LogContainerCmdHeaderTest.java
index 9c15638..0cb3b62 100644
--- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/LogContainerCmdHeaderTest.java
+++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/LogContainerCmdHeaderTest.java
@@ -73,7 +73,7 @@ public class LogContainerCmdHeaderTest extends BaseDockerHeaderTest<LogContainer
@Override
protected void setupMocks() {
Mockito.when(dockerClient.logContainerCmd(Matchers.anyString())).thenReturn(mockObject);
- Mockito.when(mockObject.exec(Mockito.anyObject())).thenReturn(callback);
+ Mockito.when(mockObject.exec(Matchers.anyObject())).thenReturn(callback);
try {
Mockito.when(callback.awaitCompletion()).thenReturn(callback);
} catch (InterruptedException e) {
http://git-wip-us.apache.org/repos/asf/camel/blob/769a5709/components/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubConsumer.java b/components/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubConsumer.java
index f056bbd..c562916 100644
--- a/components/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubConsumer.java
+++ b/components/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubConsumer.java
@@ -28,15 +28,12 @@ import com.google.api.services.pubsub.model.PullResponse;
import com.google.api.services.pubsub.model.ReceivedMessage;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
-import org.apache.camel.RuntimeCamelException;
import org.apache.camel.component.google.pubsub.consumer.ExchangeAckTransaction;
import org.apache.camel.impl.DefaultConsumer;
import org.apache.camel.spi.Synchronization;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.apache.camel.util.ObjectHelper.wrapRuntimeCamelException;
-
class GooglePubsubConsumer extends DefaultConsumer {
private Logger localLog;
http://git-wip-us.apache.org/repos/asf/camel/blob/769a5709/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/processor/aggregate/InfinispanLocalAggregationRepository.java
----------------------------------------------------------------------
diff --git a/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/processor/aggregate/InfinispanLocalAggregationRepository.java b/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/processor/aggregate/InfinispanLocalAggregationRepository.java
index cb47bfa..5785d1d 100644
--- a/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/processor/aggregate/InfinispanLocalAggregationRepository.java
+++ b/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/processor/aggregate/InfinispanLocalAggregationRepository.java
@@ -67,13 +67,13 @@ public class InfinispanLocalAggregationRepository extends ServiceSupport impleme
public Exchange add(final CamelContext camelContext, final String key, final Exchange exchange) {
LOG.trace("Adding an Exchange with ID {} for key {} in a thread-safe manner.", exchange.getExchangeId(), key);
DefaultExchangeHolder newHolder = DefaultExchangeHolder.marshal(exchange, true, allowSerializedHeaders);
- DefaultExchangeHolder oldHolder = (DefaultExchangeHolder) cache.put(key, newHolder);
+ DefaultExchangeHolder oldHolder = cache.put(key, newHolder);
return unmarshallExchange(camelContext, oldHolder);
}
@Override
public Exchange get(CamelContext camelContext, String key) {
- return unmarshallExchange(camelContext, (DefaultExchangeHolder) cache.get(key));
+ return unmarshallExchange(camelContext, cache.get(key));
}
@Override
http://git-wip-us.apache.org/repos/asf/camel/blob/769a5709/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/processor/aggregate/InfinispanRemoteAggregationRepository.java
----------------------------------------------------------------------
diff --git a/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/processor/aggregate/InfinispanRemoteAggregationRepository.java b/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/processor/aggregate/InfinispanRemoteAggregationRepository.java
index 4c747d2..73a9506 100644
--- a/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/processor/aggregate/InfinispanRemoteAggregationRepository.java
+++ b/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/processor/aggregate/InfinispanRemoteAggregationRepository.java
@@ -67,13 +67,13 @@ public class InfinispanRemoteAggregationRepository extends ServiceSupport implem
public Exchange add(final CamelContext camelContext, final String key, final Exchange exchange) {
LOG.trace("Adding an Exchange with ID {} for key {} in a thread-safe manner.", exchange.getExchangeId(), key);
DefaultExchangeHolder newHolder = DefaultExchangeHolder.marshal(exchange, true, allowSerializedHeaders);
- DefaultExchangeHolder oldHolder = (DefaultExchangeHolder) cache.put(key, newHolder);
+ DefaultExchangeHolder oldHolder = cache.put(key, newHolder);
return unmarshallExchange(camelContext, oldHolder);
}
@Override
public Exchange get(CamelContext camelContext, String key) {
- return unmarshallExchange(camelContext, (DefaultExchangeHolder) cache.get(key));
+ return unmarshallExchange(camelContext, cache.get(key));
}
@Override
http://git-wip-us.apache.org/repos/asf/camel/blob/769a5709/components/camel-ironmq/src/main/java/org/apache/camel/component/ironmq/IronMQConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-ironmq/src/main/java/org/apache/camel/component/ironmq/IronMQConsumer.java b/components/camel-ironmq/src/main/java/org/apache/camel/component/ironmq/IronMQConsumer.java
index 356545b..ebd7666 100644
--- a/components/camel-ironmq/src/main/java/org/apache/camel/component/ironmq/IronMQConsumer.java
+++ b/components/camel-ironmq/src/main/java/org/apache/camel/component/ironmq/IronMQConsumer.java
@@ -75,8 +75,8 @@ public class IronMQConsumer extends ScheduledBatchPollingConsumer {
LOG.trace("Received {} messages in this poll", messages.length);
Queue<Exchange> answer = new LinkedList<Exchange>();
- for (int i = 0; i < messages.length; i++) {
- Exchange exchange = getEndpoint().createExchange(messages[i]);
+ for (Message message : messages) {
+ Exchange exchange = getEndpoint().createExchange(message);
answer.add(exchange);
}
return answer;
http://git-wip-us.apache.org/repos/asf/camel/blob/769a5709/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalUnmarshalTypeHeaderNotAllowedTest.java
----------------------------------------------------------------------
diff --git a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalUnmarshalTypeHeaderNotAllowedTest.java b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalUnmarshalTypeHeaderNotAllowedTest.java
index 579e3be..c7c3496 100644
--- a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalUnmarshalTypeHeaderNotAllowedTest.java
+++ b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalUnmarshalTypeHeaderNotAllowedTest.java
@@ -16,8 +16,6 @@
*/
package org.apache.camel.component.jacksonxml;
-import java.util.LinkedHashMap;
-
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
http://git-wip-us.apache.org/repos/asf/camel/blob/769a5709/components/camel-jcache/src/main/java/org/apache/camel/component/jcache/JCacheProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-jcache/src/main/java/org/apache/camel/component/jcache/JCacheProducer.java b/components/camel-jcache/src/main/java/org/apache/camel/component/jcache/JCacheProducer.java
index c3ff9fe..7863454 100644
--- a/components/camel-jcache/src/main/java/org/apache/camel/component/jcache/JCacheProducer.java
+++ b/components/camel-jcache/src/main/java/org/apache/camel/component/jcache/JCacheProducer.java
@@ -305,9 +305,9 @@ public class JCacheProducer extends DefaultProducer {
static Action fromName(String name) {
if (ObjectHelper.isNotEmpty(name)) {
- for (int i = 0; i < VALUES.length; i++) {
- if (VALUES[i].name().equalsIgnoreCase(name)) {
- return VALUES[i];
+ for (Action action : VALUES) {
+ if (action.name().equalsIgnoreCase(name)) {
+ return action;
}
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/769a5709/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsPollingConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsPollingConsumer.java b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsPollingConsumer.java
index 1ad9cdc..ab37141 100644
--- a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsPollingConsumer.java
+++ b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsPollingConsumer.java
@@ -24,6 +24,7 @@ import org.apache.camel.impl.PollingConsumerSupport;
import org.apache.camel.util.ObjectHelper;
import org.springframework.jms.core.JmsOperations;
import org.springframework.jms.core.JmsTemplate;
+import org.springframework.jms.support.destination.JmsDestinationAccessor;
/**
* A JMS {@link org.apache.camel.PollingConsumer}.
@@ -48,11 +49,11 @@ public class JmsPollingConsumer extends PollingConsumerSupport implements Servic
}
public Exchange receiveNoWait() {
- return receive(JmsTemplate.RECEIVE_TIMEOUT_NO_WAIT);
+ return receive(JmsDestinationAccessor.RECEIVE_TIMEOUT_NO_WAIT);
}
public Exchange receive() {
- return receive(JmsTemplate.RECEIVE_TIMEOUT_INDEFINITE_WAIT);
+ return receive(JmsDestinationAccessor.RECEIVE_TIMEOUT_INDEFINITE_WAIT);
}
public Exchange receive(long timeout) {
http://git-wip-us.apache.org/repos/asf/camel/blob/769a5709/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerTest.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerTest.java
index c5aa150..f87b5c2 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerTest.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerTest.java
@@ -60,7 +60,7 @@ public class KafkaProducerTest {
Future future = Mockito.mock(Future.class);
Mockito.when(future.get()).thenReturn(rm);
org.apache.kafka.clients.producer.KafkaProducer kp = Mockito.mock(org.apache.kafka.clients.producer.KafkaProducer.class);
- Mockito.when(kp.send(Mockito.any(ProducerRecord.class))).thenReturn(future);
+ Mockito.when(kp.send(Matchers.any(ProducerRecord.class))).thenReturn(future);
producer.setKafkaProducer(kp);
producer.setWorkerPool(Executors.newFixedThreadPool(1));
@@ -92,7 +92,7 @@ public class KafkaProducerTest {
endpoint.getConfiguration().setTopic("sometopic");
// setup the exception here
org.apache.kafka.clients.producer.KafkaProducer kp = producer.getKafkaProducer();
- Mockito.when(kp.send(Mockito.any(ProducerRecord.class))).thenThrow(new ApiException());
+ Mockito.when(kp.send(Matchers.any(ProducerRecord.class))).thenThrow(new ApiException());
Mockito.when(exchange.getIn()).thenReturn(in);
in.setHeader(KafkaConstants.PARTITION_KEY, "4");
@@ -126,7 +126,7 @@ public class KafkaProducerTest {
// setup the exception here
org.apache.kafka.clients.producer.KafkaProducer kp = producer.getKafkaProducer();
- Mockito.when(kp.send(Mockito.any(ProducerRecord.class), Mockito.any(Callback.class))).thenThrow(new ApiException());
+ Mockito.when(kp.send(Matchers.any(ProducerRecord.class), Matchers.any(Callback.class))).thenThrow(new ApiException());
in.setHeader(KafkaConstants.PARTITION_KEY, "4");
http://git-wip-us.apache.org/repos/asf/camel/blob/769a5709/components/camel-mllp/src/test/java/org/apache/camel/test/junit/rule/mllp/MllpClientResource.java
----------------------------------------------------------------------
diff --git a/components/camel-mllp/src/test/java/org/apache/camel/test/junit/rule/mllp/MllpClientResource.java b/components/camel-mllp/src/test/java/org/apache/camel/test/junit/rule/mllp/MllpClientResource.java
index 56634eb..396397e 100644
--- a/components/camel-mllp/src/test/java/org/apache/camel/test/junit/rule/mllp/MllpClientResource.java
+++ b/components/camel-mllp/src/test/java/org/apache/camel/test/junit/rule/mllp/MllpClientResource.java
@@ -257,9 +257,9 @@ public class MllpClientResource extends ExternalResource {
} else {
log.warn("Not sending START_OF_BLOCK");
}
- for (int i = 0; i < payloadBytes.length; ++i) {
- outputStream.write(payloadBytes[i]);
- if (flushByte == payloadBytes[i]) {
+ for (byte payloadByte : payloadBytes) {
+ outputStream.write(payloadByte);
+ if (flushByte == payloadByte) {
outputStream.flush();
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/769a5709/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/keystone/producer/GroupProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/keystone/producer/GroupProducer.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/keystone/producer/GroupProducer.java
index 6c25a63..3525271 100644
--- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/keystone/producer/GroupProducer.java
+++ b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/keystone/producer/GroupProducer.java
@@ -21,6 +21,7 @@ import java.util.Map;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
+import org.apache.camel.component.openstack.common.OpenstackConstants;
import org.apache.camel.component.openstack.keystone.KeystoneConstants;
import org.apache.camel.component.openstack.keystone.KeystoneEndpoint;
import org.apache.camel.util.ObjectHelper;
@@ -40,19 +41,19 @@ public class GroupProducer extends AbstractKeystoneProducer {
public void process(Exchange exchange) throws Exception {
final String operation = getOperation(exchange);
switch (operation) {
- case KeystoneConstants.CREATE:
+ case OpenstackConstants.CREATE:
doCreate(exchange);
break;
- case KeystoneConstants.GET:
+ case OpenstackConstants.GET:
doGet(exchange);
break;
- case KeystoneConstants.GET_ALL:
+ case OpenstackConstants.GET_ALL:
doGetAll(exchange);
break;
- case KeystoneConstants.UPDATE:
+ case OpenstackConstants.UPDATE:
doUpdate(exchange);
break;
- case KeystoneConstants.DELETE:
+ case OpenstackConstants.DELETE:
doDelete(exchange);
break;
case KeystoneConstants.ADD_USER_TO_GROUP:
@@ -77,7 +78,7 @@ public class GroupProducer extends AbstractKeystoneProducer {
private void doGet(Exchange exchange) {
final Message msg = exchange.getIn();
- final String id = msg.getHeader(KeystoneConstants.ID, msg.getHeader(KeystoneConstants.GROUP_ID, String.class), String.class);
+ final String id = msg.getHeader(OpenstackConstants.ID, msg.getHeader(KeystoneConstants.GROUP_ID, String.class), String.class);
ObjectHelper.notEmpty(id, "Group ID");
final Group result = osV3Client.identity().groups().get(id);
msg.setBody(result);
@@ -97,7 +98,7 @@ public class GroupProducer extends AbstractKeystoneProducer {
private void doDelete(Exchange exchange) {
final Message msg = exchange.getIn();
- final String id = msg.getHeader(KeystoneConstants.ID, msg.getHeader(KeystoneConstants.GROUP_ID, String.class), String.class);
+ final String id = msg.getHeader(OpenstackConstants.ID, msg.getHeader(KeystoneConstants.GROUP_ID, String.class), String.class);
ObjectHelper.notEmpty(id, "Group ID");
final ActionResponse response = osV3Client.identity().groups().delete(id);
checkFailure(response, msg, "Delete group with ID " + id);
@@ -140,8 +141,8 @@ public class GroupProducer extends AbstractKeystoneProducer {
Map headers = message.getHeaders();
GroupBuilder builder = Builders.group();
- ObjectHelper.notEmpty(message.getHeader(KeystoneConstants.NAME, String.class), "Name");
- builder.name(message.getHeader(KeystoneConstants.NAME, String.class));
+ ObjectHelper.notEmpty(message.getHeader(OpenstackConstants.NAME, String.class), "Name");
+ builder.name(message.getHeader(OpenstackConstants.NAME, String.class));
if (headers.containsKey(KeystoneConstants.DOMAIN_ID)) {
builder.domainId(message.getHeader(KeystoneConstants.DOMAIN_ID, String.class));
http://git-wip-us.apache.org/repos/asf/camel/blob/769a5709/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/nova/producer/KeypairProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/nova/producer/KeypairProducer.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/nova/producer/KeypairProducer.java
index aea5144..ea202ef 100644
--- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/nova/producer/KeypairProducer.java
+++ b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/nova/producer/KeypairProducer.java
@@ -21,6 +21,7 @@ import java.util.List;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.component.openstack.common.AbstractOpenstackProducer;
+import org.apache.camel.component.openstack.common.OpenstackConstants;
import org.apache.camel.component.openstack.nova.NovaConstants;
import org.apache.camel.component.openstack.nova.NovaEndpoint;
import org.apache.camel.util.ObjectHelper;
@@ -38,16 +39,16 @@ public class KeypairProducer extends AbstractOpenstackProducer {
public void process(Exchange exchange) throws Exception {
String operation = getOperation(exchange);
switch (operation) {
- case NovaConstants.CREATE:
+ case OpenstackConstants.CREATE:
doCreate(exchange);
break;
- case NovaConstants.GET:
+ case OpenstackConstants.GET:
doGet(exchange);
break;
- case NovaConstants.GET_ALL:
+ case OpenstackConstants.GET_ALL:
doGetAll(exchange);
break;
- case NovaConstants.DELETE:
+ case OpenstackConstants.DELETE:
doDelete(exchange);
break;
default:
@@ -57,7 +58,7 @@ public class KeypairProducer extends AbstractOpenstackProducer {
private void doCreate(Exchange exchange) {
final Message msg = exchange.getIn();
- final String name = msg.getHeader(NovaConstants.NAME, String.class);
+ final String name = msg.getHeader(OpenstackConstants.NAME, String.class);
ObjectHelper.notEmpty(name, "Keypair name");
final String body = msg.getBody(String.class);
@@ -67,7 +68,7 @@ public class KeypairProducer extends AbstractOpenstackProducer {
private void doGet(Exchange exchange) {
final Message msg = exchange.getIn();
- final String keypairName = msg.getHeader(NovaConstants.NAME, String.class);
+ final String keypairName = msg.getHeader(OpenstackConstants.NAME, String.class);
ObjectHelper.notEmpty(keypairName, "Keypair name");
final Keypair kp = os.compute().keypairs().get(keypairName);
msg.setBody(kp);
@@ -81,7 +82,7 @@ public class KeypairProducer extends AbstractOpenstackProducer {
private void doDelete(Exchange exchange) {
final Message msg = exchange.getIn();
- final String keypairName = msg.getHeader(NovaConstants.NAME, String.class);
+ final String keypairName = msg.getHeader(OpenstackConstants.NAME, String.class);
ObjectHelper.notEmpty(keypairName, "Keypair name");
final ActionResponse response = os.compute().keypairs().delete(keypairName);
checkFailure(response, msg, "Delete keypair " + keypairName);
http://git-wip-us.apache.org/repos/asf/camel/blob/769a5709/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/glance/GlanceProducerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/glance/GlanceProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/glance/GlanceProducerTest.java
index 8a77c07..2c28e60 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/glance/GlanceProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/glance/GlanceProducerTest.java
@@ -22,6 +22,7 @@ import java.io.InputStream;
import java.util.UUID;
import org.apache.camel.component.openstack.AbstractProducerTestSupport;
+import org.apache.camel.component.openstack.common.OpenstackConstants;
import org.junit.Before;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
@@ -94,7 +95,7 @@ public class GlanceProducerTest extends AbstractProducerTestSupport {
@Test
public void reserveWithHeadersTest() throws Exception {
when(endpoint.getOperation()).thenReturn(GlanceConstants.RESERVE);
- msg.setHeader(GlanceConstants.NAME, dummyImage.getName());
+ msg.setHeader(OpenstackConstants.NAME, dummyImage.getName());
msg.setHeader(GlanceConstants.CONTAINER_FORMAT, dummyImage.getContainerFormat());
msg.setHeader(GlanceConstants.DISK_FORMAT, dummyImage.getDiskFormat());
msg.setHeader(GlanceConstants.CHECKSUM, dummyImage.getChecksum());
@@ -114,8 +115,8 @@ public class GlanceProducerTest extends AbstractProducerTestSupport {
@Test
public void createTest() throws Exception {
- msg.setHeader(GlanceConstants.OPERATION, GlanceConstants.CREATE);
- msg.setHeader(GlanceConstants.NAME, dummyImage.getName());
+ msg.setHeader(OpenstackConstants.OPERATION, OpenstackConstants.CREATE);
+ msg.setHeader(OpenstackConstants.NAME, dummyImage.getName());
msg.setHeader(GlanceConstants.OWNER, dummyImage.getOwner());
msg.setHeader(GlanceConstants.MIN_DISK, dummyImage.getMinDisk());
msg.setHeader(GlanceConstants.MIN_RAM, dummyImage.getMinRam());
@@ -139,9 +140,9 @@ public class GlanceProducerTest extends AbstractProducerTestSupport {
@Test
public void uploadWithoutUpdatingTest() throws Exception {
- msg.setHeader(GlanceConstants.OPERATION, GlanceConstants.UPLOAD);
+ msg.setHeader(OpenstackConstants.OPERATION, GlanceConstants.UPLOAD);
final String id = "id";
- msg.setHeader(GlanceConstants.ID, id);
+ msg.setHeader(OpenstackConstants.ID, id);
final File file = File.createTempFile("image", ".iso");
msg.setBody(file);
@@ -165,10 +166,10 @@ public class GlanceProducerTest extends AbstractProducerTestSupport {
final String newName = "newName";
dummyImage.setName(newName);
when(osImage.getName()).thenReturn(newName);
- msg.setHeader(GlanceConstants.OPERATION, GlanceConstants.UPLOAD);
+ msg.setHeader(OpenstackConstants.OPERATION, GlanceConstants.UPLOAD);
final String id = "id";
- msg.setHeader(GlanceConstants.ID, id);
- msg.setHeader(GlanceConstants.NAME, dummyImage.getName());
+ msg.setHeader(OpenstackConstants.ID, id);
+ msg.setHeader(OpenstackConstants.NAME, dummyImage.getName());
msg.setHeader(GlanceConstants.OWNER, dummyImage.getOwner());
msg.setHeader(GlanceConstants.MIN_DISK, dummyImage.getMinDisk());
msg.setHeader(GlanceConstants.MIN_RAM, dummyImage.getMinRam());
@@ -195,7 +196,7 @@ public class GlanceProducerTest extends AbstractProducerTestSupport {
@Test
public void updateTest() throws Exception {
- msg.setHeader(GlanceConstants.OPERATION, GlanceConstants.UPDATE);
+ msg.setHeader(OpenstackConstants.OPERATION, OpenstackConstants.UPDATE);
when(imageService.update(any(Image.class))).thenReturn(osImage);
final String newName = "newName";
when(osImage.getName()).thenReturn(newName);
http://git-wip-us.apache.org/repos/asf/camel/blob/769a5709/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/GroupProducerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/GroupProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/GroupProducerTest.java
index 1384b8f..fbc548c 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/GroupProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/keystone/GroupProducerTest.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.openstack.keystone;
import java.util.ArrayList;
import java.util.List;
+import org.apache.camel.component.openstack.common.OpenstackConstants;
import org.apache.camel.component.openstack.keystone.producer.GroupProducer;
import org.apache.camel.component.openstack.neutron.NeutronConstants;
import org.junit.Before;
@@ -67,8 +68,8 @@ public class GroupProducerTest extends KeystoneProducerTestSupport {
@Test
public void createTest() throws Exception {
- msg.setHeader(KeystoneConstants.OPERATION, KeystoneConstants.CREATE);
- msg.setHeader(KeystoneConstants.NAME, dummyGroup.getName());
+ msg.setHeader(OpenstackConstants.OPERATION, OpenstackConstants.CREATE);
+ msg.setHeader(OpenstackConstants.NAME, dummyGroup.getName());
msg.setHeader(KeystoneConstants.DESCRIPTION, dummyGroup.getDescription());
msg.setHeader(KeystoneConstants.DOMAIN_ID, dummyGroup.getDomainId());
@@ -84,8 +85,8 @@ public class GroupProducerTest extends KeystoneProducerTestSupport {
@Test
public void getTest() throws Exception {
final String id = "id";
- msg.setHeader(NeutronConstants.OPERATION, NeutronConstants.GET);
- msg.setHeader(NeutronConstants.ID, id);
+ msg.setHeader(OpenstackConstants.OPERATION, OpenstackConstants.GET);
+ msg.setHeader(OpenstackConstants.ID, id);
producer.process(exchange);
@@ -98,7 +99,7 @@ public class GroupProducerTest extends KeystoneProducerTestSupport {
@Test
public void getAllTest() throws Exception {
- msg.setHeader(NeutronConstants.OPERATION, NeutronConstants.GET_ALL);
+ msg.setHeader(OpenstackConstants.OPERATION, OpenstackConstants.GET_ALL);
producer.process(exchange);
@@ -110,7 +111,7 @@ public class GroupProducerTest extends KeystoneProducerTestSupport {
@Test
public void updateTest() throws Exception {
final String id = "myID";
- msg.setHeader(KeystoneConstants.OPERATION, KeystoneConstants.UPDATE);
+ msg.setHeader(OpenstackConstants.OPERATION, OpenstackConstants.UPDATE);
final String newName = "newName";
when(testOSgroup.getId()).thenReturn(id);
@@ -134,8 +135,8 @@ public class GroupProducerTest extends KeystoneProducerTestSupport {
public void deleteTest() throws Exception {
when(groupService.delete(anyString())).thenReturn(ActionResponse.actionSuccess());
final String networkID = "myID";
- msg.setHeader(NeutronConstants.OPERATION, NeutronConstants.DELETE);
- msg.setHeader(NeutronConstants.ID, networkID);
+ msg.setHeader(OpenstackConstants.OPERATION, OpenstackConstants.DELETE);
+ msg.setHeader(OpenstackConstants.ID, networkID);
producer.process(exchange);
http://git-wip-us.apache.org/repos/asf/camel/blob/769a5709/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/KeypairProducerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/KeypairProducerTest.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/KeypairProducerTest.java
index af08477..c851a40 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/KeypairProducerTest.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/KeypairProducerTest.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.openstack.nova;
import java.util.ArrayList;
import java.util.List;
+import org.apache.camel.component.openstack.common.OpenstackConstants;
import org.apache.camel.component.openstack.nova.producer.KeypairProducer;
import org.junit.Before;
import org.junit.Test;
@@ -68,8 +69,8 @@ public class KeypairProducerTest extends NovaProducerTestSupport {
when(osTestKeypair.getFingerprint()).thenReturn(fingerPrint);
when(osTestKeypair.getPrivateKey()).thenReturn(privatecKey);
- msg.setHeader(NovaConstants.OPERATION, NovaConstants.CREATE);
- msg.setHeader(NovaConstants.NAME, KEYPAIR_NAME);
+ msg.setHeader(OpenstackConstants.OPERATION, OpenstackConstants.CREATE);
+ msg.setHeader(OpenstackConstants.NAME, KEYPAIR_NAME);
producer.process(exchange);
@@ -90,8 +91,8 @@ public class KeypairProducerTest extends NovaProducerTestSupport {
@Test
public void createKeypairFromExisting() throws Exception {
- msg.setHeader(NovaConstants.OPERATION, NovaConstants.CREATE);
- msg.setHeader(NovaConstants.NAME, KEYPAIR_NAME);
+ msg.setHeader(OpenstackConstants.OPERATION, OpenstackConstants.CREATE);
+ msg.setHeader(OpenstackConstants.NAME, KEYPAIR_NAME);
String key = "existing public key string";
when(osTestKeypair.getPublicKey()).thenReturn(key);
msg.setBody(key);
@@ -113,6 +114,6 @@ public class KeypairProducerTest extends NovaProducerTestSupport {
}
private Keypair createDummyKeypair() {
- return new NovaKeypair().create(KEYPAIR_NAME, "string contains private key");
+ return NovaKeypair.create(KEYPAIR_NAME, "string contains private key");
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/769a5709/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/Main.java
----------------------------------------------------------------------
diff --git a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/Main.java b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/Main.java
index c1c8c2a..ebcb272 100644
--- a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/Main.java
+++ b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/Main.java
@@ -26,7 +26,6 @@ import org.apache.camel.CamelContext;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.main.MainSupport;
import org.osgi.framework.BundleContext;
-import org.osgi.service.blueprint.container.BlueprintEvent;
/**
* A command line tool for booting up a CamelContext using an OSGi Blueprint XML file