You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ad...@apache.org on 2014/11/17 17:21:29 UTC
[22/32] jclouds-labs git commit: JCLOUDS-780 Remove vcloud-director.
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/AdminOrg.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/AdminOrg.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/AdminOrg.java
deleted file mode 100644
index 3a6f397..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/AdminOrg.java
+++ /dev/null
@@ -1,289 +0,0 @@
-/*
- * 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.jclouds.vcloud.director.v1_5.domain.org;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jclouds.vcloud.director.v1_5.domain.Reference;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-/**
- * The AdminOrg represents an administrative view of an organization.
- * It includes all members of the Org element, and adds several
- * elements that can be viewed and modified only by system administrators.
- * <p/> The organization might be enabled or disabled. If
- * enabled, the organization allows login and all other operations.
- */
-@XmlRootElement(name = "AdminOrg")
-@XmlType(propOrder = {
- "settings",
- "users",
- "groups",
- "catalogs",
- "vdcs",
- "networks"
-})
-public class AdminOrg extends Org {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromAdminOrg(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public abstract static class Builder<B extends Builder<B>> extends Org.Builder<B> {
-
- private OrgSettings settings;
- private Set<Reference> users = Sets.newLinkedHashSet();
- private Set<Reference> groups = Sets.newLinkedHashSet();
- private Set<Reference> catalogs = Sets.newLinkedHashSet();
- private Set<Reference> vdcs = Sets.newLinkedHashSet();
- private Set<Reference> networks = Sets.newLinkedHashSet();
-
- /**
- * @see AdminOrg#getSettings()
- */
- public B settings(OrgSettings settings) {
- this.settings = settings;
- return self();
- }
-
- /**
- * @see AdminOrg#getUsers()
- */
- public B users(Iterable<Reference> users) {
- this.users = Sets.newLinkedHashSet(checkNotNull(users, "users"));
- return self();
- }
-
- /**
- * @see AdminOrg#getUsers()
- */
- public B user(Reference user) {
- users.add(checkNotNull(user, "user"));
- return self();
- }
-
- /**
- * @see AdminOrg#getGroups()
- */
- public B groups(Iterable<Reference> groups) {
- this.groups = Sets.newLinkedHashSet(checkNotNull(groups, "groups"));
- return self();
- }
-
- /**
- * @see AdminOrg#getGroups()
- */
- public B group(Reference group) {
- groups.add(checkNotNull(group, "group"));
- return self();
- }
- /**
- * @see AdminOrg#getCatalogs()
- */
- public B catalogs(Iterable<Reference> catalogReferences) {
- this.catalogs = Sets.newLinkedHashSet(checkNotNull(catalogs, "catalogs"));
- return self();
- }
-
- /**
- * @see AdminOrg#getCatalogs()
- */
- public B catalog(Reference catalog) {
- this.catalogs.add(checkNotNull(catalog, "catalog"));
- return self();
- }
- /**
- * @see AdminOrg#getVdcs()
- */
- public B vdcs(Iterable<Reference> vdcs) {
- this.vdcs = Sets.newLinkedHashSet(checkNotNull(vdcs, "vdcs"));
- return self();
- }
-
- /**
- * @see AdminOrg#getVdcs()
- */
- public B vdc(Reference vdc) {
- this.vdcs.add(checkNotNull(vdc, "vdc"));
- return self();
- }
-
- /**
- * @see AdminOrg#getNetworks()
- */
- public B networks(Iterable<Reference> networks) {
- this.networks = Sets.newLinkedHashSet(checkNotNull(networks, "networks"));
- return self();
- }
-
- /**
- * @see AdminOrg#getNetworks()
- */
- public B network(Reference network) {
- this.networks.add(checkNotNull(network, "network"));
- return self();
- }
-
- @Override
- public AdminOrg build() {
- return new AdminOrg(this);
- }
-
- public B fromAdminOrg(AdminOrg in) {
- return fromOrg(in)
- .settings(in.getSettings())
- .users(in.getUsers())
- .groups(in.getGroups())
- .catalogs(in.getCatalogs())
- .vdcs(in.getVdcs())
- .networks(in.getNetworks());
- }
- }
-
- protected AdminOrg() {
- // For JAXB
- }
-
- protected AdminOrg(Builder<?> builder) {
- super(builder);
- this.settings = builder.settings;
- this.users = builder.users == null ? Sets.<Reference>newLinkedHashSet() : ImmutableSet.copyOf(builder.users);
- this.groups = builder.groups == null ? Sets.<Reference>newLinkedHashSet() : ImmutableSet.copyOf(builder.groups);
- this.catalogs = builder.catalogs == null ? Sets.<Reference>newLinkedHashSet() : ImmutableSet.copyOf(builder.catalogs);
- this.vdcs = builder.vdcs == null ? Sets.<Reference>newLinkedHashSet() : ImmutableSet.copyOf(builder.vdcs);
- this.networks = builder.networks == null ? Sets.<Reference>newLinkedHashSet() : ImmutableSet.copyOf(builder.networks);
- }
-
- @XmlElement(name = "Settings", required = true)
- private OrgSettings settings;
- @XmlElementWrapper(name = "Users")
- @XmlElement(name = "UserReference")
- protected Set<Reference> users = Sets.newLinkedHashSet();
- @XmlElementWrapper(name = "Groups")
- @XmlElement(name = "GroupReference")
- protected Set<Reference> groups = Sets.newLinkedHashSet();
- @XmlElementWrapper(name = "Catalogs")
- @XmlElement(name = "CatalogReference")
- private Set<Reference> catalogs = Sets.newLinkedHashSet();
- @XmlElementWrapper(name = "Vdcs")
- @XmlElement(name = "Vdc")
- protected Set<Reference> vdcs = Sets.newLinkedHashSet();
- @XmlElementWrapper(name = "Networks")
- @XmlElement(name = "Network")
- protected Set<Reference> networks = Sets.newLinkedHashSet();
-
- /**
- * Gets the value of the settings property.
- */
- public OrgSettings getSettings() {
- return settings;
- }
-
- /**
- * Gets the value of the users property.
- */
- public Set<Reference> getUsers() {
- return users;
- }
-
- /**
- * Gets the value of the groups property.
- */
- public Set<Reference> getGroups() {
- return groups;
- }
-
- /**
- * Gets the value of the catalogs property.
- */
- public Set<Reference> getCatalogs() {
- return catalogs;
- }
-
- /**
- * Gets the value of the vdcs property.
- */
- public Set<Reference> getVdcs() {
- return vdcs;
- }
-
- /**
- * Gets the value of the networks property.
- */
- public Set<Reference> getNetworks() {
- return networks;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- AdminOrg that = AdminOrg.class.cast(o);
- return super.equals(that) &&
- equal(settings, that.settings) &&
- equal(users, that.users) &&
- equal(groups, that.groups) &&
- equal(catalogs, that.catalogs) &&
- equal(vdcs, that.vdcs) &&
- equal(networks, that.networks);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(),
- settings,
- users,
- groups,
- catalogs,
- vdcs,
- networks);
- }
-
- @Override
- public ToStringHelper string() {
- return super.string()
- .add("settings", settings)
- .add("users", users)
- .add("groups", groups)
- .add("catalogs", catalogs)
- .add("vdcs", vdcs)
- .add("networks", networks);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/CustomOrgLdapSettings.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/CustomOrgLdapSettings.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/CustomOrgLdapSettings.java
deleted file mode 100644
index 39fff36..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/CustomOrgLdapSettings.java
+++ /dev/null
@@ -1,576 +0,0 @@
-/*
- * 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.jclouds.vcloud.director.v1_5.domain.org;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Function;
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Maps;
-
-/**
- * Used when OrgLdapMode=CUSTOM to define connection details for
- * the organization's LDAP service.
- */
-@XmlType(name = "CustomOrgLdapSettings", propOrder = {
- "hostName",
- "port",
- "isSsl",
- "isSslAcceptAll",
- "realm",
- "searchBase",
- "userName",
- "password",
- "authenticationMechanism",
- "groupSearchBase",
- "isGroupSearchBaseEnabled",
- "connectorType",
- "userAttributes",
- "groupAttributes"
-})
-public class CustomOrgLdapSettings {
- @XmlType
- @XmlEnum(String.class)
- public static enum AuthenticationMechanism {
- @XmlEnumValue("simple") SIMPLE("simple"),
- @XmlEnumValue("kerberos") KERBEROS("kerberos"),
- @XmlEnumValue("md5digest") MD5DIGEST("md5digest"),
- @XmlEnumValue("ntlm") NTLM("ntlm"),
- UNRECOGNIZED("unrecognized");
-
- public static final List<AuthenticationMechanism> ALL = ImmutableList.of(
- SIMPLE, KERBEROS, MD5DIGEST, NTLM);
-
- protected final String stringValue;
-
- AuthenticationMechanism(String stringValue) {
- this.stringValue = stringValue;
- }
-
- public String value() {
- return stringValue;
- }
-
- protected static final Map<String, AuthenticationMechanism> AUTHENTICATION_MECHANISM_BY_ID = Maps.uniqueIndex(
- ImmutableSet.copyOf(AuthenticationMechanism.values()), new Function<AuthenticationMechanism, String>() {
- @Override
- public String apply(AuthenticationMechanism input) {
- return input.stringValue;
- }
- });
-
- public static AuthenticationMechanism fromValue(String value) {
- AuthenticationMechanism authMechanism = AUTHENTICATION_MECHANISM_BY_ID.get(checkNotNull(value, "stringValue"));
- return authMechanism == null ? UNRECOGNIZED : authMechanism;
- }
- }
-
- @XmlType
- @XmlEnum(String.class)
- public static enum ConnectorType {
- @XmlEnumValue("ACTIVE_DIRECTORY") ACTIVE_DIRECTORY("ACTIVE_DIRECTORY"),
- @XmlEnumValue("OPEN_LDAP") OPEN_LDAP("OPEN_LDAP"),
- UNRECOGNIZED("unrecognized");
-
- public static final List<ConnectorType> ALL = ImmutableList.of(
- ACTIVE_DIRECTORY, OPEN_LDAP);
-
- protected final String stringValue;
-
- ConnectorType(String stringValue) {
- this.stringValue = stringValue;
- }
-
- public String value() {
- return stringValue;
- }
-
- protected static final Map<String, ConnectorType> CONNECTOR_TYPE_BY_ID = Maps.uniqueIndex(
- ImmutableSet.copyOf(ConnectorType.values()), new Function<ConnectorType, String>() {
- @Override
- public String apply(ConnectorType input) {
- return input.stringValue;
- }
- });
-
- public static ConnectorType fromValue(String value) {
- ConnectorType type = CONNECTOR_TYPE_BY_ID.get(checkNotNull(value, "stringValue"));
- return type == null ? UNRECOGNIZED : type;
- }
- }
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return new ConcreteBuilder().fromCustomOrgLdapSettings(this);
- }
-
- public abstract static class Builder<T extends Builder<T>> {
- protected abstract T self();
-
- private String hostName;
- private int port;
- private Boolean isSsl;
- private Boolean isSslAcceptAll;
- private String realm;
- private String searchBase;
- private String userName;
- private String password;
- private String authenticationMechanism;
- private String groupSearchBase;
- private boolean isGroupSearchBaseEnabled;
- private String connectorType;
- private OrgLdapUserAttributes userAttributes;
- private OrgLdapGroupAttributes groupAttributes;
-
- /**
- * @see CustomOrgLdapSettings#getHostName()
- */
- public T hostName(String hostName) {
- this.hostName = hostName;
- return self();
- }
-
- /**
- * @see CustomOrgLdapSettings#getPort()
- */
- public T port(int port) {
- this.port = port;
- return self();
- }
-
- /**
- * @see CustomOrgLdapSettings#getIsSsl()
- */
- public T isSsl(Boolean isSsl) {
- this.isSsl = isSsl;
- return self();
- }
-
- /**
- * @see CustomOrgLdapSettings#getIsSslAcceptAll()
- */
- public T isSslAcceptAll(Boolean isSslAcceptAll) {
- this.isSslAcceptAll = isSslAcceptAll;
- return self();
- }
-
- /**
- * @see CustomOrgLdapSettings#getRealm()
- */
- public T realm(String realm) {
- this.realm = realm;
- return self();
- }
-
- /**
- * @see CustomOrgLdapSettings#getSearchBase()
- */
- public T searchBase(String searchBase) {
- this.searchBase = searchBase;
- return self();
- }
-
- /**
- * @see CustomOrgLdapSettings#getUserName()
- */
- public T userName(String userName) {
- this.userName = userName;
- return self();
- }
-
- /**
- * @see CustomOrgLdapSettings#getPassword()
- */
- public T password(String password) {
- this.password = password;
- return self();
- }
-
- /**
- * @see CustomOrgLdapSettings#getAuthenticationMechanism()
- */
- public T authenticationMechanism(String authenticationMechanism) {
- this.authenticationMechanism = authenticationMechanism;
- return self();
- }
-
- /**
- * @see CustomOrgLdapSettings#getGroupSearchBase()
- */
- public T groupSearchBase(String groupSearchBase) {
- this.groupSearchBase = groupSearchBase;
- return self();
- }
-
- /**
- * @see CustomOrgLdapSettings#getIsGroupSearchBaseEnabled()
- */
- public T isGroupSearchBaseEnabled(boolean isGroupSearchBaseEnabled) {
- this.isGroupSearchBaseEnabled = isGroupSearchBaseEnabled;
- return self();
- }
-
- /**
- * @see CustomOrgLdapSettings#getConnectorType()
- */
- public T connectorType(String connectorType) {
- this.connectorType = connectorType;
- return self();
- }
-
- /**
- * @see CustomOrgLdapSettings#getUserAttributes()
- */
- public T userAttributes(OrgLdapUserAttributes userAttributes) {
- this.userAttributes = userAttributes;
- return self();
- }
-
- /**
- * @see CustomOrgLdapSettings#getGroupAttributes()
- */
- public T groupAttributes(OrgLdapGroupAttributes groupAttributes) {
- this.groupAttributes = groupAttributes;
- return self();
- }
-
-
- public CustomOrgLdapSettings build() {
- return new CustomOrgLdapSettings(hostName, port, isSsl, isSslAcceptAll,
- realm, searchBase, userName, password, authenticationMechanism,
- groupSearchBase, isGroupSearchBaseEnabled, connectorType,
- userAttributes, groupAttributes);
- }
-
-
- public T fromCustomOrgLdapSettings(CustomOrgLdapSettings in) {
- return hostName(in.getHostName())
- .port(in.getPort())
- .isSsl(in.isSsl())
- .isSslAcceptAll(in.isSslAcceptAll())
- .realm(in.getRealm())
- .searchBase(in.getSearchBase())
- .userName(in.getUserName())
- .password(in.getPassword())
- .authenticationMechanism(in.getAuthenticationMechanism())
- .groupSearchBase(in.getGroupSearchBase())
- .isGroupSearchBaseEnabled(in.isGroupSearchBaseEnabled())
- .connectorType(in.getConnectorType())
- .userAttributes(in.getUserAttributes())
- .groupAttributes(in.getGroupAttributes());
- }
-
- }
-
- public static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- @Override
- protected ConcreteBuilder self() {
- return this;
- }
- }
-
- protected CustomOrgLdapSettings() {
- // For JAXB
- }
-
- private CustomOrgLdapSettings(String hostName, int port, Boolean isSsl,
- Boolean isSslAcceptAll, String realm, String searchBase, String userName,
- String password, String authenticationMechanism, String groupSearchBase,
- boolean isGroupSearchBaseEnabled, String connectorType,
- OrgLdapUserAttributes userAttributes, OrgLdapGroupAttributes groupAttributes) {
- this.hostName = hostName;
- this.port = port;
- this.isSsl = isSsl;
- this.password = password;
- this.authenticationMechanism = authenticationMechanism;
-
- }
-
-
-
- @XmlElement(name = "HostName", required = true)
- protected String hostName;
- @XmlElement(name = "Port")
- protected int port;
- @XmlElement(name = "IsSsl")
- protected Boolean isSsl;
- @XmlElement(name = "IsSslAcceptAll")
- protected Boolean isSslAcceptAll;
- @XmlElement(name = "Realm")
- protected String realm;
- @XmlElement(name = "SearchBase")
- protected String searchBase;
- @XmlElement(name = "UserName")
- protected String userName;
- @XmlElement(name = "Password")
- protected String password;
- @XmlElement(name = "AuthenticationMechanism", required = true)
- protected String authenticationMechanism;
- @XmlElement(name = "GroupSearchBase")
- protected String groupSearchBase;
- @XmlElement(name = "IsGroupSearchBaseEnabled")
- protected boolean isGroupSearchBaseEnabled;
- @XmlElement(name = "ConnectorType", required = true)
- protected String connectorType;
- @XmlElement(name = "UserAttributes", required = true)
- protected OrgLdapUserAttributes userAttributes;
- @XmlElement(name = "GroupAttributes", required = true)
- protected OrgLdapGroupAttributes groupAttributes;
-
- /**
- * Gets the value of the hostName property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getHostName() {
- return hostName;
- }
-
- /**
- * Gets the value of the port property.
- *
- */
- public int getPort() {
- return port;
- }
-
- /**
- * Gets the value of the isSsl property.
- *
- * @return
- * possible object is
- * {@link Boolean }
- *
- */
- public Boolean isSsl() {
- return isSsl;
- }
-
-
- /**
- * Gets the value of the isSslAcceptAll property.
- *
- * @return
- * possible object is
- * {@link Boolean }
- *
- */
- public Boolean isSslAcceptAll() {
- return isSslAcceptAll;
- }
-
- /**
- * Gets the value of the realm property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getRealm() {
- return realm;
- }
-
- /**
- * Gets the value of the searchBase property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getSearchBase() {
- return searchBase;
- }
-
- /**
- * Gets the value of the userName property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getUserName() {
- return userName;
- }
-
- /**
- * Gets the value of the password property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getPassword() {
- return password;
- }
-
- /**
- * Gets the value of the authenticationMechanism property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getAuthenticationMechanism() {
- return authenticationMechanism;
- }
-
- /**
- * Gets the value of the groupSearchBase property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getGroupSearchBase() {
- return groupSearchBase;
- }
-
- /**
- * Gets the value of the isGroupSearchBaseEnabled property.
- *
- */
- public boolean isGroupSearchBaseEnabled() {
- return isGroupSearchBaseEnabled;
- }
-
- /**
- * Gets the value of the connectorType property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getConnectorType() {
- return connectorType;
- }
-
- /**
- * Gets the value of the userAttributes property.
- *
- * @return
- * possible object is
- * {@link OrgLdapUserAttributes }
- *
- */
- public OrgLdapUserAttributes getUserAttributes() {
- return userAttributes;
- }
-
- /**
- * Gets the value of the groupAttributes property.
- *
- * @return
- * possible object is
- * {@link OrgLdapGroupAttributes }
- *
- */
- public OrgLdapGroupAttributes getGroupAttributes() {
- return groupAttributes;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- CustomOrgLdapSettings that = CustomOrgLdapSettings.class.cast(o);
- return super.equals(that) &&
- equal(hostName, that.hostName) &&
- equal(port, that.port) &&
- equal(isSsl, that.isSsl) &&
- equal(isSslAcceptAll, that.isSslAcceptAll) &&
- equal(realm, that.realm) &&
- equal(searchBase, that.searchBase) &&
- equal(userName, that.userName) &&
- equal(password, that.password) &&
- equal(authenticationMechanism, that.authenticationMechanism) &&
- equal(groupSearchBase, that.groupSearchBase) &&
- equal(isGroupSearchBaseEnabled, that.isGroupSearchBaseEnabled) &&
- equal(connectorType, that.connectorType) &&
- equal(userAttributes, that.userAttributes) &&
- equal(groupAttributes, that.groupAttributes);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(),
- hostName,
- port,
- isSsl,
- isSslAcceptAll,
- realm,
- searchBase,
- userName,
- password,
- authenticationMechanism,
- groupSearchBase,
- isGroupSearchBaseEnabled,
- connectorType,
- userAttributes,
- groupAttributes);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
- protected ToStringHelper string() {
- return Objects.toStringHelper("")
- .add("hostName", hostName)
- .add("port", port)
- .add("isSsl", isSsl)
- .add("isSslAcceptAll", isSslAcceptAll)
- .add("realm", realm)
- .add("searchBase", searchBase)
- .add("userName", userName)
- .add("password", password)
- .add("authenticationMechanism", authenticationMechanism)
- .add("groupSearchBase", groupSearchBase)
- .add("isGroupSearchBaseEnabled", isGroupSearchBaseEnabled)
- .add("connectorType", connectorType)
- .add("userAttributes", userAttributes)
- .add("groupAttributes", groupAttributes);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/Org.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/Org.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/Org.java
deleted file mode 100644
index 2932495..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/Org.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * 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.jclouds.vcloud.director.v1_5.domain.org;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-
-import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
-import org.jclouds.vcloud.director.v1_5.domain.Entity;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-
-/**
- * Represents an organization.
- *
- * <p/>Unit of multi-tenancy and a top-level container. Contain vDCs, TasksList, Catalogs and Shared Network entities.
- */
-@XmlRootElement(name = "Org")
-@XmlSeeAlso({ AdminOrg.class })
-public class Org extends Entity {
-
- public static final String MEDIA_TYPE = VCloudDirectorMediaType.ORG;
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromOrg(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public abstract static class Builder<B extends Builder<B>> extends Entity.Builder<B> {
-
- private String fullName;
- private Boolean isEnabled;
-
- /**
- * @see Org#getFullName()
- */
- public B fullName(String fullName) {
- this.fullName = fullName;
- return self();
- }
-
- /**
- * @see Org#isEnabled()
- */
- public B isEnabled(Boolean isEnabled) {
- this.isEnabled = isEnabled;
- return self();
- }
-
- @Override
- public Org build() {
- return new Org(this);
- }
-
- public B fromOrg(Org in) {
- return fromEntityType(in).fullName(in.getFullName()).isEnabled(in.isEnabled());
- }
- }
-
- protected Org() {
- // for JAXB
- }
-
- public Org(Builder<?> builder) {
- super(builder);
- this.fullName = builder.fullName;
- this.isEnabled = builder.isEnabled;
- }
-
- @XmlElement(name = "FullName", required = true)
- private String fullName;
- @XmlElement(name = "IsEnabled")
- private Boolean isEnabled;
-
- /**
- * Full name of the organization.
- */
- public String getFullName() {
- return fullName;
- }
-
- /**
- * Is the organization enabled.
- */
- public Boolean isEnabled() {
- return isEnabled;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- Org that = Org.class.cast(o);
- return super.equals(that) && equal(fullName, that.fullName) && equal(this.isEnabled, that.isEnabled);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), fullName, isEnabled);
- }
-
- @Override
- public ToStringHelper string() {
- return super.string().add("fullName", fullName).add("isEnabled", isEnabled);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgEmailSettings.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgEmailSettings.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgEmailSettings.java
deleted file mode 100644
index d310a63..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgEmailSettings.java
+++ /dev/null
@@ -1,307 +0,0 @@
-/*
- * 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.jclouds.vcloud.director.v1_5.domain.org;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jclouds.vcloud.director.v1_5.domain.Resource;
-import org.jclouds.vcloud.director.v1_5.domain.network.SmtpServerSettings;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-import com.google.common.collect.ImmutableList;
-
-@XmlRootElement(name = "OrgEmailSettings")
-@XmlType(propOrder = {
- "isDefaultSmtpServer",
- "isDefaultOrgEmail",
- "fromEmailAddress",
- "defaultSubjectPrefix",
- "isAlertEmailToAllAdmins",
- "alertEmailTo",
- "smtpServerSettings"
-})
-public class OrgEmailSettings extends Resource {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromOrgEmailSettings(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public abstract static class Builder<B extends Builder<B>> extends Resource.Builder<B> {
-
- private boolean isDefaultSmtpServer;
- private boolean isDefaultOrgEmail;
- private String fromEmailAddress;
- private String defaultSubjectPrefix;
- private boolean isAlertEmailToAllAdmins;
- private List<String> alertEmailTo;
- private SmtpServerSettings smtpServerSettings;
-
- /**
- * @see OrgEmailSettings#getIsDefaultSmtpServer()
- */
- public B isDefaultSmtpServer(boolean isDefaultSmtpServer) {
- this.isDefaultSmtpServer = isDefaultSmtpServer;
- return self();
- }
-
- /**
- * @see OrgEmailSettings#getIsDefaultOrgEmail()
- */
- public B isDefaultOrgEmail(boolean isDefaultOrgEmail) {
- this.isDefaultOrgEmail = isDefaultOrgEmail;
- return self();
- }
-
- /**
- * @see OrgEmailSettings#getFromEmailAddress()
- */
- public B fromEmailAddress(String fromEmailAddress) {
- this.fromEmailAddress = fromEmailAddress;
- return self();
- }
-
- /**
- * @see OrgEmailSettings#getDefaultSubjectPrefix()
- */
- public B defaultSubjectPrefix(String defaultSubjectPrefix) {
- this.defaultSubjectPrefix = defaultSubjectPrefix;
- return self();
- }
-
- /**
- * @see OrgEmailSettings#getIsAlertEmailToAllAdmins()
- */
- public B isAlertEmailToAllAdmins(boolean isAlertEmailToAllAdmins) {
- this.isAlertEmailToAllAdmins = isAlertEmailToAllAdmins;
- return self();
- }
-
- /**
- * @see OrgEmailSettings#getAlertEmailTo()
- */
- public B alertEmailTo(List<String> alertEmailTo) {
- this.alertEmailTo = alertEmailTo == null ? null : ImmutableList.copyOf(alertEmailTo);
- return self();
- }
-
- /**
- * @see OrgEmailSettings#getAlertEmailTo()
- */
- public B alertEmailTo(String alertEmailTo) {
- this.alertEmailTo.add(checkNotNull(alertEmailTo, "alertEmailTo"));
- return self();
- }
-
- /**
- * @see OrgEmailSettings#getSmtpServerSettings()
- */
- public B smtpServerSettings(SmtpServerSettings smtpServerSettings) {
- this.smtpServerSettings = smtpServerSettings;
- return self();
- }
-
- @Override
- public OrgEmailSettings build() {
- return new OrgEmailSettings(this);
- }
-
- public B fromOrgEmailSettings(OrgEmailSettings in) {
- return fromResource(in)
- .isDefaultSmtpServer(in.isDefaultSmtpServer())
- .isDefaultOrgEmail(in.isDefaultOrgEmail())
- .fromEmailAddress(in.getFromEmailAddress())
- .defaultSubjectPrefix(in.getDefaultSubjectPrefix())
- .isAlertEmailToAllAdmins(in.isAlertEmailToAllAdmins())
- .alertEmailTo(in.getAlertEmailTo())
- .smtpServerSettings(in.getSmtpServerSettings());
- }
- }
-
- private OrgEmailSettings() {
- // For JAXB
- }
-
- private OrgEmailSettings(Builder<?> builder) {
- super(builder);
- this.isDefaultSmtpServer = builder.isDefaultSmtpServer;
- this.isDefaultOrgEmail = builder.isDefaultOrgEmail;
- this.fromEmailAddress = builder.fromEmailAddress;
- this.defaultSubjectPrefix = builder.defaultSubjectPrefix;
- this.isAlertEmailToAllAdmins = builder.isAlertEmailToAllAdmins;
- this.alertEmailTo = builder.alertEmailTo;
- this.smtpServerSettings = builder.smtpServerSettings;
- }
-
- @XmlElement(name = "IsDefaultSmtpServer")
- private boolean isDefaultSmtpServer;
- @XmlElement(name = "IsDefaultOrgEmail")
- private boolean isDefaultOrgEmail;
- @XmlElement(name = "FromEmailAddress", required = true)
- private String fromEmailAddress;
- @XmlElement(name = "DefaultSubjectPrefix", required = true)
- private String defaultSubjectPrefix;
- @XmlElement(name = "IsAlertEmailToAllAdmins")
- private boolean isAlertEmailToAllAdmins;
- @XmlElement(name = "AlertEmailTo")
- private List<String> alertEmailTo;
- @XmlElement(name = "SmtpServerSettings")
- private SmtpServerSettings smtpServerSettings;
-
- /**
- * Gets the value of the isDefaultSmtpServer property.
- *
- */
- public boolean isDefaultSmtpServer() {
- return isDefaultSmtpServer;
- }
-
- /**
- * Gets the value of the isDefaultOrgEmail property.
- *
- */
- public boolean isDefaultOrgEmail() {
- return isDefaultOrgEmail;
- }
-
- /**
- * Gets the value of the fromEmailAddress property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getFromEmailAddress() {
- return fromEmailAddress;
- }
-
- /**
- * Gets the value of the defaultSubjectPrefix property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getDefaultSubjectPrefix() {
- return defaultSubjectPrefix;
- }
-
- /**
- * Gets the value of the isAlertEmailToAllAdmins property.
- *
- */
- public boolean isAlertEmailToAllAdmins() {
- return isAlertEmailToAllAdmins;
- }
-
- /**
- * Gets the value of the alertEmailTo property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the alertEmailTo property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getAlertEmailTo().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link String }
- *
- *
- */
- public List<String> getAlertEmailTo() {
- return this.alertEmailTo;
- }
-
- /**
- * Gets the value of the smtpServerSettings property.
- *
- * @return
- * possible object is
- * {@link SmtpServerSettings }
- *
- */
- public SmtpServerSettings getSmtpServerSettings() {
- return smtpServerSettings;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- OrgEmailSettings that = OrgEmailSettings.class.cast(o);
- return super.equals(that) &&
- equal(isDefaultSmtpServer, that.isDefaultSmtpServer) &&
- equal(isDefaultOrgEmail, that.isDefaultOrgEmail) &&
- equal(fromEmailAddress, that.fromEmailAddress) &&
- equal(defaultSubjectPrefix, that.defaultSubjectPrefix) &&
- equal(isAlertEmailToAllAdmins, that.isAlertEmailToAllAdmins) &&
- equal(alertEmailTo, that.alertEmailTo) &&
- equal(smtpServerSettings, that.smtpServerSettings);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(),
- isDefaultSmtpServer,
- isDefaultOrgEmail,
- fromEmailAddress,
- defaultSubjectPrefix,
- isAlertEmailToAllAdmins,
- alertEmailTo,
- smtpServerSettings);
- }
-
- @Override
- public ToStringHelper string() {
- return super.string()
- .add("isDefaultSmtpServer", isDefaultSmtpServer)
- .add("isDefaultOrgEmail", isDefaultOrgEmail)
- .add("fromEmailAddress", fromEmailAddress)
- .add("defaultSubjectPrefix", defaultSubjectPrefix)
- .add("isAlertEmailToAllAdmins", isAlertEmailToAllAdmins)
- .add("alertEmailTo", alertEmailTo)
- .add("smtpServerSettings", smtpServerSettings);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgGeneralSettings.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgGeneralSettings.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgGeneralSettings.java
deleted file mode 100644
index fc04897..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgGeneralSettings.java
+++ /dev/null
@@ -1,234 +0,0 @@
-/*
- * 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.jclouds.vcloud.director.v1_5.domain.org;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jclouds.vcloud.director.v1_5.domain.Resource;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-
-@XmlRootElement(name = "GeneralOrgSettings")
-@XmlType(propOrder = {
- "canPublishCatalogs",
- "deployedVMQuota",
- "storedVmQuota",
- "useServerBootSequence",
- "delayAfterPowerOnSeconds"
-})
-public class OrgGeneralSettings extends Resource {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromOrgGeneralSettings(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public abstract static class Builder<B extends Builder<B>> extends Resource.Builder<B> {
-
- private Boolean canPublishCatalogs;
- private Integer deployedVMQuota;
- private Integer storedVmQuota;
- private Boolean useServerBootSequence;
- private Integer delayAfterPowerOnSeconds;
-
- /**
- * @see OrgGeneralSettings#getCanPublishCatalogs()
- */
- public B canPublishCatalogs(Boolean canPublishCatalogs) {
- this.canPublishCatalogs = canPublishCatalogs;
- return self();
- }
-
- /**
- * @see OrgGeneralSettings#getDeployedVMQuota()
- */
- public B deployedVMQuota(Integer deployedVMQuota) {
- this.deployedVMQuota = deployedVMQuota;
- return self();
- }
-
- /**
- * @see OrgGeneralSettings#getStoredVmQuota()
- */
- public B storedVmQuota(Integer storedVmQuota) {
- this.storedVmQuota = storedVmQuota;
- return self();
- }
-
- /**
- * @see OrgGeneralSettings#getUseServerBootSequence()
- */
- public B useServerBootSequence(Boolean useServerBootSequence) {
- this.useServerBootSequence = useServerBootSequence;
- return self();
- }
-
- /**
- * @see OrgGeneralSettings#getDelayAfterPowerOnSeconds()
- */
- public B delayAfterPowerOnSeconds(Integer delayAfterPowerOnSeconds) {
- this.delayAfterPowerOnSeconds = delayAfterPowerOnSeconds;
- return self();
- }
-
- @Override
- public OrgGeneralSettings build() {
- return new OrgGeneralSettings(this);
- }
-
- public B fromOrgGeneralSettings(OrgGeneralSettings in) {
- return fromResource(in)
- .canPublishCatalogs(in.canPublishCatalogs())
- .deployedVMQuota(in.getDeployedVMQuota())
- .storedVmQuota(in.getStoredVmQuota())
- .useServerBootSequence(in.useServerBootSequence())
- .delayAfterPowerOnSeconds(in.getDelayAfterPowerOnSeconds());
- }
- }
-
- protected OrgGeneralSettings() {
- // For JAXB
- }
-
- protected OrgGeneralSettings(Builder<?> builder) {
- super(builder);
- this.canPublishCatalogs = builder.canPublishCatalogs;
- this.deployedVMQuota = builder.deployedVMQuota;
- this.storedVmQuota = builder.storedVmQuota;
- this.useServerBootSequence = builder.useServerBootSequence;
- this.delayAfterPowerOnSeconds = builder.delayAfterPowerOnSeconds;
- }
-
- @XmlElement(name = "CanPublishCatalogs")
- protected Boolean canPublishCatalogs;
- @XmlElement(name = "DeployedVMQuota")
- protected Integer deployedVMQuota;
- @XmlElement(name = "StoredVmQuota")
- protected Integer storedVmQuota;
- @XmlElement(name = "UseServerBootSequence")
- protected Boolean useServerBootSequence;
- @XmlElement(name = "DelayAfterPowerOnSeconds")
- protected Integer delayAfterPowerOnSeconds;
-
- /**
- * Gets the value of the canPublishCatalogs property.
- *
- * @return
- * possible object is
- * {@link Boolean }
- *
- */
- public Boolean canPublishCatalogs() {
- return canPublishCatalogs;
- }
-
- /**
- * Gets the value of the deployedVMQuota property.
- *
- * @return
- * possible object is
- * {@link Integer }
- *
- */
- public Integer getDeployedVMQuota() {
- return deployedVMQuota;
- }
-
- /**
- * Gets the value of the storedVmQuota property.
- *
- * @return
- * possible object is
- * {@link Integer }
- *
- */
- public Integer getStoredVmQuota() {
- return storedVmQuota;
- }
-
- /**
- * Gets the value of the useServerBootSequence property.
- *
- * @return
- * possible object is
- * {@link Boolean }
- *
- */
- public Boolean useServerBootSequence() {
- return useServerBootSequence;
- }
-
- /**
- * Gets the value of the delayAfterPowerOnSeconds property.
- *
- * @return
- * possible object is
- * {@link Integer }
- *
- */
- public Integer getDelayAfterPowerOnSeconds() {
- return delayAfterPowerOnSeconds;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- OrgGeneralSettings that = OrgGeneralSettings.class.cast(o);
- return super.equals(that) &&
- equal(canPublishCatalogs, that.canPublishCatalogs) &&
- equal(deployedVMQuota, that.deployedVMQuota) &&
- equal(storedVmQuota, that.storedVmQuota) &&
- equal(useServerBootSequence, that.useServerBootSequence) &&
- equal(delayAfterPowerOnSeconds, that.delayAfterPowerOnSeconds);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(),
- canPublishCatalogs,
- deployedVMQuota,
- storedVmQuota,
- useServerBootSequence,
- delayAfterPowerOnSeconds);
- }
-
- @Override
- public ToStringHelper string() {
- return super.string()
- .add("canPublishCatalogs", canPublishCatalogs)
- .add("deployedVMQuota", deployedVMQuota)
- .add("storedVmQuota", storedVmQuota)
- .add("useServerBootSequence", useServerBootSequence)
- .add("delayAfterPowerOnSeconds", delayAfterPowerOnSeconds);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLdapGroupAttributes.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLdapGroupAttributes.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLdapGroupAttributes.java
deleted file mode 100644
index f0ba634..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLdapGroupAttributes.java
+++ /dev/null
@@ -1,261 +0,0 @@
-/*
- * 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.jclouds.vcloud.director.v1_5.domain.org;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-
-/**
- * Defines how a group is imported from LDAP.
- */
-@XmlType(name = "OrgLdapGroupAttributes", propOrder = {
- "objectClass",
- "objectIdentifier",
- "groupName",
- "membership",
- "membershipIdentifier",
- "backLinkIdentifier"
-})
-public class OrgLdapGroupAttributes {
- public static Builder builder() {
- return new Builder();
- }
-
- public Builder toBuilder() {
- return new Builder().fromOrgLdapGroupAttributes(this);
- }
-
- public static class Builder {
-
- private String objectClass;
- private String objectIdentifier;
- private String groupName;
- private String membership;
- private String membershipIdentifier;
- private String backLinkIdentifier;
-
- /**
- * @see OrgLdapGroupAttributes#getObjectClass()
- */
- public Builder objectClass(String objectClass) {
- this.objectClass = objectClass;
- return this;
- }
-
- /**
- * @see OrgLdapGroupAttributes#getObjectIdentifier()
- */
- public Builder objectIdentifier(String objectIdentifier) {
- this.objectIdentifier = objectIdentifier;
- return this;
- }
-
- /**
- * @see OrgLdapGroupAttributes#getGroupName()
- */
- public Builder groupName(String groupName) {
- this.groupName = groupName;
- return this;
- }
-
- /**
- * @see OrgLdapGroupAttributes#getMembership()
- */
- public Builder membership(String membership) {
- this.membership = membership;
- return this;
- }
-
- /**
- * @see OrgLdapGroupAttributes#getMembershipIdentifier()
- */
- public Builder membershipIdentifier(String membershipIdentifier) {
- this.membershipIdentifier = membershipIdentifier;
- return this;
- }
-
- /**
- * @see OrgLdapGroupAttributes#getBackLinkIdentifier()
- */
- public Builder backLinkIdentifier(String backLinkIdentifier) {
- this.backLinkIdentifier = backLinkIdentifier;
- return this;
- }
-
-
- public OrgLdapGroupAttributes build() {
- return new OrgLdapGroupAttributes(objectClass, objectIdentifier, groupName,
- membership, membershipIdentifier, backLinkIdentifier);
- }
-
- public Builder fromOrgLdapGroupAttributes(OrgLdapGroupAttributes in) {
- return objectClass(in.getObjectClass())
- .objectIdentifier(in.getObjectIdentifier())
- .groupName(in.getGroupName())
- .membership(in.getMembership())
- .membershipIdentifier(in.getMembershipIdentifier())
- .backLinkIdentifier(in.getBackLinkIdentifier());
- }
- }
-
- @SuppressWarnings("unused")
- private OrgLdapGroupAttributes() {
- // For JAXB
- }
-
- public OrgLdapGroupAttributes(String objectClass, String objectIdentifier,
- String groupName, String membership, String membershipIdentifier,
- String backLinkIdentifier) {
- this.objectClass = objectClass;
- this.objectIdentifier = objectIdentifier;
- this.groupName = groupName;
- this.membership = membership;
- this.membershipIdentifier = membershipIdentifier;
- this.backLinkIdentifier = backLinkIdentifier;
- }
-
- @XmlElement(name = "ObjectClass", required = true)
- protected String objectClass;
- @XmlElement(name = "ObjectIdentifier", required = true)
- protected String objectIdentifier;
- @XmlElement(name = "GroupName", required = true)
- protected String groupName;
- @XmlElement(name = "Membership", required = true)
- protected String membership;
- @XmlElement(name = "MembershipIdentifier", required = true)
- protected String membershipIdentifier;
- @XmlElement(name = "BackLinkIdentifier")
- protected String backLinkIdentifier;
-
- /**
- * Gets the value of the objectClass property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getObjectClass() {
- return objectClass;
- }
-
- /**
- * Gets the value of the objectIdentifier property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getObjectIdentifier() {
- return objectIdentifier;
- }
-
- /**
- * Gets the value of the groupName property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getGroupName() {
- return groupName;
- }
-
- /**
- * Gets the value of the membership property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getMembership() {
- return membership;
- }
-
- /**
- * Gets the value of the membershipIdentifier property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getMembershipIdentifier() {
- return membershipIdentifier;
- }
-
- /**
- * Gets the value of the backLinkIdentifier property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getBackLinkIdentifier() {
- return backLinkIdentifier;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- OrgLdapGroupAttributes that = OrgLdapGroupAttributes.class.cast(o);
- return equal(objectClass, that.objectClass) &&
- equal(objectIdentifier, that.objectIdentifier) &&
- equal(groupName, that.groupName) &&
- equal(membership, that.membership) &&
- equal(membershipIdentifier, that.membershipIdentifier) &&
- equal(backLinkIdentifier, that.backLinkIdentifier);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(objectClass,
- objectIdentifier,
- groupName,
- membership,
- membershipIdentifier,
- backLinkIdentifier);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
- public ToStringHelper string() {
- return Objects.toStringHelper("")
- .add("objectClass", objectClass)
- .add("objectIdentifier", objectIdentifier)
- .add("groupName", groupName)
- .add("membership", membership)
- .add("membershipIdentifier", membershipIdentifier)
- .add("backLinkIdentifier", backLinkIdentifier);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLdapSettings.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLdapSettings.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLdapSettings.java
deleted file mode 100644
index a994658..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLdapSettings.java
+++ /dev/null
@@ -1,230 +0,0 @@
-/*
- * 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.jclouds.vcloud.director.v1_5.domain.org;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jclouds.vcloud.director.v1_5.domain.Resource;
-
-import com.google.common.base.Function;
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Maps;
-/**
- * Base settings for LDAP connection
- *
- * <pre>
- * <complexType name="OrgLdapSettings">
- * <complexContent>
- * <extension base="{http://www.vmware.com/vcloud/v1.5}ResourceType">
- * <sequence>
- * <element name="OrgLdapMode" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * <element name="CustomUsersOu" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * <element name="CustomOrgLdapSettings" type="{http://www.vmware.com/vcloud/v1.5}CustomOrgLdapSettings" minOccurs="0"/>
- * </sequence>
- * <anyAttribute processContents='lax' namespace='##other'/>
- * </extension>
- * </complexContent>
- * </complexType>
- * </pre>
- */
-@XmlRootElement(name = "OrgLdapSettings")
-@XmlType(propOrder = {
- "ldapMode",
- "customUsersOu",
- "customOrgLdapSettings"
-})
-public class OrgLdapSettings extends Resource {
-
- @XmlType
- @XmlEnum(String.class)
- public static enum LdapMode {
- @XmlEnumValue("NONE") NONE("NONE"),
- @XmlEnumValue("SYSTEM") SYSTEM("SYSTEM"),
- @XmlEnumValue("CUSTOM") CUSTOM("CUSTOM"),
- UNRECOGNIZED("unrecognized");
-
- public static final List<LdapMode> ALL = ImmutableList.of( NONE, SYSTEM, CUSTOM );
-
- protected final String stringValue;
-
- LdapMode(String stringValue) {
- this.stringValue = stringValue;
- }
-
- public String value() {
- return stringValue;
- }
-
- protected static final Map<String, LdapMode> LDAP_MODE_BY_ID = Maps.uniqueIndex(
- ImmutableSet.copyOf(LdapMode.values()), new Function<LdapMode, String>() {
- @Override
- public String apply(LdapMode input) {
- return input.stringValue;
- }
- });
-
- public static LdapMode fromValue(String value) {
- LdapMode mode = LDAP_MODE_BY_ID.get(checkNotNull(value, "stringValue"));
- return mode == null ? UNRECOGNIZED : mode;
- }
- }
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromOrgLdapSettings(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public abstract static class Builder<B extends Builder<B>> extends Resource.Builder<B> {
-
- private LdapMode ldapMode;
- private String customUsersOu;
- private CustomOrgLdapSettings customOrgLdapSettings;
-
- /**
- * @see OrgLdapSettings#getLdapMode()
- */
- public B ldapMode(LdapMode ldapMode) {
- this.ldapMode = ldapMode;
- return self();
- }
-
- /**
- * @see OrgLdapSettings#getLdapMode()
- */
- public B ldapMode(String ldapMode) {
- this.ldapMode = LdapMode.fromValue(ldapMode);
- return self();
- }
-
- /**
- * @see OrgLdapSettings#getCustomUsersOu()
- */
- public B customUsersOu(String customUsersOu) {
- this.customUsersOu = customUsersOu;
- return self();
- }
-
- /**
- * @see OrgLdapSettings#getCustomOrgLdapSettings()
- */
- public B customOrgLdapSettings(CustomOrgLdapSettings customOrgLdapSettings) {
- this.customOrgLdapSettings = customOrgLdapSettings;
- return self();
- }
-
- @Override
- public OrgLdapSettings build() {
- return new OrgLdapSettings(this);
- }
-
- public B fromOrgLdapSettings(OrgLdapSettings in) {
- return fromResource(in)
- .ldapMode(in.getLdapMode())
- .customUsersOu(in.getCustomUsersOu())
- .customOrgLdapSettings(in.getCustomOrgLdapSettings());
- }
- }
-
- protected OrgLdapSettings() {
- // For JAXB
- }
-
- protected OrgLdapSettings(Builder<?> builder) {
- super(builder);
- this.ldapMode = builder.ldapMode;
- this.customUsersOu = builder.customUsersOu;
- this.customOrgLdapSettings = builder.customOrgLdapSettings;
- }
-
- @XmlElement(name = "OrgLdapMode")
- private LdapMode ldapMode;
- @XmlElement(name = "CustomUsersOu")
- private String customUsersOu;
- @XmlElement(name = "CustomOrgLdapSettings")
- private CustomOrgLdapSettings customOrgLdapSettings;
-
- /**
- * Gets the value of the orgLdapMode property.
- */
- public LdapMode getLdapMode() {
- return ldapMode;
- }
-
- /**
- * Gets the value of the customUsersOu property.
- */
- public String getCustomUsersOu() {
- return customUsersOu;
- }
-
- /**
- * Gets the value of the customOrgLdapSettings property.
- */
- public CustomOrgLdapSettings getCustomOrgLdapSettings() {
- return customOrgLdapSettings;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- OrgLdapSettings that = OrgLdapSettings.class.cast(o);
- return super.equals(that) &&
- equal(ldapMode, that.ldapMode) &&
- equal(customUsersOu, that.customUsersOu) &&
- equal(customOrgLdapSettings, that.customOrgLdapSettings);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(),
- ldapMode,
- customUsersOu,
- customOrgLdapSettings);
- }
-
- @Override
- public ToStringHelper string() {
- return super.string()
- .add("orgLdapMode", ldapMode)
- .add("customUsersOu", customUsersOu)
- .add("customOrgLdapSettings", customOrgLdapSettings);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLdapUserAttributes.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLdapUserAttributes.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLdapUserAttributes.java
deleted file mode 100644
index cba4df5..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLdapUserAttributes.java
+++ /dev/null
@@ -1,378 +0,0 @@
-/*
- * 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.jclouds.vcloud.director.v1_5.domain.org;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-
-/**
- * Defines how LDAP attributes are used when importing a user.
- */
-@XmlType(name = "OrgLdapUserAttributes", propOrder = {
- "objectClass",
- "objectIdentifier",
- "userName",
- "email",
- "fullName",
- "givenName",
- "surname",
- "telephone",
- "groupMembershipIdentifier",
- "groupBackLinkIdentifier"
-})
-public class OrgLdapUserAttributes {
- public static Builder builder() {
- return new Builder();
- }
-
- public Builder toBuilder() {
- return new Builder().fromOrgLdapUserAttributes(this);
- }
-
- public static class Builder {
-
- private String objectClass;
- private String objectIdentifier;
- private String userName;
- private String email;
- private String fullName;
- private String givenName;
- private String surname;
- private String telephone;
- private String groupMembershipIdentifier;
- private String groupBackLinkIdentifier;
-
- /**
- * @see OrgLdapUserAttributes#getObjectClass()
- */
- public Builder objectClass(String objectClass) {
- this.objectClass = objectClass;
- return this;
- }
-
- /**
- * @see OrgLdapUserAttributes#getObjectIdentifier()
- */
- public Builder objectIdentifier(String objectIdentifier) {
- this.objectIdentifier = objectIdentifier;
- return this;
- }
-
- /**
- * @see OrgLdapUserAttributes#getUserName()
- */
- public Builder userName(String userName) {
- this.userName = userName;
- return this;
- }
-
- /**
- * @see OrgLdapUserAttributes#getEmail()
- */
- public Builder email(String email) {
- this.email = email;
- return this;
- }
-
- /**
- * @see OrgLdapUserAttributes#getFullName()
- */
- public Builder fullName(String fullName) {
- this.fullName = fullName;
- return this;
- }
-
- /**
- * @see OrgLdapUserAttributes#getGivenName()
- */
- public Builder givenName(String givenName) {
- this.givenName = givenName;
- return this;
- }
-
- /**
- * @see OrgLdapUserAttributes#getSurname()
- */
- public Builder surname(String surname) {
- this.surname = surname;
- return this;
- }
-
- /**
- * @see OrgLdapUserAttributes#getTelephone()
- */
- public Builder telephone(String telephone) {
- this.telephone = telephone;
- return this;
- }
-
- /**
- * @see OrgLdapUserAttributes#getGroupMembershipIdentifier()
- */
- public Builder groupMembershipIdentifier(String groupMembershipIdentifier) {
- this.groupMembershipIdentifier = groupMembershipIdentifier;
- return this;
- }
-
- /**
- * @see OrgLdapUserAttributes#getGroupBackLinkIdentifier()
- */
- public Builder groupBackLinkIdentifier(String groupBackLinkIdentifier) {
- this.groupBackLinkIdentifier = groupBackLinkIdentifier;
- return this;
- }
-
-
- public OrgLdapUserAttributes build() {
- return new OrgLdapUserAttributes(objectClass, objectIdentifier, userName, email,
- fullName, givenName, surname, telephone, groupMembershipIdentifier, groupBackLinkIdentifier);
- }
-
- public Builder fromOrgLdapUserAttributes(OrgLdapUserAttributes in) {
- return objectClass(in.getObjectClass())
- .objectIdentifier(in.getObjectIdentifier())
- .userName(in.getUserName())
- .email(in.getEmail())
- .fullName(in.getFullName())
- .givenName(in.getGivenName())
- .surname(in.getSurname())
- .telephone(in.getTelephone())
- .groupMembershipIdentifier(in.getGroupMembershipIdentifier())
- .groupBackLinkIdentifier(in.getGroupBackLinkIdentifier());
- }
- }
-
- @SuppressWarnings("unused")
- private OrgLdapUserAttributes() {
- // For JAXB
- }
-
- public OrgLdapUserAttributes(String objectClass, String objectIdentifier,
- String userName, String email, String fullName, String givenName,
- String surname, String telephone, String groupMembershipIdentifier,
- String groupBackLinkIdentifier) {
- this.objectClass = objectClass;
- this.objectIdentifier = objectIdentifier;
- this.userName = userName;
- this.email = email;
- this.fullName = fullName;
- this.givenName = givenName;
- this.surname = surname;
- this.telephone = telephone;
- this.groupMembershipIdentifier = groupMembershipIdentifier;
- this.groupBackLinkIdentifier = groupBackLinkIdentifier;
- }
-
- @XmlElement(name = "ObjectClass", required = true)
- protected String objectClass;
- @XmlElement(name = "ObjectIdentifier", required = true)
- protected String objectIdentifier;
- @XmlElement(name = "UserName", required = true)
- protected String userName;
- @XmlElement(name = "Email", required = true)
- protected String email;
- @XmlElement(name = "FullName", required = true)
- protected String fullName;
- @XmlElement(name = "GivenName", required = true)
- protected String givenName;
- @XmlElement(name = "Surname", required = true)
- protected String surname;
- @XmlElement(name = "Telephone", required = true)
- protected String telephone;
- @XmlElement(name = "GroupMembershipIdentifier", required = true)
- protected String groupMembershipIdentifier;
- @XmlElement(name = "GroupBackLinkIdentifier")
- protected String groupBackLinkIdentifier;
-
- /**
- * Gets the value of the objectClass property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getObjectClass() {
- return objectClass;
- }
-
- /**
- * Gets the value of the objectIdentifier property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getObjectIdentifier() {
- return objectIdentifier;
- }
-
- /**
- * Gets the value of the userName property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getUserName() {
- return userName;
- }
-
- /**
- * Gets the value of the email property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getEmail() {
- return email;
- }
-
- /**
- * Gets the value of the fullName property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getFullName() {
- return fullName;
- }
-
- /**
- * Gets the value of the givenName property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getGivenName() {
- return givenName;
- }
-
- /**
- * Gets the value of the surname property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getSurname() {
- return surname;
- }
-
- /**
- * Gets the value of the telephone property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getTelephone() {
- return telephone;
- }
-
- /**
- * Gets the value of the groupMembershipIdentifier property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getGroupMembershipIdentifier() {
- return groupMembershipIdentifier;
- }
-
- /**
- * Gets the value of the groupBackLinkIdentifier property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getGroupBackLinkIdentifier() {
- return groupBackLinkIdentifier;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- OrgLdapUserAttributes that = OrgLdapUserAttributes.class.cast(o);
- return equal(objectClass, that.objectClass) &&
- equal(objectIdentifier, that.objectIdentifier) &&
- equal(userName, that.userName) &&
- equal(email, that.email) &&
- equal(fullName, that.fullName) &&
- equal(givenName, that.givenName) &&
- equal(surname, that.surname) &&
- equal(telephone, that.telephone) &&
- equal(groupMembershipIdentifier, that.groupMembershipIdentifier) &&
- equal(groupBackLinkIdentifier, that.groupBackLinkIdentifier);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(objectClass,
- objectIdentifier,
- userName,
- email,
- fullName,
- givenName,
- surname,
- telephone,
- groupMembershipIdentifier,
- groupBackLinkIdentifier);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
- public ToStringHelper string() {
- return Objects.toStringHelper("")
- .add("objectClass", objectClass)
- .add("objectIdentifier", objectIdentifier)
- .add("userName", userName)
- .add("email", email)
- .add("fullName", fullName)
- .add("givenName", givenName)
- .add("surname", surname)
- .add("telephone", telephone)
- .add("groupMembershipIdentifier", groupMembershipIdentifier)
- .add("groupBackLinkIdentifier", groupBackLinkIdentifier);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLeaseSettings.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLeaseSettings.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLeaseSettings.java
deleted file mode 100644
index 9e14d02..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLeaseSettings.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * 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.jclouds.vcloud.director.v1_5.domain.org;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jclouds.vcloud.director.v1_5.domain.Resource;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-
-/**
- * Defines default lease durations and policies for an organization.
- */
-@XmlRootElement(name = "VAppLeaseSettings")
-@XmlType(propOrder = {
- "deleteOnStorageLeaseExpiration",
- "deploymentLeaseSeconds",
- "storageLeaseSeconds"
-})
-public class OrgLeaseSettings extends Resource {
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromOrgLeaseSettings(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public abstract static class Builder<B extends Builder<B>> extends Resource.Builder<B> {
-
- private Boolean deleteOnStorageLeaseExpiration;
- private Integer deploymentLeaseSeconds;
- private Integer storageLeaseSeconds;
-
- /**
- * @see OrgLeaseSettings#getDeleteOnStorageLeaseExpiration()
- */
- public B deleteOnStorageLeaseExpiration(Boolean deleteOnStorageLeaseExpiration) {
- this.deleteOnStorageLeaseExpiration = deleteOnStorageLeaseExpiration;
- return self();
- }
-
- /**
- * @see OrgLeaseSettings#getDeploymentLeaseSeconds()
- */
- public B deploymentLeaseSeconds(Integer deploymentLeaseSeconds) {
- this.deploymentLeaseSeconds = deploymentLeaseSeconds;
- return self();
- }
-
- /**
- * @see OrgLeaseSettings#getStorageLeaseSeconds()
- */
- public B storageLeaseSeconds(Integer storageLeaseSeconds) {
- this.storageLeaseSeconds = storageLeaseSeconds;
- return self();
- }
-
- @Override
- public OrgLeaseSettings build() {
- return new OrgLeaseSettings(this);
- }
-
- public B fromOrgLeaseSettings(OrgLeaseSettings in) {
- return fromResource(in)
- .deleteOnStorageLeaseExpiration(in.deleteOnStorageLeaseExpiration())
- .deploymentLeaseSeconds(in.getDeploymentLeaseSeconds())
- .storageLeaseSeconds(in.getStorageLeaseSeconds());
- }
- }
-
- protected OrgLeaseSettings() {
- // For JAXB
- }
-
- protected OrgLeaseSettings(Builder<?> builder) {
- super(builder);
- this.deleteOnStorageLeaseExpiration = builder.deleteOnStorageLeaseExpiration;
- this.deploymentLeaseSeconds = builder.deploymentLeaseSeconds;
- this.storageLeaseSeconds = builder.storageLeaseSeconds;
- }
-
- @XmlElement(name = "DeleteOnStorageLeaseExpiration")
- private Boolean deleteOnStorageLeaseExpiration;
- @XmlElement(name = "DeploymentLeaseSeconds")
- private Integer deploymentLeaseSeconds;
- @XmlElement(name = "StorageLeaseSeconds")
- private Integer storageLeaseSeconds;
-
- /**
- * Gets the value of the deleteOnStorageLeaseExpiration property.
- *
- * @return
- * possible object is
- * {@link Boolean }
- *
- */
- public Boolean deleteOnStorageLeaseExpiration() {
- return deleteOnStorageLeaseExpiration;
- }
-
- /**
- * Gets the value of the deploymentLeaseSeconds property.
- *
- * @return
- * possible object is
- * {@link Integer }
- *
- */
- public Integer getDeploymentLeaseSeconds() {
- return deploymentLeaseSeconds;
- }
-
- /**
- * Gets the value of the storageLeaseSeconds property.
- *
- * @return
- * possible object is
- * {@link Integer }
- *
- */
- public Integer getStorageLeaseSeconds() {
- return storageLeaseSeconds;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- OrgLeaseSettings that = OrgLeaseSettings.class.cast(o);
- return super.equals(that) &&
- equal(deleteOnStorageLeaseExpiration, that.deleteOnStorageLeaseExpiration) &&
- equal(deploymentLeaseSeconds, that.deploymentLeaseSeconds) &&
- equal(storageLeaseSeconds, that.storageLeaseSeconds);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(),
- deleteOnStorageLeaseExpiration,
- deploymentLeaseSeconds,
- storageLeaseSeconds);
- }
-
- @Override
- public ToStringHelper string() {
- return super.string()
- .add("deleteOnStorageLeaseExpiration", deleteOnStorageLeaseExpiration)
- .add("deploymentLeaseSeconds", deploymentLeaseSeconds)
- .add("storageLeaseSeconds", storageLeaseSeconds);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgList.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgList.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgList.java
deleted file mode 100644
index d50e5c1..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgList.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * 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.jclouds.vcloud.director.v1_5.domain.org;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Collections;
-import java.util.Set;
-
-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.Reference;
-
-import com.google.common.collect.ForwardingSet;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-@XmlRootElement(name = "OrgList")
-public class OrgList extends ForwardingSet<Reference> {
-
- public static final String MEDIA_TYPE = VCloudDirectorMediaType.ORG_LIST;
-
- public static Builder builder() {
- return new Builder();
- }
-
- public Builder toBuilder() {
- return new Builder().fromOrgList(this);
- }
-
- public static class Builder {
-
- private Set<Reference> orgs = Sets.newLinkedHashSet();
-
- /**
- * @see OrgList#getOrgs
- */
- public Builder orgs(Set<Reference> orgs) {
- this.orgs = Sets.newLinkedHashSet(checkNotNull(orgs, "orgs"));
- return this;
- }
-
- /**
- * @see OrgList#getOrgs
- */
- public Builder org(Reference org) {
- orgs.add(checkNotNull(org, "org"));
- return this;
- }
-
- public OrgList build() {
- return new OrgList(orgs);
- }
-
- public Builder fromOrgList(OrgList in) {
- return orgs(in.delegate());
- }
- }
-
- private OrgList() {
- // for JAXB
- }
-
- private OrgList(Set<Reference> orgs) {
- this.orgs = ImmutableSet.copyOf(orgs);
- }
-
- @XmlElement(name = "Org")
- private Set<Reference> orgs = Sets.newLinkedHashSet();
-
- @Override
- protected Set<Reference> delegate() {
- return Collections.unmodifiableSet(orgs);
- }
-
-}