From 04e7318e93f79ad35d09ed9f00442adce6070958 Mon Sep 17 00:00:00 2001 From: gaygauta Date: Tue, 26 Apr 2016 16:11:23 +0530 Subject: [PATCH 1/4] add attributes related to vnf status --- .../openstack/heat/v1/domain/Attributes.java | 184 ++++++++ .../heat/v1/domain/StackResource.java | 437 +++++++++--------- 2 files changed, 402 insertions(+), 219 deletions(-) create mode 100644 apis/openstack-heat/src/main/java/org/jclouds/openstack/heat/v1/domain/Attributes.java diff --git a/apis/openstack-heat/src/main/java/org/jclouds/openstack/heat/v1/domain/Attributes.java b/apis/openstack-heat/src/main/java/org/jclouds/openstack/heat/v1/domain/Attributes.java new file mode 100644 index 00000000000..fa9ba21abd1 --- /dev/null +++ b/apis/openstack-heat/src/main/java/org/jclouds/openstack/heat/v1/domain/Attributes.java @@ -0,0 +1,184 @@ +/** + * + */ +package org.jclouds.openstack.heat.v1.domain; + +import static com.google.common.base.Preconditions.checkNotNull; + +import java.beans.ConstructorProperties; + +import javax.inject.Named; + +import org.jclouds.openstack.v2_0.domain.Link; +import org.jclouds.openstack.v2_0.services.Image; + +import com.google.common.base.Objects; +import com.google.common.base.Objects.ToStringHelper; + +/** + * @author deviyada + * + */ +public class Attributes { + + @Named("id") + private String id; + @Named("progress") + private String progress; + @Named("status") + private String status; + @Named("config_drive") + private String config_drive; + @Named("tenant_id") + private String tenant_id; + @Named("hostId") + private String hostId; + @Named("created") + private String created; + @Named("name") + private String name; + @Named("user_id") + private String user_id; + @Named("links") + private Link[] links; + + public String getProgress() { + return progress; + } + + public void setProgress(String progress) { + this.progress = progress; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getConfig_drive() { + return config_drive; + } + + public void setConfig_drive(String config_drive) { + this.config_drive = config_drive; + } + + public String getTenant_id() { + return tenant_id; + } + + public void setTenant_id(String tenant_id) { + this.tenant_id = tenant_id; + } + + public String getHostId() { + return hostId; + } + + public void setHostId(String hostId) { + this.hostId = hostId; + } + + public Link[] getLinks() { + return links; + } + + public void setLinks(Link[] links) { + this.links = links; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getCreated() { + return created; + } + + public void setCreated(String created) { + this.created = created; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getUser_id() { + return user_id; + } + + public void setUser_id(String user_id) { + this.user_id = user_id; + } + + public Attributes build() { + return new Attributes(id, progress, status, config_drive, tenant_id, hostId, created, user_id, links); + } + + @ConstructorProperties({ "id", "progress", "status", "config_drive", "tenant_id", "hostId", "created", "user_id", + "links"}) + protected Attributes(String id, String progress, String status, String config_drive, String tenant_id, + String hostId, String created, String user_id, Link[] links) { + this.id = checkNotNull(id, "id"); + this.progress = progress; + this.status = status; + this.config_drive = config_drive; + this.tenant_id = tenant_id; + this.hostId = hostId; + this.created = created; + this.user_id = user_id; + this.links = links; + } + + @Override + public int hashCode() { + return Objects.hashCode(id, tenant_id,hostId,status,progress,config_drive,created,user_id,links); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null || getClass() != obj.getClass()) + return false; + Attributes that = Attributes.class.cast(obj); + return Objects.equal(this.id, that.id) + && Objects.equal(this.tenant_id, that.tenant_id) + && Objects.equal(this.hostId, that.hostId) + && Objects.equal(this.status, that.status) + && Objects.equal(this.progress, that.progress) + && Objects.equal(this.config_drive, that.config_drive) + && Objects.equal(this.created, that.created) + && Objects.equal(this.user_id, that.user_id) + && Objects.equal(this.links, that.links); + } + + protected ToStringHelper string() { + return Objects.toStringHelper(this).add("id", id) + .add("tenant_id", tenant_id) + .add("hostId", hostId) + .add("status", status) + .add("progress", progress) + .add("config_drive", config_drive) + .add("created", created) + .add("user_id", user_id) + .add("links", links); + } + + @Override + public String toString() { + return string().toString(); + } + +} diff --git a/apis/openstack-heat/src/main/java/org/jclouds/openstack/heat/v1/domain/StackResource.java b/apis/openstack-heat/src/main/java/org/jclouds/openstack/heat/v1/domain/StackResource.java index b98e698e28b..e75c69d5121 100644 --- a/apis/openstack-heat/src/main/java/org/jclouds/openstack/heat/v1/domain/StackResource.java +++ b/apis/openstack-heat/src/main/java/org/jclouds/openstack/heat/v1/domain/StackResource.java @@ -16,235 +16,234 @@ */ package org.jclouds.openstack.heat.v1.domain; -import com.google.common.base.CaseFormat; -import com.google.common.base.Objects; -import com.google.common.collect.ImmutableSet; -import org.jclouds.openstack.v2_0.domain.Link; -import org.jclouds.openstack.v2_0.domain.Resource; +import static com.google.common.base.Preconditions.checkNotNull; -import javax.inject.Named; import java.beans.ConstructorProperties; import java.util.Date; import java.util.Set; -import static com.google.common.base.Preconditions.checkNotNull; +import javax.inject.Named; + +import org.jclouds.openstack.v2_0.domain.Link; +import org.jclouds.openstack.v2_0.domain.Resource; + +import com.google.common.base.CaseFormat; +import com.google.common.base.Objects; +import com.google.common.collect.ImmutableSet; /** * Representation of an OpenStack Heat Stack Resources. */ public class StackResource extends Resource { - @Named("logical_resource_id") - private final String logicalResourceId; - @Named("resource_status_reason") - private final String statusReason; - @Named("resource_status") - private final Status status; - @Named("physical_resource_id") - private final String physicalResourceId; - @Named("required_by") - private Set requiredBy = ImmutableSet.of(); - @Named("resource_type") - private final String resourceType; - - @Named("updated_time") - private final Date updated; - - - @ConstructorProperties({"id", "resource_name", "links", "logical_resource_id", "resource_status_reason", "updated_time", "required_by", "resource_status", "physical_resource_id", "resource_type"}) - public StackResource(String id, String name, Set links, String logicalResourceId, String statusReason, Date updated, Set requiredBy, - Status status, String physicalResourceId, String resourceType) { - super(id, name, links); - this.logicalResourceId = logicalResourceId; - this.statusReason = statusReason; - this.requiredBy = logicalResourceId == null ? ImmutableSet.of() : ImmutableSet.copyOf(requiredBy); - this.physicalResourceId = physicalResourceId; - this.status = status; - this.updated = updated; - this.resourceType = resourceType; - } - - public String getLogicalResourceId() { - return logicalResourceId; - } - - public String getStatusReason() { - return statusReason; - } - - public Status getStatus() { - return status; - } - - public String getPhysicalResourceId() { - return physicalResourceId; - } - - public Set getRequiredBy() { - return requiredBy; - } - - public String getResourceType() { - return resourceType; - } - - public Date getUpdated() { - return updated; - } - - public enum Status { - INIT_COMPLETE, CREATE_IN_PROGRESS, CREATE_COMPLETE, CREATE_FAILED, - UPDATE_IN_PROGRESS, UPDATE_COMPLETE, UPDATE_FAILED, - DELETE_IN_PROGRESS, DELETE_COMPLETE, DELETE_FAILED, - ROLLBACK_IN_PROGRESS, ROLLBACK_COMPLETE, ROLLBACK_FAILED, - SUSPEND_IN_PROGRESS, SUSPEND_COMPLETE, SUSPEND_FAILED, - RESUME_IN_PROGRESS, RESUME_COMPLETE, RESUME_FAILED, - CHECK_IN_PROGRESS, CHECK_COMPLETE, CHECK_FAILED, - UNRECOGNIZED; - - public String value() { - return CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.LOWER_HYPHEN, name()); - } - - @Override - public String toString() { - return value(); - } - - /** - * This provides GSON enum support in jclouds. - * - * @param name The string representation of this enum value. - * @return The corresponding enum value. - */ - - public static Status fromValue(String status) { - try { - return valueOf(checkNotNull(status, "status")); - } catch (IllegalArgumentException e) { - return UNRECOGNIZED; - } - } - } - - @Override - public int hashCode() { - return Objects.hashCode(super.hashCode(), logicalResourceId, physicalResourceId, requiredBy, resourceType, status, statusReason, - updated); - } - - @Override - public boolean equals(Object obj) { - if (this == obj) return true; - if (obj == null || getClass() != obj.getClass()) return false; - StackResource that = StackResource.class.cast(obj); - return super.equals(that) && - Objects.equal(this.logicalResourceId, that.logicalResourceId) && - Objects.equal(this.physicalResourceId, that.physicalResourceId) && - Objects.equal(this.requiredBy, that.requiredBy) && - Objects.equal(this.resourceType, that.resourceType) && - Objects.equal(this.status, that.status) && - Objects.equal(this.statusReason, that.statusReason) && - Objects.equal(this.updated, that.updated); - } - - protected Objects.ToStringHelper string() { - return super.string() - .add("logicalResourceId", logicalResourceId) - .add("physicalResourceId", physicalResourceId) - .add("requiredBy", requiredBy) - .add("resourceType", resourceType) - .add("status", status) - .add("logicalResourceId", logicalResourceId) - .add("statusReason", statusReason) - .add("status", status) - .add("statusReason", statusReason) - .add("updated", updated); - } - - @Override - public String toString() { - return string().toString(); - } - - public static Builder builder() { - return new ConcreteBuilder(); - } - - public Builder toBuilder() { - return new ConcreteBuilder().fromStackResource(this); - } - - public abstract static class Builder> extends Resource.Builder { - - protected String logicalResourceId; - protected String statusReason; - protected Status status; - protected String physicalResourceId; - protected Set requiredBy = ImmutableSet.of(); - protected String resourceType; - protected Date updated; - - public T logicalResourceId(String logicalResourceId) { - this.logicalResourceId = logicalResourceId; - return self(); - } - - public T statusReason(String statusReason) { - this.statusReason = statusReason; - return self(); - } - - public T status(Status status) { - this.status = status; - return self(); - } - - public T physicalResourceId(String physicalResourceId) { - this.physicalResourceId = physicalResourceId; - return self(); - } - - public T requiredBy(Set requiredBy) { - this.requiredBy = requiredBy; - return self(); - } - - public T resourceType(String resourceType) { - this.resourceType = resourceType; - return self(); - } - - public T updated(Date updated) { - this.updated = updated; - return self(); - } - - /** - * @return A new Stack object. - */ - public StackResource build() { - return new StackResource(id, name, links, logicalResourceId, statusReason, updated, requiredBy, status, physicalResourceId, resourceType); - } - - public T fromStackResource(StackResource in) { - return this.fromResource(in) - .logicalResourceId(in.getLogicalResourceId()) - .statusReason(in.getStatusReason()) - .updated(in.getUpdated()) - .requiredBy(in.getRequiredBy()) - .status(in.getStatus()) - .physicalResourceId(in.getPhysicalResourceId()) - .resourceType(in.getResourceType()); - } - - } - - private static class ConcreteBuilder extends Builder { - @Override - protected ConcreteBuilder self() { - return this; - } - } + @Named("logical_resource_id") + private final String logicalResourceId; + @Named("resource_status_reason") + private final String statusReason; + @Named("resource_status") + private final Status status; + @Named("physical_resource_id") + private final String physicalResourceId; + @Named("required_by") + private Set requiredBy = ImmutableSet.of(); + @Named("resource_type") + private final String resourceType; + @Named("updated_time") + private final Date updated; + @Named("attributes") + private Attributes attributes; + + @ConstructorProperties({ "id", "resource_name", "links", "logical_resource_id", "resource_status_reason", + "updated_time", "required_by", "resource_status", "physical_resource_id", "resource_type", "attributes" }) + public StackResource(String id, String name, Set links, String logicalResourceId, String statusReason, + Date updated, Set requiredBy, Status status, String physicalResourceId, String resourceType, + Attributes attributes) { + super(id, name, links); + this.logicalResourceId = logicalResourceId; + this.statusReason = statusReason; + this.requiredBy = logicalResourceId == null ? ImmutableSet. of() : ImmutableSet.copyOf(requiredBy); + this.physicalResourceId = physicalResourceId; + this.status = status; + this.updated = updated; + this.resourceType = resourceType; + this.attributes = attributes; + } + + public String getLogicalResourceId() { + return logicalResourceId; + } + + public String getStatusReason() { + return statusReason; + } + + public Status getStatus() { + return status; + } + + public String getPhysicalResourceId() { + return physicalResourceId; + } + + public Set getRequiredBy() { + return requiredBy; + } + + public String getResourceType() { + return resourceType; + } + + public Date getUpdated() { + return updated; + } + + public Attributes getAttributes() { + return attributes; + } + + public enum Status { + INIT_COMPLETE, CREATE_IN_PROGRESS, CREATE_COMPLETE, CREATE_FAILED, UPDATE_IN_PROGRESS, UPDATE_COMPLETE, UPDATE_FAILED, DELETE_IN_PROGRESS, DELETE_COMPLETE, DELETE_FAILED, ROLLBACK_IN_PROGRESS, ROLLBACK_COMPLETE, ROLLBACK_FAILED, SUSPEND_IN_PROGRESS, SUSPEND_COMPLETE, SUSPEND_FAILED, RESUME_IN_PROGRESS, RESUME_COMPLETE, RESUME_FAILED, CHECK_IN_PROGRESS, CHECK_COMPLETE, CHECK_FAILED, UNRECOGNIZED; + + public String value() { + return CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.LOWER_HYPHEN, name()); + } + + @Override + public String toString() { + return value(); + } + + /** + * This provides GSON enum support in jclouds. + * + * @param name + * The string representation of this enum value. + * @return The corresponding enum value. + */ + + public static Status fromValue(String status) { + try { + return valueOf(checkNotNull(status, "status")); + } catch (IllegalArgumentException e) { + return UNRECOGNIZED; + } + } + } + + @Override + public int hashCode() { + return Objects.hashCode(super.hashCode(), logicalResourceId, physicalResourceId, requiredBy, resourceType, + status, statusReason, updated,attributes); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null || getClass() != obj.getClass()) + return false; + StackResource that = StackResource.class.cast(obj); + return super.equals(that) && Objects.equal(this.logicalResourceId, that.logicalResourceId) + && Objects.equal(this.physicalResourceId, that.physicalResourceId) + && Objects.equal(this.requiredBy, that.requiredBy) + && Objects.equal(this.resourceType, that.resourceType) && Objects.equal(this.status, that.status) + && Objects.equal(this.statusReason, that.statusReason) && Objects.equal(this.updated, that.updated) + && Objects.equal(this.attributes, that.attributes); + } + + protected Objects.ToStringHelper string() { + return super.string().add("logicalResourceId", logicalResourceId).add("physicalResourceId", physicalResourceId) + .add("requiredBy", requiredBy).add("resourceType", resourceType).add("status", status) + .add("logicalResourceId", logicalResourceId).add("statusReason", statusReason).add("status", status) + .add("statusReason", statusReason).add("updated", updated).add("attributes", attributes); + } + + @Override + public String toString() { + return string().toString(); + } + + public static Builder builder() { + return new ConcreteBuilder(); + } + + public Builder toBuilder() { + return new ConcreteBuilder().fromStackResource(this); + } + + public abstract static class Builder> extends Resource.Builder { + + protected String logicalResourceId; + protected String statusReason; + protected Status status; + protected String physicalResourceId; + protected Set requiredBy = ImmutableSet.of(); + protected String resourceType; + protected Date updated; + protected Attributes attributes; + + public T logicalResourceId(String logicalResourceId) { + this.logicalResourceId = logicalResourceId; + return self(); + } + + public T statusReason(String statusReason) { + this.statusReason = statusReason; + return self(); + } + + public T status(Status status) { + this.status = status; + return self(); + } + + public T physicalResourceId(String physicalResourceId) { + this.physicalResourceId = physicalResourceId; + return self(); + } + + public T requiredBy(Set requiredBy) { + this.requiredBy = requiredBy; + return self(); + } + + public T resourceType(String resourceType) { + this.resourceType = resourceType; + return self(); + } + + public T updated(Date updated) { + this.updated = updated; + return self(); + } + + public T attributes(Attributes attributes) { + this.attributes = attributes; + return self(); + } + + /** + * @return A new Stack object. + */ + public StackResource build() { + return new StackResource(id, name, links, logicalResourceId, statusReason, updated, requiredBy, status, + physicalResourceId, resourceType, attributes); + } + + public T fromStackResource(StackResource in) { + return this.fromResource(in).logicalResourceId(in.getLogicalResourceId()).statusReason(in.getStatusReason()) + .updated(in.getUpdated()).requiredBy(in.getRequiredBy()).status(in.getStatus()) + .physicalResourceId(in.getPhysicalResourceId()).resourceType(in.getResourceType()) + .attributes(in.getAttributes()); + } + + } + + private static class ConcreteBuilder extends Builder { + @Override + protected ConcreteBuilder self() { + return this; + } + } } \ No newline at end of file From 480104e1dd3b54bc04a52389a2b2912013aed1eb Mon Sep 17 00:00:00 2001 From: gaygauta Date: Tue, 26 Apr 2016 16:12:10 +0530 Subject: [PATCH 2/4] Incrementing version number to 1.8.1-CB-25 --- all/pom.xml | 2 +- allblobstore/pom.xml | 2 +- allcompute/pom.xml | 2 +- allloadbalancer/pom.xml | 2 +- apis/atmos/pom.xml | 2 +- apis/byon/pom.xml | 2 +- apis/cloudfiles/pom.xml | 2 +- apis/cloudservers/pom.xml | 2 +- apis/cloudsigma/pom.xml | 2 +- apis/cloudstack/pom.xml | 2 +- apis/cloudwatch/pom.xml | 2 +- apis/ec2/pom.xml | 2 +- apis/elasticstack/pom.xml | 2 +- apis/filesystem/pom.xml | 2 +- apis/openstack-ceilometer/pom.xml | 2 +- apis/openstack-cinder/pom.xml | 2 +- apis/openstack-glance/pom.xml | 2 +- apis/openstack-heat/pom.xml | 2 +- apis/openstack-keystone/pom.xml | 2 +- apis/openstack-murano/pom.xml | 2 +- apis/openstack-neutron/pom.xml | 2 +- apis/openstack-nova-ec2/pom.xml | 2 +- apis/openstack-nova/pom.xml | 2 +- apis/openstack-swift/pom.xml | 2 +- apis/openstack-trove/pom.xml | 2 +- apis/pom.xml | 2 +- apis/rackspace-clouddns/pom.xml | 2 +- apis/rackspace-cloudidentity/pom.xml | 2 +- apis/rackspace-cloudloadbalancers/pom.xml | 2 +- apis/route53/pom.xml | 2 +- apis/s3/pom.xml | 2 +- apis/sqs/pom.xml | 2 +- apis/sts/pom.xml | 2 +- apis/swift/pom.xml | 2 +- apis/vcloud/pom.xml | 2 +- blobstore/pom.xml | 2 +- common/azure/pom.xml | 2 +- common/openstack/pom.xml | 2 +- common/pom.xml | 2 +- compute/pom.xml | 2 +- core/pom.xml | 2 +- drivers/apachehc/pom.xml | 2 +- drivers/bouncycastle/pom.xml | 2 +- drivers/enterprise/pom.xml | 2 +- drivers/gae/pom.xml | 2 +- drivers/joda/pom.xml | 2 +- drivers/jsch/pom.xml | 2 +- drivers/log4j/pom.xml | 2 +- drivers/netty/pom.xml | 2 +- drivers/okhttp/pom.xml | 2 +- drivers/pom.xml | 2 +- drivers/slf4j/pom.xml | 2 +- drivers/sshj/pom.xml | 2 +- loadbalancer/pom.xml | 2 +- pom.xml | 2 +- project/pom.xml | 2 +- providers/aws-cloudwatch/pom.xml | 2 +- providers/aws-ec2/pom.xml | 2 +- providers/aws-route53/pom.xml | 2 +- providers/aws-s3/pom.xml | 2 +- providers/aws-sqs/pom.xml | 2 +- providers/aws-sts/pom.xml | 2 +- providers/azureblob/pom.xml | 2 +- providers/bluelock-vcloud-zone01/pom.xml | 2 +- providers/cloudfiles-uk/pom.xml | 2 +- providers/cloudfiles-us/pom.xml | 2 +- providers/cloudonestorage/pom.xml | 2 +- providers/cloudservers-uk/pom.xml | 2 +- providers/cloudservers-us/pom.xml | 2 +- providers/cloudsigma-lvs/pom.xml | 2 +- providers/cloudsigma-zrh/pom.xml | 2 +- providers/docker/pom.xml | 2 +- providers/dynect/pom.xml | 2 +- providers/elastichosts-ams-e/pom.xml | 2 +- providers/elastichosts-hkg-e/pom.xml | 2 +- providers/elastichosts-lax-p/pom.xml | 2 +- providers/elastichosts-lon-b/pom.xml | 2 +- providers/elastichosts-lon-p/pom.xml | 2 +- providers/elastichosts-sat-p/pom.xml | 2 +- providers/elastichosts-sjc-c/pom.xml | 2 +- providers/elastichosts-syd-v/pom.xml | 2 +- providers/elastichosts-tor-p/pom.xml | 2 +- providers/glesys/pom.xml | 2 +- providers/go2cloud-jhb1/pom.xml | 2 +- providers/gogrid/pom.xml | 2 +- providers/greenhousedata-element-vcloud/pom.xml | 2 +- providers/hpcloud-blockstorage/pom.xml | 2 +- providers/hpcloud-compute/pom.xml | 2 +- providers/hpcloud-objectstorage/pom.xml | 2 +- providers/ninefold-compute/pom.xml | 2 +- providers/ninefold-storage/pom.xml | 2 +- providers/openhosting-east1/pom.xml | 2 +- providers/pom.xml | 2 +- providers/rackspace-cloudblockstorage-uk/pom.xml | 2 +- providers/rackspace-cloudblockstorage-us/pom.xml | 2 +- providers/rackspace-clouddatabases-uk/pom.xml | 2 +- providers/rackspace-clouddatabases-us/pom.xml | 2 +- providers/rackspace-clouddns-uk/pom.xml | 2 +- providers/rackspace-clouddns-us/pom.xml | 2 +- providers/rackspace-cloudloadbalancers-uk/pom.xml | 2 +- providers/rackspace-cloudloadbalancers-us/pom.xml | 2 +- providers/rackspace-cloudservers-uk/pom.xml | 2 +- providers/rackspace-cloudservers-us/pom.xml | 2 +- providers/serverlove-z1-man/pom.xml | 2 +- providers/skalicloud-sdg-my/pom.xml | 2 +- providers/softlayer/pom.xml | 2 +- providers/ultradns-ws/pom.xml | 2 +- resources/pom.xml | 2 +- scriptbuilder/pom.xml | 2 +- skeletons/pom.xml | 2 +- skeletons/standalone-compute/pom.xml | 2 +- 111 files changed, 111 insertions(+), 111 deletions(-) diff --git a/all/pom.xml b/all/pom.xml index dde5958a6f8..3d50b73b7ed 100644 --- a/all/pom.xml +++ b/all/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../project/pom.xml jclouds-all diff --git a/allblobstore/pom.xml b/allblobstore/pom.xml index 71e6109181b..efa3ca2221b 100644 --- a/allblobstore/pom.xml +++ b/allblobstore/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../project/pom.xml jclouds-allblobstore diff --git a/allcompute/pom.xml b/allcompute/pom.xml index 83ccc592700..4459ebf3090 100644 --- a/allcompute/pom.xml +++ b/allcompute/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../project/pom.xml jclouds-allcompute diff --git a/allloadbalancer/pom.xml b/allloadbalancer/pom.xml index e3de38c1e20..8d32e60ebbe 100644 --- a/allloadbalancer/pom.xml +++ b/allloadbalancer/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../project/pom.xml jclouds-allloadbalancer diff --git a/apis/atmos/pom.xml b/apis/atmos/pom.xml index c3bc98edb1d..f04b6a5eaf9 100644 --- a/apis/atmos/pom.xml +++ b/apis/atmos/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml diff --git a/apis/byon/pom.xml b/apis/byon/pom.xml index a80077b046d..960555f9f2c 100644 --- a/apis/byon/pom.xml +++ b/apis/byon/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml diff --git a/apis/cloudfiles/pom.xml b/apis/cloudfiles/pom.xml index 8e8ccf472d2..e1e7bc61d6c 100644 --- a/apis/cloudfiles/pom.xml +++ b/apis/cloudfiles/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.api diff --git a/apis/cloudservers/pom.xml b/apis/cloudservers/pom.xml index 21b5599e7f4..6dfbf52c960 100644 --- a/apis/cloudservers/pom.xml +++ b/apis/cloudservers/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml diff --git a/apis/cloudsigma/pom.xml b/apis/cloudsigma/pom.xml index e53ca438c19..f7bbb9faaaf 100644 --- a/apis/cloudsigma/pom.xml +++ b/apis/cloudsigma/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.api diff --git a/apis/cloudstack/pom.xml b/apis/cloudstack/pom.xml index 97a138142c6..0ab902549c7 100644 --- a/apis/cloudstack/pom.xml +++ b/apis/cloudstack/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.api diff --git a/apis/cloudwatch/pom.xml b/apis/cloudwatch/pom.xml index a78829dd242..703920278ae 100644 --- a/apis/cloudwatch/pom.xml +++ b/apis/cloudwatch/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.api diff --git a/apis/ec2/pom.xml b/apis/ec2/pom.xml index 59439ac8d9f..384c12f9da2 100644 --- a/apis/ec2/pom.xml +++ b/apis/ec2/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.api diff --git a/apis/elasticstack/pom.xml b/apis/elasticstack/pom.xml index f6ba8783842..cf56dabaeb5 100644 --- a/apis/elasticstack/pom.xml +++ b/apis/elasticstack/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.api diff --git a/apis/filesystem/pom.xml b/apis/filesystem/pom.xml index 3362e893ec3..a22e0849d05 100644 --- a/apis/filesystem/pom.xml +++ b/apis/filesystem/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.api diff --git a/apis/openstack-ceilometer/pom.xml b/apis/openstack-ceilometer/pom.xml index 7d69e6931b9..1dc8b79131d 100644 --- a/apis/openstack-ceilometer/pom.xml +++ b/apis/openstack-ceilometer/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml diff --git a/apis/openstack-cinder/pom.xml b/apis/openstack-cinder/pom.xml index f7c4f8c9a8a..20ebcd8ff49 100644 --- a/apis/openstack-cinder/pom.xml +++ b/apis/openstack-cinder/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.api diff --git a/apis/openstack-glance/pom.xml b/apis/openstack-glance/pom.xml index f50b9cc101d..6cbfc1336bd 100644 --- a/apis/openstack-glance/pom.xml +++ b/apis/openstack-glance/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml diff --git a/apis/openstack-heat/pom.xml b/apis/openstack-heat/pom.xml index b9edac95e3d..ff790a0eea6 100644 --- a/apis/openstack-heat/pom.xml +++ b/apis/openstack-heat/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.api diff --git a/apis/openstack-keystone/pom.xml b/apis/openstack-keystone/pom.xml index 6015b16c2d7..c4eb08b658c 100644 --- a/apis/openstack-keystone/pom.xml +++ b/apis/openstack-keystone/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.api diff --git a/apis/openstack-murano/pom.xml b/apis/openstack-murano/pom.xml index a808d1cafe9..27649659fc7 100644 --- a/apis/openstack-murano/pom.xml +++ b/apis/openstack-murano/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.api diff --git a/apis/openstack-neutron/pom.xml b/apis/openstack-neutron/pom.xml index 6ea27a06038..89aa024526d 100644 --- a/apis/openstack-neutron/pom.xml +++ b/apis/openstack-neutron/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml diff --git a/apis/openstack-nova-ec2/pom.xml b/apis/openstack-nova-ec2/pom.xml index da800cd682f..3fbe320a68f 100644 --- a/apis/openstack-nova-ec2/pom.xml +++ b/apis/openstack-nova-ec2/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.api diff --git a/apis/openstack-nova/pom.xml b/apis/openstack-nova/pom.xml index d54b1b75af7..7d4eb675900 100644 --- a/apis/openstack-nova/pom.xml +++ b/apis/openstack-nova/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.api diff --git a/apis/openstack-swift/pom.xml b/apis/openstack-swift/pom.xml index 49c3461864c..8b4af466b7c 100644 --- a/apis/openstack-swift/pom.xml +++ b/apis/openstack-swift/pom.xml @@ -27,7 +27,7 @@ org.apache.jclouds.api openstack-swift - 1.8.1-CB-24 + 1.8.1-CB-25 jclouds openstack-swift api jclouds components to access an implementation of OpenStack Swift bundle diff --git a/apis/openstack-trove/pom.xml b/apis/openstack-trove/pom.xml index 9dfd1f3583b..d7285542158 100644 --- a/apis/openstack-trove/pom.xml +++ b/apis/openstack-trove/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.api diff --git a/apis/pom.xml b/apis/pom.xml index 4d812d86245..f9bcd959889 100644 --- a/apis/pom.xml +++ b/apis/pom.xml @@ -22,7 +22,7 @@ jclouds-project org.apache.jclouds - 1.8.1-CB-24 + 1.8.1-CB-25 ../project/pom.xml org.apache.jclouds.api diff --git a/apis/rackspace-clouddns/pom.xml b/apis/rackspace-clouddns/pom.xml index 23d44933d83..883a5976493 100644 --- a/apis/rackspace-clouddns/pom.xml +++ b/apis/rackspace-clouddns/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.api diff --git a/apis/rackspace-cloudidentity/pom.xml b/apis/rackspace-cloudidentity/pom.xml index 6e42bee5de3..f372fbdfda8 100644 --- a/apis/rackspace-cloudidentity/pom.xml +++ b/apis/rackspace-cloudidentity/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.api diff --git a/apis/rackspace-cloudloadbalancers/pom.xml b/apis/rackspace-cloudloadbalancers/pom.xml index c3183dade9d..7335da5c8fa 100644 --- a/apis/rackspace-cloudloadbalancers/pom.xml +++ b/apis/rackspace-cloudloadbalancers/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.api diff --git a/apis/route53/pom.xml b/apis/route53/pom.xml index c70ecb444bf..dbfe92bc8a1 100644 --- a/apis/route53/pom.xml +++ b/apis/route53/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.api diff --git a/apis/s3/pom.xml b/apis/s3/pom.xml index 5631bd6a4ce..114193bc7f3 100644 --- a/apis/s3/pom.xml +++ b/apis/s3/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.api diff --git a/apis/sqs/pom.xml b/apis/sqs/pom.xml index 2aee6eda32e..1c9dd3f4d95 100644 --- a/apis/sqs/pom.xml +++ b/apis/sqs/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.api diff --git a/apis/sts/pom.xml b/apis/sts/pom.xml index 20b897265fd..7769b2b9a24 100644 --- a/apis/sts/pom.xml +++ b/apis/sts/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.api diff --git a/apis/swift/pom.xml b/apis/swift/pom.xml index 4e5b4d75eba..2c8b70ac172 100644 --- a/apis/swift/pom.xml +++ b/apis/swift/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.api diff --git a/apis/vcloud/pom.xml b/apis/vcloud/pom.xml index 005d9fcac76..225fc5d3d63 100644 --- a/apis/vcloud/pom.xml +++ b/apis/vcloud/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.api diff --git a/blobstore/pom.xml b/blobstore/pom.xml index ee061b79696..79e6abb434e 100644 --- a/blobstore/pom.xml +++ b/blobstore/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../project/pom.xml jclouds-blobstore diff --git a/common/azure/pom.xml b/common/azure/pom.xml index 2025cd0778b..a0e5a34c75e 100644 --- a/common/azure/pom.xml +++ b/common/azure/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.common diff --git a/common/openstack/pom.xml b/common/openstack/pom.xml index f32770d79a8..32a34a97ad1 100644 --- a/common/openstack/pom.xml +++ b/common/openstack/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml diff --git a/common/pom.xml b/common/pom.xml index a99e523d0c7..40795f5f2fe 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -22,7 +22,7 @@ jclouds-project org.apache.jclouds - 1.8.1-CB-24 + 1.8.1-CB-25 ../project/pom.xml org.apache.jclouds.common diff --git a/compute/pom.xml b/compute/pom.xml index 2667f79a2da..7ead92dc6c1 100644 --- a/compute/pom.xml +++ b/compute/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../project/pom.xml diff --git a/core/pom.xml b/core/pom.xml index cad405d262f..807729ee248 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -22,7 +22,7 @@ jclouds-project org.apache.jclouds - 1.8.1-CB-24 + 1.8.1-CB-25 ../project/pom.xml jclouds-core diff --git a/drivers/apachehc/pom.xml b/drivers/apachehc/pom.xml index 5d9b434be6c..9fb5e26016d 100644 --- a/drivers/apachehc/pom.xml +++ b/drivers/apachehc/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.driver diff --git a/drivers/bouncycastle/pom.xml b/drivers/bouncycastle/pom.xml index dd6a20770ae..aeb06a61572 100644 --- a/drivers/bouncycastle/pom.xml +++ b/drivers/bouncycastle/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.driver diff --git a/drivers/enterprise/pom.xml b/drivers/enterprise/pom.xml index d9badfd39a6..eb7f6d3ec90 100644 --- a/drivers/enterprise/pom.xml +++ b/drivers/enterprise/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.driver diff --git a/drivers/gae/pom.xml b/drivers/gae/pom.xml index bff537e1d51..84807e06d27 100644 --- a/drivers/gae/pom.xml +++ b/drivers/gae/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.driver diff --git a/drivers/joda/pom.xml b/drivers/joda/pom.xml index 3c51210f50f..c4f612032bc 100644 --- a/drivers/joda/pom.xml +++ b/drivers/joda/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.driver diff --git a/drivers/jsch/pom.xml b/drivers/jsch/pom.xml index e8f5e633693..88ab570d95b 100644 --- a/drivers/jsch/pom.xml +++ b/drivers/jsch/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.driver diff --git a/drivers/log4j/pom.xml b/drivers/log4j/pom.xml index 52fe6bf6757..9063b62532f 100644 --- a/drivers/log4j/pom.xml +++ b/drivers/log4j/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.driver diff --git a/drivers/netty/pom.xml b/drivers/netty/pom.xml index 1236f991471..0cf66c5e501 100644 --- a/drivers/netty/pom.xml +++ b/drivers/netty/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.driver diff --git a/drivers/okhttp/pom.xml b/drivers/okhttp/pom.xml index cf56766e5fb..ba3ae4de8f2 100644 --- a/drivers/okhttp/pom.xml +++ b/drivers/okhttp/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.driver diff --git a/drivers/pom.xml b/drivers/pom.xml index fadb73b17e3..40d7128a2eb 100644 --- a/drivers/pom.xml +++ b/drivers/pom.xml @@ -22,7 +22,7 @@ jclouds-project org.apache.jclouds - 1.8.1-CB-24 + 1.8.1-CB-25 ../project/pom.xml jclouds-drivers-project diff --git a/drivers/slf4j/pom.xml b/drivers/slf4j/pom.xml index 798f0d7178f..f003715dacf 100644 --- a/drivers/slf4j/pom.xml +++ b/drivers/slf4j/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.driver diff --git a/drivers/sshj/pom.xml b/drivers/sshj/pom.xml index e581a9669b0..db4ce0f4bea 100644 --- a/drivers/sshj/pom.xml +++ b/drivers/sshj/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.driver diff --git a/loadbalancer/pom.xml b/loadbalancer/pom.xml index 1988fe4e9f9..d403cecc11c 100644 --- a/loadbalancer/pom.xml +++ b/loadbalancer/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../project/pom.xml jclouds-loadbalancer diff --git a/pom.xml b/pom.xml index 0cb3bdc6bd4..6f30d1cee88 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 project/pom.xml jclouds diff --git a/project/pom.xml b/project/pom.xml index 350f486c8d0..f5eedb76684 100644 --- a/project/pom.xml +++ b/project/pom.xml @@ -27,7 +27,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 pom Apache jclouds Project http://jclouds.apache.org/ diff --git a/providers/aws-cloudwatch/pom.xml b/providers/aws-cloudwatch/pom.xml index f7fe0a01763..e7120a9f0b2 100644 --- a/providers/aws-cloudwatch/pom.xml +++ b/providers/aws-cloudwatch/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.provider diff --git a/providers/aws-ec2/pom.xml b/providers/aws-ec2/pom.xml index ecad0ac8d3e..64dbac536da 100644 --- a/providers/aws-ec2/pom.xml +++ b/providers/aws-ec2/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.provider diff --git a/providers/aws-route53/pom.xml b/providers/aws-route53/pom.xml index 3e24401d6e8..ceb401e973a 100644 --- a/providers/aws-route53/pom.xml +++ b/providers/aws-route53/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.provider diff --git a/providers/aws-s3/pom.xml b/providers/aws-s3/pom.xml index 2b0532defbf..cd05748e4d2 100644 --- a/providers/aws-s3/pom.xml +++ b/providers/aws-s3/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.provider diff --git a/providers/aws-sqs/pom.xml b/providers/aws-sqs/pom.xml index 7e9b14b0735..a98375d710d 100644 --- a/providers/aws-sqs/pom.xml +++ b/providers/aws-sqs/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.provider diff --git a/providers/aws-sts/pom.xml b/providers/aws-sts/pom.xml index ee07bbf5f91..452c41e8ebf 100644 --- a/providers/aws-sts/pom.xml +++ b/providers/aws-sts/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.provider diff --git a/providers/azureblob/pom.xml b/providers/azureblob/pom.xml index d7e31dafd54..fdbb142cf32 100644 --- a/providers/azureblob/pom.xml +++ b/providers/azureblob/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.provider diff --git a/providers/bluelock-vcloud-zone01/pom.xml b/providers/bluelock-vcloud-zone01/pom.xml index 708464ca8d3..756f0777a3f 100644 --- a/providers/bluelock-vcloud-zone01/pom.xml +++ b/providers/bluelock-vcloud-zone01/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.provider diff --git a/providers/cloudfiles-uk/pom.xml b/providers/cloudfiles-uk/pom.xml index 4ab63b89b1a..67c4201d8ed 100644 --- a/providers/cloudfiles-uk/pom.xml +++ b/providers/cloudfiles-uk/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.provider diff --git a/providers/cloudfiles-us/pom.xml b/providers/cloudfiles-us/pom.xml index dd46151bd18..299c86a731d 100644 --- a/providers/cloudfiles-us/pom.xml +++ b/providers/cloudfiles-us/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.provider diff --git a/providers/cloudonestorage/pom.xml b/providers/cloudonestorage/pom.xml index 7c5357d317c..c4e826a9952 100644 --- a/providers/cloudonestorage/pom.xml +++ b/providers/cloudonestorage/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.provider diff --git a/providers/cloudservers-uk/pom.xml b/providers/cloudservers-uk/pom.xml index 9ac42f44bf0..353efee5bbf 100644 --- a/providers/cloudservers-uk/pom.xml +++ b/providers/cloudservers-uk/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.provider diff --git a/providers/cloudservers-us/pom.xml b/providers/cloudservers-us/pom.xml index 584a51f56d5..28f5bb13049 100644 --- a/providers/cloudservers-us/pom.xml +++ b/providers/cloudservers-us/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.provider diff --git a/providers/cloudsigma-lvs/pom.xml b/providers/cloudsigma-lvs/pom.xml index 8240cf5d948..dd21148db6e 100644 --- a/providers/cloudsigma-lvs/pom.xml +++ b/providers/cloudsigma-lvs/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.provider diff --git a/providers/cloudsigma-zrh/pom.xml b/providers/cloudsigma-zrh/pom.xml index 687714339b7..6791d9f485f 100644 --- a/providers/cloudsigma-zrh/pom.xml +++ b/providers/cloudsigma-zrh/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.provider diff --git a/providers/docker/pom.xml b/providers/docker/pom.xml index c611207c643..af41f2ed23e 100644 --- a/providers/docker/pom.xml +++ b/providers/docker/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml diff --git a/providers/dynect/pom.xml b/providers/dynect/pom.xml index d287520d6ba..09d1ef4c70f 100644 --- a/providers/dynect/pom.xml +++ b/providers/dynect/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.provider diff --git a/providers/elastichosts-ams-e/pom.xml b/providers/elastichosts-ams-e/pom.xml index 6a6e6ca7635..09c4abd325e 100644 --- a/providers/elastichosts-ams-e/pom.xml +++ b/providers/elastichosts-ams-e/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.provider diff --git a/providers/elastichosts-hkg-e/pom.xml b/providers/elastichosts-hkg-e/pom.xml index b22a84792cc..abd6c848df1 100644 --- a/providers/elastichosts-hkg-e/pom.xml +++ b/providers/elastichosts-hkg-e/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.provider diff --git a/providers/elastichosts-lax-p/pom.xml b/providers/elastichosts-lax-p/pom.xml index 39b7a15d990..6b53c3b2d58 100644 --- a/providers/elastichosts-lax-p/pom.xml +++ b/providers/elastichosts-lax-p/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.provider diff --git a/providers/elastichosts-lon-b/pom.xml b/providers/elastichosts-lon-b/pom.xml index 5484dcf5f12..9a550027973 100644 --- a/providers/elastichosts-lon-b/pom.xml +++ b/providers/elastichosts-lon-b/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.provider diff --git a/providers/elastichosts-lon-p/pom.xml b/providers/elastichosts-lon-p/pom.xml index 30e9bdc5e74..2fe68c20ee6 100644 --- a/providers/elastichosts-lon-p/pom.xml +++ b/providers/elastichosts-lon-p/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.provider diff --git a/providers/elastichosts-sat-p/pom.xml b/providers/elastichosts-sat-p/pom.xml index 1169ee61efd..b947f19a6a6 100644 --- a/providers/elastichosts-sat-p/pom.xml +++ b/providers/elastichosts-sat-p/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.provider diff --git a/providers/elastichosts-sjc-c/pom.xml b/providers/elastichosts-sjc-c/pom.xml index 436993d3cc5..545046043b3 100644 --- a/providers/elastichosts-sjc-c/pom.xml +++ b/providers/elastichosts-sjc-c/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.provider diff --git a/providers/elastichosts-syd-v/pom.xml b/providers/elastichosts-syd-v/pom.xml index a852f54f827..bcc83f5f50b 100644 --- a/providers/elastichosts-syd-v/pom.xml +++ b/providers/elastichosts-syd-v/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.provider diff --git a/providers/elastichosts-tor-p/pom.xml b/providers/elastichosts-tor-p/pom.xml index 191a0883e25..3684f95806f 100644 --- a/providers/elastichosts-tor-p/pom.xml +++ b/providers/elastichosts-tor-p/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.provider diff --git a/providers/glesys/pom.xml b/providers/glesys/pom.xml index d1aa8e1ad3a..84203747625 100644 --- a/providers/glesys/pom.xml +++ b/providers/glesys/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.provider diff --git a/providers/go2cloud-jhb1/pom.xml b/providers/go2cloud-jhb1/pom.xml index 5a3d0f2372f..6dbcea0d2b0 100644 --- a/providers/go2cloud-jhb1/pom.xml +++ b/providers/go2cloud-jhb1/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.provider diff --git a/providers/gogrid/pom.xml b/providers/gogrid/pom.xml index 22c5dd45ca5..5fdcd0b6eb0 100644 --- a/providers/gogrid/pom.xml +++ b/providers/gogrid/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.provider diff --git a/providers/greenhousedata-element-vcloud/pom.xml b/providers/greenhousedata-element-vcloud/pom.xml index 76785ab712f..b5f6a623435 100644 --- a/providers/greenhousedata-element-vcloud/pom.xml +++ b/providers/greenhousedata-element-vcloud/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.provider diff --git a/providers/hpcloud-blockstorage/pom.xml b/providers/hpcloud-blockstorage/pom.xml index 54a0a15039f..0ae09f23dce 100644 --- a/providers/hpcloud-blockstorage/pom.xml +++ b/providers/hpcloud-blockstorage/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.provider diff --git a/providers/hpcloud-compute/pom.xml b/providers/hpcloud-compute/pom.xml index 90d01d2ba60..e2f140087d8 100644 --- a/providers/hpcloud-compute/pom.xml +++ b/providers/hpcloud-compute/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.provider diff --git a/providers/hpcloud-objectstorage/pom.xml b/providers/hpcloud-objectstorage/pom.xml index 9874452c804..670d0911f7b 100644 --- a/providers/hpcloud-objectstorage/pom.xml +++ b/providers/hpcloud-objectstorage/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.provider diff --git a/providers/ninefold-compute/pom.xml b/providers/ninefold-compute/pom.xml index a316f02caa8..9ec9d974f0b 100644 --- a/providers/ninefold-compute/pom.xml +++ b/providers/ninefold-compute/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.provider diff --git a/providers/ninefold-storage/pom.xml b/providers/ninefold-storage/pom.xml index 7cb1fca1517..19ca1e4c22d 100644 --- a/providers/ninefold-storage/pom.xml +++ b/providers/ninefold-storage/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.provider diff --git a/providers/openhosting-east1/pom.xml b/providers/openhosting-east1/pom.xml index e7ad7d3ec19..b5bdbc1bfcc 100644 --- a/providers/openhosting-east1/pom.xml +++ b/providers/openhosting-east1/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.provider diff --git a/providers/pom.xml b/providers/pom.xml index 833b0ecb62d..f52d7e50e26 100644 --- a/providers/pom.xml +++ b/providers/pom.xml @@ -22,7 +22,7 @@ jclouds-project org.apache.jclouds - 1.8.1-CB-24 + 1.8.1-CB-25 ../project/pom.xml org.apache.jclouds.provider diff --git a/providers/rackspace-cloudblockstorage-uk/pom.xml b/providers/rackspace-cloudblockstorage-uk/pom.xml index 5c3dbf6166d..13c02b8901e 100644 --- a/providers/rackspace-cloudblockstorage-uk/pom.xml +++ b/providers/rackspace-cloudblockstorage-uk/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.provider diff --git a/providers/rackspace-cloudblockstorage-us/pom.xml b/providers/rackspace-cloudblockstorage-us/pom.xml index 72e8ad7f58a..afc1c5cbe4e 100644 --- a/providers/rackspace-cloudblockstorage-us/pom.xml +++ b/providers/rackspace-cloudblockstorage-us/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.provider diff --git a/providers/rackspace-clouddatabases-uk/pom.xml b/providers/rackspace-clouddatabases-uk/pom.xml index 26ff376fef4..ad0170e7068 100644 --- a/providers/rackspace-clouddatabases-uk/pom.xml +++ b/providers/rackspace-clouddatabases-uk/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.provider diff --git a/providers/rackspace-clouddatabases-us/pom.xml b/providers/rackspace-clouddatabases-us/pom.xml index 54673cb6852..88bb89c3d29 100644 --- a/providers/rackspace-clouddatabases-us/pom.xml +++ b/providers/rackspace-clouddatabases-us/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.provider diff --git a/providers/rackspace-clouddns-uk/pom.xml b/providers/rackspace-clouddns-uk/pom.xml index db4692db487..ef9b4be12db 100644 --- a/providers/rackspace-clouddns-uk/pom.xml +++ b/providers/rackspace-clouddns-uk/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.provider diff --git a/providers/rackspace-clouddns-us/pom.xml b/providers/rackspace-clouddns-us/pom.xml index de54f0b2f67..de3eecd1760 100644 --- a/providers/rackspace-clouddns-us/pom.xml +++ b/providers/rackspace-clouddns-us/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.provider diff --git a/providers/rackspace-cloudloadbalancers-uk/pom.xml b/providers/rackspace-cloudloadbalancers-uk/pom.xml index a66e214d173..be3b90c88ca 100644 --- a/providers/rackspace-cloudloadbalancers-uk/pom.xml +++ b/providers/rackspace-cloudloadbalancers-uk/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.provider diff --git a/providers/rackspace-cloudloadbalancers-us/pom.xml b/providers/rackspace-cloudloadbalancers-us/pom.xml index 0af6ce5f9c4..ad468cdcc79 100644 --- a/providers/rackspace-cloudloadbalancers-us/pom.xml +++ b/providers/rackspace-cloudloadbalancers-us/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.provider diff --git a/providers/rackspace-cloudservers-uk/pom.xml b/providers/rackspace-cloudservers-uk/pom.xml index 7ed9441fe9a..65289f53e34 100644 --- a/providers/rackspace-cloudservers-uk/pom.xml +++ b/providers/rackspace-cloudservers-uk/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.provider diff --git a/providers/rackspace-cloudservers-us/pom.xml b/providers/rackspace-cloudservers-us/pom.xml index 27f299e0e90..66ac64d2feb 100644 --- a/providers/rackspace-cloudservers-us/pom.xml +++ b/providers/rackspace-cloudservers-us/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.provider diff --git a/providers/serverlove-z1-man/pom.xml b/providers/serverlove-z1-man/pom.xml index 0dd955ac07f..f1f85c8af83 100644 --- a/providers/serverlove-z1-man/pom.xml +++ b/providers/serverlove-z1-man/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.provider diff --git a/providers/skalicloud-sdg-my/pom.xml b/providers/skalicloud-sdg-my/pom.xml index 83fc7d950a9..9baa9bbcb69 100644 --- a/providers/skalicloud-sdg-my/pom.xml +++ b/providers/skalicloud-sdg-my/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.provider diff --git a/providers/softlayer/pom.xml b/providers/softlayer/pom.xml index 054c8dcd65f..787c6e04e1b 100644 --- a/providers/softlayer/pom.xml +++ b/providers/softlayer/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.provider diff --git a/providers/ultradns-ws/pom.xml b/providers/ultradns-ws/pom.xml index 238c3ef669a..a4fbe63c05d 100644 --- a/providers/ultradns-ws/pom.xml +++ b/providers/ultradns-ws/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.provider diff --git a/resources/pom.xml b/resources/pom.xml index caed0cbfee1..8340f5ecb3b 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -22,7 +22,7 @@ jclouds-project org.apache.jclouds - 1.8.1-CB-24 + 1.8.1-CB-25 ../project/pom.xml jclouds-resources diff --git a/scriptbuilder/pom.xml b/scriptbuilder/pom.xml index 5cf82a7fce3..c4bf54ce7a0 100644 --- a/scriptbuilder/pom.xml +++ b/scriptbuilder/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../project/pom.xml jclouds-scriptbuilder diff --git a/skeletons/pom.xml b/skeletons/pom.xml index 00448e2c691..28dd3271a7d 100644 --- a/skeletons/pom.xml +++ b/skeletons/pom.xml @@ -21,7 +21,7 @@ jclouds-project org.apache.jclouds - 1.8.1-CB-24 + 1.8.1-CB-25 ../project/pom.xml 4.0.0 diff --git a/skeletons/standalone-compute/pom.xml b/skeletons/standalone-compute/pom.xml index 0e68a020a8f..f41d77cfebe 100644 --- a/skeletons/standalone-compute/pom.xml +++ b/skeletons/standalone-compute/pom.xml @@ -22,7 +22,7 @@ org.apache.jclouds jclouds-project - 1.8.1-CB-24 + 1.8.1-CB-25 ../../project/pom.xml org.apache.jclouds.api From 7a8c89bc9f30ce9cff1b27fe8940fb6c235e44ca Mon Sep 17 00:00:00 2001 From: gaygauta Date: Fri, 29 Apr 2016 12:47:43 +0530 Subject: [PATCH 3/4] Incorporating the review comments,and comparing as per the standard of other class. Also checked the styling --- .../openstack/heat/v1/domain/Attributes.java | 249 +++++++++--------- 1 file changed, 127 insertions(+), 122 deletions(-) diff --git a/apis/openstack-heat/src/main/java/org/jclouds/openstack/heat/v1/domain/Attributes.java b/apis/openstack-heat/src/main/java/org/jclouds/openstack/heat/v1/domain/Attributes.java index fa9ba21abd1..5b436d1c268 100644 --- a/apis/openstack-heat/src/main/java/org/jclouds/openstack/heat/v1/domain/Attributes.java +++ b/apis/openstack-heat/src/main/java/org/jclouds/openstack/heat/v1/domain/Attributes.java @@ -3,182 +3,187 @@ */ package org.jclouds.openstack.heat.v1.domain; -import static com.google.common.base.Preconditions.checkNotNull; - import java.beans.ConstructorProperties; +import java.util.Set; import javax.inject.Named; import org.jclouds.openstack.v2_0.domain.Link; -import org.jclouds.openstack.v2_0.services.Image; +import org.jclouds.openstack.v2_0.domain.Resource; import com.google.common.base.Objects; import com.google.common.base.Objects.ToStringHelper; /** * @author deviyada - * + * */ -public class Attributes { +public class Attributes extends Resource { - @Named("id") - private String id; - @Named("progress") private String progress; - @Named("status") private String status; @Named("config_drive") - private String config_drive; + private String configDrive; @Named("tenant_id") - private String tenant_id; - @Named("hostId") + private String tenantId; + @Named("host_id") private String hostId; - @Named("created") private String created; - @Named("name") - private String name; @Named("user_id") - private String user_id; - @Named("links") - private Link[] links; + private String userId; - public String getProgress() { - return progress; - } - - public void setProgress(String progress) { + @ConstructorProperties({ "id", "name","links","progress", "status", "config_drive", + "tenant_id", "host_id", "created", "user_id"}) + protected Attributes(String id,String name, Set links, String progress, String status, + String configDrive, String tenantId, String hostId,String created, String userId) { + super(id, name, links); this.progress = progress; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { this.status = status; + this.configDrive = configDrive; + this.tenantId = tenantId; + this.hostId = hostId; + this.created = created; + this.userId = userId; } - public String getConfig_drive() { - return config_drive; + public String getProgress() { + return progress; } - public void setConfig_drive(String config_drive) { - this.config_drive = config_drive; + public String getStatus() { + return status; } - public String getTenant_id() { - return tenant_id; + public String getConfigDrive() { + return configDrive; } - public void setTenant_id(String tenant_id) { - this.tenant_id = tenant_id; + public String getTenantId() { + return tenantId; } public String getHostId() { return hostId; } - public void setHostId(String hostId) { - this.hostId = hostId; - } - - public Link[] getLinks() { - return links; - } - - public void setLinks(Link[] links) { - this.links = links; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - public String getCreated() { return created; } - public void setCreated(String created) { - this.created = created; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getUser_id() { - return user_id; - } - - public void setUser_id(String user_id) { - this.user_id = user_id; - } - - public Attributes build() { - return new Attributes(id, progress, status, config_drive, tenant_id, hostId, created, user_id, links); - } - - @ConstructorProperties({ "id", "progress", "status", "config_drive", "tenant_id", "hostId", "created", "user_id", - "links"}) - protected Attributes(String id, String progress, String status, String config_drive, String tenant_id, - String hostId, String created, String user_id, Link[] links) { - this.id = checkNotNull(id, "id"); - this.progress = progress; - this.status = status; - this.config_drive = config_drive; - this.tenant_id = tenant_id; - this.hostId = hostId; - this.created = created; - this.user_id = user_id; - this.links = links; + public String getUserId() { + return userId; } - + @Override public int hashCode() { - return Objects.hashCode(id, tenant_id,hostId,status,progress,config_drive,created,user_id,links); + return Objects.hashCode(super.hashCode(), progress, status, configDrive, tenantId, + hostId, created,userId); } @Override public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null || getClass() != obj.getClass()) - return false; + if (this == obj) return true; + if (obj == null || getClass() != obj.getClass()) return false; Attributes that = Attributes.class.cast(obj); - return Objects.equal(this.id, that.id) - && Objects.equal(this.tenant_id, that.tenant_id) - && Objects.equal(this.hostId, that.hostId) + return super.equals(that) + && Objects.equal(this.progress, that.progress) && Objects.equal(this.status, that.status) - && Objects.equal(this.progress, that.progress) - && Objects.equal(this.config_drive, that.config_drive) + && Objects.equal(this.configDrive, that.configDrive) + && Objects.equal(this.tenantId, that.tenantId) + && Objects.equal(this.hostId, that.hostId) && Objects.equal(this.created, that.created) - && Objects.equal(this.user_id, that.user_id) - && Objects.equal(this.links, that.links); + && Objects.equal(this.userId, that.userId); } protected ToStringHelper string() { - return Objects.toStringHelper(this).add("id", id) - .add("tenant_id", tenant_id) - .add("hostId", hostId) - .add("status", status) - .add("progress", progress) - .add("config_drive", config_drive) - .add("created", created) - .add("user_id", user_id) - .add("links", links); - } - - @Override - public String toString() { - return string().toString(); + return super.string() + .add("progress", progress).add("status", status) + .add("config_drive", configDrive).add("tenant_id", tenantId) + .add("host_id", hostId).add("created", created) + .add("user_id", userId); + } + + @Override + public String toString() { + return string().toString(); + } + + public static Builder builder() { + return new ConcreteBuilder(); + } + + public Builder toBuilder() { + return new ConcreteBuilder().fromAttributes(this); + } + + public abstract static class Builder> extends Resource.Builder + { + protected String progress; + protected String status; + protected String configDrive; + protected String tenantId; + protected String hostId; + protected String created; + protected String userId; + + public T progress(String progress) { + this.progress = progress; + return self(); + } + + public T status(String status) { + this.status = status; + return self(); + } + + public T configDrive(String configDrive) { + this.configDrive = configDrive; + return self(); + } + + public T tenantId(String tenantId) { + this.tenantId = tenantId; + return self(); + } + + public T hostId(String hostId) { + this.hostId = hostId; + return self(); + } + + public T created(String created) { + this.created = created; + return self(); + } + + public T userId(String userId) { + this.userId = userId; + return self(); + } + + + public Attributes build() { + return new Attributes(id,name,links, progress, status, configDrive, tenantId, + hostId, created,userId); + } + + public T fromAttributes(Attributes in) { + return this.fromResource(in) + .progress(in.getProgress()) + .status(in.getStatus()) + .configDrive(in.getConfigDrive()) + .tenantId(in.getTenantId()) + .hostId(in.getHostId()) + .created(in.getCreated()) + .userId(in.getUserId()); + } + } + + private static class ConcreteBuilder extends Builder { + @Override + protected ConcreteBuilder self() { + return this; + } } } From 4d486a7ec737b95b6e3e1361edc617527f08d20b Mon Sep 17 00:00:00 2001 From: gaygauta Date: Fri, 29 Apr 2016 15:14:19 +0530 Subject: [PATCH 4/4] Changing the protected constructor to public --- .../java/org/jclouds/openstack/heat/v1/domain/Attributes.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apis/openstack-heat/src/main/java/org/jclouds/openstack/heat/v1/domain/Attributes.java b/apis/openstack-heat/src/main/java/org/jclouds/openstack/heat/v1/domain/Attributes.java index 5b436d1c268..5a3f93fe77e 100644 --- a/apis/openstack-heat/src/main/java/org/jclouds/openstack/heat/v1/domain/Attributes.java +++ b/apis/openstack-heat/src/main/java/org/jclouds/openstack/heat/v1/domain/Attributes.java @@ -34,7 +34,7 @@ public class Attributes extends Resource { @ConstructorProperties({ "id", "name","links","progress", "status", "config_drive", "tenant_id", "host_id", "created", "user_id"}) - protected Attributes(String id,String name, Set links, String progress, String status, + public Attributes(String id,String name, Set links, String progress, String status, String configDrive, String tenantId, String hostId,String created, String userId) { super(id, name, links); this.progress = progress;