Remove subsystem property (fix #52)

ecarriou · ecarriou · commit 83de8d5f12b8 · 2017-08-11T19:45:44.000+02:00
diff --git a/extensions/mode-admin.json b/extensions/mode-admin.json
@@ -410,7 +410,14 @@
           }
         ]
       },
-      "send": {}
+      "send": {
+        "params": [
+          {
+            "name": "message",
+            "type": "message"
+          }
+        ]
+      }
     }
   },
   "schemas": {
@@ -726,6 +733,5 @@
   "version": "1.0.0",
   "description": "Enable connection to System Designer",
   "_id": "18ed81de331252c",
-  "master": false,
-  "subsystem": false
+  "master": false
 }
diff --git a/extensions/mode-dev.json b/extensions/mode-dev.json
@@ -1,7 +1,6 @@
 {
   "name": "mode-dev",
   "master": false,
-  "subsystem": false,
   "version": "1.0.0",
   "description": "Development mode",
   "schemas": {},
diff --git a/extensions/storage.json b/extensions/storage.json
@@ -1,7 +1,6 @@
 {
   "name": "storage",
   "master": false,
-  "subsystem": false,
   "version": "1.0.0",
   "description": "Storage",
   "schemas": {
diff --git a/src/db.js b/src/db.js
@@ -264,6 +264,9 @@ function impSystem(importedSystem) {
 
   if (importedSystem) {
 
+    // remove deprecated property
+    delete importedSystem.subsystem;
+
     // add types
     for (typeName in importedSystem.types) {
       $metamodel.type(importedSystem.types[typeName]);
@@ -350,7 +353,6 @@ function expSystem() {
     exportedSystem.description = mastersystem.description;
     exportedSystem.version = mastersystem.version;
     exportedSystem.master = true;
-    exportedSystem.subsystem = false;
 
     // dump
     dbDump = dump();
@@ -410,8 +412,6 @@ function expSubsystem(params) {
   system.version = params.version || '0.0.1';
   system.description = params.description || '';
 
-  system.subsystem = true;
-
   // schemas
   system.schemas = {};
   if (params.schemas) {
diff --git a/src/systems/classes/_Behavior.json b/src/systems/classes/_Behavior.json
@@ -58,6 +58,5 @@
   },
   "types": {},
   "components": {},
-  "master": false,
-  "subsystem": false
+  "master": false
 }
diff --git a/src/systems/classes/_Channel.json b/src/systems/classes/_Channel.json
@@ -110,6 +110,5 @@
       }
     }
   },
-  "master": false,
-  "subsystem": false
+  "master": false
 }
diff --git a/src/systems/classes/_ClassInfo.json b/src/systems/classes/_ClassInfo.json
@@ -178,6 +178,5 @@
   },
   "types": {},
   "components": {},
-  "master": false,
-  "subsystem": false
+  "master": false
 }
diff --git a/src/systems/classes/_Component.json b/src/systems/classes/_Component.json
@@ -124,6 +124,5 @@
   },
   "types": {},
   "components": {},
-  "master": false,
-  "subsystem": false
+  "master": false
 }
diff --git a/src/systems/classes/_Database.json b/src/systems/classes/_Database.json
@@ -69,6 +69,5 @@
       }
     }
   },
-  "master": false,
-  "subsystem": false
+  "master": false
 }
diff --git a/src/systems/classes/_Log.json b/src/systems/classes/_Log.json
@@ -65,6 +65,5 @@
   },
   "types": {},
   "components": {},
-  "master": false,
-  "subsystem": false
+  "master": false
 }
diff --git a/src/systems/classes/_Logger.json b/src/systems/classes/_Logger.json
@@ -107,6 +107,5 @@
       }
     }
   },
-  "master": false,
-  "subsystem": false
+  "master": false
 }
diff --git a/src/systems/classes/_Message.json b/src/systems/classes/_Message.json
@@ -44,6 +44,5 @@
   },
   "types": {},
   "components": {},
-  "master": false,
-  "subsystem": false
+  "master": false
 }
diff --git a/src/systems/classes/_Metamodel.json b/src/systems/classes/_Metamodel.json
@@ -96,6 +96,5 @@
       }
     }
   },
-  "master": false,
-  "subsystem": false
+  "master": false
 }
diff --git a/src/systems/classes/_OSGi.json b/src/systems/classes/_OSGi.json
@@ -131,6 +131,5 @@
   },
   "types": {},
   "components": {},
-  "master": false,
-  "subsystem": false
+  "master": false
 }
diff --git a/src/systems/classes/_Runtime.json b/src/systems/classes/_Runtime.json
@@ -77,6 +77,5 @@
       }
     }
   },
-  "master": false,
-  "subsystem": false
+  "master": false
 }
diff --git a/src/systems/classes/_State.json b/src/systems/classes/_State.json
@@ -36,6 +36,5 @@
   },
   "types": {},
   "components": {},
-  "master": false,
-  "subsystem": false
+  "master": false
 }
diff --git a/src/systems/classes/_System.json b/src/systems/classes/_System.json
@@ -14,7 +14,6 @@
       "_core": true,
       "name": "property",
       "master": "property",
-      "subsystem": "property",
       "version": "property",
       "description": "property",
       "schemas": "property",
@@ -40,12 +39,6 @@
         "mandatory": false,
         "default": false
       },
-      "subsystem": {
-        "type": "boolean",
-        "readOnly": false,
-        "mandatory": false,
-        "default": false
-      },
       "version": {
         "type": "string",
         "readOnly": false,
@@ -93,6 +86,5 @@
   },
   "types": {},
   "components": {},
-  "master": false,
-  "subsystem": false
+  "master": false
 }
diff --git a/src/systems/classes/_SystemOSGi.json b/src/systems/classes/_SystemOSGi.json
@@ -41,6 +41,5 @@
   },
   "types": {},
   "components": {},
-  "master": false,
-  "subsystem": false
+  "master": false
 }
diff --git a/src/systems/core/system-runtime.json b/src/systems/core/system-runtime.json
@@ -17,6 +17,5 @@
   "models": {},
   "types": {},
   "components": {},
-  "master": false,
-  "subsystem": false
+  "master": false
 }
diff --git a/src/systems/types/types.json b/src/systems/types/types.json
@@ -1,7 +1,6 @@
 {
   "name": "types",
   "master": false,
-  "subsystem": false,
   "version": "1.0.0",
   "description": "",
   "schemas": {},
diff --git a/src/workflow.js b/src/workflow.js
@@ -258,6 +258,7 @@ function checkResult(params) {
   var component = params.component || null,
     methodName = params.methodName || '',
     methodResult = null,
+    typeofMethodResult = '',
     componentClassName = '',
     returnType = null,
     result = true;
@@ -286,6 +287,22 @@ function checkResult(params) {
           $log.invalidResultType(component.id(), component.constructor.name, methodName, returnType, null);
         }
         break;
+      case returnType.indexOf('@') !== -1:
+        if (methodResult.constructor) {
+          if (methodResult.constructor.name === 'Function') {
+            typeofMethodResult = methodResult.name;
+          } else {
+            typeofMethodResult = methodResult.constructor.name;
+          }
+          if (typeofMethodResult !== returnType.replace('@', '')) {
+            result = false;
+            $log.invalidResultType(component.id(), component.constructor.name, methodName, returnType, typeofMethodResult);
+          }
+        } else {
+          result = false;
+          $log.invalidResultType(component.id(), component.constructor.name, methodName, returnType, typeof methodResult);
+        }
+        break;
       default:
         if (typeof methodResult !== returnType) {
           result = false;
diff --git a/test/runtime/system-spec.js b/test/runtime/system-spec.js
@@ -22,10 +22,6 @@ describe('a system', function () {
     expect(system.version()).toBeDefined();
   });
 
-  it('can tell if it is a subsystem', function () {
-    expect(system.subsystem()).toBe(false);
-  });
-
   it('has schemas', function () {
     expect(system.schemas()).toBeDefined();
   });

Original file line number	Diff line number	Diff line change
`@@ -410,7 +410,14 @@`
`410`	`410`	`}`
`411`	`411`	`]`
`412`	`412`	`},`
`413`		`- "send": {}`
	`413`	`+ "send": {`
	`414`	`+ "params": [`
	`415`	`+ {`
	`416`	`+ "name": "message",`
	`417`	`+ "type": "message"`
	`418`	`+ }`
	`419`	`+ ]`
	`420`	`+ }`
`414`	`421`	`}`
`415`	`422`	`},`
`416`	`423`	`"schemas": {`
`@@ -726,6 +733,5 @@`
`726`	`733`	`"version": "1.0.0",`
`727`	`734`	`"description": "Enable connection to System Designer",`
`728`	`735`	`"_id": "18ed81de331252c",`
`729`		`- "master": false,`
`730`		`- "subsystem": false`
	`736`	`+ "master": false`
`731`	`737`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "mode-dev",`
`3`	`3`	`"master": false,`
`4`		`- "subsystem": false,`
`5`	`4`	`"version": "1.0.0",`
`6`	`5`	`"description": "Development mode",`
`7`	`6`	`"schemas": {},`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "storage",`
`3`	`3`	`"master": false,`
`4`		`- "subsystem": false,`
`5`	`4`	`"version": "1.0.0",`
`6`	`5`	`"description": "Storage",`
`7`	`6`	`"schemas": {`
Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,5 @@`
`58`	`58`	`},`
`59`	`59`	`"types": {},`
`60`	`60`	`"components": {},`
`61`		`- "master": false,`
`62`		`- "subsystem": false`
	`61`	`+ "master": false`
`63`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -110,6 +110,5 @@`
`110`	`110`	`}`
`111`	`111`	`}`
`112`	`112`	`},`
`113`		`- "master": false,`
`114`		`- "subsystem": false`
	`113`	`+ "master": false`
`115`	`114`	`}`
Original file line number	Diff line number	Diff line change
`@@ -178,6 +178,5 @@`
`178`	`178`	`},`
`179`	`179`	`"types": {},`
`180`	`180`	`"components": {},`
`181`		`- "master": false,`
`182`		`- "subsystem": false`
	`181`	`+ "master": false`
`183`	`182`	`}`
Original file line number	Diff line number	Diff line change
`@@ -124,6 +124,5 @@`
`124`	`124`	`},`
`125`	`125`	`"types": {},`
`126`	`126`	`"components": {},`
`127`		`- "master": false,`
`128`		`- "subsystem": false`
	`127`	`+ "master": false`
`129`	`128`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,5 @@`
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`	`},`
`72`		`- "master": false,`
`73`		`- "subsystem": false`
	`72`	`+ "master": false`
`74`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,5 @@`
`65`	`65`	`},`
`66`	`66`	`"types": {},`
`67`	`67`	`"components": {},`
`68`		`- "master": false,`
`69`		`- "subsystem": false`
	`68`	`+ "master": false`
`70`	`69`	`}`