Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
CONF
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
UvA
CONF
Commits
9a82a58c
Commit
9a82a58c
authored
Nov 01, 2019
by
Spiros Koulouzis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
changed types
parent
8e781faa
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
1126 additions
and
1175 deletions
+1126
-1175
Credentials.java
...mons/src/main/java/nl/uva/sne/drip/model/Credentials.java
+180
-184
NodeTemplate.java
...ons/src/main/java/nl/uva/sne/drip/model/NodeTemplate.java
+305
-314
TopologyTemplate.java
...src/main/java/nl/uva/sne/drip/model/TopologyTemplate.java
+25
-63
ToscaTemplate.java
...ns/src/main/java/nl/uva/sne/drip/model/ToscaTemplate.java
+550
-529
User.java
drip-commons/src/main/java/nl/uva/sne/drip/model/User.java
+35
-54
NodeTemplate.yml
openAPI/TOSCA/NodeTemplate.yml
+8
-8
TopologyTemplate.yml
openAPI/TOSCA/TopologyTemplate.yml
+12
-12
ToscaTemplate.yml
openAPI/TOSCA/ToscaTemplate.yml
+11
-11
No files found.
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,6 +38,7 @@ public class Credentials {
@Id
@JsonIgnore
private
String
id
;
@JsonProperty
(
"protocol"
)
private
String
protocol
=
null
;
...
...
@@ -65,12 +65,11 @@ public class Credentials {
/**
* Get protocol
*
* @return protocol
*
*/
**/
@ApiModelProperty
(
value
=
""
)
public
String
getProtocol
()
{
return
protocol
;
}
...
...
@@ -86,12 +85,11 @@ public class Credentials {
/**
* Get tokenType
*
* @return tokenType
*
*/
**/
@ApiModelProperty
(
value
=
""
)
public
String
getTokenType
()
{
return
tokenType
;
}
...
...
@@ -107,12 +105,11 @@ public class Credentials {
/**
* Get token
*
* @return token
*
*/
**/
@ApiModelProperty
(
value
=
""
)
public
String
getToken
()
{
return
token
;
}
...
...
@@ -136,12 +133,11 @@ public class Credentials {
/**
* Get keys
*
* @return keys
*
*/
**/
@ApiModelProperty
(
value
=
""
)
public
Map
<
String
,
String
>
getKeys
()
{
return
keys
;
}
...
...
@@ -157,12 +153,11 @@ public class Credentials {
/**
* Get user
*
* @return user
*
*/
**/
@ApiModelProperty
(
value
=
""
)
public
String
getUser
()
{
return
user
;
}
...
...
@@ -178,12 +173,11 @@ public class Credentials {
/**
* Get cloudProviderName
*
* @return cloudProviderName
*
*/
**/
@ApiModelProperty
(
value
=
""
)
public
String
getCloudProviderName
()
{
return
cloudProviderName
;
}
...
...
@@ -192,6 +186,7 @@ public class Credentials {
this
.
cloudProviderName
=
cloudProviderName
;
}
@Override
public
boolean
equals
(
java
.
lang
.
Object
o
)
{
if
(
this
==
o
)
{
...
...
@@ -201,12 +196,12 @@ public class Credentials {
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
);
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
...
...
@@ -240,3 +235,4 @@ public class Credentials {
return
o
.
toString
().
replace
(
"\n"
,
"\n "
);
}
}
drip-commons/src/main/java/nl/uva/sne/drip/model/NodeTemplate.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,9 +19,9 @@ import org.springframework.data.annotation.Id;
* NodeTemplate
*/
@Validated
@JsonInclude
(
JsonInclude
.
Include
.
NON_NULL
)
public
class
NodeTemplate
{
@javax
.
annotation
.
Generated
(
value
=
"io.swagger.codegen.languages.SpringCodegen"
,
date
=
"2019-11-01T13:58:45.661Z"
)
public
class
NodeTemplate
{
/**
* @return the id
*/
...
...
@@ -40,6 +39,7 @@ public class NodeTemplate {
@Id
@JsonIgnore
private
String
id
;
@JsonProperty
(
"derived_from"
)
private
String
derivedFrom
=
null
;
...
...
@@ -84,12 +84,11 @@ public class NodeTemplate {
/**
* Get derivedFrom
*
* @return derivedFrom
*
*/
**/
@ApiModelProperty
(
value
=
""
)
public
String
getDerivedFrom
()
{
return
derivedFrom
;
}
...
...
@@ -113,12 +112,11 @@ public class NodeTemplate {
/**
* Get properties
*
* @return properties
*
*/
**/
@ApiModelProperty
(
value
=
""
)
public
Map
<
String
,
Object
>
getProperties
()
{
return
properties
;
}
...
...
@@ -142,10 +140,8 @@ public class NodeTemplate {
/**
* Get requirements
*
* @return requirements
*
*/
**/
@ApiModelProperty
(
value
=
""
)
@Valid
...
...
@@ -173,12 +169,11 @@ public class NodeTemplate {
/**
* Get interfaces
*
* @return interfaces
*
*/
**/
@ApiModelProperty
(
value
=
""
)
public
Map
<
String
,
Object
>
getInterfaces
()
{
return
interfaces
;
}
...
...
@@ -202,12 +197,11 @@ public class NodeTemplate {
/**
* Get capabilities
*
* @return capabilities
*
*/
**/
@ApiModelProperty
(
value
=
""
)
public
Map
<
String
,
Object
>
getCapabilities
()
{
return
capabilities
;
}
...
...
@@ -223,12 +217,11 @@ public class NodeTemplate {
/**
* Get type
*
* @return type
*
*/
**/
@ApiModelProperty
(
value
=
""
)
public
String
getType
()
{
return
type
;
}
...
...
@@ -244,12 +237,11 @@ public class NodeTemplate {
/**
* Get description
*
* @return description
*
*/
**/
@ApiModelProperty
(
value
=
""
)
public
String
getDescription
()
{
return
description
;
}
...
...
@@ -273,12 +265,11 @@ public class NodeTemplate {
/**
* Get directives
*
* @return directives
*
*/
**/
@ApiModelProperty
(
value
=
""
)
public
List
<
String
>
getDirectives
()
{
return
directives
;
}
...
...
@@ -302,12 +293,11 @@ public class NodeTemplate {
/**
* Get attributes
*
* @return attributes
*
*/
**/
@ApiModelProperty
(
value
=
""
)
public
Map
<
String
,
Object
>
getAttributes
()
{
return
attributes
;
}
...
...
@@ -331,12 +321,11 @@ public class NodeTemplate {
/**
* Get artifacts
*
* @return artifacts
*
*/
**/
@ApiModelProperty
(
value
=
""
)
public
Map
<
String
,
Object
>
getArtifacts
()
{
return
artifacts
;
}
...
...
@@ -345,6 +334,7 @@ public class NodeTemplate {
this
.
artifacts
=
artifacts
;
}
@Override
public
boolean
equals
(
java
.
lang
.
Object
o
)
{
if
(
this
==
o
)
{
...
...
@@ -354,16 +344,16 @@ public class NodeTemplate {
return
false
;
}
NodeTemplate
nodeTemplate
=
(
NodeTemplate
)
o
;
return
Objects
.
equals
(
this
.
derivedFrom
,
nodeTemplate
.
derivedFrom
)
&&
Objects
.
equals
(
this
.
properties
,
nodeTemplate
.
properties
)
&&
Objects
.
equals
(
this
.
requirements
,
nodeTemplate
.
requirements
)
&&
Objects
.
equals
(
this
.
interfaces
,
nodeTemplate
.
interfaces
)
&&
Objects
.
equals
(
this
.
capabilities
,
nodeTemplate
.
capabilities
)
&&
Objects
.
equals
(
this
.
type
,
nodeTemplate
.
type
)
&&
Objects
.
equals
(
this
.
description
,
nodeTemplate
.
description
)
&&
Objects
.
equals
(
this
.
directives
,
nodeTemplate
.
directives
)
&&
Objects
.
equals
(
this
.
attributes
,
nodeTemplate
.
attributes
)
&&
Objects
.
equals
(
this
.
artifacts
,
nodeTemplate
.
artifacts
);
return
Objects
.
equals
(
this
.
derivedFrom
,
nodeTemplate
.
derivedFrom
)
&&
Objects
.
equals
(
this
.
properties
,
nodeTemplate
.
properties
)
&&
Objects
.
equals
(
this
.
requirements
,
nodeTemplate
.
requirements
)
&&
Objects
.
equals
(
this
.
interfaces
,
nodeTemplate
.
interfaces
)
&&
Objects
.
equals
(
this
.
capabilities
,
nodeTemplate
.
capabilities
)
&&
Objects
.
equals
(
this
.
type
,
nodeTemplate
.
type
)
&&
Objects
.
equals
(
this
.
description
,
nodeTemplate
.
description
)
&&
Objects
.
equals
(
this
.
directives
,
nodeTemplate
.
directives
)
&&
Objects
.
equals
(
this
.
attributes
,
nodeTemplate
.
attributes
)
&&
Objects
.
equals
(
this
.
artifacts
,
nodeTemplate
.
artifacts
);
}
@Override
...
...
@@ -401,3 +391,4 @@ public class NodeTemplate {
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/ToscaTemplate.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,8 +19,10 @@ import org.springframework.data.annotation.Id;
* ToscaTemplate
*/
@Validated
@JsonInclude
(
JsonInclude
.
Include
.
NON_NULL
)
@javax
.
annotation
.
Generated
(
value
=
"io.swagger.codegen.languages.SpringCodegen"
,
date
=
"2019-11-01T13:58:45.661Z"
)
public
class
ToscaTemplate
{
/**
* @return the id
*/
...
...
@@ -39,6 +40,7 @@ public class ToscaTemplate {
@Id
@JsonIgnore
private
String
id
;
@JsonProperty
(
"tosca_definitions_version"
)
private
String
toscaDefinitionsVersion
=
null
;
...
...
@@ -115,11 +117,12 @@ public class ToscaTemplate {
/**
* Get toscaDefinitionsVersion
*
* @return toscaDefinitionsVersion
**/
*
*/
@ApiModelProperty
(
value
=
""
)
public
String
getToscaDefinitionsVersion
()
{
return
toscaDefinitionsVersion
;
}
...
...
@@ -135,11 +138,12 @@ public class ToscaTemplate {
/**
* Get toscaDefaultNamespace
*
* @return toscaDefaultNamespace
**/
*
*/
@ApiModelProperty
(
value
=
""
)
public
String
getToscaDefaultNamespace
()
{
return
toscaDefaultNamespace
;
}
...
...
@@ -155,11 +159,12 @@ public class ToscaTemplate {
/**
* Get templateName
*
* @return templateName
**/
*
*/
@ApiModelProperty
(
value
=
""
)
public
String
getTemplateName
()
{
return
templateName
;
}
...
...
@@ -175,8 +180,10 @@ public class ToscaTemplate {
/**
* Get topologyTemplate
*
* @return topologyTemplate
**/
*
*/
@ApiModelProperty
(
value
=
""
)
@Valid
...
...
@@ -196,11 +203,12 @@ public class ToscaTemplate {
/**
* Get templateAuthor
*
* @return templateAuthor
**/
*
*/
@ApiModelProperty
(
value
=
""
)
public
String
getTemplateAuthor
()
{
return
templateAuthor
;
}
...
...
@@ -216,11 +224,12 @@ public class ToscaTemplate {
/**
* Get templateVersion
*
* @return templateVersion
**/
*
*/
@ApiModelProperty
(
value
=
""
)
public
String
getTemplateVersion
()
{
return
templateVersion
;
}
...
...
@@ -236,11 +245,12 @@ public class ToscaTemplate {
/**
* Get description
*
* @return description
**/
*
*/
@ApiModelProperty
(
value
=
""
)
public
String
getDescription
()
{
return
description
;
}
...
...
@@ -264,8 +274,10 @@ public class ToscaTemplate {
/**
* Get imports
*
* @return imports
**/
*
*/
@ApiModelProperty
(
value
=
""
)
@Valid
...
...
@@ -293,11 +305,12 @@ public class ToscaTemplate {
/**
* Get dslDefinitions
*
* @return dslDefinitions
**/
*
*/
@ApiModelProperty
(
value
=
""
)
public
Map
<
String
,
Object
>
getDslDefinitions
()
{
return
dslDefinitions
;
}
...
...
@@ -321,11 +334,12 @@ public class ToscaTemplate {
/**
* Get nodeTypes
*
* @return nodeTypes
**/
*
*/
@ApiModelProperty
(
value
=
""
)
public
Map
<
String
,
Object
>
getNodeTypes
()
{
return
nodeTypes
;
}
...
...
@@ -349,11 +363,12 @@ public class ToscaTemplate {
/**
* Get relationshipTypes
*
* @return relationshipTypes
**/
*
*/
@ApiModelProperty
(
value
=
""
)
public
Map
<
String
,
Object
>
getRelationshipTypes
()
{
return
relationshipTypes
;
}
...
...
@@ -377,11 +392,12 @@ public class ToscaTemplate {
/**
* Get relationshipTemplates
*
* @return relationshipTemplates
**/
*
*/
@ApiModelProperty
(
value
=
""
)
public
Map
<
String
,
Object
>
getRelationshipTemplates
()
{
return
relationshipTemplates
;
}
...
...
@@ -405,11 +421,12 @@ public class ToscaTemplate {
/**
* Get capabilityTypes
*
* @return capabilityTypes
**/
*
*/
@ApiModelProperty
(
value
=
""
)
public
Map
<
String
,
Object
>
getCapabilityTypes
()
{
return
capabilityTypes
;
}
...
...
@@ -433,11 +450,12 @@ public class ToscaTemplate {
/**
* Get artifactTypes
*
* @return artifactTypes
**/
*
*/
@ApiModelProperty
(
value
=
""
)
public
Map
<
String
,
Object
>
getArtifactTypes
()
{
return
artifactTypes
;
}
...
...
@@ -461,11 +479,12 @@ public class ToscaTemplate {
/**
* Get dataTypes
*
* @return dataTypes
**/
*
*/
@ApiModelProperty
(
value
=
""
)
public
Map
<
String
,
Object
>
getDataTypes
()
{
return
dataTypes
;
}
...
...
@@ -489,11 +508,12 @@ public class ToscaTemplate {
/**
* Get interfaceTypes
*
* @return interfaceTypes
**/
*
*/
@ApiModelProperty
(
value
=
""
)
public
Map
<
String
,
Object
>
getInterfaceTypes
()
{
return
interfaceTypes
;
}
...
...
@@ -517,11 +537,12 @@ public class ToscaTemplate {
/**
* Get policyTypes
*
* @return policyTypes
**/
*
*/
@ApiModelProperty
(
value
=
""
)
public
Map
<
String
,
String
>
getPolicyTypes
()
{
return
policyTypes
;
}
...
...
@@ -545,11 +566,12 @@ public class ToscaTemplate {
/**
* Get groupTypes
*
* @return groupTypes
**/
*
*/
@ApiModelProperty
(
value
=
""
)
public
Map
<
String
,
Object
>
getGroupTypes
()
{
return
groupTypes
;
}
...
...
@@ -573,11 +595,12 @@ public class ToscaTemplate {
/**
* Get repositories
*
* @return repositories
**/
*
*/
@ApiModelProperty
(
value
=
""
)
public
Map
<
String
,
Object
>
getRepositories
()
{
return
repositories
;
}
...
...
@@ -586,7 +609,6 @@ public class ToscaTemplate {
this
.
repositories
=
repositories
;
}
@Override
public
boolean
equals
(
java
.
lang
.
Object
o
)
{
if
(
this
==
o
)
{
...
...
@@ -596,25 +618,25 @@ public class ToscaTemplate {
return
false
;
}
ToscaTemplate
toscaTemplate
=
(
ToscaTemplate
)
o
;
return
Objects
.
equals
(
this
.
toscaDefinitionsVersion
,
toscaTemplate
.
toscaDefinitionsVersion
)
&&
Objects
.
equals
(
this
.
toscaDefaultNamespace
,
toscaTemplate
.
toscaDefaultNamespace
)
&&
Objects
.
equals
(
this
.
templateName
,
toscaTemplate
.
templateName
)
&&
Objects
.
equals
(
this
.
topologyTemplate
,
toscaTemplate
.
topologyTemplate
)
&&
Objects
.
equals
(
this
.
templateAuthor
,
toscaTemplate
.
templateAuthor
)
&&
Objects
.
equals
(
this
.
templateVersion
,
toscaTemplate
.
templateVersion
)
&&
Objects
.
equals
(
this
.
description
,
toscaTemplate
.
description
)
&&
Objects
.
equals
(
this
.
imports
,
toscaTemplate
.
imports
)
&&
Objects
.
equals
(
this
.
dslDefinitions
,
toscaTemplate
.
dslDefinitions
)
&&
Objects
.
equals
(
this
.
nodeTypes
,
toscaTemplate
.
nodeTypes
)
&&
Objects
.
equals
(
this
.
relationshipTypes
,
toscaTemplate
.
relationshipTypes
)
&&
Objects
.
equals
(
this
.
relationshipTemplates
,
toscaTemplate
.
relationshipTemplates
)
&&
Objects
.
equals
(
this
.
capabilityTypes
,
toscaTemplate
.
capabilityTypes
)
&&
Objects
.
equals
(
this
.
artifactTypes
,
toscaTemplate
.
artifactTypes
)
&&
Objects
.
equals
(
this
.
dataTypes
,
toscaTemplate
.
dataTypes
)
&&
Objects
.
equals
(
this
.
interfaceTypes
,
toscaTemplate
.
interfaceTypes
)
&&
Objects
.
equals
(
this
.
policyTypes
,
toscaTemplate
.
policyTypes
)
&&
Objects
.
equals
(
this
.
groupTypes
,
toscaTemplate
.
groupTypes
)
&&
Objects
.
equals
(
this
.
repositories
,
toscaTemplate
.
repositories
);
return
Objects
.
equals
(
this
.
toscaDefinitionsVersion
,
toscaTemplate
.
toscaDefinitionsVersion
)
&&
Objects
.
equals
(
this
.
toscaDefaultNamespace
,
toscaTemplate
.
toscaDefaultNamespace
)
&&
Objects
.
equals
(
this
.
templateName
,
toscaTemplate
.
templateName
)
&&
Objects
.
equals
(
this
.
topologyTemplate
,
toscaTemplate
.
topologyTemplate
)
&&
Objects
.
equals
(
this
.
templateAuthor
,
toscaTemplate
.
templateAuthor
)
&&
Objects
.
equals
(
this
.
templateVersion
,
toscaTemplate
.
templateVersion
)
&&
Objects
.
equals
(
this
.
description
,
toscaTemplate
.
description
)
&&
Objects
.
equals
(
this
.
imports
,
toscaTemplate
.
imports
)
&&
Objects
.
equals
(
this
.
dslDefinitions
,
toscaTemplate
.
dslDefinitions
)
&&
Objects
.
equals
(
this
.
nodeTypes
,
toscaTemplate
.
nodeTypes
)
&&
Objects
.
equals
(
this
.
relationshipTypes
,
toscaTemplate
.
relationshipTypes
)
&&
Objects
.
equals
(
this
.
relationshipTemplates
,
toscaTemplate
.
relationshipTemplates
)
&&
Objects
.
equals
(
this
.
capabilityTypes
,
toscaTemplate
.
capabilityTypes
)
&&
Objects
.
equals
(
this
.
artifactTypes
,
toscaTemplate
.
artifactTypes
)
&&
Objects
.
equals
(
this
.
dataTypes
,
toscaTemplate
.
dataTypes
)
&&
Objects
.
equals
(
this
.
interfaceTypes
,
toscaTemplate
.
interfaceTypes
)
&&
Objects
.
equals
(
this
.
policyTypes
,
toscaTemplate
.
policyTypes
)
&&
Objects
.
equals
(
this
.
groupTypes
,
toscaTemplate
.
groupTypes
)
&&
Objects
.
equals
(
this
.
repositories
,
toscaTemplate
.
repositories
);
}
@Override
...
...
@@ -661,4 +683,3 @@ public class ToscaTemplate {
return
o
.
toString
().
replace
(
"\n"
,
"\n "
);
}
}
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
{
/**
* @return the id
*/
public
String
getId
()
{
return
id
;
}
@javax
.
annotation
.
Generated
(
value
=
"io.swagger.codegen.languages.SpringCodegen"
,
date
=
"2019-11-01T13:58:45.661Z"
)
/**
* @param id the id to set
*/
public
void
setId
(
String
id
)
{
this
.
id
=
id
;
}
@Id
@JsonIgnore
private
String
id
;
public
class
User
{
@Override
public
boolean
equals
(
java
.
lang
.
Object
o
)
{
...
...
@@ -69,3 +49,4 @@ public class User {
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
:
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
additionalProperties
:
type
:
object
additionalProperties
:
type
:
string
node_templates
:
type
:
object
additionalProperties
:
...
...
@@ -14,22 +14,22 @@
relationship_templates
:
type
:
object
additionalProperties
:
type
:
object
outputs
:
type
:
string
additionalPropertie
s
:
output
s
:
type
:
object
groups
:
type
:
string
additionalProperties
:
type
:
object
substitution_mappings
:
type
:
string
groups
:
type
:
object
additionalProperties
:
type
:
string
substitution_mappings
:
type
:
object
additionalProperties
:
type
:
string
policies
:
type
:
"
array"
items
:
type
:
string
additionalProperties
:
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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment