Bug fix: JSON export of genmodels if data type placeholder P is present

Author: socadk

dsl-core/io.mdsl.tests/test-data/exporter/simple-generation-input-2.mdsl

@@ -1,6 +1,13 @@
 API description TestAPI
 
+data type TestType0 P
+data type TestType1 "nameOnly"
+data type TestType2 D
+data type TestType3 D<string> 
+data type TestType4 "aNumber": D<int> 
+
 data type VersionedType version "0.1"  "uri": Link<string> default is "http://localhost:8080"
+
 event type workTrigger
 command type work
 

dsl-core/io.mdsl.tests/test-data/exporter/simple-generation-input-2_GeneratorModel.json

@@ -1,6 +1,54 @@
 {
   "apiName" : "TestAPI",
   "dataTypes" : [ {
+    "name" : "TestType0",
+    "fields" : [ ],
+    "version" : "N/A",
+    "defaultValue" : null,
+    "atomic" : false
+  }, {
+    "name" : "TestType1",
+    "fields" : [ ],
+    "version" : "N/A",
+    "defaultValue" : null,
+    "atomic" : false
+  }, {
+    "name" : "TestType2",
+    "fields" : [ {
+      "name" : "anonymous1",
+      "type" : "VOID",
+      "list" : false,
+      "nullable" : false,
+      "typeAsString" : "void"
+    } ],
+    "version" : "N/A",
+    "defaultValue" : null,
+    "atomic" : true
+  }, {
+    "name" : "TestType3",
+    "fields" : [ {
+      "name" : "anonymous2",
+      "type" : "STRING",
+      "list" : false,
+      "nullable" : false,
+      "typeAsString" : "string"
+    } ],
+    "version" : "N/A",
+    "defaultValue" : null,
+    "atomic" : true
+  }, {
+    "name" : "TestType4",
+    "fields" : [ {
+      "name" : "aNumber",
+      "type" : "INTEGER",
+      "list" : false,
+      "nullable" : false,
+      "typeAsString" : "int"
+    } ],
+    "version" : "N/A",
+    "defaultValue" : null,
+    "atomic" : true
+  }, {
     "name" : "VersionedType",
     "fields" : [ {
       "name" : "uri",

dsl-core/io.mdsl.tests/test-data/exporter/simple-generation-input-2_GeneratorModel.yaml

@@ -1,5 +1,45 @@
 apiName: "TestAPI"
 dataTypes:
+- name: "TestType0"
+  fields: []
+  version: "N/A"
+  defaultValue: null
+  atomic: false
+- name: "TestType1"
+  fields: []
+  version: "N/A"
+  defaultValue: null
+  atomic: false
+- name: "TestType2"
+  fields:
+  - name: "anonymous1"
+    type: "VOID"
+    list: false
+    nullable: false
+    typeAsString: "void"
+  version: "N/A"
+  defaultValue: null
+  atomic: true
+- name: "TestType3"
+  fields:
+  - name: "anonymous2"
+    type: "STRING"
+    list: false
+    nullable: false
+    typeAsString: "string"
+  version: "N/A"
+  defaultValue: null
+  atomic: true
+- name: "TestType4"
+  fields:
+  - name: "aNumber"
+    type: "INTEGER"
+    list: false
+    nullable: false
+    typeAsString: "int"
+  version: "N/A"
+  defaultValue: null
+  atomic: true
 - name: "VersionedType"
   fields:
   - name: "uri"

dsl-core/io.mdsl/src/io/mdsl/generator/model/DataType.java

@@ -90,9 +90,11 @@ public boolean isAtomic() {
 		if(fields.size()>1) {
 			return false;
 		}
-		
-		if(fields.get(0).getType() instanceof BasicType) {
-			return true;
+		// bug fix in v546:
+		else if (fields.size()==1) {
+			if(fields.get(0).getType() instanceof BasicType) {
+				return true;
+			}
 		}
 
 		return false;