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:55 UTC
[16/17] camel git commit: CAMEL-9748: fix CS
CAMEL-9748: fix CS
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7d2907d2
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7d2907d2
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7d2907d2
Branch: refs/heads/master
Commit: 7d2907d2af43b1e85fe9ca5b7fe0cade204de97e
Parents: 04a9036
Author: Jan Bouska <jb...@redhat.com>
Authored: Fri Dec 16 15:37:19 2016 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Sat Dec 17 12:25:15 2016 +0100
----------------------------------------------------------------------
.../main/docs/openstack-cinder-component.adoc | 2 +-
.../main/docs/openstack-glance-component.adoc | 2 +-
.../main/docs/openstack-neutron-component.adoc | 2 +-
.../src/main/docs/openstack-nova-component.adoc | 2 +-
.../main/docs/openstack-swift-component.adoc | 2 +-
.../openstack/cinder/CinderComponent.java | 17 +-
.../openstack/cinder/CinderConstants.java | 44 +-
.../openstack/cinder/CinderEndpoint.java | 302 +++++++-------
.../cinder/producer/SnapshotProducer.java | 194 ++++-----
.../cinder/producer/VolumeProducer.java | 232 +++++------
.../common/AbstractOpenstackEndpoint.java | 98 +++--
.../common/AbstractOpenstackProducer.java | 90 ++---
.../openstack/common/OpenstackConstants.java | 22 +-
.../openstack/glance/GlanceComponent.java | 17 +-
.../openstack/glance/GlanceConstants.java | 25 +-
.../openstack/glance/GlanceEndpoint.java | 260 ++++++------
.../openstack/glance/GlanceProducer.java | 302 +++++++-------
.../openstack/keystone/KeystoneComponent.java | 17 +-
.../openstack/keystone/KeystoneConstants.java | 34 +-
.../openstack/keystone/KeystoneEndpoint.java | 297 +++++++-------
.../producer/AbstractKeystoneProducer.java | 17 +-
.../keystone/producer/DomainProducer.java | 165 ++++----
.../keystone/producer/GroupProducer.java | 251 ++++++------
.../keystone/producer/ProjectProducer.java | 180 ++++-----
.../keystone/producer/RegionProducer.java | 137 +++----
.../keystone/producer/UserProducer.java | 189 ++++-----
.../openstack/neutron/NeutronComponent.java | 17 +-
.../openstack/neutron/NeutronConstants.java | 75 ++--
.../openstack/neutron/NeutronEndpoint.java | 310 +++++++--------
.../neutron/producer/NetworkProducer.java | 187 ++++-----
.../neutron/producer/PortProducer.java | 187 ++++-----
.../neutron/producer/RouterProducer.java | 222 +++++------
.../neutron/producer/SubnetProducer.java | 190 ++++-----
.../component/openstack/nova/NovaComponent.java | 17 +-
.../component/openstack/nova/NovaConstants.java | 56 ++-
.../component/openstack/nova/NovaEndpoint.java | 307 +++++++-------
.../nova/producer/FlavorsProducer.java | 173 ++++----
.../nova/producer/KeypairProducer.java | 105 ++---
.../openstack/nova/producer/ServerProducer.java | 240 +++++------
.../openstack/swift/SwiftComponent.java | 17 +-
.../openstack/swift/SwiftConstants.java | 29 +-
.../openstack/swift/SwiftEndpoint.java | 304 +++++++-------
.../swift/producer/ContainerProducer.java | 328 +++++++--------
.../swift/producer/ObjectProducer.java | 177 ++++-----
.../openstack/AbstractProducerTestSupport.java | 28 +-
.../cinder/CinderProducerTestSupport.java | 34 +-
.../openstack/cinder/VolumeProducerTest.java | 247 ++++++------
.../cinder/VolumeSnapshotProducerTest.java | 203 +++++-----
.../openstack/glance/GlanceProducerTest.java | 397 +++++++++----------
.../openstack/keystone/DomainProducerTest.java | 262 ++++++------
.../openstack/keystone/GroupProducerTest.java | 267 ++++++-------
.../keystone/KeystoneProducerTestSupport.java | 52 ++-
.../openstack/keystone/ProjectProducerTest.java | 273 +++++++------
.../openstack/keystone/RegionProducerTest.java | 253 ++++++------
.../openstack/keystone/UserProducerTest.java | 285 +++++++------
.../openstack/neutron/NetworkProducerTest.java | 226 ++++++-----
.../neutron/NeutronProducerTestSupport.java | 46 +--
.../openstack/neutron/PortProducerTest.java | 278 +++++++------
.../openstack/neutron/RouterProducerTest.java | 368 +++++++++--------
.../openstack/neutron/SubnetProducerTest.java | 221 +++++------
.../openstack/nova/FlavorProducerTest.java | 315 ++++++++-------
.../openstack/nova/KeypairProducerTest.java | 177 ++++-----
.../openstack/nova/NovaProducerTestSupport.java | 40 +-
.../openstack/nova/ServerProducerTest.java | 239 ++++++-----
.../openstack/swift/ContainerProducerTest.java | 306 +++++++-------
.../openstack/swift/ObjectProducerTest.java | 244 ++++++------
.../swift/SwiftProducerTestSupport.java | 34 +-
67 files changed, 5310 insertions(+), 5326 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/7d2907d2/components/camel-openstack/src/main/docs/openstack-cinder-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-openstack/src/main/docs/openstack-cinder-component.adoc b/components/camel-openstack/src/main/docs/openstack-cinder-component.adoc
index a9bf942..6a983c6 100644
--- a/components/camel-openstack/src/main/docs/openstack-cinder-component.adoc
+++ b/components/camel-openstack/src/main/docs/openstack-cinder-component.adoc
@@ -54,7 +54,7 @@ The OpenStack-Cinder component supports 13 endpoint options which are listed bel
|=======================================================================
| Name | Group | Default | Java Type | Description
| host | common | | String | *Required* OpenStack host url
-| apiVersion | common | v3 | String | OpenStack API version
+| apiVersion | common | V3 | String | OpenStack API version
| config | common | | Config | OpenStack configuration
| domain | common | default | String | Authentication domain
| operation | common | | String | The operation to do
http://git-wip-us.apache.org/repos/asf/camel/blob/7d2907d2/components/camel-openstack/src/main/docs/openstack-glance-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-openstack/src/main/docs/openstack-glance-component.adoc b/components/camel-openstack/src/main/docs/openstack-glance-component.adoc
index 528ae17..0cca3db 100644
--- a/components/camel-openstack/src/main/docs/openstack-glance-component.adoc
+++ b/components/camel-openstack/src/main/docs/openstack-glance-component.adoc
@@ -54,7 +54,7 @@ The OpenStack-Glance component supports 12 endpoint options which are listed bel
|=======================================================================
| Name | Group | Default | Java Type | Description
| host | common | | String | *Required* OpenStack host url
-| apiVersion | common | v3 | String | OpenStack API version
+| apiVersion | common | V3 | String | OpenStack API version
| config | common | | Config | OpenStack configuration
| domain | common | default | String | Authentication domain
| operation | common | | String | The operation to do
http://git-wip-us.apache.org/repos/asf/camel/blob/7d2907d2/components/camel-openstack/src/main/docs/openstack-neutron-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-openstack/src/main/docs/openstack-neutron-component.adoc b/components/camel-openstack/src/main/docs/openstack-neutron-component.adoc
index c746f70..3b303df 100644
--- a/components/camel-openstack/src/main/docs/openstack-neutron-component.adoc
+++ b/components/camel-openstack/src/main/docs/openstack-neutron-component.adoc
@@ -54,7 +54,7 @@ The OpenStack-Neutron component supports 13 endpoint options which are listed be
|=======================================================================
| Name | Group | Default | Java Type | Description
| host | common | | String | *Required* OpenStack host url
-| apiVersion | common | v3 | String | OpenStack API version
+| apiVersion | common | V3 | String | OpenStack API version
| config | common | | Config | OpenStack configuration
| domain | common | default | String | Authentication domain
| operation | common | | String | The operation to do
http://git-wip-us.apache.org/repos/asf/camel/blob/7d2907d2/components/camel-openstack/src/main/docs/openstack-nova-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-openstack/src/main/docs/openstack-nova-component.adoc b/components/camel-openstack/src/main/docs/openstack-nova-component.adoc
index ef7daed..26d18ff 100644
--- a/components/camel-openstack/src/main/docs/openstack-nova-component.adoc
+++ b/components/camel-openstack/src/main/docs/openstack-nova-component.adoc
@@ -54,7 +54,7 @@ The OpenStack-Nova component supports 13 endpoint options which are listed below
|=======================================================================
| Name | Group | Default | Java Type | Description
| host | common | | String | *Required* OpenStack host url
-| apiVersion | common | v3 | String | OpenStack API version
+| apiVersion | common | V3 | String | OpenStack API version
| config | common | | Config | OpenStack configuration
| domain | common | default | String | Authentication domain
| operation | common | | String | The operation to do
http://git-wip-us.apache.org/repos/asf/camel/blob/7d2907d2/components/camel-openstack/src/main/docs/openstack-swift-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-openstack/src/main/docs/openstack-swift-component.adoc b/components/camel-openstack/src/main/docs/openstack-swift-component.adoc
index 4c6e267..ee88964 100644
--- a/components/camel-openstack/src/main/docs/openstack-swift-component.adoc
+++ b/components/camel-openstack/src/main/docs/openstack-swift-component.adoc
@@ -54,7 +54,7 @@ The OpenStack-Swift component supports 13 endpoint options which are listed belo
|=======================================================================
| Name | Group | Default | Java Type | Description
| host | common | | String | *Required* OpenStack host url
-| apiVersion | common | v3 | String | OpenStack API version
+| apiVersion | common | V3 | String | OpenStack API version
| config | common | | Config | OpenStack configuration
| domain | common | default | String | Authentication domain
| operation | common | | String | The operation to do
http://git-wip-us.apache.org/repos/asf/camel/blob/7d2907d2/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/cinder/CinderComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/cinder/CinderComponent.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/cinder/CinderComponent.java
index 2baaa7a..ef5c693 100644
--- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/cinder/CinderComponent.java
+++ b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/cinder/CinderComponent.java
@@ -16,17 +16,18 @@
*/
package org.apache.camel.component.openstack.cinder;
+import java.util.Map;
+
import org.apache.camel.Endpoint;
import org.apache.camel.impl.DefaultComponent;
-import java.util.Map;
-
public class CinderComponent extends DefaultComponent {
- @Override protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
- CinderEndpoint endpoint = new CinderEndpoint(uri, this);
- setProperties(endpoint, parameters);
- endpoint.setHost(remaining);
- return endpoint;
- }
+ @Override
+ protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
+ CinderEndpoint endpoint = new CinderEndpoint(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/cinder/CinderConstants.java
----------------------------------------------------------------------
diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/cinder/CinderConstants.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/cinder/CinderConstants.java
index e78cb12..2772ce3 100644
--- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/cinder/CinderConstants.java
+++ b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/cinder/CinderConstants.java
@@ -1,23 +1,41 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.camel.component.openstack.cinder;
import org.apache.camel.component.openstack.common.OpenstackConstants;
-public final class CinderConstants extends OpenstackConstants{
+public final class CinderConstants extends OpenstackConstants {
- public static final String VOLUMES = "volumes";
- public static final String SNAPSHOTS = "snapshots";
+ public static final String VOLUMES = "volumes";
+ public static final String SNAPSHOTS = "snapshots";
- //volumes
- public static final String SIZE = "size";
- public static final String VOLUME_TYPE = "volumeType";
- public static final String IMAGE_REF = "imageRef";
- public static final String SNAPSHOT_ID = "snapshotId";
- public static final String IS_BOOTABLE = "isBootable";
+ //volumes
+ public static final String SIZE = "size";
+ public static final String VOLUME_TYPE = "volumeType";
+ public static final String IMAGE_REF = "imageRef";
+ public static final String SNAPSHOT_ID = "snapshotId";
+ public static final String IS_BOOTABLE = "isBootable";
- //volumeSnapshots
- public static final String VOLUME_ID = "volumeId";
- public static final String FORCE = "force";
+ //volumeSnapshots
+ public static final String VOLUME_ID = "volumeId";
+ public static final String FORCE = "force";
- public static final String GET_ALL_TYPES = "getAllTypes";
+ public static final String GET_ALL_TYPES = "getAllTypes";
+
+ private CinderConstants() { }
}
http://git-wip-us.apache.org/repos/asf/camel/blob/7d2907d2/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/cinder/CinderEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/cinder/CinderEndpoint.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/cinder/CinderEndpoint.java
index ce93763..03ac7e9 100644
--- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/cinder/CinderEndpoint.java
+++ b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/cinder/CinderEndpoint.java
@@ -24,164 +24,160 @@ 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-cinder", title = "OpenStack-Cinder", syntax = "openstack-cinder:host", label = "cloud, virtualization")
public class CinderEndpoint extends AbstractOpenstackEndpoint {
- @UriPath
- @Metadata(required = "true")
- private String host;
-
- @UriParam(defaultValue = "default")
- private String domain = "default";
-
- @UriParam(enums = "snapshots, volumes")
- @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 CinderEndpoint(String uri, CinderComponent component) {
- super(uri, component);
- }
-
- @Override
- public Producer createProducer() throws Exception {
- switch (getSubsystem()) {
- case CinderConstants.VOLUMES:
- return new VolumeProducer(this, createClient());
- case CinderConstants.SNAPSHOTS:
- return new SnapshotProducer(this, createClient());
- default:
- throw new IllegalArgumentException("Can't create producer with subsystem " + subsystem);
- }
- }
-
- public String getSubsystem() {
- return subsystem;
- }
-
- /**
- * OpenStack Cinder 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 = "snapshots, volumes")
+ @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 CinderEndpoint(String uri, CinderComponent component) {
+ super(uri, component);
+ }
+
+ @Override
+ public Producer createProducer() throws Exception {
+ switch (getSubsystem()) {
+ case CinderConstants.VOLUMES:
+ return new VolumeProducer(this, createClient());
+ case CinderConstants.SNAPSHOTS:
+ return new SnapshotProducer(this, createClient());
+ default:
+ throw new IllegalArgumentException("Can't create producer with subsystem " + subsystem);
+ }
+ }
+
+ public String getSubsystem() {
+ return subsystem;
+ }
+
+ /**
+ * OpenStack Cinder 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/cinder/producer/SnapshotProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/cinder/producer/SnapshotProducer.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/cinder/producer/SnapshotProducer.java
index 85bc79b..78d6078 100644
--- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/cinder/producer/SnapshotProducer.java
+++ b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/cinder/producer/SnapshotProducer.java
@@ -16,114 +16,116 @@
*/
package org.apache.camel.component.openstack.cinder.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.cinder.CinderConstants;
import org.apache.camel.component.openstack.cinder.CinderEndpoint;
import org.apache.camel.component.openstack.common.AbstractOpenstackProducer;
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.storage.block.VolumeSnapshot;
import org.openstack4j.model.storage.block.builder.VolumeSnapshotBuilder;
-import java.util.List;
-import java.util.Map;
-
public class SnapshotProducer extends AbstractOpenstackProducer {
- public SnapshotProducer(CinderEndpoint endpoint, OSClient client) {
- super(endpoint, client);
- }
-
- @Override
- public void process(Exchange exchange) throws Exception {
- String operation = getOperation(exchange);
-
- switch (operation) {
- case CinderConstants.CREATE:
- doCreate(exchange);
- break;
- case CinderConstants.GET:
- doGet(exchange);
- break;
- case CinderConstants.GET_ALL:
- doGetAll(exchange);
- break;
- case CinderConstants.UPDATE:
- doUpdate(exchange);
- break;
- case CinderConstants.DELETE:
- doDelete(exchange);
- break;
- default:
- throw new IllegalArgumentException("Unsupported operation " + operation);
- }
- }
-
- private void doCreate(Exchange exchange) {
- final Message msg = exchange.getIn();
- final VolumeSnapshot in = messageToSnapshot(msg);
- final VolumeSnapshot out = os.blockStorage().snapshots().create(in);
- msg.setBody(out);
- }
-
- private void doGet(Exchange exchange) {
- final Message msg = exchange.getIn();
- final String id = msg.getHeader(CinderConstants.ID, msg.getHeader(CinderConstants.SNAPSHOT_ID, String.class), String.class);
- ObjectHelper.notEmpty(id, "Snapshot ID");
- final VolumeSnapshot out = os.blockStorage().snapshots().get(id);
- msg.setBody(out);
- }
-
- private void doGetAll(Exchange exchange) {
- final List<? extends VolumeSnapshot> out = os.blockStorage().snapshots().list();
- exchange.getIn().setBody(out);
- }
-
- private void doUpdate(Exchange exchange) {
- final Message msg = exchange.getIn();
- final String id = msg.getHeader(CinderConstants.ID, msg.getHeader(CinderConstants.SNAPSHOT_ID, String.class), String.class);
- final VolumeSnapshot vs = messageToSnapshot(msg);
- ObjectHelper.notEmpty(id, "Cinder Snapshot ID");
-
- final ActionResponse out = os.blockStorage().snapshots().update(id, vs.getName(), vs.getDescription());
- checkFailure(out, msg, "Update volume snapshot " + id);
- }
-
- private void doDelete(Exchange exchange) {
- final Message msg = exchange.getIn();
- final String id = msg.getHeader(CinderConstants.ID, msg.getHeader(CinderConstants.SNAPSHOT_ID, String.class), String.class);
- ObjectHelper.notEmpty(id, "Cinder Snapshot ID");
-
- final ActionResponse out = os.blockStorage().snapshots().delete(id);
- checkFailure(out, msg, "Delete snapshot " + id);
- }
-
- private VolumeSnapshot messageToSnapshot(Message message) {
- VolumeSnapshot volume = message.getBody(VolumeSnapshot.class);
- if (volume == null) {
- Map headers = message.getHeaders();
- VolumeSnapshotBuilder builder = Builders.volumeSnapshot();
-
- final String name = message.getHeader(CinderConstants.NAME, String.class);
- ObjectHelper.notEmpty(name, "Name");
- builder.name(name);
-
- if(headers.containsKey(CinderConstants.DESCRIPTION))
- builder.description(message.getHeader(CinderConstants.DESCRIPTION, String.class));
-
- if(headers.containsKey(CinderConstants.VOLUME_ID))
- builder.volume(message.getHeader(CinderConstants.VOLUME_ID, String.class));
-
- if(headers.containsKey(CinderConstants.FORCE))
- builder.force(message.getHeader(CinderConstants.FORCE, Boolean.class));
-
- volume = builder.build();
- }
-
- return volume;
- }
+ public SnapshotProducer(CinderEndpoint endpoint, OSClient client) {
+ super(endpoint, client);
+ }
+
+ @Override
+ public void process(Exchange exchange) throws Exception {
+ String operation = getOperation(exchange);
+
+ switch (operation) {
+ case CinderConstants.CREATE:
+ doCreate(exchange);
+ break;
+ case CinderConstants.GET:
+ doGet(exchange);
+ break;
+ case CinderConstants.GET_ALL:
+ doGetAll(exchange);
+ break;
+ case CinderConstants.UPDATE:
+ doUpdate(exchange);
+ break;
+ case CinderConstants.DELETE:
+ doDelete(exchange);
+ break;
+ default:
+ throw new IllegalArgumentException("Unsupported operation " + operation);
+ }
+ }
+
+ private void doCreate(Exchange exchange) {
+ final Message msg = exchange.getIn();
+ final VolumeSnapshot in = messageToSnapshot(msg);
+ final VolumeSnapshot out = os.blockStorage().snapshots().create(in);
+ msg.setBody(out);
+ }
+
+ private void doGet(Exchange exchange) {
+ final Message msg = exchange.getIn();
+ final String id = msg.getHeader(CinderConstants.ID, msg.getHeader(CinderConstants.SNAPSHOT_ID, String.class), String.class);
+ ObjectHelper.notEmpty(id, "Snapshot ID");
+ final VolumeSnapshot out = os.blockStorage().snapshots().get(id);
+ msg.setBody(out);
+ }
+
+ private void doGetAll(Exchange exchange) {
+ final List<? extends VolumeSnapshot> out = os.blockStorage().snapshots().list();
+ exchange.getIn().setBody(out);
+ }
+
+ private void doUpdate(Exchange exchange) {
+ final Message msg = exchange.getIn();
+ final String id = msg.getHeader(CinderConstants.ID, msg.getHeader(CinderConstants.SNAPSHOT_ID, String.class), String.class);
+ final VolumeSnapshot vs = messageToSnapshot(msg);
+ ObjectHelper.notEmpty(id, "Cinder Snapshot ID");
+
+ final ActionResponse out = os.blockStorage().snapshots().update(id, vs.getName(), vs.getDescription());
+ checkFailure(out, msg, "Update volume snapshot " + id);
+ }
+
+ private void doDelete(Exchange exchange) {
+ final Message msg = exchange.getIn();
+ final String id = msg.getHeader(CinderConstants.ID, msg.getHeader(CinderConstants.SNAPSHOT_ID, String.class), String.class);
+ ObjectHelper.notEmpty(id, "Cinder Snapshot ID");
+
+ final ActionResponse out = os.blockStorage().snapshots().delete(id);
+ checkFailure(out, msg, "Delete snapshot " + id);
+ }
+
+ private VolumeSnapshot messageToSnapshot(Message message) {
+ VolumeSnapshot volume = message.getBody(VolumeSnapshot.class);
+ if (volume == null) {
+ Map headers = message.getHeaders();
+ VolumeSnapshotBuilder builder = Builders.volumeSnapshot();
+
+ final String name = message.getHeader(CinderConstants.NAME, String.class);
+ ObjectHelper.notEmpty(name, "Name");
+ builder.name(name);
+
+ if (headers.containsKey(CinderConstants.DESCRIPTION)) {
+ builder.description(message.getHeader(CinderConstants.DESCRIPTION, String.class));
+ }
+
+ if (headers.containsKey(CinderConstants.VOLUME_ID)) {
+ builder.volume(message.getHeader(CinderConstants.VOLUME_ID, String.class));
+ }
+
+ if (headers.containsKey(CinderConstants.FORCE)) {
+ builder.force(message.getHeader(CinderConstants.FORCE, Boolean.class));
+ }
+
+ volume = builder.build();
+ }
+
+ return volume;
+ }
}
http://git-wip-us.apache.org/repos/asf/camel/blob/7d2907d2/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/cinder/producer/VolumeProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/cinder/producer/VolumeProducer.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/cinder/producer/VolumeProducer.java
index 22163e7..62ed0bc 100644
--- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/cinder/producer/VolumeProducer.java
+++ b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/cinder/producer/VolumeProducer.java
@@ -16,13 +16,15 @@
*/
package org.apache.camel.component.openstack.cinder.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.cinder.CinderConstants;
import org.apache.camel.component.openstack.cinder.CinderEndpoint;
import org.apache.camel.component.openstack.common.AbstractOpenstackProducer;
import org.apache.camel.util.ObjectHelper;
-
import org.openstack4j.api.Builders;
import org.openstack4j.api.OSClient;
import org.openstack4j.model.common.ActionResponse;
@@ -30,119 +32,121 @@ import org.openstack4j.model.storage.block.Volume;
import org.openstack4j.model.storage.block.VolumeType;
import org.openstack4j.model.storage.block.builder.VolumeBuilder;
-import java.util.List;
-import java.util.Map;
-
public class VolumeProducer extends AbstractOpenstackProducer {
- public VolumeProducer(CinderEndpoint endpoint, OSClient client) {
- super(endpoint, client);
- }
-
- @Override
- public void process(Exchange exchange) throws Exception {
- String operation = getOperation(exchange);
-
- switch (operation) {
- case CinderConstants.CREATE:
- doCreate(exchange);
- break;
- case CinderConstants.GET:
- doGet(exchange);
- break;
- case CinderConstants.GET_ALL:
- doGetAll(exchange);
- break;
- case CinderConstants.GET_ALL_TYPES:
- doGetAllTypes(exchange);
- break;
- case CinderConstants.UPDATE:
- doUpdate(exchange);
- break;
- case CinderConstants.DELETE:
- doDelete(exchange);
- break;
- default:
- throw new IllegalArgumentException("Unsupported operation " + operation);
- }
- }
-
- private void doCreate(Exchange exchange) {
- final Message msg = exchange.getIn();
- final Volume in = messageToVolume(msg);
- final Volume out = os.blockStorage().volumes().create(in);
- msg.setBody(out);
- }
-
- private void doGet(Exchange exchange) {
- final Message msg = exchange.getIn();
- final String id = msg.getHeader(CinderConstants.ID, msg.getHeader(CinderConstants.VOLUME_ID, String.class), String.class);
- ObjectHelper.notEmpty(id, "Volume ID");
- final Volume out = os.blockStorage().volumes().get(id);
- msg.setBody(out);
- }
-
- private void doGetAll(Exchange exchange) {
- final List<? extends Volume> out = os.blockStorage().volumes().list();
- exchange.getIn().setBody(out);
- }
-
- private void doGetAllTypes(Exchange exchange) {
- final List<? extends VolumeType> out = os.blockStorage().volumes().listVolumeTypes();
- exchange.getIn().setBody(out);
- }
-
- private void doUpdate(Exchange exchange) {
- final Message msg = exchange.getIn();
- final String id = msg.getHeader(CinderConstants.ID, msg.getHeader(CinderConstants.VOLUME_ID, String.class), String.class);
- final Volume vol = messageToVolume(msg);
- ;
- ObjectHelper.notEmpty(id, "Cinder Volume ID");
- ObjectHelper.notEmpty(vol.getDescription(), "Cinder Volume Description");
- ObjectHelper.notEmpty(vol.getName(), "Cinder Volume Name");
- final ActionResponse out = os.blockStorage().volumes().update(id, vol.getName(), vol.getDescription());
- checkFailure(out, msg, "Update volume " + id);
- }
-
- private void doDelete(Exchange exchange) {
- final Message msg = exchange.getIn();
- final String id = msg.getHeader(CinderConstants.ID, msg.getHeader(CinderConstants.VOLUME_ID, String.class), String.class);
- ObjectHelper.notEmpty(id, "Cinder Volume ID");
- final ActionResponse out = os.blockStorage().volumes().delete(id);
- checkFailure(out, msg, "Delete volume " + id);
- }
-
- private Volume messageToVolume(Message message) {
- Volume volume = message.getBody(Volume.class);
- if (volume == null) {
- Map headers = message.getHeaders();
- VolumeBuilder builder = Builders.volume();
-
- final String name = message.getHeader(CinderConstants.NAME, String.class);
- ObjectHelper.notEmpty(name, "Name ");
- builder.name(name);
-
- if (headers.containsKey(CinderConstants.DESCRIPTION))
- builder.description(message.getHeader(CinderConstants.DESCRIPTION, String.class));
-
- if (headers.containsKey(CinderConstants.SIZE))
- builder.size(message.getHeader(CinderConstants.SIZE, Integer.class));
-
- if (headers.containsKey(CinderConstants.VOLUME_TYPE))
- builder.volumeType(message.getHeader(CinderConstants.VOLUME_TYPE, String.class));
-
- if (headers.containsKey(CinderConstants.IMAGE_REF))
- builder.imageRef(message.getHeader(CinderConstants.IMAGE_REF, String.class));
-
- if (headers.containsKey(CinderConstants.SNAPSHOT_ID))
- builder.snapshot(message.getHeader(CinderConstants.SNAPSHOT_ID, String.class));
-
- if (headers.containsKey(CinderConstants.IS_BOOTABLE))
- builder.bootable(message.getHeader(CinderConstants.IS_BOOTABLE, Boolean.class));
-
- volume = builder.build();
- }
-
- return volume;
- }
+ public VolumeProducer(CinderEndpoint endpoint, OSClient client) {
+ super(endpoint, client);
+ }
+
+ @Override
+ public void process(Exchange exchange) throws Exception {
+ String operation = getOperation(exchange);
+
+ switch (operation) {
+ case CinderConstants.CREATE:
+ doCreate(exchange);
+ break;
+ case CinderConstants.GET:
+ doGet(exchange);
+ break;
+ case CinderConstants.GET_ALL:
+ doGetAll(exchange);
+ break;
+ case CinderConstants.GET_ALL_TYPES:
+ doGetAllTypes(exchange);
+ break;
+ case CinderConstants.UPDATE:
+ doUpdate(exchange);
+ break;
+ case CinderConstants.DELETE:
+ doDelete(exchange);
+ break;
+ default:
+ throw new IllegalArgumentException("Unsupported operation " + operation);
+ }
+ }
+
+ private void doCreate(Exchange exchange) {
+ final Message msg = exchange.getIn();
+ final Volume in = messageToVolume(msg);
+ final Volume out = os.blockStorage().volumes().create(in);
+ msg.setBody(out);
+ }
+
+ private void doGet(Exchange exchange) {
+ final Message msg = exchange.getIn();
+ final String id = msg.getHeader(CinderConstants.ID, msg.getHeader(CinderConstants.VOLUME_ID, String.class), String.class);
+ ObjectHelper.notEmpty(id, "Volume ID");
+ final Volume out = os.blockStorage().volumes().get(id);
+ msg.setBody(out);
+ }
+
+ private void doGetAll(Exchange exchange) {
+ final List<? extends Volume> out = os.blockStorage().volumes().list();
+ exchange.getIn().setBody(out);
+ }
+
+ private void doGetAllTypes(Exchange exchange) {
+ final List<? extends VolumeType> out = os.blockStorage().volumes().listVolumeTypes();
+ exchange.getIn().setBody(out);
+ }
+
+ private void doUpdate(Exchange exchange) {
+ final Message msg = exchange.getIn();
+ final String id = msg.getHeader(CinderConstants.ID, msg.getHeader(CinderConstants.VOLUME_ID, String.class), String.class);
+ final Volume vol = messageToVolume(msg);
+ ObjectHelper.notEmpty(id, "Cinder Volume ID");
+ ObjectHelper.notEmpty(vol.getDescription(), "Cinder Volume Description");
+ ObjectHelper.notEmpty(vol.getName(), "Cinder Volume Name");
+ final ActionResponse out = os.blockStorage().volumes().update(id, vol.getName(), vol.getDescription());
+ checkFailure(out, msg, "Update volume " + id);
+ }
+
+ private void doDelete(Exchange exchange) {
+ final Message msg = exchange.getIn();
+ final String id = msg.getHeader(CinderConstants.ID, msg.getHeader(CinderConstants.VOLUME_ID, String.class), String.class);
+ ObjectHelper.notEmpty(id, "Cinder Volume ID");
+ final ActionResponse out = os.blockStorage().volumes().delete(id);
+ checkFailure(out, msg, "Delete volume " + id);
+ }
+
+ private Volume messageToVolume(Message message) {
+ Volume volume = message.getBody(Volume.class);
+ if (volume == null) {
+ Map headers = message.getHeaders();
+ VolumeBuilder builder = Builders.volume();
+
+ final String name = message.getHeader(CinderConstants.NAME, String.class);
+ ObjectHelper.notEmpty(name, "Name ");
+ builder.name(name);
+
+ if (headers.containsKey(CinderConstants.DESCRIPTION)) {
+ builder.description(message.getHeader(CinderConstants.DESCRIPTION, String.class));
+ }
+
+ if (headers.containsKey(CinderConstants.SIZE)) {
+ builder.size(message.getHeader(CinderConstants.SIZE, Integer.class));
+ }
+
+ if (headers.containsKey(CinderConstants.VOLUME_TYPE)) {
+ builder.volumeType(message.getHeader(CinderConstants.VOLUME_TYPE, String.class));
+ }
+
+ if (headers.containsKey(CinderConstants.IMAGE_REF)) {
+ builder.imageRef(message.getHeader(CinderConstants.IMAGE_REF, String.class));
+ }
+
+ if (headers.containsKey(CinderConstants.SNAPSHOT_ID)) {
+ builder.snapshot(message.getHeader(CinderConstants.SNAPSHOT_ID, String.class));
+ }
+
+ if (headers.containsKey(CinderConstants.IS_BOOTABLE)) {
+ builder.bootable(message.getHeader(CinderConstants.IS_BOOTABLE, Boolean.class));
+ }
+
+ volume = builder.build();
+ }
+
+ return volume;
+ }
}
http://git-wip-us.apache.org/repos/asf/camel/blob/7d2907d2/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/common/AbstractOpenstackEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/common/AbstractOpenstackEndpoint.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/common/AbstractOpenstackEndpoint.java
index 8466995..5716052 100644
--- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/common/AbstractOpenstackEndpoint.java
+++ b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/common/AbstractOpenstackEndpoint.java
@@ -20,8 +20,6 @@ import org.apache.camel.Component;
import org.apache.camel.Consumer;
import org.apache.camel.Processor;
import org.apache.camel.impl.DefaultEndpoint;
-import org.apache.camel.util.ObjectHelper;
-
import org.openstack4j.api.OSClient;
import org.openstack4j.api.client.IOSClientBuilder;
import org.openstack4j.core.transport.Config;
@@ -30,76 +28,76 @@ import org.openstack4j.openstack.OSFactory;
public abstract class AbstractOpenstackEndpoint extends DefaultEndpoint {
- public static final String v2 = "v2";
- public static final String v3 = "v3";
+ public static final String V2 = "V2";
+ public static final String V3 = "V3";
- protected abstract String getHost();
+ public AbstractOpenstackEndpoint(String endpointUri, Component component) {
+ super(endpointUri, component);
+ }
- protected abstract String getUsername();
+ protected abstract String getHost();
- protected abstract String getDomain();
+ protected abstract String getUsername();
- protected abstract String getPassword();
+ protected abstract String getDomain();
- protected abstract String getProject();
+ protected abstract String getPassword();
- protected abstract String getOperation();
+ protected abstract String getProject();
- protected abstract Config getConfig();
+ protected abstract String getOperation();
- protected abstract String getApiVersion();
+ protected abstract Config getConfig();
- public AbstractOpenstackEndpoint(String endpointUri, Component component) {
- super(endpointUri, component);
- }
+ protected abstract String getApiVersion();
- protected OSClient createClient() {
+ protected OSClient createClient() {
- //client should reAuthenticate itself when token expires
- if(v2.equals(getApiVersion())) {
- return createV2Client();
- }
+ //client should reAuthenticate itself when token expires
+ if (V2.equals(getApiVersion())) {
+ return createV2Client();
+ }
- return createV3Client();
- }
+ return createV3Client();
+ }
- @Override
- public Consumer createConsumer(Processor processor) throws Exception {
- throw new IllegalStateException("There is no consumer available for OpenStack");
- }
+ @Override
+ public Consumer createConsumer(Processor processor) throws Exception {
+ throw new IllegalStateException("There is no consumer available for OpenStack");
+ }
- @Override
- public boolean isSingleton() {
- return false;
- }
+ @Override
+ public boolean isSingleton() {
+ return false;
+ }
- private OSClient.OSClientV3 createV3Client() {
- IOSClientBuilder.V3 builder = OSFactory.builderV3()
- .endpoint(getHost());
+ private OSClient.OSClientV3 createV3Client() {
+ IOSClientBuilder.V3 builder = OSFactory.builderV3()
+ .endpoint(getHost());
- builder.credentials(getUsername(), getPassword(), Identifier.byId(getDomain()));
+ builder.credentials(getUsername(), getPassword(), Identifier.byId(getDomain()));
- builder.scopeToProject(Identifier.byId(getProject()));
+ builder.scopeToProject(Identifier.byId(getProject()));
- if(getConfig() != null) {
- builder.withConfig(getConfig());
- }
+ if (getConfig() != null) {
+ builder.withConfig(getConfig());
+ }
- return builder.authenticate();
- }
+ return builder.authenticate();
+ }
- private OSClient.OSClientV2 createV2Client() {
- IOSClientBuilder.V2 builder = OSFactory.builderV2()
- .endpoint(getHost());
+ private OSClient.OSClientV2 createV2Client() {
+ IOSClientBuilder.V2 builder = OSFactory.builderV2()
+ .endpoint(getHost());
- builder.credentials(getUsername(), getPassword());
+ builder.credentials(getUsername(), getPassword());
- builder.tenantId(getProject());
+ builder.tenantId(getProject());
- if(getConfig() != null) {
- builder.withConfig(getConfig());
- }
+ if (getConfig() != null) {
+ builder.withConfig(getConfig());
+ }
- return builder.authenticate();
- }
+ return builder.authenticate();
+ }
}
http://git-wip-us.apache.org/repos/asf/camel/blob/7d2907d2/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/common/AbstractOpenstackProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/common/AbstractOpenstackProducer.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/common/AbstractOpenstackProducer.java
index 4e1ae56..5a93dc5 100644
--- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/common/AbstractOpenstackProducer.java
+++ b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/common/AbstractOpenstackProducer.java
@@ -16,71 +16,67 @@
*/
package org.apache.camel.component.openstack.common;
+import java.io.File;
+import java.io.InputStream;
+import java.net.URL;
+
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.component.openstack.nova.NovaConstants;
import org.apache.camel.impl.DefaultProducer;
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.common.Payloads;
-import java.io.File;
-import java.io.InputStream;
-import java.net.URL;
-
public abstract class AbstractOpenstackProducer extends DefaultProducer {
- protected OSClient os;
+ protected OSClient os;
- private AbstractOpenstackEndpoint endpoint;
+ private AbstractOpenstackEndpoint endpoint;
- public AbstractOpenstackProducer(AbstractOpenstackEndpoint endpoint, OSClient client) {
- super(endpoint);
- this.os = client;
- this.endpoint = endpoint;
- }
+ public AbstractOpenstackProducer(AbstractOpenstackEndpoint endpoint, OSClient client) {
+ super(endpoint);
+ this.os = client;
+ this.endpoint = endpoint;
+ }
- protected Payload createPayload(Message msg) {
- //if payload object is send directly
- Payload payload = msg.getBody(Payload.class);
- if(ObjectHelper.isNotEmpty(payload))
- {
- return payload;
- }
+ protected Payload createPayload(Message msg) {
+ //if payload object is send directly
+ Payload payload = msg.getBody(Payload.class);
+ if (ObjectHelper.isNotEmpty(payload)) {
+ return payload;
+ }
- Object messageBody = msg.getBody();
- if (messageBody instanceof URL) {
- payload = Payloads.create((URL) messageBody);
- }
- if (messageBody instanceof File) {
- payload = Payloads.create((File) messageBody);
- }
- if (messageBody instanceof InputStream) {
- payload = Payloads.create((InputStream) messageBody);
- }
+ Object messageBody = msg.getBody();
+ if (messageBody instanceof URL) {
+ payload = Payloads.create((URL) messageBody);
+ }
+ if (messageBody instanceof File) {
+ payload = Payloads.create((File) messageBody);
+ }
+ if (messageBody instanceof InputStream) {
+ payload = Payloads.create((InputStream) messageBody);
+ }
- if (payload == null) {
- throw new IllegalArgumentException("You have to set payload. It can be InputStream, File or URL class");
- }
+ if (payload == null) {
+ throw new IllegalArgumentException("You have to set payload. It can be InputStream, File or URL class");
+ }
- return payload;
- }
+ return payload;
+ }
- protected String getOperation(Exchange exchange) {
- final String operation = exchange.getIn().getHeader(NovaConstants.OPERATION, endpoint.getOperation(), String.class);
- ObjectHelper.notEmpty(operation, "Operation");
- return operation;
- }
+ protected String getOperation(Exchange exchange) {
+ final String operation = exchange.getIn().getHeader(NovaConstants.OPERATION, endpoint.getOperation(), String.class);
+ ObjectHelper.notEmpty(operation, "Operation");
+ return operation;
+ }
- protected void checkFailure(ActionResponse response, Message msg, String operation)
- {
- msg.setFault(!response.isSuccess());
- if(!response.isSuccess())
- {
- msg.setBody(String.format(" %s was not successful: %s", operation, response.getFault()));
- }
- }
+ protected void checkFailure(ActionResponse response, Message msg, String operation) {
+ msg.setFault(!response.isSuccess());
+ if (!response.isSuccess()) {
+ msg.setBody(String.format(" %s was not successful: %s", operation, response.getFault()));
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/camel/blob/7d2907d2/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/common/OpenstackConstants.java
----------------------------------------------------------------------
diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/common/OpenstackConstants.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/common/OpenstackConstants.java
index 83a4925..4f490b2 100644
--- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/common/OpenstackConstants.java
+++ b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/common/OpenstackConstants.java
@@ -22,15 +22,17 @@ package org.apache.camel.component.openstack.common;
*/
public class OpenstackConstants {
- public static final String OPERATION = "operation";
- public static final String ID = "ID";
- public static final String NAME = "name";
- public static final String DESCRIPTION = "description";
- public static final String PROPERTIES = "properties";
+ public static final String OPERATION = "operation";
+ public static final String ID = "ID";
+ public static final String NAME = "name";
+ public static final String DESCRIPTION = "description";
+ public static final String PROPERTIES = "properties";
- public static final String CREATE = "create";
- public static final String UPDATE = "update";
- public static final String GET_ALL = "getAll";
- public static final String GET = "get";
- public static final String DELETE = "delete";
+ public static final String CREATE = "create";
+ public static final String UPDATE = "update";
+ public static final String GET_ALL = "getAll";
+ public static final String GET = "get";
+ public static final String DELETE = "delete";
+
+ protected OpenstackConstants() { }
}
http://git-wip-us.apache.org/repos/asf/camel/blob/7d2907d2/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/glance/GlanceComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/glance/GlanceComponent.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/glance/GlanceComponent.java
index 5e07694..760e2d3 100644
--- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/glance/GlanceComponent.java
+++ b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/glance/GlanceComponent.java
@@ -16,17 +16,18 @@
*/
package org.apache.camel.component.openstack.glance;
+import java.util.Map;
+
import org.apache.camel.Endpoint;
import org.apache.camel.impl.DefaultComponent;
-import java.util.Map;
-
public class GlanceComponent extends DefaultComponent {
- @Override protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
- GlanceEndpoint endpoint = new GlanceEndpoint(uri, this);
- setProperties(endpoint, parameters);
- endpoint.setHost(remaining);
- return endpoint;
- }
+ @Override
+ protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
+ GlanceEndpoint endpoint = new GlanceEndpoint(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/glance/GlanceConstants.java
----------------------------------------------------------------------
diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/glance/GlanceConstants.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/glance/GlanceConstants.java
index a47f764..165878a 100644
--- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/glance/GlanceConstants.java
+++ b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/glance/GlanceConstants.java
@@ -18,17 +18,20 @@ package org.apache.camel.component.openstack.glance;
import org.apache.camel.component.openstack.common.OpenstackConstants;
-public final class GlanceConstants extends OpenstackConstants{
+public final class GlanceConstants extends OpenstackConstants {
- public static final String DISK_FORMAT = "diskFormat";
- public static final String CONTAINER_FORMAT = "containerFormat";
- public static final String OWNER = "owner";
- public static final String IS_PUBLIC = "isPublic";
- public static final String MIN_RAM = "minRam";
- public static final String MIN_DISK = "minDisk";
- public static final String SIZE = "size";
- public static final String CHECKSUM = "checksum";
+ public static final String DISK_FORMAT = "diskFormat";
+ public static final String CONTAINER_FORMAT = "containerFormat";
+ public static final String OWNER = "owner";
+ public static final String IS_PUBLIC = "isPublic";
+ public static final String MIN_RAM = "minRam";
+ public static final String MIN_DISK = "minDisk";
+ public static final String SIZE = "size";
+ public static final String CHECKSUM = "checksum";
+
+ public static final String RESERVE = "reserve";
+ public static final String UPLOAD = "upload";
+
+ private GlanceConstants() { }
- public static final String RESERVE = "reserve";
- public static final String UPLOAD = "upload";
}
http://git-wip-us.apache.org/repos/asf/camel/blob/7d2907d2/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/glance/GlanceEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/glance/GlanceEndpoint.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/glance/GlanceEndpoint.java
index 0d6c0d2..0427d0c 100644
--- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/glance/GlanceEndpoint.java
+++ b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/glance/GlanceEndpoint.java
@@ -27,135 +27,135 @@ import org.openstack4j.core.transport.Config;
@UriEndpoint(scheme = "openstack-glance", title = "OpenStack-Glance", syntax = "openstack-glance:host", label = "cloud, virtualization")
public class GlanceEndpoint extends AbstractOpenstackEndpoint {
- @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 GlanceEndpoint(String uri, GlanceComponent component) {
- super(uri, component);
- }
-
- @Override
- public Producer createProducer() throws Exception {
- return new GlanceProducer(this, createClient());
- }
-
- @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;
- }
+ @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 GlanceEndpoint(String uri, GlanceComponent component) {
+ super(uri, component);
+ }
+
+ @Override
+ public Producer createProducer() throws Exception {
+ return new GlanceProducer(this, createClient());
+ }
+
+ @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/glance/GlanceProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/glance/GlanceProducer.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/glance/GlanceProducer.java
index 5cf15a0..1b7687c 100644
--- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/glance/GlanceProducer.java
+++ b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/glance/GlanceProducer.java
@@ -16,11 +16,13 @@
*/
package org.apache.camel.component.openstack.glance;
+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.util.ObjectHelper;
-
import org.openstack4j.api.Builders;
import org.openstack4j.api.OSClient;
import org.openstack4j.model.common.ActionResponse;
@@ -30,151 +32,159 @@ import org.openstack4j.model.image.DiskFormat;
import org.openstack4j.model.image.Image;
import org.openstack4j.model.image.builder.ImageBuilder;
-import java.util.List;
-import java.util.Map;
-
public class GlanceProducer extends AbstractOpenstackProducer {
- public GlanceProducer(GlanceEndpoint endpoint, OSClient client) {
- super(endpoint, client);
- }
-
- @Override
- public void process(Exchange exchange) throws Exception {
- String operation = getOperation(exchange);
-
- switch (operation) {
- case GlanceConstants.RESERVE:
- doReserve(exchange);
- break;
- case GlanceConstants.CREATE:
- doCreate(exchange);
- break;
- case GlanceConstants.UPDATE:
- doUpdate(exchange);
- break;
- case GlanceConstants.UPLOAD:
- doUpload(exchange);
- break;
- case GlanceConstants.GET:
- doGet(exchange);
- break;
- case GlanceConstants.GET_ALL:
- doGetAll(exchange);
- break;
- case GlanceConstants.DELETE:
- doDelete(exchange);
- break;
- default:
- throw new IllegalArgumentException("Unsupported operation " + operation);
- }
- }
-
- private void doReserve(Exchange exchange) {
- final Image in = messageToImage(exchange.getIn());
- final Image out = os.images().reserve(in);
- exchange.getIn().setBody(out);
- }
-
- private void doCreate(Exchange exchange) {
- final Message msg = exchange.getIn();
- final Image in = messageHeadersToImage(msg, true);
- final Payload payload = createPayload(msg);
- final Image out = os.images().create(in, payload);
- msg.setBody(out);
- }
-
- private void doUpload(Exchange exchange) {
- final Message msg = exchange.getIn();
- final String imageId = msg.getHeader(GlanceConstants.ID, String.class);
- ObjectHelper.notEmpty(imageId, "Image ID");
- final Image in = messageHeadersToImage(msg, false);
- final Payload payload = createPayload(msg);
- final Image out = os.images().upload(imageId, payload, in);
- msg.setBody(out);
- }
-
- private void doUpdate(Exchange exchange) {
- final Message msg = exchange.getIn();
- final Image in = messageToImage(msg);
- final Image out = os.images().update(in);
- msg.setBody(out);
- }
-
- private void doGet(Exchange exchange) {
- final Message msg = exchange.getIn();
- final String imageId = msg.getHeader(GlanceConstants.ID, String.class);
- ObjectHelper.notEmpty(imageId, "ImageID");
- final Image out = os.images().get(imageId);
- msg.setBody(out);
- }
-
- private void doGetAll(Exchange exchange) {
- final List<? extends Image> out = os.images().list();
- exchange.getIn().setBody(out);
- }
-
- private void doDelete(Exchange exchange) {
- final Message msg = exchange.getIn();
- final String imageId = msg.getHeader(GlanceConstants.ID, String.class);
- ObjectHelper.notEmpty(imageId, "ImageID");
- final ActionResponse response = os.compute().images().delete(imageId);
- checkFailure(response, msg, "Delete image " + imageId);
- }
-
- private Image messageToImage(Message message) {
- Image image = message.getBody(Image.class);
- if (image == null) {
- image = messageHeadersToImage(message, true);
- }
-
- return image;
- }
-
- private Image messageHeadersToImage(Message message, boolean required) {
- ImageBuilder imageBuilder = null;
-
- if (required && ObjectHelper.isEmpty(message.getHeader(GlanceConstants.NAME, String.class)))
- throw new IllegalArgumentException("Image Name must be specified and not empty");
-
- if (ObjectHelper.isNotEmpty(message.getHeader(GlanceConstants.NAME, String.class)))
- imageBuilder = getImageBuilder(imageBuilder).name(message.getHeader(GlanceConstants.NAME, String.class));
-
- if (ObjectHelper.isNotEmpty(message.getHeader(GlanceConstants.DISK_FORMAT, DiskFormat.class)))
- imageBuilder = getImageBuilder(imageBuilder).diskFormat(message.getHeader(GlanceConstants.DISK_FORMAT, DiskFormat.class));
-
- if (ObjectHelper.isNotEmpty(message.getHeader(GlanceConstants.CONTAINER_FORMAT, ContainerFormat.class)))
- imageBuilder = getImageBuilder(imageBuilder).containerFormat(message.getHeader(GlanceConstants.CONTAINER_FORMAT, ContainerFormat.class));
-
- if (ObjectHelper.isNotEmpty(message.getHeader(GlanceConstants.SIZE, Long.class)))
- imageBuilder = getImageBuilder(imageBuilder).size(message.getHeader(GlanceConstants.SIZE, Long.class));
-
- if (ObjectHelper.isNotEmpty(message.getHeader(GlanceConstants.CHECKSUM)))
- imageBuilder = getImageBuilder(imageBuilder).checksum(message.getHeader(GlanceConstants.CHECKSUM, String.class));
-
- if (ObjectHelper.isNotEmpty(message.getHeader(GlanceConstants.MIN_DISK)))
- imageBuilder = getImageBuilder(imageBuilder).minDisk(message.getHeader(GlanceConstants.MIN_DISK, Long.class));
-
- if (ObjectHelper.isNotEmpty(message.getHeader(GlanceConstants.MIN_RAM)))
- imageBuilder = getImageBuilder(imageBuilder).minRam(message.getHeader(GlanceConstants.MIN_RAM, Long.class));
-
- if (ObjectHelper.isNotEmpty(message.getHeader(GlanceConstants.OWNER)))
- imageBuilder = getImageBuilder(imageBuilder).owner(message.getHeader(GlanceConstants.OWNER, String.class));
-
- if (ObjectHelper.isNotEmpty(message.getHeader(GlanceConstants.IS_PUBLIC)))
- imageBuilder = getImageBuilder(imageBuilder).isPublic(message.getHeader(GlanceConstants.IS_PUBLIC, Boolean.class));
-
- if (ObjectHelper.isNotEmpty(message.getHeader(GlanceConstants.PROPERTIES)))
- imageBuilder = getImageBuilder(imageBuilder).properties(message.getHeader(GlanceConstants.PROPERTIES, Map.class));
-
- if (!required && imageBuilder == null) {
- return null;
- }
- ObjectHelper.notNull(imageBuilder, "Image");
- return imageBuilder.build();
- }
-
- private ImageBuilder getImageBuilder(ImageBuilder builder) {
- return builder == null ? Builders.image() : builder;
- }
+ public GlanceProducer(GlanceEndpoint endpoint, OSClient client) {
+ super(endpoint, client);
+ }
+
+ @Override
+ public void process(Exchange exchange) throws Exception {
+ String operation = getOperation(exchange);
+
+ switch (operation) {
+ case GlanceConstants.RESERVE:
+ doReserve(exchange);
+ break;
+ case GlanceConstants.CREATE:
+ doCreate(exchange);
+ break;
+ case GlanceConstants.UPDATE:
+ doUpdate(exchange);
+ break;
+ case GlanceConstants.UPLOAD:
+ doUpload(exchange);
+ break;
+ case GlanceConstants.GET:
+ doGet(exchange);
+ break;
+ case GlanceConstants.GET_ALL:
+ doGetAll(exchange);
+ break;
+ case GlanceConstants.DELETE:
+ doDelete(exchange);
+ break;
+ default:
+ throw new IllegalArgumentException("Unsupported operation " + operation);
+ }
+ }
+
+ private void doReserve(Exchange exchange) {
+ final Image in = messageToImage(exchange.getIn());
+ final Image out = os.images().reserve(in);
+ exchange.getIn().setBody(out);
+ }
+
+ private void doCreate(Exchange exchange) {
+ final Message msg = exchange.getIn();
+ final Image in = messageHeadersToImage(msg, true);
+ final Payload payload = createPayload(msg);
+ final Image out = os.images().create(in, payload);
+ msg.setBody(out);
+ }
+
+ private void doUpload(Exchange exchange) {
+ final Message msg = exchange.getIn();
+ final String imageId = msg.getHeader(GlanceConstants.ID, String.class);
+ ObjectHelper.notEmpty(imageId, "Image ID");
+ final Image in = messageHeadersToImage(msg, false);
+ final Payload payload = createPayload(msg);
+ final Image out = os.images().upload(imageId, payload, in);
+ msg.setBody(out);
+ }
+
+ private void doUpdate(Exchange exchange) {
+ final Message msg = exchange.getIn();
+ final Image in = messageToImage(msg);
+ final Image out = os.images().update(in);
+ msg.setBody(out);
+ }
+
+ private void doGet(Exchange exchange) {
+ final Message msg = exchange.getIn();
+ final String imageId = msg.getHeader(GlanceConstants.ID, String.class);
+ ObjectHelper.notEmpty(imageId, "ImageID");
+ final Image out = os.images().get(imageId);
+ msg.setBody(out);
+ }
+
+ private void doGetAll(Exchange exchange) {
+ final List<? extends Image> out = os.images().list();
+ exchange.getIn().setBody(out);
+ }
+
+ private void doDelete(Exchange exchange) {
+ final Message msg = exchange.getIn();
+ final String imageId = msg.getHeader(GlanceConstants.ID, String.class);
+ ObjectHelper.notEmpty(imageId, "ImageID");
+ final ActionResponse response = os.compute().images().delete(imageId);
+ checkFailure(response, msg, "Delete image " + imageId);
+ }
+
+ private Image messageToImage(Message message) {
+ Image image = message.getBody(Image.class);
+ if (image == null) {
+ image = messageHeadersToImage(message, true);
+ }
+
+ return image;
+ }
+
+ private Image messageHeadersToImage(Message message, boolean required) {
+ ImageBuilder imageBuilder = null;
+
+ if (required && ObjectHelper.isEmpty(message.getHeader(GlanceConstants.NAME, String.class))) {
+ throw new IllegalArgumentException("Image Name must be specified and not empty");
+ }
+
+ if (ObjectHelper.isNotEmpty(message.getHeader(GlanceConstants.NAME, String.class))) {
+ imageBuilder = getImageBuilder(imageBuilder).name(message.getHeader(GlanceConstants.NAME, String.class));
+ }
+
+ if (ObjectHelper.isNotEmpty(message.getHeader(GlanceConstants.DISK_FORMAT, DiskFormat.class))) {
+ imageBuilder = getImageBuilder(imageBuilder).diskFormat(message.getHeader(GlanceConstants.DISK_FORMAT, DiskFormat.class));
+ }
+
+ if (ObjectHelper.isNotEmpty(message.getHeader(GlanceConstants.CONTAINER_FORMAT, ContainerFormat.class))) {
+ imageBuilder = getImageBuilder(imageBuilder).containerFormat(message.getHeader(GlanceConstants.CONTAINER_FORMAT, ContainerFormat.class));
+ }
+
+ if (ObjectHelper.isNotEmpty(message.getHeader(GlanceConstants.SIZE, Long.class))) {
+ imageBuilder = getImageBuilder(imageBuilder).size(message.getHeader(GlanceConstants.SIZE, Long.class));
+ }
+
+ if (ObjectHelper.isNotEmpty(message.getHeader(GlanceConstants.CHECKSUM))) {
+ imageBuilder = getImageBuilder(imageBuilder).checksum(message.getHeader(GlanceConstants.CHECKSUM, String.class));
+ }
+
+ if (ObjectHelper.isNotEmpty(message.getHeader(GlanceConstants.MIN_DISK))) {
+ imageBuilder = getImageBuilder(imageBuilder).minDisk(message.getHeader(GlanceConstants.MIN_DISK, Long.class));
+ }
+
+ if (ObjectHelper.isNotEmpty(message.getHeader(GlanceConstants.MIN_RAM))) {
+ imageBuilder = getImageBuilder(imageBuilder).minRam(message.getHeader(GlanceConstants.MIN_RAM, Long.class));
+ }
+
+ if (ObjectHelper.isNotEmpty(message.getHeader(GlanceConstants.OWNER))) {
+ imageBuilder = getImageBuilder(imageBuilder).owner(message.getHeader(GlanceConstants.OWNER, String.class));
+ }
+
+ if (ObjectHelper.isNotEmpty(message.getHeader(GlanceConstants.IS_PUBLIC))) {
+ imageBuilder = getImageBuilder(imageBuilder).isPublic(message.getHeader(GlanceConstants.IS_PUBLIC, Boolean.class));
+ }
+
+ if (ObjectHelper.isNotEmpty(message.getHeader(GlanceConstants.PROPERTIES))) {
+ imageBuilder = getImageBuilder(imageBuilder).properties(message.getHeader(GlanceConstants.PROPERTIES, Map.class));
+ }
+
+ if (!required && imageBuilder == null) {
+ return null;
+ }
+ ObjectHelper.notNull(imageBuilder, "Image");
+ return imageBuilder.build();
+ }
+
+ private ImageBuilder getImageBuilder(ImageBuilder builder) {
+ return builder == null ? Builders.image() : builder;
+ }
}
http://git-wip-us.apache.org/repos/asf/camel/blob/7d2907d2/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/keystone/KeystoneComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/keystone/KeystoneComponent.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/keystone/KeystoneComponent.java
index 34e92f9..048c027 100644
--- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/keystone/KeystoneComponent.java
+++ b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/keystone/KeystoneComponent.java
@@ -16,18 +16,19 @@
*/
package org.apache.camel.component.openstack.keystone;
+import java.util.Map;
+
import org.apache.camel.Endpoint;
import org.apache.camel.impl.DefaultComponent;
-import java.util.Map;
-
public class KeystoneComponent extends DefaultComponent {
- @Override protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
- KeystoneEndpoint endpoint = new KeystoneEndpoint(uri, this);
- setProperties(endpoint, parameters);
- endpoint.setHost(remaining);
- return endpoint;
- }
+ @Override
+ protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
+ KeystoneEndpoint endpoint = new KeystoneEndpoint(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/keystone/KeystoneConstants.java
----------------------------------------------------------------------
diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/keystone/KeystoneConstants.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/keystone/KeystoneConstants.java
index e6273b0..c7afe22 100644
--- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/keystone/KeystoneConstants.java
+++ b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/keystone/KeystoneConstants.java
@@ -18,26 +18,28 @@ package org.apache.camel.component.openstack.keystone;
import org.apache.camel.component.openstack.common.OpenstackConstants;
-public final class KeystoneConstants extends OpenstackConstants{
+public final class KeystoneConstants extends OpenstackConstants {
- public static final String REGIONS = "regions";
- public static final String DOMAINS = "domains";
- public static final String PROJECTS = "projects";
- public static final String USERS = "users";
- public static final String GROUPS = "groups";
+ public static final String REGIONS = "regions";
+ public static final String DOMAINS = "domains";
+ public static final String PROJECTS = "projects";
+ public static final String USERS = "users";
+ public static final String GROUPS = "groups";
- public static final String DESCRIPTION = "description";
- public static final String DOMAIN_ID = "domainId";
- public static final String PARENT_ID = "parentId";
+ public static final String DESCRIPTION = "description";
+ public static final String DOMAIN_ID = "domainId";
+ public static final String PARENT_ID = "parentId";
- public static final String PASSWORD = "password";
- public static final String EMAIL = "email";
+ public static final String PASSWORD = "password";
+ public static final String EMAIL = "email";
- public static final String USER_ID = "userId";
- public static final String GROUP_ID = "groupId";
+ public static final String USER_ID = "userId";
+ public static final String GROUP_ID = "groupId";
- public static final String ADD_USER_TO_GROUP = "addUserToGroup";
- public static final String CHECK_GROUP_USER = "checkUserGroup";
- public static final String REMOVE_USER_FROM_GROUP = "removeUserFromGroup";
+ public static final String ADD_USER_TO_GROUP = "addUserToGroup";
+ public static final String CHECK_GROUP_USER = "checkUserGroup";
+ public static final String REMOVE_USER_FROM_GROUP = "removeUserFromGroup";
+
+ private KeystoneConstants() { }
}
http://git-wip-us.apache.org/repos/asf/camel/blob/7d2907d2/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/keystone/KeystoneEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/keystone/KeystoneEndpoint.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/keystone/KeystoneEndpoint.java
index ed03705..bd2914e 100644
--- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/keystone/KeystoneEndpoint.java
+++ b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/keystone/KeystoneEndpoint.java
@@ -27,159 +27,156 @@ 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-keystone", title = "OpenStack-Keystone", syntax = "openstack-keystone:host", label = "cloud, virtualization")
public class KeystoneEndpoint extends AbstractOpenstackEndpoint {
- @UriPath
- @Metadata(required = "true")
- private String host;
-
- @UriParam(enums = "regions, domains, projects, users, groups")
- @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;
-
- public KeystoneEndpoint(String uri, KeystoneComponent component) {
- super(uri, component);
- }
-
- @Override
- public Producer createProducer() throws Exception {
- switch (getSubsystem()) {
- case KeystoneConstants.REGIONS:
- return new RegionProducer(this, createClient());
- case KeystoneConstants.DOMAINS:
- return new DomainProducer(this, createClient());
- case KeystoneConstants.PROJECTS:
- return new ProjectProducer(this, createClient());
- case KeystoneConstants.USERS:
- return new UserProducer(this, createClient());
- case KeystoneConstants.GROUPS:
- return new GroupProducer(this, createClient());
- default:
- throw new IllegalArgumentException("Can't create producer with subsystem " + subsystem);
- }
- }
-
- public String getSubsystem() {
- return subsystem;
- }
-
- /**
- * OpenStack Keystone 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;
- }
-
- // v2 API is not supported (is deprecated)
- public String getApiVersion() {
- return v3;
- }
+ @UriParam(enums = "regions, domains, projects, users, groups")
+ @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;
+
+ public KeystoneEndpoint(String uri, KeystoneComponent component) {
+ super(uri, component);
+ }
+
+ @Override
+ public Producer createProducer() throws Exception {
+ switch (getSubsystem()) {
+ case KeystoneConstants.REGIONS:
+ return new RegionProducer(this, createClient());
+ case KeystoneConstants.DOMAINS:
+ return new DomainProducer(this, createClient());
+ case KeystoneConstants.PROJECTS:
+ return new ProjectProducer(this, createClient());
+ case KeystoneConstants.USERS:
+ return new UserProducer(this, createClient());
+ case KeystoneConstants.GROUPS:
+ return new GroupProducer(this, createClient());
+ default:
+ throw new IllegalArgumentException("Can't create producer with subsystem " + subsystem);
+ }
+ }
+
+ public String getSubsystem() {
+ return subsystem;
+ }
+
+ /**
+ * OpenStack Keystone 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;
+ }
+
+ // V2 API is not supported (is deprecated)
+ public String getApiVersion() {
+ return V3;
+ }
}
http://git-wip-us.apache.org/repos/asf/camel/blob/7d2907d2/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/keystone/producer/AbstractKeystoneProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/keystone/producer/AbstractKeystoneProducer.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/keystone/producer/AbstractKeystoneProducer.java
index eb57e18..797ec1f 100644
--- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/keystone/producer/AbstractKeystoneProducer.java
+++ b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/keystone/producer/AbstractKeystoneProducer.java
@@ -18,19 +18,18 @@ package org.apache.camel.component.openstack.keystone.producer;
import org.apache.camel.component.openstack.common.AbstractOpenstackEndpoint;
import org.apache.camel.component.openstack.common.AbstractOpenstackProducer;
-
import org.openstack4j.api.OSClient;
public abstract class AbstractKeystoneProducer extends AbstractOpenstackProducer {
- OSClient.OSClientV3 osV3Client;
+ OSClient.OSClientV3 osV3Client;
- public AbstractKeystoneProducer(AbstractOpenstackEndpoint endpoint, OSClient client) {
- super(endpoint, client);
- if(!(client instanceof OSClient.OSClientV3)) {
- throw new IllegalArgumentException("Only Identity API v3 is supported");
- }
- osV3Client = (OSClient.OSClientV3) client;
- }
+ public AbstractKeystoneProducer(AbstractOpenstackEndpoint endpoint, OSClient client) {
+ super(endpoint, client);
+ if (!(client instanceof OSClient.OSClientV3)) {
+ throw new IllegalArgumentException("Only Identity API V3 is supported");
+ }
+ osV3Client = (OSClient.OSClientV3) client;
+ }
}