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 2016/12/17 11:53:53 UTC

[14/17] camel git commit: CAMEL-9748: fix CS

http://git-wip-us.apache.org/repos/asf/camel/blob/7d2907d2/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/neutron/producer/SubnetProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/neutron/producer/SubnetProducer.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/neutron/producer/SubnetProducer.java
index 73c3735..508e36e 100644
--- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/neutron/producer/SubnetProducer.java
+++ b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/neutron/producer/SubnetProducer.java
@@ -16,13 +16,15 @@
  */
 package org.apache.camel.component.openstack.neutron.producer;
 
+import java.util.List;
+import java.util.Map;
+
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
 import org.apache.camel.component.openstack.common.AbstractOpenstackProducer;
 import org.apache.camel.component.openstack.neutron.NeutronConstants;
 import org.apache.camel.component.openstack.neutron.NeutronEndpoint;
 import org.apache.camel.util.ObjectHelper;
-
 import org.openstack4j.api.Builders;
 import org.openstack4j.api.OSClient;
 import org.openstack4j.model.common.ActionResponse;
@@ -31,98 +33,100 @@ import org.openstack4j.model.network.Subnet;
 import org.openstack4j.model.network.builder.SubnetBuilder;
 import org.openstack4j.openstack.networking.domain.NeutronPool;
 
-import java.util.List;
-import java.util.Map;
-
 public class SubnetProducer extends AbstractOpenstackProducer {
 
-	public SubnetProducer(NeutronEndpoint endpoint, OSClient client) {
-		super(endpoint, client);
-	}
-
-	@Override public void process(Exchange exchange) throws Exception {
-		final String operation = getOperation(exchange);
-		switch (operation) {
-			case NeutronConstants.CREATE:
-				doCreate(exchange);
-				break;
-			case NeutronConstants.GET:
-				doGet(exchange);
-				break;
-			case NeutronConstants.GET_ALL:
-				doGetAll(exchange);
-				break;
-			case NeutronConstants.DELETE:
-				doDelete(exchange);
-				break;
-			default:
-				throw new IllegalArgumentException("Unsupported operation " + operation);
-		}
-	}
-
-	private void doCreate(Exchange exchange) {
-		final Subnet in = messageToSubnet(exchange.getIn());
-		final Subnet out = os.networking().subnet().create(in);
-		exchange.getIn().setBody(out);
-	}
-
-	private void doGet(Exchange exchange) {
-		final Message msg = exchange.getIn();
-		final String id = msg.getHeader(NeutronConstants.ID, msg.getHeader(NeutronConstants.SUBNET_ID, String.class), String.class);
-		ObjectHelper.notEmpty(id, "Subnet ID");
-		final Subnet out = os.networking().subnet().get(id);
-		exchange.getIn().setBody(out);
-	}
-
-	private void doGetAll(Exchange exchange) {
-		final List<? extends Subnet> out = os.networking().subnet().list();
-		exchange.getIn().setBody(out);
-	}
-
-	private void doDelete(Exchange exchange) {
-		final Message msg = exchange.getIn();
-		final String id = msg.getHeader(NeutronConstants.ID, msg.getHeader(NeutronConstants.SUBNET_ID, String.class), String.class);
-		ObjectHelper.notEmpty(id, "Subnet ID");
-		final ActionResponse response = os.networking().subnet().delete(id);
-		checkFailure(response, msg, "Delete network " + id);
-	}
-
-
-	private Subnet messageToSubnet(Message message) {
-		Subnet subnet = message.getBody(Subnet.class);
-		if(subnet == null) {
-			Map headers = message.getHeaders();
-			SubnetBuilder builder = Builders.subnet();
-
-			ObjectHelper.notEmpty(message.getHeader(NeutronConstants.NAME, String.class), "Name");
-			builder.name(message.getHeader(NeutronConstants.NAME, String.class));
-
-			ObjectHelper.notEmpty(message.getHeader(NeutronConstants.NETWORK_ID, String.class), "Network ID");
-				builder.networkId(message.getHeader(NeutronConstants.NETWORK_ID, String.class));
-
-			ObjectHelper.notNull(message.getHeader(NeutronConstants.IP_VERSION, IPVersionType.class), "IP version");
-			builder.ipVersion(message.getHeader(NeutronConstants.IP_VERSION, IPVersionType.class));
-
-			if(headers.containsKey(NeutronConstants.CIDR))
-				builder.cidr(message.getHeader(NeutronConstants.CIDR, String.class));
-
-			if(headers.containsKey(NeutronConstants.SUBNET_POOL)) {
-				final NeutronPool pool =  message.getHeader(NeutronConstants.SUBNET_POOL, NeutronPool.class);
-				builder.addPool(pool.getStart(), pool.getEnd());
-			}
-
-			if(headers.containsKey(NeutronConstants.NETWORK_ID))
-				builder.networkId(message.getHeader(NeutronConstants.NETWORK_ID, String.class));
-
-			if(headers.containsKey(NeutronConstants.ENABLE_DHCP))
-				builder.enableDHCP(message.getHeader(NeutronConstants.ENABLE_DHCP, Boolean.class));
-
-			if(headers.containsKey(NeutronConstants.GATEWAY))
-				builder.gateway(message.getHeader(NeutronConstants.GATEWAY, String.class));
-
-			subnet = builder.build();
-		}
-
-		return subnet;
-	}
+    public SubnetProducer(NeutronEndpoint endpoint, OSClient client) {
+        super(endpoint, client);
+    }
+
+    @Override
+    public void process(Exchange exchange) throws Exception {
+        final String operation = getOperation(exchange);
+        switch (operation) {
+        case NeutronConstants.CREATE:
+            doCreate(exchange);
+            break;
+        case NeutronConstants.GET:
+            doGet(exchange);
+            break;
+        case NeutronConstants.GET_ALL:
+            doGetAll(exchange);
+            break;
+        case NeutronConstants.DELETE:
+            doDelete(exchange);
+            break;
+        default:
+            throw new IllegalArgumentException("Unsupported operation " + operation);
+        }
+    }
+
+    private void doCreate(Exchange exchange) {
+        final Subnet in = messageToSubnet(exchange.getIn());
+        final Subnet out = os.networking().subnet().create(in);
+        exchange.getIn().setBody(out);
+    }
+
+    private void doGet(Exchange exchange) {
+        final Message msg = exchange.getIn();
+        final String id = msg.getHeader(NeutronConstants.ID, msg.getHeader(NeutronConstants.SUBNET_ID, String.class), String.class);
+        ObjectHelper.notEmpty(id, "Subnet ID");
+        final Subnet out = os.networking().subnet().get(id);
+        exchange.getIn().setBody(out);
+    }
+
+    private void doGetAll(Exchange exchange) {
+        final List<? extends Subnet> out = os.networking().subnet().list();
+        exchange.getIn().setBody(out);
+    }
+
+    private void doDelete(Exchange exchange) {
+        final Message msg = exchange.getIn();
+        final String id = msg.getHeader(NeutronConstants.ID, msg.getHeader(NeutronConstants.SUBNET_ID, String.class), String.class);
+        ObjectHelper.notEmpty(id, "Subnet ID");
+        final ActionResponse response = os.networking().subnet().delete(id);
+        checkFailure(response, msg, "Delete network " + id);
+    }
+
+
+    private Subnet messageToSubnet(Message message) {
+        Subnet subnet = message.getBody(Subnet.class);
+        if (subnet == null) {
+            Map headers = message.getHeaders();
+            SubnetBuilder builder = Builders.subnet();
+
+            ObjectHelper.notEmpty(message.getHeader(NeutronConstants.NAME, String.class), "Name");
+            builder.name(message.getHeader(NeutronConstants.NAME, String.class));
+
+            ObjectHelper.notEmpty(message.getHeader(NeutronConstants.NETWORK_ID, String.class), "Network ID");
+            builder.networkId(message.getHeader(NeutronConstants.NETWORK_ID, String.class));
+
+            ObjectHelper.notNull(message.getHeader(NeutronConstants.IP_VERSION, IPVersionType.class), "IP version");
+            builder.ipVersion(message.getHeader(NeutronConstants.IP_VERSION, IPVersionType.class));
+
+            if (headers.containsKey(NeutronConstants.CIDR)) {
+                builder.cidr(message.getHeader(NeutronConstants.CIDR, String.class));
+            }
+
+            if (headers.containsKey(NeutronConstants.SUBNET_POOL)) {
+                final NeutronPool pool = message.getHeader(NeutronConstants.SUBNET_POOL, NeutronPool.class);
+                builder.addPool(pool.getStart(), pool.getEnd());
+            }
+
+            if (headers.containsKey(NeutronConstants.NETWORK_ID)) {
+                builder.networkId(message.getHeader(NeutronConstants.NETWORK_ID, String.class));
+            }
+
+            if (headers.containsKey(NeutronConstants.ENABLE_DHCP)) {
+                builder.enableDHCP(message.getHeader(NeutronConstants.ENABLE_DHCP, Boolean.class));
+            }
+
+            if (headers.containsKey(NeutronConstants.GATEWAY)) {
+                builder.gateway(message.getHeader(NeutronConstants.GATEWAY, String.class));
+            }
+
+            subnet = builder.build();
+        }
+
+        return subnet;
+    }
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/7d2907d2/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/nova/NovaComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/nova/NovaComponent.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/nova/NovaComponent.java
index 5313992..0250e34 100644
--- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/nova/NovaComponent.java
+++ b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/nova/NovaComponent.java
@@ -16,18 +16,19 @@
  */
 package org.apache.camel.component.openstack.nova;
 
+import java.util.Map;
+
 import org.apache.camel.Endpoint;
 import org.apache.camel.impl.DefaultComponent;
 
-import java.util.Map;
-
 public class NovaComponent extends DefaultComponent {
 
-	@Override protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
-		NovaEndpoint endpoint = new NovaEndpoint(uri, this);
-		setProperties(endpoint, parameters);
-		endpoint.setHost(remaining);
-		return endpoint;
-	}
+    @Override
+    protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
+        NovaEndpoint endpoint = new NovaEndpoint(uri, this);
+        setProperties(endpoint, parameters);
+        endpoint.setHost(remaining);
+        return endpoint;
+    }
 }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7d2907d2/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/nova/NovaConstants.java
----------------------------------------------------------------------
diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/nova/NovaConstants.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/nova/NovaConstants.java
index 00d621e..f06e9d1 100644
--- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/nova/NovaConstants.java
+++ b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/nova/NovaConstants.java
@@ -18,35 +18,29 @@ package org.apache.camel.component.openstack.nova;
 
 import org.apache.camel.component.openstack.common.OpenstackConstants;
 
-public final class  NovaConstants extends OpenstackConstants{
-
-	/*****************************************
-	 * 		constants for options			 *
-	 *****************************************/
-	public static final String NOVA_SUBSYSTEM_FLAVORS = "flavors";
-	public static final String NOVA_SUBSYSTEM_SERVERS = "servers";
-	public static final String NOVA_SUBSYSTEM_KEYPAIRS = "keypairs";
-
-
-	public static final String FLAVOR_ID = "FlavorId";
-
-	//flavor
-	public static final String RAM = "RAM";
-	public static final String VCPU = "VCPU";
-	public static final String DISK = "disk";
-	public static final String SWAP = "swap";
-	public static final String RXTXFACTOR = "rxtxFactor";
-
-	//server
-	public static final String ADMIN_PASSWORD = "AdminPassword";
-	public static final String IMAGE_ID = "ImageId";
-	public static final String KEYPAIR_NAME = "KeypairName";
-	public static final String NETWORK = "NetworkId";
-
-	/*****************************************
-	 * constants for operations				 *
-	 *****************************************/
-	//server
-	public static final String CREATE_SNAPSHOT = "createSnapshot";
-	public static final String ACTION= "action";
+public final class NovaConstants extends OpenstackConstants {
+    public static final String NOVA_SUBSYSTEM_FLAVORS = "flavors";
+    public static final String NOVA_SUBSYSTEM_SERVERS = "servers";
+    public static final String NOVA_SUBSYSTEM_KEYPAIRS = "keypairs";
+
+    public static final String FLAVOR_ID = "FlavorId";
+
+    //flavor
+    public static final String RAM = "RAM";
+    public static final String VCPU = "VCPU";
+    public static final String DISK = "disk";
+    public static final String SWAP = "swap";
+    public static final String RXTXFACTOR = "rxtxFactor";
+
+    //server
+    public static final String ADMIN_PASSWORD = "AdminPassword";
+    public static final String IMAGE_ID = "ImageId";
+    public static final String KEYPAIR_NAME = "KeypairName";
+    public static final String NETWORK = "NetworkId";
+
+    //server
+    public static final String CREATE_SNAPSHOT = "createSnapshot";
+    public static final String ACTION = "action";
+
+    private NovaConstants() { }
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/7d2907d2/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/nova/NovaEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/nova/NovaEndpoint.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/nova/NovaEndpoint.java
index bab7193..3ea2a0c 100644
--- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/nova/NovaEndpoint.java
+++ b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/nova/NovaEndpoint.java
@@ -25,164 +25,161 @@ import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.UriEndpoint;
 import org.apache.camel.spi.UriParam;
 import org.apache.camel.spi.UriPath;
-
 import org.openstack4j.core.transport.Config;
 
 @UriEndpoint(scheme = "openstack-nova", title = "OpenStack-Nova", syntax = "openstack-nova:host", label = "cloud, virtualization")
 public class NovaEndpoint extends AbstractOpenstackEndpoint {
 
-	@UriPath
-	@Metadata(required = "true")
-	private String host;
-
-	@UriParam (enums = "flavors, servers, keypairs")
-	@Metadata(required = "true")
-	String subsystem;
-
-	@UriParam(defaultValue = "default")
-	private String domain = "default";
-
-	@UriParam
-	@Metadata(required = "true")
-	private String project;
-
-	@UriParam
-	private String operation;
-
-	@UriParam
-	@Metadata(required = "true")
-	private String username;
-
-	@UriParam
-	@Metadata(required = "true")
-	private String password;
-
-	@UriParam
-	private Config config;
-
-	@UriParam(defaultValue = v3, enums = "v2, v3")
-	private String apiVersion = v3;
-
-	public NovaEndpoint(String uri, NovaComponent component) {
-		super(uri, component);
-	}
-
-	@Override
-	public Producer createProducer() throws Exception {
-		switch (getSubsystem()) {
-			case NovaConstants.NOVA_SUBSYSTEM_FLAVORS:
-				return new FlavorsProducer(this, createClient());
-			case NovaConstants.NOVA_SUBSYSTEM_SERVERS:
-				return new ServerProducer(this, createClient());
-			case NovaConstants.NOVA_SUBSYSTEM_KEYPAIRS:
-				return new KeypairProducer(this, createClient());
-			default:
-				throw new IllegalArgumentException("Can't create producer with subsystem " + subsystem);
-		}
-	}
-
-	public String getSubsystem() {
-		return subsystem;
-	}
-
-	/**
-	 * OpenStack Nova subsystem
-	 */
-	public void setSubsystem(String subsystem) {
-		this.subsystem = subsystem;
-	}
-
-	@Override
-	public String getDomain() {
-		return domain;
-	}
-
-	/**
-	 * Authentication domain
-	 */
-	public void setDomain(String domain) {
-		this.domain = domain;
-	}
-
-	@Override
-	public String getProject() {
-		return project;
-	}
-
-	/**
-	 * The project ID
-	 */
-	public void setProject(String project) {
-		this.project = project;
-	}
-
-	@Override
-	public String getOperation() {
-		return operation;
-	}
-
-	/**
-	 * The operation to do
-	 */
-	public void setOperation(String operation) {
-		this.operation = operation;
-	}
-
-	@Override
-	public String getUsername() {
-		return username;
-	}
-
-	/**
-	 * OpenStack username
-	 */
-	public void setUsername(String username) {
-		this.username = username;
-	}
-
-	@Override
-	public String getPassword() {
-		return password;
-	}
-
-	/**
-	 * OpenStack password
-	 */
-	public void setPassword(String password) {
-		this.password = password;
-	}
-
-	@Override
-	public String getHost() {
-		return host;
-	}
-
-	/**
-	 * OpenStack host url
-	 */
-	public void setHost(String host) {
-		this.host = host;
-	}
-
-	public Config getConfig() {
-		return config;
-	}
-
-	/**
-	 *OpenStack configuration
-	 */
-	public void setConfig(Config config) {
-		this.config = config;
-	}
-
-	public String getApiVersion() {
-		return apiVersion;
-	}
-
-	/**
-	 * OpenStack API version
-	 */
-	public void setApiVersion(String apiVersion) {
-		this.apiVersion = apiVersion;
-	}
+    @UriParam(enums = "flavors, servers, keypairs")
+    @Metadata(required = "true")
+    String subsystem;
+    @UriPath
+    @Metadata(required = "true")
+    private String host;
+    @UriParam(defaultValue = "default")
+    private String domain = "default";
+
+    @UriParam
+    @Metadata(required = "true")
+    private String project;
+
+    @UriParam
+    private String operation;
+
+    @UriParam
+    @Metadata(required = "true")
+    private String username;
+
+    @UriParam
+    @Metadata(required = "true")
+    private String password;
+
+    @UriParam
+    private Config config;
+
+    @UriParam(defaultValue = V3, enums = "V2, V3")
+    private String apiVersion = V3;
+
+    public NovaEndpoint(String uri, NovaComponent component) {
+        super(uri, component);
+    }
+
+    @Override
+    public Producer createProducer() throws Exception {
+        switch (getSubsystem()) {
+        case NovaConstants.NOVA_SUBSYSTEM_FLAVORS:
+            return new FlavorsProducer(this, createClient());
+        case NovaConstants.NOVA_SUBSYSTEM_SERVERS:
+            return new ServerProducer(this, createClient());
+        case NovaConstants.NOVA_SUBSYSTEM_KEYPAIRS:
+            return new KeypairProducer(this, createClient());
+        default:
+            throw new IllegalArgumentException("Can't create producer with subsystem " + subsystem);
+        }
+    }
+
+    public String getSubsystem() {
+        return subsystem;
+    }
+
+    /**
+     * OpenStack Nova subsystem
+     */
+    public void setSubsystem(String subsystem) {
+        this.subsystem = subsystem;
+    }
+
+    @Override
+    public String getDomain() {
+        return domain;
+    }
+
+    /**
+     * Authentication domain
+     */
+    public void setDomain(String domain) {
+        this.domain = domain;
+    }
+
+    @Override
+    public String getProject() {
+        return project;
+    }
+
+    /**
+     * The project ID
+     */
+    public void setProject(String project) {
+        this.project = project;
+    }
+
+    @Override
+    public String getOperation() {
+        return operation;
+    }
+
+    /**
+     * The operation to do
+     */
+    public void setOperation(String operation) {
+        this.operation = operation;
+    }
+
+    @Override
+    public String getUsername() {
+        return username;
+    }
+
+    /**
+     * OpenStack username
+     */
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    @Override
+    public String getPassword() {
+        return password;
+    }
+
+    /**
+     * OpenStack password
+     */
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    @Override
+    public String getHost() {
+        return host;
+    }
+
+    /**
+     * OpenStack host url
+     */
+    public void setHost(String host) {
+        this.host = host;
+    }
+
+    public Config getConfig() {
+        return config;
+    }
+
+    /**
+     *OpenStack configuration
+     */
+    public void setConfig(Config config) {
+        this.config = config;
+    }
+
+    public String getApiVersion() {
+        return apiVersion;
+    }
+
+    /**
+     * OpenStack API version
+     */
+    public void setApiVersion(String apiVersion) {
+        this.apiVersion = apiVersion;
+    }
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/7d2907d2/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/nova/producer/FlavorsProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/nova/producer/FlavorsProducer.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/nova/producer/FlavorsProducer.java
index 651ecfb..55416d7 100644
--- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/nova/producer/FlavorsProducer.java
+++ b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/nova/producer/FlavorsProducer.java
@@ -16,102 +16,107 @@
  */
 package org.apache.camel.component.openstack.nova.producer;
 
+import java.util.List;
+import java.util.Map;
+
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
 import org.apache.camel.component.openstack.common.AbstractOpenstackProducer;
 import org.apache.camel.component.openstack.nova.NovaConstants;
 import org.apache.camel.component.openstack.nova.NovaEndpoint;
 import org.apache.camel.util.ObjectHelper;
-
 import org.openstack4j.api.Builders;
 import org.openstack4j.api.OSClient;
 import org.openstack4j.model.common.ActionResponse;
 import org.openstack4j.model.compute.Flavor;
 import org.openstack4j.model.compute.builder.FlavorBuilder;
 
-import java.util.List;
-import java.util.Map;
-
 public class FlavorsProducer extends AbstractOpenstackProducer {
 
-	public FlavorsProducer(NovaEndpoint endpoint, OSClient client) {
-		super(endpoint, client);
-	}
-
-	@Override public void process(Exchange exchange) throws Exception {
-		final String operation = getOperation(exchange);
-		switch (operation) {
-			case NovaConstants.CREATE:
-				doCreate(exchange);
-				break;
-			case NovaConstants.GET:
-				doGet(exchange);
-				break;
-			case NovaConstants.GET_ALL:
-				doGetAll(exchange);
-				break;
-			case NovaConstants.DELETE:
-				doDelete(exchange);
-				break;
-			default:
-				throw new IllegalArgumentException("Unsupported operation " + operation);
-		}
-	}
-
-	private void doCreate(Exchange exchange) {
-		final Flavor in = messageToFlavor(exchange.getIn());
-		final Flavor out = os.compute().flavors().create(in);
-		exchange.getIn().setBody(out);
-	}
-
-	private void doGet(Exchange exchange) {
-		final Message msg = exchange.getIn();
-		final String flavorId = msg.getHeader(NovaConstants.ID, msg.getHeader(NovaConstants.FLAVOR_ID, String.class), String.class);
-		ObjectHelper.notEmpty(flavorId, "FlavorID");
-		final Flavor out = os.compute().flavors().get(flavorId);
-		exchange.getIn().setBody(out);
-	}
-
-	private void doGetAll(Exchange exchange) {
-		final List<? extends Flavor> out = os.compute().flavors().list();
-		exchange.getIn().setBody(out);
-	}
-
-	private void doDelete(Exchange exchange) {
-		final Message msg = exchange.getIn();
-		final String flavorId = msg.getHeader(NovaConstants.ID, msg.getHeader(NovaConstants.FLAVOR_ID, String.class), String.class);
-		ObjectHelper.notEmpty(flavorId, "FlavorID");
-		final ActionResponse response = os.compute().flavors().delete(flavorId);
-		checkFailure(response, msg, "Delete flavor");
-	}
-
-	private org.openstack4j.model.compute.Flavor messageToFlavor(Message message) {
-		Flavor flavor = message.getBody(Flavor.class);
-		if(flavor == null) {
-			Map headers = message.getHeaders();
-			FlavorBuilder flavorBuilder = Builders.flavor();
-
-			ObjectHelper.notEmpty(message.getHeader(NovaConstants.NAME, String.class), "Name");
-			flavorBuilder.name(message.getHeader(NovaConstants.NAME, String.class));
-
-			if(headers.containsKey(NovaConstants.VCPU))
-			flavorBuilder.vcpus(message.getHeader(NovaConstants.VCPU, Integer.class));
-
-			if(headers.containsKey(NovaConstants.RAM))
-			flavorBuilder.ram(message.getHeader(NovaConstants.RAM, Integer.class));
-
-			if(headers.containsKey(NovaConstants.DISK))
-			flavorBuilder.disk(message.getHeader(NovaConstants.DISK, Integer.class));
-
-			if(headers.containsKey(NovaConstants.SWAP))
-			flavorBuilder.swap(message.getHeader(NovaConstants.SWAP, Integer.class));
-
-			if(headers.containsKey(NovaConstants.RXTXFACTOR))
-			flavorBuilder.rxtxFactor(message.getHeader(NovaConstants.RXTXFACTOR, Integer.class));
-
-			flavor = flavorBuilder.build();
-		}
-
-		return flavor;
-	}
+    public FlavorsProducer(NovaEndpoint endpoint, OSClient client) {
+        super(endpoint, client);
+    }
+
+    @Override
+    public void process(Exchange exchange) throws Exception {
+        final String operation = getOperation(exchange);
+        switch (operation) {
+        case NovaConstants.CREATE:
+            doCreate(exchange);
+            break;
+        case NovaConstants.GET:
+            doGet(exchange);
+            break;
+        case NovaConstants.GET_ALL:
+            doGetAll(exchange);
+            break;
+        case NovaConstants.DELETE:
+            doDelete(exchange);
+            break;
+        default:
+            throw new IllegalArgumentException("Unsupported operation " + operation);
+        }
+    }
+
+    private void doCreate(Exchange exchange) {
+        final Flavor in = messageToFlavor(exchange.getIn());
+        final Flavor out = os.compute().flavors().create(in);
+        exchange.getIn().setBody(out);
+    }
+
+    private void doGet(Exchange exchange) {
+        final Message msg = exchange.getIn();
+        final String flavorId = msg.getHeader(NovaConstants.ID, msg.getHeader(NovaConstants.FLAVOR_ID, String.class), String.class);
+        ObjectHelper.notEmpty(flavorId, "FlavorID");
+        final Flavor out = os.compute().flavors().get(flavorId);
+        exchange.getIn().setBody(out);
+    }
+
+    private void doGetAll(Exchange exchange) {
+        final List<? extends Flavor> out = os.compute().flavors().list();
+        exchange.getIn().setBody(out);
+    }
+
+    private void doDelete(Exchange exchange) {
+        final Message msg = exchange.getIn();
+        final String flavorId = msg.getHeader(NovaConstants.ID, msg.getHeader(NovaConstants.FLAVOR_ID, String.class), String.class);
+        ObjectHelper.notEmpty(flavorId, "FlavorID");
+        final ActionResponse response = os.compute().flavors().delete(flavorId);
+        checkFailure(response, msg, "Delete flavor");
+    }
+
+    private org.openstack4j.model.compute.Flavor messageToFlavor(Message message) {
+        Flavor flavor = message.getBody(Flavor.class);
+        if (flavor == null) {
+            Map headers = message.getHeaders();
+            FlavorBuilder flavorBuilder = Builders.flavor();
+
+            ObjectHelper.notEmpty(message.getHeader(NovaConstants.NAME, String.class), "Name");
+            flavorBuilder.name(message.getHeader(NovaConstants.NAME, String.class));
+
+            if (headers.containsKey(NovaConstants.VCPU)) {
+                flavorBuilder.vcpus(message.getHeader(NovaConstants.VCPU, Integer.class));
+            }
+
+            if (headers.containsKey(NovaConstants.RAM)) {
+                flavorBuilder.ram(message.getHeader(NovaConstants.RAM, Integer.class));
+            }
+
+            if (headers.containsKey(NovaConstants.DISK)) {
+                flavorBuilder.disk(message.getHeader(NovaConstants.DISK, Integer.class));
+            }
+
+            if (headers.containsKey(NovaConstants.SWAP)) {
+                flavorBuilder.swap(message.getHeader(NovaConstants.SWAP, Integer.class));
+            }
+
+            if (headers.containsKey(NovaConstants.RXTXFACTOR)) {
+                flavorBuilder.rxtxFactor(message.getHeader(NovaConstants.RXTXFACTOR, Integer.class));
+            }
+
+            flavor = flavorBuilder.build();
+        }
+
+        return flavor;
+    }
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/7d2907d2/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 7712121..aea5144 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
@@ -16,74 +16,75 @@
  */
 package org.apache.camel.component.openstack.nova.producer;
 
+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.nova.NovaConstants;
 import org.apache.camel.component.openstack.nova.NovaEndpoint;
 import org.apache.camel.util.ObjectHelper;
-
 import org.openstack4j.api.OSClient;
 import org.openstack4j.model.common.ActionResponse;
 import org.openstack4j.model.compute.Keypair;
 
-import java.util.List;
-
 public class KeypairProducer extends AbstractOpenstackProducer {
 
-	public KeypairProducer(NovaEndpoint endpoint, OSClient client) {
-		super(endpoint, client);
-	}
+    public KeypairProducer(NovaEndpoint endpoint, OSClient client) {
+        super(endpoint, client);
+    }
+
+    @Override
+    public void process(Exchange exchange) throws Exception {
+        String operation = getOperation(exchange);
+        switch (operation) {
+        case NovaConstants.CREATE:
+            doCreate(exchange);
+            break;
+        case NovaConstants.GET:
+            doGet(exchange);
+            break;
+        case NovaConstants.GET_ALL:
+            doGetAll(exchange);
+            break;
+        case NovaConstants.DELETE:
+            doDelete(exchange);
+            break;
+        default:
+            throw new IllegalArgumentException("Unsupported operation " + operation);
+        }
+    }
 
-	@Override public void process(Exchange exchange) throws Exception {
-		String operation = getOperation(exchange);
-		switch (operation) {
-			case NovaConstants.CREATE:
-				doCreate(exchange);
-				break;
-			case NovaConstants.GET:
-				doGet(exchange);
-				break;
-			case NovaConstants.GET_ALL:
-				doGetAll(exchange);
-				break;
-			case NovaConstants.DELETE:
-				doDelete(exchange);
-				break;
-			default:
-				throw new IllegalArgumentException("Unsupported operation " + operation);
-		}
-	}
-	private void doCreate(Exchange exchange){
-		final Message msg = exchange.getIn();
-		final String name = msg.getHeader(NovaConstants.NAME, String.class);
-		ObjectHelper.notEmpty(name, "Keypair name");
+    private void doCreate(Exchange exchange) {
+        final Message msg = exchange.getIn();
+        final String name = msg.getHeader(NovaConstants.NAME, String.class);
+        ObjectHelper.notEmpty(name, "Keypair name");
 
-		final String body  = msg.getBody(String.class);
-		final Keypair kp = os.compute().keypairs().create(name, body);
-		msg.setBody(kp);
-	}
+        final String body = msg.getBody(String.class);
+        final Keypair kp = os.compute().keypairs().create(name, body);
+        msg.setBody(kp);
+    }
 
-	private void doGet(Exchange exchange) {
-		final Message msg = exchange.getIn();
-		final String keypairName = msg.getHeader(NovaConstants.NAME, String.class);
-		ObjectHelper.notEmpty(keypairName, "Keypair name");
-		final Keypair kp = os.compute().keypairs().get(keypairName);
-		msg.setBody(kp);
-	}
+    private void doGet(Exchange exchange) {
+        final Message msg = exchange.getIn();
+        final String keypairName = msg.getHeader(NovaConstants.NAME, String.class);
+        ObjectHelper.notEmpty(keypairName, "Keypair name");
+        final Keypair kp = os.compute().keypairs().get(keypairName);
+        msg.setBody(kp);
+    }
 
-	private void doGetAll(Exchange exchange) {
-		final Message msg = exchange.getIn();
-		final List<? extends Keypair> keypairs = os.compute().keypairs().list();
-		msg.setBody(keypairs);
-	}
+    private void doGetAll(Exchange exchange) {
+        final Message msg = exchange.getIn();
+        final List<? extends Keypair> keypairs = os.compute().keypairs().list();
+        msg.setBody(keypairs);
+    }
 
-	private void doDelete(Exchange exchange){
-		final Message msg = exchange.getIn();
-		final String keypairName = msg.getHeader(NovaConstants.NAME, String.class);
-		ObjectHelper.notEmpty(keypairName, "Keypair name");
-		final ActionResponse response = os.compute().keypairs().delete(keypairName);
-		checkFailure(response, msg, "Delete keypair " + keypairName);
-	}
+    private void doDelete(Exchange exchange) {
+        final Message msg = exchange.getIn();
+        final String keypairName = msg.getHeader(NovaConstants.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/7d2907d2/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/nova/producer/ServerProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/nova/producer/ServerProducer.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/nova/producer/ServerProducer.java
index 53469a1..0c8bb5f 100644
--- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/nova/producer/ServerProducer.java
+++ b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/nova/producer/ServerProducer.java
@@ -16,13 +16,15 @@
  */
 package org.apache.camel.component.openstack.nova.producer;
 
+import java.util.List;
+import java.util.Map;
+
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
 import org.apache.camel.component.openstack.common.AbstractOpenstackProducer;
 import org.apache.camel.component.openstack.nova.NovaConstants;
 import org.apache.camel.component.openstack.nova.NovaEndpoint;
 import org.apache.camel.util.ObjectHelper;
-
 import org.openstack4j.api.Builders;
 import org.openstack4j.api.OSClient;
 import org.openstack4j.model.common.ActionResponse;
@@ -31,123 +33,125 @@ import org.openstack4j.model.compute.Server;
 import org.openstack4j.model.compute.ServerCreate;
 import org.openstack4j.model.compute.builder.ServerCreateBuilder;
 
-import java.util.List;
-import java.util.Map;
-
 public class ServerProducer extends AbstractOpenstackProducer {
 
-	public ServerProducer(NovaEndpoint endpoint, OSClient client) {
-		super(endpoint, client);
-	}
-
-	@Override
-	public void process(Exchange exchange) throws Exception {
-		final String operation = getOperation(exchange);
-		switch (operation) {
-			case NovaConstants.CREATE:
-				doCreate(exchange);
-				break;
-			case NovaConstants.CREATE_SNAPSHOT:
-				doCreateSnapshot(exchange);
-				break;
-			case NovaConstants.GET:
-				doGet(exchange);
-				break;
-			case NovaConstants.GET_ALL:
-				doGetAll(exchange);
-			case NovaConstants.DELETE:
-				doDelete(exchange);
-				break;
-			case NovaConstants.ACTION:
-				doAction(exchange);
-				break;
-			default:
-				//execute action when Operation:Action header is not set but
-				// Action is properly specified
-				if (exchange.getIn().getHeaders().containsKey(NovaConstants.ACTION)) {
-					doAction(exchange);
-				}
-				else {
-					throw new IllegalArgumentException("Unsupported operation " + operation);
-				}
-		}
-	}
-
-	private void doCreate(Exchange exchange) {
-		final ServerCreate in = messageToServer(exchange.getIn());
-		final Server out = os.compute().servers().boot(in);
-		exchange.getIn().setBody(out);
-	}
-
-	private void doCreateSnapshot(Exchange exchange) {
-		final Message msg = exchange.getIn();
-		final String serverId = msg.getHeader(NovaConstants.ID, String.class);
-		final String name = msg.getHeader(NovaConstants.NAME, String.class);
-		ObjectHelper.notEmpty(serverId, "Server ID");
-		ObjectHelper.notEmpty(name, "VolumeSnapshot name");
-
-		final String snapshotId = os.compute().servers().createSnapshot(serverId, name);
-		msg.setBody(snapshotId);
-	}
-
-	private void doGet(Exchange exchange) {
-		final Message msg = exchange.getIn();
-		final String serverId = msg.getHeader(NovaConstants.ID, String.class);
-		ObjectHelper.notEmpty(serverId, "Server ID");
-		final Server result = os.compute().servers().get(serverId);
-		msg.setBody(result);
-	}
-
-	private void doGetAll(Exchange exchange) {
-		final List<? extends Server> out = os.compute().servers().list();
-		exchange.getIn().setBody(out);
-	}
-
-	private void doAction(Exchange exchange) {
-		final Message msg = exchange.getIn();
-		final Action action = msg.getHeader(NovaConstants.ACTION, Action.class);
-		final String serverId = msg.getHeader(NovaConstants.ID, String.class);
-		ObjectHelper.notNull(action, "Server action");
-		ObjectHelper.notEmpty(serverId, "Server ID");
-		final ActionResponse response = os.compute().servers().action(serverId, action);
-		checkFailure(response, msg, "Performing action " + action.name());
-	}
-
-	private void doDelete(Exchange exchange) {
-		final Message msg = exchange.getIn();
-		final String serverId = msg.getHeader(NovaConstants.ID, String.class);
-		ObjectHelper.notEmpty(serverId, "Server ID");
-		final ActionResponse response = os.compute().servers().delete(serverId);
-		checkFailure(response, msg, "Delete server with ID " + serverId);
-	}
-
-	private ServerCreate messageToServer(Message message) {
-		ServerCreate serverCreate = message.getBody(ServerCreate.class);
-
-		if (serverCreate == null) {
-			Map headers = message.getHeaders();
-			ServerCreateBuilder builder = Builders.server();
-
-			ObjectHelper.notEmpty(message.getHeader(NovaConstants.NAME, String.class), "Name");
-			builder.name(message.getHeader(NovaConstants.NAME, String.class));
-
-			if (headers.containsKey(NovaConstants.IMAGE_ID))
-				builder.image(message.getHeader(NovaConstants.IMAGE_ID, String.class));
-
-			if(headers.containsKey(NovaConstants.NETWORK))
-				builder.networks(message.getHeader(NovaConstants.NETWORK, List.class));
-
-			if (headers.containsKey(NovaConstants.FLAVOR_ID))
-				builder.flavor(message.getHeader(NovaConstants.FLAVOR_ID, String.class));
-
-			if (headers.containsKey(NovaConstants.KEYPAIR_NAME))
-				builder.keypairName(message.getHeader(NovaConstants.KEYPAIR_NAME, String.class));
-
-			if (headers.containsKey(NovaConstants.ADMIN_PASSWORD))
-				builder.addAdminPass(message.getHeader(NovaConstants.ADMIN_PASSWORD, String.class));
-
-			serverCreate = builder.build();
-		}
-		return serverCreate;
-	}
+    public ServerProducer(NovaEndpoint endpoint, OSClient client) {
+        super(endpoint, client);
+    }
+
+    @Override
+    public void process(Exchange exchange) throws Exception {
+        final String operation = getOperation(exchange);
+        switch (operation) {
+        case NovaConstants.CREATE:
+            doCreate(exchange);
+            break;
+        case NovaConstants.CREATE_SNAPSHOT:
+            doCreateSnapshot(exchange);
+            break;
+        case NovaConstants.GET:
+            doGet(exchange);
+            break;
+        case NovaConstants.GET_ALL:
+            doGetAll(exchange);
+            break;
+        case NovaConstants.DELETE:
+            doDelete(exchange);
+            break;
+        case NovaConstants.ACTION:
+            doAction(exchange);
+            break;
+        default:
+            //execute action when Operation:Action header is not set but
+            // Action is properly specified
+            if (exchange.getIn().getHeaders().containsKey(NovaConstants.ACTION)) {
+                doAction(exchange);
+            } else {
+                throw new IllegalArgumentException("Unsupported operation " + operation);
+            }
+        }
+    }
+
+    private void doCreate(Exchange exchange) {
+        final ServerCreate in = messageToServer(exchange.getIn());
+        final Server out = os.compute().servers().boot(in);
+        exchange.getIn().setBody(out);
+    }
+
+    private void doCreateSnapshot(Exchange exchange) {
+        final Message msg = exchange.getIn();
+        final String serverId = msg.getHeader(NovaConstants.ID, String.class);
+        final String name = msg.getHeader(NovaConstants.NAME, String.class);
+        ObjectHelper.notEmpty(serverId, "Server ID");
+        ObjectHelper.notEmpty(name, "VolumeSnapshot name");
+
+        final String snapshotId = os.compute().servers().createSnapshot(serverId, name);
+        msg.setBody(snapshotId);
+    }
+
+    private void doGet(Exchange exchange) {
+        final Message msg = exchange.getIn();
+        final String serverId = msg.getHeader(NovaConstants.ID, String.class);
+        ObjectHelper.notEmpty(serverId, "Server ID");
+        final Server result = os.compute().servers().get(serverId);
+        msg.setBody(result);
+    }
+
+    private void doGetAll(Exchange exchange) {
+        final List<? extends Server> out = os.compute().servers().list();
+        exchange.getIn().setBody(out);
+    }
+
+    private void doAction(Exchange exchange) {
+        final Message msg = exchange.getIn();
+        final Action action = msg.getHeader(NovaConstants.ACTION, Action.class);
+        final String serverId = msg.getHeader(NovaConstants.ID, String.class);
+        ObjectHelper.notNull(action, "Server action");
+        ObjectHelper.notEmpty(serverId, "Server ID");
+        final ActionResponse response = os.compute().servers().action(serverId, action);
+        checkFailure(response, msg, "Performing action " + action.name());
+    }
+
+    private void doDelete(Exchange exchange) {
+        final Message msg = exchange.getIn();
+        final String serverId = msg.getHeader(NovaConstants.ID, String.class);
+        ObjectHelper.notEmpty(serverId, "Server ID");
+        final ActionResponse response = os.compute().servers().delete(serverId);
+        checkFailure(response, msg, "Delete server with ID " + serverId);
+    }
+
+    private ServerCreate messageToServer(Message message) {
+        ServerCreate serverCreate = message.getBody(ServerCreate.class);
+
+        if (serverCreate == null) {
+            Map headers = message.getHeaders();
+            ServerCreateBuilder builder = Builders.server();
+
+            ObjectHelper.notEmpty(message.getHeader(NovaConstants.NAME, String.class), "Name");
+            builder.name(message.getHeader(NovaConstants.NAME, String.class));
+
+            if (headers.containsKey(NovaConstants.IMAGE_ID)) {
+                builder.image(message.getHeader(NovaConstants.IMAGE_ID, String.class));
+            }
+
+            if (headers.containsKey(NovaConstants.NETWORK)) {
+                builder.networks(message.getHeader(NovaConstants.NETWORK, List.class));
+            }
+
+            if (headers.containsKey(NovaConstants.FLAVOR_ID)) {
+                builder.flavor(message.getHeader(NovaConstants.FLAVOR_ID, String.class));
+            }
+
+            if (headers.containsKey(NovaConstants.KEYPAIR_NAME)) {
+                builder.keypairName(message.getHeader(NovaConstants.KEYPAIR_NAME, String.class));
+            }
+
+            if (headers.containsKey(NovaConstants.ADMIN_PASSWORD)) {
+                builder.addAdminPass(message.getHeader(NovaConstants.ADMIN_PASSWORD, String.class));
+            }
+
+            serverCreate = builder.build();
+        }
+        return serverCreate;
+    }
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/7d2907d2/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/swift/SwiftComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/swift/SwiftComponent.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/swift/SwiftComponent.java
index 70e1042..9995d9e 100644
--- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/swift/SwiftComponent.java
+++ b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/swift/SwiftComponent.java
@@ -16,17 +16,18 @@
  */
 package org.apache.camel.component.openstack.swift;
 
+import java.util.Map;
+
 import org.apache.camel.Endpoint;
 import org.apache.camel.impl.DefaultComponent;
 
-import java.util.Map;
-
 public class SwiftComponent extends DefaultComponent {
 
-	@Override protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
-		SwiftEndpoint endpoint = new SwiftEndpoint(uri, this);
-		setProperties(endpoint, parameters);
-		endpoint.setHost(remaining);
-		return endpoint;
-	}
+    @Override
+    protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
+        SwiftEndpoint endpoint = new SwiftEndpoint(uri, this);
+        setProperties(endpoint, parameters);
+        endpoint.setHost(remaining);
+        return endpoint;
+    }
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/7d2907d2/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/swift/SwiftConstants.java
----------------------------------------------------------------------
diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/swift/SwiftConstants.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/swift/SwiftConstants.java
index ed7a856..2d2f67f 100644
--- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/swift/SwiftConstants.java
+++ b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/swift/SwiftConstants.java
@@ -18,25 +18,24 @@ package org.apache.camel.component.openstack.swift;
 
 import org.apache.camel.component.openstack.common.OpenstackConstants;
 
-public final class SwiftConstants extends OpenstackConstants{
+public final class SwiftConstants extends OpenstackConstants {
 
-	public static final String SWIFT_SUBSYSTEM_OBJECTS = "objects";
-	public static final String SWIFT_SUBSYSTEM_CONTAINERS = "containers";
+    public static final String SWIFT_SUBSYSTEM_OBJECTS = "objects";
+    public static final String SWIFT_SUBSYSTEM_CONTAINERS = "containers";
 
-	public static final String CONTAINER_NAME = "containerName";
-	public static final String OBJECT_NAME = "objectName";
-
-	public static final String LIMIT = "limit";
-	public static final String MARKER = "marker";
-	public static final String END_MARKER = "end_marker";
-	public static final String DELIMITER = "delimiter";
-	public static final String PATH = "path";
-
-	public static final String GET_METADATA = "getMetadata";
-	public static final String CREATE_UPDATE_METADATA = "createUpdateMetadata";
-	public static final String DELETE_METADATA = "deleteMetadata";
+    public static final String CONTAINER_NAME = "containerName";
+    public static final String OBJECT_NAME = "objectName";
 
+    public static final String LIMIT = "limit";
+    public static final String MARKER = "marker";
+    public static final String END_MARKER = "end_marker";
+    public static final String DELIMITER = "delimiter";
+    public static final String PATH = "path";
 
+    public static final String GET_METADATA = "getMetadata";
+    public static final String CREATE_UPDATE_METADATA = "createUpdateMetadata";
+    public static final String DELETE_METADATA = "deleteMetadata";
 
+    private SwiftConstants() { }
 
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/7d2907d2/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/swift/SwiftEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/swift/SwiftEndpoint.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/swift/SwiftEndpoint.java
index 9ee9596..890839a 100644
--- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/swift/SwiftEndpoint.java
+++ b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/swift/SwiftEndpoint.java
@@ -29,160 +29,156 @@ import org.openstack4j.core.transport.Config;
 @UriEndpoint(scheme = "openstack-swift", title = "OpenStack-Swift", syntax = "openstack-swift:host", label = "cloud, virtualization")
 public class SwiftEndpoint extends AbstractOpenstackEndpoint {
 
-	@UriPath
-	@Metadata(required = "true")
-	private String host;
-
-	@UriParam(defaultValue = "default")
-	private String domain = "default";
-
-	@UriParam(enums = "objects, containers")
-	@Metadata(required = "true")
-	String subsystem;
-
-	@UriParam
-	@Metadata(required = "true")
-	private String project;
-
-	@UriParam
-	private String operation;
-
-	@UriParam
-	@Metadata(required = "true")
-	private String username;
-
-	@UriParam
-	@Metadata(required = "true")
-	private String password;
-
-	@UriParam
-	private Config config;
-
-	@UriParam(defaultValue = v3, enums = "v2, v3")
-	private String apiVersion = v3;
-
-	public SwiftEndpoint(String uri, SwiftComponent component) {
-		super(uri, component);
-
-	}
-
-	@Override
-	public Producer createProducer() throws Exception {
-		switch (subsystem) {
-			case SwiftConstants.SWIFT_SUBSYSTEM_OBJECTS:
-				return new ObjectProducer(this, createClient());
-			case SwiftConstants.SWIFT_SUBSYSTEM_CONTAINERS:
-				return new ContainerProducer(this, createClient());
-			default:
-				throw new IllegalArgumentException("Can't create producer with subsystem " + subsystem);
-		}
-	}
-
-	public String getSubsystem() {
-		return subsystem;
-	}
-
-	/**
-	 * OpenStack Swift subsystem
-	 */
-	public void setSubsystem(String subsystem) {
-		this.subsystem = subsystem;
-	}
-
-	@Override
-	public String getDomain() {
-		return domain;
-	}
-
-	/**
-	 * Authentication domain
-	 */
-	public void setDomain(String domain) {
-		this.domain = domain;
-	}
-
-	@Override
-	public String getProject() {
-		return project;
-	}
-
-	/**
-	 * The project ID
-	 */
-	public void setProject(String project) {
-		this.project = project;
-	}
-
-	@Override
-	public String getOperation() {
-		return operation;
-	}
-
-	/**
-	 * The operation to do
-	 */
-	public void setOperation(String operation) {
-		this.operation = operation;
-	}
-
-	@Override
-	public String getUsername() {
-		return username;
-	}
-
-	/**
-	 * OpenStack username
-	 */
-	public void setUsername(String username) {
-		this.username = username;
-	}
-
-	@Override
-	public String getPassword() {
-		return password;
-	}
-
-	/**
-	 * OpenStack password
-	 */
-	public void setPassword(String password) {
-		this.password = password;
-	}
-
-	@Override
-	public String getHost() {
-		return host;
-	}
-
-	/**
-	 * OpenStack host url
-	 */
-	public void setHost(String host) {
-		this.host = host;
-	}
-
-	public Config getConfig() {
-		return config;
-	}
-
-	/**
-	 *OpenStack configuration
-	 */
-	public void setConfig(Config config) {
-		this.config = config;
-	}
-
-
-	public String getApiVersion() {
-		return apiVersion;
-	}
-
-	/**
-	 * OpenStack API version
-	 */
-	public void setApiVersion(String apiVersion) {
-		this.apiVersion = apiVersion;
-	}
+    @UriParam(enums = "objects, containers")
+    @Metadata(required = "true")
+    String subsystem;
+    @UriPath
+    @Metadata(required = "true")
+    private String host;
+    @UriParam(defaultValue = "default")
+    private String domain = "default";
+    @UriParam
+    @Metadata(required = "true")
+    private String project;
+
+    @UriParam
+    private String operation;
+
+    @UriParam
+    @Metadata(required = "true")
+    private String username;
+
+    @UriParam
+    @Metadata(required = "true")
+    private String password;
+
+    @UriParam
+    private Config config;
+
+    @UriParam(defaultValue = V3, enums = "V2, V3")
+    private String apiVersion = V3;
+
+    public SwiftEndpoint(String uri, SwiftComponent component) {
+        super(uri, component);
+    }
+
+    @Override
+    public Producer createProducer() throws Exception {
+        switch (subsystem) {
+        case SwiftConstants.SWIFT_SUBSYSTEM_OBJECTS:
+            return new ObjectProducer(this, createClient());
+        case SwiftConstants.SWIFT_SUBSYSTEM_CONTAINERS:
+            return new ContainerProducer(this, createClient());
+        default:
+            throw new IllegalArgumentException("Can't create producer with subsystem " + subsystem);
+        }
+    }
+
+    public String getSubsystem() {
+        return subsystem;
+    }
+
+    /**
+     * OpenStack Swift subsystem
+     */
+    public void setSubsystem(String subsystem) {
+        this.subsystem = subsystem;
+    }
+
+    @Override
+    public String getDomain() {
+        return domain;
+    }
+
+    /**
+     * Authentication domain
+     */
+    public void setDomain(String domain) {
+        this.domain = domain;
+    }
+
+    @Override
+    public String getProject() {
+        return project;
+    }
+
+    /**
+     * The project ID
+     */
+    public void setProject(String project) {
+        this.project = project;
+    }
+
+    @Override
+    public String getOperation() {
+        return operation;
+    }
+
+    /**
+     * The operation to do
+     */
+    public void setOperation(String operation) {
+        this.operation = operation;
+    }
+
+    @Override
+    public String getUsername() {
+        return username;
+    }
+
+    /**
+     * OpenStack username
+     */
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    @Override
+    public String getPassword() {
+        return password;
+    }
+
+    /**
+     * OpenStack password
+     */
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    @Override
+    public String getHost() {
+        return host;
+    }
+
+    /**
+     * OpenStack host url
+     */
+    public void setHost(String host) {
+        this.host = host;
+    }
+
+    public Config getConfig() {
+        return config;
+    }
+
+    /**
+     *OpenStack configuration
+     */
+    public void setConfig(Config config) {
+        this.config = config;
+    }
+
+
+    public String getApiVersion() {
+        return apiVersion;
+    }
+
+    /**
+     * OpenStack API version
+     */
+    public void setApiVersion(String apiVersion) {
+        this.apiVersion = apiVersion;
+    }
 }
 
 

http://git-wip-us.apache.org/repos/asf/camel/blob/7d2907d2/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/swift/producer/ContainerProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/swift/producer/ContainerProducer.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/swift/producer/ContainerProducer.java
index 16ca6b9..c0c2d5b 100644
--- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/swift/producer/ContainerProducer.java
+++ b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/swift/producer/ContainerProducer.java
@@ -16,13 +16,15 @@
  */
 package org.apache.camel.component.openstack.swift.producer;
 
+import java.util.List;
+import java.util.Map;
+
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
 import org.apache.camel.component.openstack.common.AbstractOpenstackProducer;
 import org.apache.camel.component.openstack.swift.SwiftConstants;
 import org.apache.camel.component.openstack.swift.SwiftEndpoint;
 import org.apache.camel.util.ObjectHelper;
-
 import org.openstack4j.api.OSClient;
 import org.openstack4j.model.common.ActionResponse;
 import org.openstack4j.model.storage.object.SwiftContainer;
@@ -30,165 +32,171 @@ import org.openstack4j.model.storage.object.SwiftHeaders;
 import org.openstack4j.model.storage.object.options.ContainerListOptions;
 import org.openstack4j.model.storage.object.options.CreateUpdateContainerOptions;
 
-import java.util.List;
-import java.util.Map;
-
 public class ContainerProducer extends AbstractOpenstackProducer {
 
-	public ContainerProducer(SwiftEndpoint endpoint, OSClient client) {
-		super(endpoint, client);
-	}
-
-	@Override
-	public void process(Exchange exchange) throws Exception {
-		String operation = getOperation(exchange);
-
-		switch (operation) {
-			case SwiftConstants.CREATE:
-				doCreate(exchange);
-				break;
-			case SwiftConstants.GET:
-				doGet(exchange);
-				break;
-			case SwiftConstants.GET_ALL:
-				doGetAll(exchange);
-				break;
-			case SwiftConstants.UPDATE:
-				doUpdate(exchange);
-				break;
-			case SwiftConstants.DELETE:
-				doDelete(exchange);
-				break;
-			case SwiftConstants.GET_METADATA:
-				doGetMetadata(exchange);
-				break;
-			case SwiftConstants.CREATE_UPDATE_METADATA:
-				doUpdateMetadata(exchange);
-				break;
-			case SwiftConstants.DELETE_METADATA:
-				doDeleteMetadata(exchange);
-				break;
-			default:
-				throw new IllegalArgumentException("Unsupported operation " + operation);
-		}
-	}
-
-	private void doCreate(Exchange exchange) {
-		final Message msg = exchange.getIn();
-		final String name = msg.getHeader(SwiftConstants.NAME, msg.getHeader(SwiftConstants.CONTAINER_NAME, String.class), String.class);
-		ObjectHelper.notEmpty(name, "Container name");
-
-		final CreateUpdateContainerOptions options = messageToCreateUpdateOptions(msg);
-		final ActionResponse out = os.objectStorage().containers().create(name, options);
-		checkFailure(out, msg, "Create container " + name);
-	}
-
-	private void doGet(Exchange exchange) {
-		final Message msg = exchange.getIn();
-		final ContainerListOptions options = messageToListOptions(msg);
-		final List<? extends SwiftContainer> out = os.objectStorage().containers().list(options);
-		msg.setBody(out);
-	}
-
-	private void doGetAll(Exchange exchange) {
-		final Message msg = exchange.getIn();
-		final List<? extends SwiftContainer> out = os.objectStorage().containers().list();
-		msg.setBody(out);
-	}
-
-	private void doUpdate(Exchange exchange) {
-		final Message msg = exchange.getIn();
-		final String name = msg.getHeader(SwiftConstants.NAME, msg.getHeader(SwiftConstants.CONTAINER_NAME, String.class), String.class);
-		ObjectHelper.notEmpty(name, "Container name");
-		final CreateUpdateContainerOptions options = messageToCreateUpdateOptions(msg);
-		final ActionResponse out = os.objectStorage().containers().update(name, options);
-		checkFailure(out, msg, "Update container " + name);
-	}
-
-	private void doDelete(Exchange exchange) {
-		final Message msg = exchange.getIn();
-		final String name = msg.getHeader(SwiftConstants.NAME, msg.getHeader(SwiftConstants.CONTAINER_NAME, String.class), String.class);
-		ObjectHelper.notEmpty(name, "Container name");
-		final ActionResponse out = os.objectStorage().containers().delete(name);
-		checkFailure(out, msg, "Delete container " + name);
-	}
-
-	private void doGetMetadata(Exchange exchange) {
-		final Message msg = exchange.getIn();
-		final String name = msg.getHeader(SwiftConstants.NAME, msg.getHeader(SwiftConstants.CONTAINER_NAME, String.class), String.class);
-		ObjectHelper.notEmpty(name, "Container name");
-		msg.setBody(os.objectStorage().containers().getMetadata(name));
-	}
-
-	private void doDeleteMetadata(Exchange exchange) {
-		final Message msg = exchange.getIn();
-		final String name = msg.getHeader(SwiftConstants.NAME, msg.getHeader(SwiftConstants.CONTAINER_NAME, String.class), String.class);
-		ObjectHelper.notEmpty(name, "Container name");
-		boolean success = os.objectStorage().containers().deleteMetadata(name, msg.getBody(Map.class));
-		msg.setFault(!success);
-		if (!success) {
-			msg.setBody("Removing metadata was not successful");
-		}
-	}
-
-	private void doUpdateMetadata(Exchange exchange) {
-		final Message msg = exchange.getIn();
-		final String name = msg.getHeader(SwiftConstants.NAME, msg.getHeader(SwiftConstants.CONTAINER_NAME, String.class), String.class);
-		ObjectHelper.notEmpty(name, "Container name");
-		boolean success = os.objectStorage().containers().updateMetadata(name, msg.getBody(Map.class));
-		msg.setFault(!success);
-		if (!success) {
-			msg.setBody("Updating metadata was not successful");
-		}
-	}
-
-	private CreateUpdateContainerOptions messageToCreateUpdateOptions(Message message) {
-		CreateUpdateContainerOptions options = message.getBody(CreateUpdateContainerOptions.class);
-		if (options == null) {
-			Map headers = message.getHeaders();
-			if (headers.containsKey(SwiftHeaders.CONTAINER_METADATA_PREFIX))
-				options = getCreateUpdateOptions(options).metadata(message.getHeader(SwiftHeaders.CONTAINER_METADATA_PREFIX, Map.class));
-
-			if (headers.containsKey(SwiftHeaders.VERSIONS_LOCATION))
-				options = getCreateUpdateOptions(options).versionsLocation(message.getHeader(SwiftHeaders.VERSIONS_LOCATION, String.class));
-
-			if (headers.containsKey(SwiftHeaders.CONTAINER_READ))
-				options = getCreateUpdateOptions(options).accessRead(message.getHeader(SwiftHeaders.CONTAINER_READ, String.class));
-
-			if (headers.containsKey(SwiftHeaders.CONTAINER_WRITE))
-				options = getCreateUpdateOptions(options).accessWrite(message.getHeader(SwiftHeaders.CONTAINER_WRITE, String.class));
-		}
-		return options;
-	}
-
-	private CreateUpdateContainerOptions getCreateUpdateOptions(CreateUpdateContainerOptions options) {
-		return options == null ? CreateUpdateContainerOptions.create() : options;
-	}
-
-	private ContainerListOptions messageToListOptions(Message message) {
-		ContainerListOptions options = message.getBody(ContainerListOptions.class);
-		if (options == null) {
-			Map headers = message.getHeaders();
-
-			if (headers.containsKey(SwiftConstants.LIMIT))
-				options = getListOptions(options).limit(message.getHeader(SwiftConstants.LIMIT, Integer.class));
-
-			if (headers.containsKey(SwiftConstants.MARKER))
-				options = getListOptions(options).marker(message.getHeader(SwiftConstants.MARKER, String.class));
-
-			if (headers.containsKey(SwiftConstants.END_MARKER))
-				options = getListOptions(options).endMarker(message.getHeader(SwiftConstants.END_MARKER, String.class));
-
-			if (headers.containsKey(SwiftConstants.DELIMITER))
-				options = getListOptions(options).delimiter(message.getHeader(SwiftConstants.DELIMITER, Character.class));
-
-			if (headers.containsKey(SwiftConstants.PATH))
-				options = getListOptions(options).path(message.getHeader(SwiftConstants.PATH, String.class));
-		}
-		return options;
-	}
-
-	private ContainerListOptions getListOptions(ContainerListOptions options) {
-		return options == null ? ContainerListOptions.create() : options;
-	}
+    public ContainerProducer(SwiftEndpoint endpoint, OSClient client) {
+        super(endpoint, client);
+    }
+
+    @Override
+    public void process(Exchange exchange) throws Exception {
+        String operation = getOperation(exchange);
+
+        switch (operation) {
+        case SwiftConstants.CREATE:
+            doCreate(exchange);
+            break;
+        case SwiftConstants.GET:
+            doGet(exchange);
+            break;
+        case SwiftConstants.GET_ALL:
+            doGetAll(exchange);
+            break;
+        case SwiftConstants.UPDATE:
+            doUpdate(exchange);
+            break;
+        case SwiftConstants.DELETE:
+            doDelete(exchange);
+            break;
+        case SwiftConstants.GET_METADATA:
+            doGetMetadata(exchange);
+            break;
+        case SwiftConstants.CREATE_UPDATE_METADATA:
+            doUpdateMetadata(exchange);
+            break;
+        case SwiftConstants.DELETE_METADATA:
+            doDeleteMetadata(exchange);
+            break;
+        default:
+            throw new IllegalArgumentException("Unsupported operation " + operation);
+        }
+    }
+
+    private void doCreate(Exchange exchange) {
+        final Message msg = exchange.getIn();
+        final String name = msg.getHeader(SwiftConstants.NAME, msg.getHeader(SwiftConstants.CONTAINER_NAME, String.class), String.class);
+        ObjectHelper.notEmpty(name, "Container name");
+
+        final CreateUpdateContainerOptions options = messageToCreateUpdateOptions(msg);
+        final ActionResponse out = os.objectStorage().containers().create(name, options);
+        checkFailure(out, msg, "Create container " + name);
+    }
+
+    private void doGet(Exchange exchange) {
+        final Message msg = exchange.getIn();
+        final ContainerListOptions options = messageToListOptions(msg);
+        final List<? extends SwiftContainer> out = os.objectStorage().containers().list(options);
+        msg.setBody(out);
+    }
+
+    private void doGetAll(Exchange exchange) {
+        final Message msg = exchange.getIn();
+        final List<? extends SwiftContainer> out = os.objectStorage().containers().list();
+        msg.setBody(out);
+    }
+
+    private void doUpdate(Exchange exchange) {
+        final Message msg = exchange.getIn();
+        final String name = msg.getHeader(SwiftConstants.NAME, msg.getHeader(SwiftConstants.CONTAINER_NAME, String.class), String.class);
+        ObjectHelper.notEmpty(name, "Container name");
+        final CreateUpdateContainerOptions options = messageToCreateUpdateOptions(msg);
+        final ActionResponse out = os.objectStorage().containers().update(name, options);
+        checkFailure(out, msg, "Update container " + name);
+    }
+
+    private void doDelete(Exchange exchange) {
+        final Message msg = exchange.getIn();
+        final String name = msg.getHeader(SwiftConstants.NAME, msg.getHeader(SwiftConstants.CONTAINER_NAME, String.class), String.class);
+        ObjectHelper.notEmpty(name, "Container name");
+        final ActionResponse out = os.objectStorage().containers().delete(name);
+        checkFailure(out, msg, "Delete container " + name);
+    }
+
+    private void doGetMetadata(Exchange exchange) {
+        final Message msg = exchange.getIn();
+        final String name = msg.getHeader(SwiftConstants.NAME, msg.getHeader(SwiftConstants.CONTAINER_NAME, String.class), String.class);
+        ObjectHelper.notEmpty(name, "Container name");
+        msg.setBody(os.objectStorage().containers().getMetadata(name));
+    }
+
+    private void doDeleteMetadata(Exchange exchange) {
+        final Message msg = exchange.getIn();
+        final String name = msg.getHeader(SwiftConstants.NAME, msg.getHeader(SwiftConstants.CONTAINER_NAME, String.class), String.class);
+        ObjectHelper.notEmpty(name, "Container name");
+        boolean success = os.objectStorage().containers().deleteMetadata(name, msg.getBody(Map.class));
+        msg.setFault(!success);
+        if (!success) {
+            msg.setBody("Removing metadata was not successful");
+        }
+    }
+
+    private void doUpdateMetadata(Exchange exchange) {
+        final Message msg = exchange.getIn();
+        final String name = msg.getHeader(SwiftConstants.NAME, msg.getHeader(SwiftConstants.CONTAINER_NAME, String.class), String.class);
+        ObjectHelper.notEmpty(name, "Container name");
+        boolean success = os.objectStorage().containers().updateMetadata(name, msg.getBody(Map.class));
+        msg.setFault(!success);
+        if (!success) {
+            msg.setBody("Updating metadata was not successful");
+        }
+    }
+
+    private CreateUpdateContainerOptions messageToCreateUpdateOptions(Message message) {
+        CreateUpdateContainerOptions options = message.getBody(CreateUpdateContainerOptions.class);
+        if (options == null) {
+            Map headers = message.getHeaders();
+            if (headers.containsKey(SwiftHeaders.CONTAINER_METADATA_PREFIX)) {
+                options = getCreateUpdateOptions(options).metadata(message.getHeader(SwiftHeaders.CONTAINER_METADATA_PREFIX, Map.class));
+            }
+
+            if (headers.containsKey(SwiftHeaders.VERSIONS_LOCATION)) {
+                options = getCreateUpdateOptions(options).versionsLocation(message.getHeader(SwiftHeaders.VERSIONS_LOCATION, String.class));
+            }
+
+            if (headers.containsKey(SwiftHeaders.CONTAINER_READ)) {
+                options = getCreateUpdateOptions(options).accessRead(message.getHeader(SwiftHeaders.CONTAINER_READ, String.class));
+            }
+
+            if (headers.containsKey(SwiftHeaders.CONTAINER_WRITE)) {
+                options = getCreateUpdateOptions(options).accessWrite(message.getHeader(SwiftHeaders.CONTAINER_WRITE, String.class));
+            }
+        }
+        return options;
+    }
+
+    private CreateUpdateContainerOptions getCreateUpdateOptions(CreateUpdateContainerOptions options) {
+        return options == null ? CreateUpdateContainerOptions.create() : options;
+    }
+
+    private ContainerListOptions messageToListOptions(Message message) {
+        ContainerListOptions options = message.getBody(ContainerListOptions.class);
+        if (options == null) {
+            Map headers = message.getHeaders();
+
+            if (headers.containsKey(SwiftConstants.LIMIT)) {
+                options = getListOptions(options).limit(message.getHeader(SwiftConstants.LIMIT, Integer.class));
+            }
+
+            if (headers.containsKey(SwiftConstants.MARKER)) {
+                options = getListOptions(options).marker(message.getHeader(SwiftConstants.MARKER, String.class));
+            }
+
+            if (headers.containsKey(SwiftConstants.END_MARKER)) {
+                options = getListOptions(options).endMarker(message.getHeader(SwiftConstants.END_MARKER, String.class));
+            }
+
+            if (headers.containsKey(SwiftConstants.DELIMITER)) {
+                options = getListOptions(options).delimiter(message.getHeader(SwiftConstants.DELIMITER, Character.class));
+            }
+
+            if (headers.containsKey(SwiftConstants.PATH)) {
+                options = getListOptions(options).path(message.getHeader(SwiftConstants.PATH, String.class));
+            }
+        }
+        return options;
+    }
+
+    private ContainerListOptions getListOptions(ContainerListOptions options) {
+        return options == null ? ContainerListOptions.create() : options;
+    }
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/7d2907d2/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/swift/producer/ObjectProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/swift/producer/ObjectProducer.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/swift/producer/ObjectProducer.java
index 40a079d..25564e7 100644
--- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/swift/producer/ObjectProducer.java
+++ b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/swift/producer/ObjectProducer.java
@@ -16,116 +16,115 @@
  */
 package org.apache.camel.component.openstack.swift.producer;
 
+import java.util.List;
+import java.util.Map;
+
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
 import org.apache.camel.component.openstack.common.AbstractOpenstackProducer;
 import org.apache.camel.component.openstack.swift.SwiftConstants;
 import org.apache.camel.component.openstack.swift.SwiftEndpoint;
 import org.apache.camel.util.ObjectHelper;
-
 import org.openstack4j.api.OSClient;
 import org.openstack4j.model.common.ActionResponse;
 import org.openstack4j.model.common.Payload;
 import org.openstack4j.model.storage.object.SwiftObject;
 import org.openstack4j.model.storage.object.options.ObjectLocation;
 
-import java.util.List;
-import java.util.Map;
-
 public class ObjectProducer extends AbstractOpenstackProducer {
 
-	public ObjectProducer(SwiftEndpoint endpoint, OSClient client) {
-		super(endpoint, client);
-	}
+    public ObjectProducer(SwiftEndpoint endpoint, OSClient client) {
+        super(endpoint, client);
+    }
 
-	@Override
-	public void process(Exchange exchange) throws Exception {
-		String operation = getOperation(exchange);
+    @Override
+    public void process(Exchange exchange) throws Exception {
+        String operation = getOperation(exchange);
 
-		switch (operation) {
-			case SwiftConstants.CREATE:
-				doCreate(exchange);
-				break;
-			case SwiftConstants.GET:
-				doGet(exchange);
-				break;
-			case SwiftConstants.GET_ALL:
-				doGetAll(exchange);
-				break;
-			case SwiftConstants.DELETE:
-				doDelete(exchange);
-				break;
-			case SwiftConstants.GET_METADATA:
-				doGetMetadata(exchange);
-				break;
-			case SwiftConstants.CREATE_UPDATE_METADATA:
-				doUpdateMetadata(exchange);
-				break;
-			default:
-				throw new IllegalArgumentException("Unsupported operation " + operation);
-		}
-	}
+        switch (operation) {
+        case SwiftConstants.CREATE:
+            doCreate(exchange);
+            break;
+        case SwiftConstants.GET:
+            doGet(exchange);
+            break;
+        case SwiftConstants.GET_ALL:
+            doGetAll(exchange);
+            break;
+        case SwiftConstants.DELETE:
+            doDelete(exchange);
+            break;
+        case SwiftConstants.GET_METADATA:
+            doGetMetadata(exchange);
+            break;
+        case SwiftConstants.CREATE_UPDATE_METADATA:
+            doUpdateMetadata(exchange);
+            break;
+        default:
+            throw new IllegalArgumentException("Unsupported operation " + operation);
+        }
+    }
 
-	private void doCreate(Exchange exchange) {
-		final Message msg = exchange.getIn();
-		final Payload payload = createPayload(msg);
-		final String containerName = msg.getHeader(SwiftConstants.CONTAINER_NAME, String.class);
-		final String objectName = msg.getHeader(SwiftConstants.OBJECT_NAME, String.class);
-		ObjectHelper.notEmpty(containerName, "Container name");
-		ObjectHelper.notEmpty(objectName, "Object name");
-		final String etag = os.objectStorage().objects().put(containerName, objectName, payload);
-		msg.setBody(etag);
-	}
+    private void doCreate(Exchange exchange) {
+        final Message msg = exchange.getIn();
+        final Payload payload = createPayload(msg);
+        final String containerName = msg.getHeader(SwiftConstants.CONTAINER_NAME, String.class);
+        final String objectName = msg.getHeader(SwiftConstants.OBJECT_NAME, String.class);
+        ObjectHelper.notEmpty(containerName, "Container name");
+        ObjectHelper.notEmpty(objectName, "Object name");
+        final String etag = os.objectStorage().objects().put(containerName, objectName, payload);
+        msg.setBody(etag);
+    }
 
-	private void doGet(Exchange exchange) {
-		final Message msg = exchange.getIn();
-		final String containerName = msg.getHeader(SwiftConstants.CONTAINER_NAME, String.class);
-		final String objectName = msg.getHeader(SwiftConstants.OBJECT_NAME, String.class);
-		ObjectHelper.notEmpty(containerName, "Container name");
-		ObjectHelper.notEmpty(objectName, "Object name");
-		final SwiftObject out = os.objectStorage().objects().get(containerName, objectName);
-		msg.setBody(out);
-	}
+    private void doGet(Exchange exchange) {
+        final Message msg = exchange.getIn();
+        final String containerName = msg.getHeader(SwiftConstants.CONTAINER_NAME, String.class);
+        final String objectName = msg.getHeader(SwiftConstants.OBJECT_NAME, String.class);
+        ObjectHelper.notEmpty(containerName, "Container name");
+        ObjectHelper.notEmpty(objectName, "Object name");
+        final SwiftObject out = os.objectStorage().objects().get(containerName, objectName);
+        msg.setBody(out);
+    }
 
-	private void doGetAll(Exchange exchange) {
-		final Message msg = exchange.getIn();
-		final String name = msg.getHeader(SwiftConstants.CONTAINER_NAME, msg.getHeader(SwiftConstants.NAME, String.class), String.class);
-		ObjectHelper.notEmpty(name, "Container name");
-		final List<? extends SwiftObject> out = os.objectStorage().objects().list(name);
-		exchange.getIn().setBody(out);
-	}
+    private void doGetAll(Exchange exchange) {
+        final Message msg = exchange.getIn();
+        final String name = msg.getHeader(SwiftConstants.CONTAINER_NAME, msg.getHeader(SwiftConstants.NAME, String.class), String.class);
+        ObjectHelper.notEmpty(name, "Container name");
+        final List<? extends SwiftObject> out = os.objectStorage().objects().list(name);
+        exchange.getIn().setBody(out);
+    }
 
-	private void doDelete(Exchange exchange) {
-		final Message msg = exchange.getIn();
-		final String containerName = msg.getHeader(SwiftConstants.CONTAINER_NAME, String.class);
-		final String objectName = msg.getHeader(SwiftConstants.OBJECT_NAME, String.class);
-		ObjectHelper.notEmpty(containerName, "Container name");
-		ObjectHelper.notEmpty(objectName, "Object name");
-		final ActionResponse out = os.objectStorage().objects().delete(containerName, objectName);
-		msg.setBody(out.getFault());
-		msg.setFault(!out.isSuccess());
-	}
+    private void doDelete(Exchange exchange) {
+        final Message msg = exchange.getIn();
+        final String containerName = msg.getHeader(SwiftConstants.CONTAINER_NAME, String.class);
+        final String objectName = msg.getHeader(SwiftConstants.OBJECT_NAME, String.class);
+        ObjectHelper.notEmpty(containerName, "Container name");
+        ObjectHelper.notEmpty(objectName, "Object name");
+        final ActionResponse out = os.objectStorage().objects().delete(containerName, objectName);
+        msg.setBody(out.getFault());
+        msg.setFault(!out.isSuccess());
+    }
 
-	private void doGetMetadata(Exchange exchange) {
-		final Message msg = exchange.getIn();
-		final String containerName = msg.getHeader(SwiftConstants.CONTAINER_NAME, String.class);
-		final String objectName = msg.getHeader(SwiftConstants.OBJECT_NAME, String.class);
-		ObjectHelper.notEmpty(containerName, "Container name");
-		ObjectHelper.notEmpty(objectName, "Object name");
+    private void doGetMetadata(Exchange exchange) {
+        final Message msg = exchange.getIn();
+        final String containerName = msg.getHeader(SwiftConstants.CONTAINER_NAME, String.class);
+        final String objectName = msg.getHeader(SwiftConstants.OBJECT_NAME, String.class);
+        ObjectHelper.notEmpty(containerName, "Container name");
+        ObjectHelper.notEmpty(objectName, "Object name");
 
-		msg.setBody(os.objectStorage().objects().getMetadata(containerName, objectName));
-	}
+        msg.setBody(os.objectStorage().objects().getMetadata(containerName, objectName));
+    }
 
-	private void doUpdateMetadata(Exchange exchange) {
-		final Message msg = exchange.getIn();
-		final String containerName = msg.getHeader(SwiftConstants.CONTAINER_NAME, String.class);
-		final String objectName = msg.getHeader(SwiftConstants.OBJECT_NAME, String.class);
-		ObjectHelper.notEmpty(containerName, "Container name");
-		ObjectHelper.notEmpty(objectName, "Object name");
-		final boolean success = os.objectStorage().objects().updateMetadata(ObjectLocation.create(containerName, objectName), msg.getBody(Map.class));
-		msg.setFault(!success);
-		if (!success) {
-			msg.setBody("Updating metadata was not successful");
-		}
-	}
+    private void doUpdateMetadata(Exchange exchange) {
+        final Message msg = exchange.getIn();
+        final String containerName = msg.getHeader(SwiftConstants.CONTAINER_NAME, String.class);
+        final String objectName = msg.getHeader(SwiftConstants.OBJECT_NAME, String.class);
+        ObjectHelper.notEmpty(containerName, "Container name");
+        ObjectHelper.notEmpty(objectName, "Object name");
+        final boolean success = os.objectStorage().objects().updateMetadata(ObjectLocation.create(containerName, objectName), msg.getBody(Map.class));
+        msg.setFault(!success);
+        if (!success) {
+            msg.setBody("Updating metadata was not successful");
+        }
+    }
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/7d2907d2/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/AbstractProducerTestSupport.java
----------------------------------------------------------------------
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/AbstractProducerTestSupport.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/AbstractProducerTestSupport.java
index e464c74..ea87b57 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/AbstractProducerTestSupport.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/AbstractProducerTestSupport.java
@@ -16,38 +16,36 @@
  */
 package org.apache.camel.component.openstack;
 
-import static org.mockito.Mockito.when;
+import java.io.IOException;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
 import org.apache.camel.Producer;
 import org.apache.camel.impl.DefaultMessage;
-
 import org.junit.Before;
 import org.junit.runner.RunWith;
-
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 import org.openstack4j.api.OSClient;
 
-import java.io.IOException;
+import static org.mockito.Mockito.when;
 
 @RunWith(MockitoJUnitRunner.class)
 public abstract class AbstractProducerTestSupport {
 
-	@Mock
-	protected OSClient.OSClientV3 client;
+    @Mock
+    protected OSClient.OSClientV3 client;
 
-	@Mock
-	protected Exchange exchange;
+    @Mock
+    protected Exchange exchange;
 
-	protected Message msg;
+    protected Message msg;
 
-	protected Producer producer;
+    protected Producer producer;
 
-	@Before
-	public void before() throws IOException {
-		msg  = new DefaultMessage();
-		when(exchange.getIn()).thenReturn(msg);
-	}
+    @Before
+    public void before() throws IOException {
+        msg = new DefaultMessage();
+        when(exchange.getIn()).thenReturn(msg);
+    }
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/7d2907d2/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/cinder/CinderProducerTestSupport.java
----------------------------------------------------------------------
diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/cinder/CinderProducerTestSupport.java b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/cinder/CinderProducerTestSupport.java
index b6bc939..f62e2ca 100644
--- a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/cinder/CinderProducerTestSupport.java
+++ b/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/cinder/CinderProducerTestSupport.java
@@ -16,35 +16,33 @@
  */
 package org.apache.camel.component.openstack.cinder;
 
-import static org.mockito.Mockito.when;
-
 import org.apache.camel.component.openstack.AbstractProducerTestSupport;
-
 import org.junit.Before;
-
 import org.mockito.Mock;
 import org.openstack4j.api.storage.BlockStorageService;
 import org.openstack4j.api.storage.BlockVolumeService;
 import org.openstack4j.api.storage.BlockVolumeSnapshotService;
 
+import static org.mockito.Mockito.when;
+
 public class CinderProducerTestSupport extends AbstractProducerTestSupport {
 
-	@Mock
-	protected CinderEndpoint endpoint;
+    @Mock
+    protected CinderEndpoint endpoint;
 
-	@Mock
-	protected BlockStorageService blockStorageService;
+    @Mock
+    protected BlockStorageService blockStorageService;
 
-	@Mock
-	protected BlockVolumeService volumeService;
+    @Mock
+    protected BlockVolumeService volumeService;
 
-	@Mock
-	protected BlockVolumeSnapshotService snapshotService;
+    @Mock
+    protected BlockVolumeSnapshotService snapshotService;
 
-	@Before
-	public void setUpComputeService(){
-		when(client.blockStorage()).thenReturn(blockStorageService);
-		when(blockStorageService.volumes()).thenReturn(volumeService);
-		when(blockStorageService.snapshots()).thenReturn(snapshotService);
-	}
+    @Before
+    public void setUpComputeService() {
+        when(client.blockStorage()).thenReturn(blockStorageService);
+        when(blockStorageService.volumes()).thenReturn(volumeService);
+        when(blockStorageService.snapshots()).thenReturn(snapshotService);
+    }
 }