Skip to content

C
CONF
Commit 9a82a58c authored by Spiros Koulouzis's avatar Spiros Koulouzis
Browse files
Options

changed types

parent 8e781faa
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1126 additions and 1175 deletions
drip-commons/src/main/java/nl/uva/sne/drip/model/Credentials.java
View file @ 9a82a58c
......@@ -4,7 +4,6 @@ import java.util.Objects;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.HashMap;
......@@ -19,9 +18,9 @@ import org.springframework.data.annotation.Id;
* Credentials
*/
@Validated
@JsonInclude(JsonInclude.Include.NON_NULL)
public class Credentials {
@javax.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-11-01T13:58:45.661Z")
public class Credentials {
/**
* @return the id
*/
......@@ -39,204 +38,201 @@ public class Credentials {
@Id
@JsonIgnore
private String id;
@JsonProperty("protocol")
private String protocol = null;
@JsonProperty("protocol")
private String protocol = null;
@JsonProperty("token_type")
private String tokenType = null;
@JsonProperty("token_type")
private String tokenType = null;
@JsonProperty("token")
private String token = null;
@JsonProperty("token")
private String token = null;
@JsonProperty("keys")
@Valid
private Map<String, String> keys = null;
@JsonProperty("keys")
@Valid
private Map<String, String> keys = null;
@JsonProperty("user")
private String user = null;
@JsonProperty("user")
private String user = null;
@JsonProperty("cloud_provider_name")
private String cloudProviderName = null;
@JsonProperty("cloud_provider_name")
private String cloudProviderName = null;
public Credentials protocol(String protocol) {
this.protocol = protocol;
return this;
}
public Credentials protocol(String protocol) {
this.protocol = protocol;
return this;
}
/**
* Get protocol
*
* @return protocol
*
*/
@ApiModelProperty(value = "")
/**
* Get protocol
* @return protocol
**/
@ApiModelProperty(value = "")
public String getProtocol() {
return protocol;
}
public void setProtocol(String protocol) {
this.protocol = protocol;
}
public String getProtocol() {
return protocol;
}
public Credentials tokenType(String tokenType) {
this.tokenType = tokenType;
return this;
}
public void setProtocol(String protocol) {
this.protocol = protocol;
}
/**
* Get tokenType
*
* @return tokenType
*
*/
@ApiModelProperty(value = "")
public Credentials tokenType(String tokenType) {
this.tokenType = tokenType;
return this;
}
public String getTokenType() {
return tokenType;
}
/**
* Get tokenType
* @return tokenType
**/
@ApiModelProperty(value = "")
public void setTokenType(String tokenType) {
this.tokenType = tokenType;
}
public Credentials token(String token) {
this.token = token;
return this;
}
public String getTokenType() {
return tokenType;
}
/**
* Get token
*
* @return token
*
*/
@ApiModelProperty(value = "")
public void setTokenType(String tokenType) {
this.tokenType = tokenType;
}
public String getToken() {
return token;
}
public Credentials token(String token) {
this.token = token;
return this;
}
public void setToken(String token) {
this.token = token;
}
public Credentials keys(Map<String, String> keys) {
this.keys = keys;
return this;
}
/**
* Get token
* @return token
**/
@ApiModelProperty(value = "")
public Credentials putKeysItem(String key, String keysItem) {
if (this.keys == null) {
this.keys = new HashMap<String, String>();
}
this.keys.put(key, keysItem);
return this;
}
/**
* Get keys
*
* @return keys
*
*/
@ApiModelProperty(value = "")
public Map<String, String> getKeys() {
return keys;
}
public void setKeys(Map<String, String> keys) {
this.keys = keys;
}
public Credentials user(String user) {
this.user = user;
return this;
}
/**
* Get user
*
* @return user
*
*/
@ApiModelProperty(value = "")
public String getUser() {
return user;
}
public void setUser(String user) {
this.user = user;
}
public Credentials cloudProviderName(String cloudProviderName) {
this.cloudProviderName = cloudProviderName;
return this;
}
/**
* Get cloudProviderName
*
* @return cloudProviderName
*
*/
@ApiModelProperty(value = "")
public String getCloudProviderName() {
return cloudProviderName;
}
public void setCloudProviderName(String cloudProviderName) {
this.cloudProviderName = cloudProviderName;
}
@Override
public boolean equals(java.lang.Object o) {
if (this == o) {
return true;
}
if (o == null || getClass() != o.getClass()) {
return false;
}
Credentials credentials = (Credentials) o;
return Objects.equals(this.protocol, credentials.protocol)
&& Objects.equals(this.tokenType, credentials.tokenType)
&& Objects.equals(this.token, credentials.token)
&& Objects.equals(this.keys, credentials.keys)
&& Objects.equals(this.user, credentials.user)
&& Objects.equals(this.cloudProviderName, credentials.cloudProviderName);
}
@Override
public int hashCode() {
return Objects.hash(protocol, tokenType, token, keys, user, cloudProviderName);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("class Credentials {\n");
sb.append(" protocol: ").append(toIndentedString(protocol)).append("\n");
sb.append(" tokenType: ").append(toIndentedString(tokenType)).append("\n");
sb.append(" token: ").append(toIndentedString(token)).append("\n");
sb.append(" keys: ").append(toIndentedString(keys)).append("\n");
sb.append(" user: ").append(toIndentedString(user)).append("\n");
sb.append(" cloudProviderName: ").append(toIndentedString(cloudProviderName)).append("\n");
sb.append("}");
return sb.toString();
}
/**
* Convert the given object to string with each line indented by 4 spaces
* (except the first line).
*/
private String toIndentedString(java.lang.Object o) {
if (o == null) {
return "null";
}
return o.toString().replace("\n", "\n ");
}
public String getToken() {
return token;
}
public void setToken(String token) {
this.token = token;
}
public Credentials keys(Map<String, String> keys) {
this.keys = keys;
return this;
}
public Credentials putKeysItem(String key, String keysItem) {
if (this.keys == null) {
this.keys = new HashMap<String, String>();
}
this.keys.put(key, keysItem);
return this;
}
/**
* Get keys
* @return keys
**/
@ApiModelProperty(value = "")
public Map<String, String> getKeys() {
return keys;
}
public void setKeys(Map<String, String> keys) {
this.keys = keys;
}
public Credentials user(String user) {
this.user = user;
return this;
}
/**
* Get user
* @return user
**/
@ApiModelProperty(value = "")
public String getUser() {
return user;
}
public void setUser(String user) {
this.user = user;
}
public Credentials cloudProviderName(String cloudProviderName) {
this.cloudProviderName = cloudProviderName;
return this;
}
/**
* Get cloudProviderName
* @return cloudProviderName
**/
@ApiModelProperty(value = "")
public String getCloudProviderName() {
return cloudProviderName;
}
public void setCloudProviderName(String cloudProviderName) {
this.cloudProviderName = cloudProviderName;
}
@Override
public boolean equals(java.lang.Object o) {
if (this == o) {
return true;
}
if (o == null || getClass() != o.getClass()) {
return false;
}
Credentials credentials = (Credentials) o;
return Objects.equals(this.protocol, credentials.protocol) &&
Objects.equals(this.tokenType, credentials.tokenType) &&
Objects.equals(this.token, credentials.token) &&
Objects.equals(this.keys, credentials.keys) &&
Objects.equals(this.user, credentials.user) &&
Objects.equals(this.cloudProviderName, credentials.cloudProviderName);
}
@Override
public int hashCode() {
return Objects.hash(protocol, tokenType, token, keys, user, cloudProviderName);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("class Credentials {\n");
sb.append(" protocol: ").append(toIndentedString(protocol)).append("\n");
sb.append(" tokenType: ").append(toIndentedString(tokenType)).append("\n");
sb.append(" token: ").append(toIndentedString(token)).append("\n");
sb.append(" keys: ").append(toIndentedString(keys)).append("\n");
sb.append(" user: ").append(toIndentedString(user)).append("\n");
sb.append(" cloudProviderName: ").append(toIndentedString(cloudProviderName)).append("\n");
sb.append("}");
return sb.toString();
}
/**
* Convert the given object to string with each line indented by 4 spaces
* (except the first line).
*/
private String toIndentedString(java.lang.Object o) {
if (o == null) {
return "null";
}
return o.toString().replace("\n", "\n ");
}
}
drip-commons/src/main/java/nl/uva/sne/drip/model/TopologyTemplate.java
View file @ 9a82a58c
......@@ -4,7 +4,6 @@ import java.util.Objects;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.ArrayList;
......@@ -20,7 +19,8 @@ import org.springframework.data.annotation.Id;
* TopologyTemplate
*/
@Validated
@JsonInclude(JsonInclude.Include.NON_NULL)
@javax.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-11-01T13:58:45.661Z")
public class TopologyTemplate {
/**
* @return the id
......@@ -39,12 +39,12 @@ public class TopologyTemplate {
@Id
@JsonIgnore
private String id;
@JsonProperty("description")
private String description = null;
@JsonProperty("inputs")
@Valid
private List<Map<String, Object>> inputs = null;
private String inputs = null;
@JsonProperty("node_templates")
@Valid
......@@ -55,20 +55,17 @@ public class TopologyTemplate {
private Map<String, Object> relationshipTemplates = null;
@JsonProperty("outputs")
@Valid
private List<Map<String, Object>> outputs = null;
private String outputs = null;
@JsonProperty("groups")
@Valid
private Map<String, Object> groups = null;
private String groups = null;
@JsonProperty("substitution_mappings")
@Valid
private Map<String, Object> substitutionMappings = null;
private String substitutionMappings = null;
@JsonProperty("policies")
@Valid
private List<Map<String, Object>> policies = null;
private List<String> policies = null;
public TopologyTemplate description(String description) {
this.description = description;
......@@ -90,32 +87,23 @@ public class TopologyTemplate {
this.description = description;
}
public TopologyTemplate inputs(List<Map<String, Object>> inputs) {
public TopologyTemplate inputs(String inputs) {
this.inputs = inputs;
return this;
}
public TopologyTemplate addInputsItem(Map<String, Object> inputsItem) {
if (this.inputs == null) {
this.inputs = new ArrayList<Map<String, Object>>();
}
this.inputs.add(inputsItem);
return this;
}
/**
* Get inputs
* @return inputs
**/
@ApiModelProperty(value = "")
@Valid
public List<Map<String, Object>> getInputs() {
public String getInputs() {
return inputs;
}
public void setInputs(List<Map<String, Object>> inputs) {
public void setInputs(String inputs) {
this.inputs = inputs;
}
......@@ -176,48 +164,31 @@ public class TopologyTemplate {
this.relationshipTemplates = relationshipTemplates;
}
public TopologyTemplate outputs(List<Map<String, Object>> outputs) {
public TopologyTemplate outputs(String outputs) {
this.outputs = outputs;
return this;
}
public TopologyTemplate addOutputsItem(Map<String, Object> outputsItem) {
if (this.outputs == null) {
this.outputs = new ArrayList<Map<String, Object>>();
}
this.outputs.add(outputsItem);
return this;
}
/**
* Get outputs
* @return outputs
**/
@ApiModelProperty(value = "")
@Valid
public List<Map<String, Object>> getOutputs() {
public String getOutputs() {
return outputs;
}
public void setOutputs(List<Map<String, Object>> outputs) {
public void setOutputs(String outputs) {
this.outputs = outputs;
}
public TopologyTemplate groups(Map<String, Object> groups) {
public TopologyTemplate groups(String groups) {
this.groups = groups;
return this;
}
public TopologyTemplate putGroupsItem(String key, Object groupsItem) {
if (this.groups == null) {
this.groups = new HashMap<String, Object>();
}
this.groups.put(key, groupsItem);
return this;
}
/**
* Get groups
* @return groups
......@@ -225,27 +196,19 @@ public class TopologyTemplate {
@ApiModelProperty(value = "")
public Map<String, Object> getGroups() {
public String getGroups() {
return groups;
}
public void setGroups(Map<String, Object> groups) {
public void setGroups(String groups) {
this.groups = groups;
}
public TopologyTemplate substitutionMappings(Map<String, Object> substitutionMappings) {
public TopologyTemplate substitutionMappings(String substitutionMappings) {
this.substitutionMappings = substitutionMappings;
return this;
}
public TopologyTemplate putSubstitutionMappingsItem(String key, Object substitutionMappingsItem) {
if (this.substitutionMappings == null) {
this.substitutionMappings = new HashMap<String, Object>();
}
this.substitutionMappings.put(key, substitutionMappingsItem);
return this;
}
/**
* Get substitutionMappings
* @return substitutionMappings
......@@ -253,22 +216,22 @@ public class TopologyTemplate {
@ApiModelProperty(value = "")
public Map<String, Object> getSubstitutionMappings() {
public String getSubstitutionMappings() {
return substitutionMappings;
}
public void setSubstitutionMappings(Map<String, Object> substitutionMappings) {
public void setSubstitutionMappings(String substitutionMappings) {
this.substitutionMappings = substitutionMappings;
}
public TopologyTemplate policies(List<Map<String, Object>> policies) {
public TopologyTemplate policies(List<String> policies) {
this.policies = policies;
return this;
}
public TopologyTemplate addPoliciesItem(Map<String, Object> policiesItem) {
public TopologyTemplate addPoliciesItem(String policiesItem) {
if (this.policies == null) {
this.policies = new ArrayList<Map<String, Object>>();
this.policies = new ArrayList<String>();
}
this.policies.add(policiesItem);
return this;
......@@ -280,13 +243,12 @@ public class TopologyTemplate {
**/
@ApiModelProperty(value = "")
@Valid
public List<Map<String, Object>> getPolicies() {
public List<String> getPolicies() {
return policies;
}
public void setPolicies(List<Map<String, Object>> policies) {
public void setPolicies(List<String> policies) {
this.policies = policies;
}
......
drip-commons/src/main/java/nl/uva/sne/drip/model/User.java
View file @ 9a82a58c
package nl.uva.sne.drip.model;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
import java.util.Objects;
import org.springframework.validation.annotation.Validated;
import javax.validation.Valid;
import javax.validation.constraints.*;
import org.springframework.data.annotation.Id;
/**
* User
*/
@Validated
@JsonInclude(JsonInclude.Include.NON_NULL)
public class User {
@javax.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-11-01T13:58:45.661Z")
/**
* @return the id
*/
public String getId() {
return id;
}
/**
* @param id the id to set
*/
public void setId(String id) {
this.id = id;
}
@Id
@JsonIgnore
private String id;
@Override
public boolean equals(java.lang.Object o) {
if (this == o) {
return true;
}
if (o == null || getClass() != o.getClass()) {
return false;
}
return true;
}
public class User {
@Override
public int hashCode() {
return Objects.hash();
@Override
public boolean equals(java.lang.Object o) {
if (this == o) {
return true;
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("class User {\n");
sb.append("}");
return sb.toString();
if (o == null || getClass() != o.getClass()) {
return false;
}
/**
* Convert the given object to string with each line indented by 4 spaces
* (except the first line).
*/
private String toIndentedString(java.lang.Object o) {
if (o == null) {
return "null";
}
return o.toString().replace("\n", "\n ");
return true;
}
@Override
public int hashCode() {
return Objects.hash();
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("class User {\n");
sb.append("}");
return sb.toString();
}
/**
* Convert the given object to string with each line indented by 4 spaces
* (except the first line).
*/
private String toIndentedString(java.lang.Object o) {
if (o == null) {
return "null";
}
return o.toString().replace("\n", "\n ");
}
}
openAPI/TOSCA/NodeTemplate.yml
View file @ 9a82a58c
......@@ -6,21 +6,21 @@
properties:
type: object
additionalProperties:
type: object
type: string
requirements:
type: "array"
items:
type: object
additionalProperties:
type: object
type: object
additionalProperties:
type: string
interfaces:
type: object
additionalProperties:
type: object
type: string
capabilities:
type: object
additionalProperties:
type: object
type: string
type:
type: "string"
description:
......@@ -32,11 +32,11 @@
attributes:
type: object
additionalProperties:
type: object
type: string
artifacts:
type: object
additionalProperties:
type: object
type: string
......
openAPI/TOSCA/TopologyTemplate.yml
View file @ 9a82a58c
......@@ -4,9 +4,9 @@
description:
type: "string"
inputs:
type: string
type: object
additionalProperties:
type: object
type: string
node_templates:
type: object
additionalProperties:
......@@ -14,22 +14,22 @@
relationship_templates:
type: object
additionalProperties:
type: object
type: string
outputs:
type: string
type: object
additionalProperties:
type: object
type: string
groups:
type: string
type: object
additionalProperties:
type: object
type: string
substitution_mappings:
type: string
type: object
additionalProperties:
type: object
type: string
policies:
type: "array"
items:
type: string
additionalProperties:
type: object
type: object
additionalProperties:
type: string
openAPI/TOSCA/ToscaTemplate.yml
View file @ 9a82a58c
......@@ -20,39 +20,39 @@
items:
type: object
additionalProperties:
type: object
type: string
dsl_definitions:
type: object
additionalProperties:
type: object
type: string
node_types:
type: object
additionalProperties:
type: object
type: string
relationship_types:
type: object
additionalProperties:
type: object
type: string
relationship_templates:
type: object
additionalProperties:
type: object
type: string
capability_types:
type: object
additionalProperties:
type: object
type: string
artifact_types:
type: object
additionalProperties:
type: object
type: string
data_types:
type: object
additionalProperties:
type: object
type: string
interface_types:
type: object
additionalProperties:
type: object
type: string
policy_types:
type: object
additionalProperties:
......@@ -60,9 +60,9 @@
group_types:
type: object
additionalProperties:
type: object
type: string
repositories:
type: object
additionalProperties:
type: object
type: string
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment