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