Fix TParameter xml serialization (winery#606)

Signed-off-by: Marvin Bechtold <[email protected]>
OpenTOSCA · Jul 29, 2021 · 2d5e36f · 2d5e36f
1 parent 51a2437
commit 2d5e36f
Show file tree

Hide file tree

Showing 5 changed files with 96 additions and 0 deletions.
diff --git a/...winery.model.tosca.canonical/src/main/java/org/eclipse/winery/model/tosca/TParameter.java b/...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/.../java/org/eclipse/winery/repository/rest/resources/interfaces/InterfacesResourceTest.java b/.../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/...se.winery.repository.rest/src/test/resources/entitytypes/interfaces/add_input_params.json b/...se.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"
+    }
+]
diff --git a/...ry.repository.rest/src/test/resources/entitytypes/interfaces/add_input_params_result.json b/...ry.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"
+    }
+]
diff --git a/...ery.repository.rest/src/test/resources/entitytypes/interfaces/add_input_params_result.xml b/...ery.repository.rest/src/test/resources/entitytypes/interfaces/add_input_params_result.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<Definitions xmlns="http://docs.oasis-open.org/tosca/ns/2011/12" xmlns:winery="http://www.opentosca.org/winery/extensions/tosca/2013/02/12" xmlns:selfservice="http://www.eclipse.org/winery/model/selfservice" xmlns:testwineryopentoscaorg="http://test.winery.opentosca.org" targetNamespace="http://opentosca.org/nodetypes" id="winery-defs-for_nodetypes1-MySQL-DBMS">
+    <NodeType name="MySQL-DBMS" abstract="no" final="no" targetNamespace="http://opentosca.org/nodetypes">
+        <Interfaces>
+            <Interface name="http://www.example.com/interfaces/lifecycle">
+                <Operation name="configure">
+                    <InputParameters>
+                        <InputParameter name="Param1" type="xsd:string" required="yes"/>
+                        <InputParameter name="Param2" type="xsd:string" required="yes"/>
+                        <InputParameter name="Param3" type="xsd:string" required="no"/>
+                    </InputParameters>
+                </Operation>
+            </Interface>
+        </Interfaces>
+    </NodeType>
+</Definitions>