Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updating domain objects

This commit is contained in:
Andrew Donald Kennedy 2012-02-10 12:11:04 +00:00
parent ca54098661
commit 751d99c143
5 changed files with 37 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CatalogItem.java
View File

@ -43,7 +43,7 @@ import com.google.common.collect.Sets;
*
* @author grkvlt@apache.org
*/
@XmlRootElement(namespace = VCLOUD_1_5_NS, name = "Catalog")
@XmlRootElement(namespace = VCLOUD_1_5_NS, name = "CatalogItem")
public class CatalogItem extends EntityType<CatalogItem> {
public static final String MEDIA_TYPE = VCloudDirectorMediaType.CATALOG_ITEM;
@ -197,14 +197,16 @@ public class CatalogItem extends EntityType<CatalogItem> {
private List<Property> properties = Lists.newArrayList();
/**
* Gets the value of the entity property.
* A reference to a VappTemplate or Media object.
*/
public Reference getEntity() {
return entity;
}
/**
* Gets the value of the properties property.
* User-specified key/value pair.
*
* This element has been superseded by the {@link Metadata} element, which is the preferred way to specify key/value pairs for objects.
*/
public List<Property> getProperties() {
return this.properties;

13
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/MetadataEntry.java
View File

@ -29,7 +29,6 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
import org.jclouds.vcloud.director.v1_5.domain.Link.Builder;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
@ -61,7 +60,7 @@ public class MetadataEntry extends ResourceType<MetadataEntry> {
public static class Builder extends ResourceType.Builder<MetadataEntry> {
private String key;
private MetadataValue value;
private String value;
/**
* @see MetadataEntry#getKey()
@ -74,7 +73,7 @@ public class MetadataEntry extends ResourceType<MetadataEntry> {
/**
* @see MetadataEntry#getValue()
*/
public Builder value(MetadataValue value) {
public Builder value(String value) {
this.value = value;
return this;
}
@ -83,7 +82,7 @@ public class MetadataEntry extends ResourceType<MetadataEntry> {
* @see MetadataEntry#getKey()
* @see MetadataEntry#getValue()
*/
public Builder entry(String key, MetadataValue value) {
public Builder entry(String key, String value) {
this.key = key;
this.value = value;
return this;
@ -150,7 +149,7 @@ public class MetadataEntry extends ResourceType<MetadataEntry> {
// For JAXB and builder use
}
private MetadataEntry(URI href, String key, MetadataValue value) {
private MetadataEntry(URI href, String key, String value) {
super(href);
this.key = checkNotNull(key, "key");
this.value = checkNotNull(value, "value");
@ -159,7 +158,7 @@ public class MetadataEntry extends ResourceType<MetadataEntry> {
@XmlElement(namespace = VCLOUD_1_5_NS, name = "Key")
private String key;
@XmlElement(namespace = VCLOUD_1_5_NS, name = "Value")
private MetadataValue value;
private String value;
/**
* @return key of the entry
@ -171,7 +170,7 @@ public class MetadataEntry extends ResourceType<MetadataEntry> {
/**
* @return value of the entry
*/
public MetadataValue getValue() {
public String getValue() {
return value;
}

3
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/MetadataValue.java
View File

@ -29,7 +29,6 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
import org.jclouds.vcloud.director.v1_5.domain.MetadataValue.Builder;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
@ -42,7 +41,7 @@ import com.google.common.collect.Sets;
* &lt;xs:complexType name="MetadataType"&gt;
* </pre>
*
* @author danikov
* @author grkvlt@apache.org
*/
@XmlRootElement(namespace = VCLOUD_1_5_NS, name = "MetadataValue")
public class MetadataValue extends ResourceType<MetadataValue> {

2
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Org.java
View File

@ -219,7 +219,7 @@ public class Org extends EntityType<Org> {
return isEnabled;
}
public void isEnabled(Boolean isEnabled) {
public void setIsEnabled(Boolean isEnabled) {
this.isEnabled = isEnabled;
}

24
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/package-info.java Normal file
View File

@ -0,0 +1,24 @@
/*
* Licensed to jclouds, Inc. (jclouds) under one or more
* contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. jclouds 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.
*/
@XmlSchema(namespace = VCLOUD_1_5_NS, elementFormDefault = XmlNsForm.QUALIFIED)
package org.jclouds.vcloud.director.v1_5.domain;
import javax.xml.bind.annotation.XmlNsForm;
import javax.xml.bind.annotation.XmlSchema;
import static org.jclouds.vcloud.director.v1_5.VCloudDirectorConstants.*;