From 2d5e36fad2712f84850739c0378913c716c42216 Mon Sep 17 00:00:00 2001 From: Marvin Bechtold Date: Thu, 29 Jul 2021 17:19:26 +0200 Subject: [PATCH] Fix TParameter xml serialization (#606) Signed-off-by: Marvin Bechtold --- .../winery/model/tosca/TParameter.java | 3 ++ .../interfaces/InterfacesResourceTest.java | 16 ++++++++++ .../interfaces/add_input_params.json | 29 +++++++++++++++++ .../interfaces/add_input_params_result.json | 32 +++++++++++++++++++ .../interfaces/add_input_params_result.xml | 16 ++++++++++ 5 files changed, 96 insertions(+) create mode 100644 org.eclipse.winery.repository.rest/src/test/resources/entitytypes/interfaces/add_input_params.json create mode 100644 org.eclipse.winery.repository.rest/src/test/resources/entitytypes/interfaces/add_input_params_result.json create mode 100644 org.eclipse.winery.repository.rest/src/test/resources/entitytypes/interfaces/add_input_params_result.xml diff --git a/org.eclipse.winery.model/org.eclipse.winery.model.tosca.canonical/src/main/java/org/eclipse/winery/model/tosca/TParameter.java b/org.eclipse.winery.model/org.eclipse.winery.model.tosca.canonical/src/main/java/org/eclipse/winery/model/tosca/TParameter.java index 6712da8296..6381eb6d06 100644 --- a/org.eclipse.winery.model/org.eclipse.winery.model.tosca.canonical/src/main/java/org/eclipse/winery/model/tosca/TParameter.java +++ b/org.eclipse.winery.model/org.eclipse.winery.model.tosca.canonical/src/main/java/org/eclipse/winery/model/tosca/TParameter.java @@ -21,7 +21,9 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import org.eclipse.winery.model.jaxbsupport.map.BooleanToYesNo; import org.eclipse.winery.model.jsonsupport.YesNo; import org.eclipse.winery.model.tosca.visitor.Visitor; @@ -42,6 +44,7 @@ public class TParameter implements Serializable { protected String type; @XmlAttribute(name = "required") + @XmlJavaTypeAdapter(type = boolean.class, value = BooleanToYesNo.class) @JsonSerialize(using = YesNo.Serializer.class) @JsonDeserialize(using = YesNo.Deserializer.class) protected boolean required; diff --git a/org.eclipse.winery.repository.rest/src/test/java/org/eclipse/winery/repository/rest/resources/interfaces/InterfacesResourceTest.java b/org.eclipse.winery.repository.rest/src/test/java/org/eclipse/winery/repository/rest/resources/interfaces/InterfacesResourceTest.java index a819d03234..a7b942512f 100644 --- a/org.eclipse.winery.repository.rest/src/test/java/org/eclipse/winery/repository/rest/resources/interfaces/InterfacesResourceTest.java +++ b/org.eclipse.winery.repository.rest/src/test/java/org/eclipse/winery/repository/rest/resources/interfaces/InterfacesResourceTest.java @@ -29,5 +29,21 @@ public void createConfigureInterface() throws Exception { "entitytypes/interfaces/create_configure_interface_result.json"); this.assertGet("relationshiptypes/http%253A%252F%252Fplain.winery.opentosca.org%252Frelationshiptypes/RelationshipTypeWithoutProperties", "entitytypes/interfaces/create_configure_interface_result.xml"); + this.assertGet("relationshiptypes/http%253A%252F%252Fplain.winery.opentosca.org%252Frelationshiptypes/RelationshipTypeWithoutProperties/xml", + "entitytypes/interfaces/create_configure_interface_result.xml"); + } + + @Test + public void addInputParameters() throws Exception { + this.setRevisionTo("origin/plain"); + this.assertNoContentPost("nodetypes/http%253A%252F%252Fopentosca.org%252Fnodetypes/MySQL-DBMS/interfaces/", + "entitytypes/interfaces/add_input_params.json"); + this.assertGet("nodetypes/http%253A%252F%252Fopentosca.org%252Fnodetypes/MySQL-DBMS/interfaces/", + "entitytypes/interfaces/add_input_params_result.json"); + this.assertGet("nodetypes/http%253A%252F%252Fopentosca.org%252Fnodetypes/MySQL-DBMS", + "entitytypes/interfaces/add_input_params_result.xml"); + this.assertGet("nodetypes/http%253A%252F%252Fopentosca.org%252Fnodetypes/MySQL-DBMS/xml", + "entitytypes/interfaces/add_input_params_result.xml"); } + } diff --git a/org.eclipse.winery.repository.rest/src/test/resources/entitytypes/interfaces/add_input_params.json b/org.eclipse.winery.repository.rest/src/test/resources/entitytypes/interfaces/add_input_params.json new file mode 100644 index 0000000000..c85e7b3bd2 --- /dev/null +++ b/org.eclipse.winery.repository.rest/src/test/resources/entitytypes/interfaces/add_input_params.json @@ -0,0 +1,29 @@ +[ + { + "operation": [ + { + "inputParameters": { + "inputParameter": [ + { + "name": "Param1", + "type": "xsd:string", + "required": "YES" + }, + { + "name": "Param2", + "type": "xsd:string", + "required": "YES" + }, + { + "name": "Param3", + "type": "xsd:string", + "required": "NO" + } + ] + }, + "name": "configure" + } + ], + "name": "http://www.example.com/interfaces/lifecycle" + } +] \ No newline at end of file diff --git a/org.eclipse.winery.repository.rest/src/test/resources/entitytypes/interfaces/add_input_params_result.json b/org.eclipse.winery.repository.rest/src/test/resources/entitytypes/interfaces/add_input_params_result.json new file mode 100644 index 0000000000..a5891505d2 --- /dev/null +++ b/org.eclipse.winery.repository.rest/src/test/resources/entitytypes/interfaces/add_input_params_result.json @@ -0,0 +1,32 @@ +[ + { + "operation": [ + { + "documentation": [], + "any": [], + "otherAttributes": {}, + "inputParameters": { + "inputParameter": [ + { + "name": "Param1", + "type": "xsd:string", + "required": "YES" + }, + { + "name": "Param2", + "type": "xsd:string", + "required": "YES" + }, + { + "name": "Param3", + "type": "xsd:string", + "required": "NO" + } + ] + }, + "name": "configure" + } + ], + "name": "http://www.example.com/interfaces/lifecycle" + } +] \ No newline at end of file diff --git a/org.eclipse.winery.repository.rest/src/test/resources/entitytypes/interfaces/add_input_params_result.xml b/org.eclipse.winery.repository.rest/src/test/resources/entitytypes/interfaces/add_input_params_result.xml new file mode 100644 index 0000000000..a179209cd5 --- /dev/null +++ b/org.eclipse.winery.repository.rest/src/test/resources/entitytypes/interfaces/add_input_params_result.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + +