Seralization cleanup

serialization/src/test/java/org/finos/rune/serialization/RuneJsonSerializerErrorHandlingTest.java

@@ -44,6 +44,7 @@
 public class RuneJsonSerializerErrorHandlingTest {
     public static final String TEST_TYPE = "rune-serializer-error-handling-test";
     private ObjectMapper objectMapper;
+    public static final String NAMESPACE_PREFIX = TEST_MODEL_NAME + ".test.failing.";
 
     private static CodeGeneratorTestHelper helper;
 
@@ -142,7 +143,7 @@ private static Path getGroupPath(String groupName) {
     private Class<RosettaModelObject> getRootRosettaModelObjectClass(Path groupPath, String fileName) {
         Path rosetta = getFile(groupPath, fileName);
         String groupName = groupPath.getFileName().toString();
-        return generateCompileAndGetRootDataType(groupName, Collections.singletonList(rosetta), helper, new DynamicCompiledClassLoader());
+        return generateCompileAndGetRootDataType(NAMESPACE_PREFIX, groupName, Collections.singletonList(rosetta), helper, new DynamicCompiledClassLoader());
     }
 
     private <T extends RosettaModelObject> T fromJson(String runeJson, Class<T> type) {

serialization/src/test/java/org/finos/rune/serialization/RuneJsonSerializerRoundTripTest.java

@@ -42,6 +42,7 @@
 public class RuneJsonSerializerRoundTripTest {
     public static final String TEST_TYPE = "rune-serializer-round-trip-test";
     private static DynamicCompiledClassLoader dynamicCompiledClassLoader;
+    public static final String NAMESPACE_PREFIX = TEST_MODEL_NAME + ".test.passing.";
 
     private static CodeGeneratorTestHelper helper;
     private ObjectMapper objectMapper;
@@ -72,7 +73,7 @@ public static Stream<Arguments> testCases() {
                 .flatMap(groupPath -> {
                             List<Path> rosettas = listFiles(groupPath, ".rosetta");
                             String groupName = groupPath.getFileName().toString();
-                    Class<RosettaModelObject> rootDataType = generateCompileAndGetRootDataType(groupName, rosettas, helper, dynamicCompiledClassLoader);
+                    Class<RosettaModelObject> rootDataType = generateCompileAndGetRootDataType(NAMESPACE_PREFIX, groupName, rosettas, helper, dynamicCompiledClassLoader);
 
                             return listFiles(groupPath, ".json").stream()
                                     .map(jsonPath -> Arguments.of(

serialization/src/test/java/org/finos/rune/serialization/RuneSerializerTestHelper.java

@@ -47,18 +47,18 @@
 import java.util.stream.Stream;
 
 public class RuneSerializerTestHelper {
-
     public static final String TEST_MODEL_NAME = "serialization";
 
     @SuppressWarnings("unchecked")
-    public static <T extends RosettaModelObject> Class<T> generateCompileAndGetRootDataType(String groupName,
+    public static <T extends RosettaModelObject> Class<T> generateCompileAndGetRootDataType(String namespacePrefix, String groupName,
                                                                                             List<Path> rosettaPaths,
-                                                                                            CodeGeneratorTestHelper helper, DynamicCompiledClassLoader dynamicCompiledClassLoader) {
+                                                                                            CodeGeneratorTestHelper helper,
+                                                                                            DynamicCompiledClassLoader dynamicCompiledClassLoader) {
         String[] rosettaFileContents = rosettaPaths.stream().map(RuneSerializerTestHelper::readAsString).toArray(String[]::new);
         HashMap<String, String> generatedCode = helper.generateCode(rosettaFileContents);
         Map<String, Class<?>> compiledCode = helper.compileToClasses(generatedCode);
         dynamicCompiledClassLoader.setCompiledCode(compiledCode);
-        Class<?> aClass = compiledCode.get(TEST_MODEL_NAME + ".test." + groupName + ".Root");
+        Class<?> aClass = compiledCode.get(namespacePrefix + groupName + ".Root");
         return (Class<T>) aClass;
     }
 

serialization/src/test/resources/rune-serializer-error-handling-test/cardinality/cardinality.rosetta

@@ -1,4 +1,4 @@
-namespace cardinality
+namespace serialization.test.failing.cardinality
 
 annotation rootType: <"Mark a type as a root of the rosetta model">
 

serialization/src/test/resources/rune-serializer-error-handling-test/cardinality/too-many-elements.json

@@ -1,6 +1,6 @@
 {
-  "@model": "test.cardinality",
-  "@type": "test.cardinality.Root",
+  "@model": "serialization",
+  "@type": "serialization.test.failing.cardinality.Root",
   "@version": "0.0.0",
   "stringList": ["foo", "bar", "baz"]
 }

serialization/src/test/resources/rune-serializer-round-trip-test/metakey/dangling-attribute-ref.json → serialization/src/test/resources/rune-serializer-error-handling-test/metakey/dangling-attribute-ref.json

@@ -1,6 +1,6 @@
 {
   "@model" : "serialization",
-  "@type" : "serialization.test.metakey.Root",
+  "@type" : "serialization.test.failing.metakey.Root",
   "@version" : "0.0.0",
   "attributeRef" : {
     "dateReference" : {

serialization/src/test/resources/rune-serializer-round-trip-test/metakey/dangling-node-ref.json → serialization/src/test/resources/rune-serializer-error-handling-test/metakey/dangling-node-ref.json

@@ -1,6 +1,6 @@
 {
   "@model" : "serialization",
-  "@type" : "serialization.test.metakey.Root",
+  "@type" : "serialization.test.failing.metakey.Root",
   "@version" : "0.0.0",
   "nodeRef" : {
     "aReference" : {

serialization/src/test/resources/rune-serializer-error-handling-test/metakey/meta-key.rosetta

@@ -0,0 +1,23 @@
+namespace serialization.test.failing.metakey
+
+annotation rootType: <"Mark a type as a root of the rosetta model">
+
+type A:
+  [metadata key]
+  fieldA string (1..1)
+
+type NodeRef:
+  typeA A (0..1)
+  aReference A (0..1)
+    [metadata reference]
+
+type AttributeRef:
+  dateField date (0..1)
+    [metadata id]
+  dateReference date (0..1)
+    [metadata reference]
+
+type Root:
+  [rootType]
+  nodeRef NodeRef (0..1)
+  attributeRef AttributeRef (0..1)

serialization/src/test/resources/rune-serializer-round-trip-test/metalocation/dangling-address.json → serialization/src/test/resources/rune-serializer-error-handling-test/metalocation/dangling-address.json

@@ -1,6 +1,6 @@
 {
   "@model" : "serialization",
-  "@type" : "serialization.test.metalocation.Root",
+  "@type" : "serialization.test.failing.metalocation.Root",
   "@version" : "0.0.0",
   "bAddress" : {
     "@ref:scoped" : "someLocation"

serialization/src/test/resources/rune-serializer-error-handling-test/metalocation/meta-location.rosetta

@@ -0,0 +1,16 @@
+namespace serialization.failing.metalocation
+
+annotation rootType: <"Mark a type as a root of the rosetta model">
+
+type A:
+  b B (1..1)
+    [metadata location]
+
+type B:
+  fieldB string (1..1)
+
+type Root:
+  [rootType]
+  typeA A (0..1)
+  bAddress B (0..1)
+    [metadata address "pointsTo"=A->b]

serialization/src/test/resources/rune-serializer-error-handling-test/parameterised/number-fraction-too-large.json

@@ -1,6 +1,6 @@
 {
-  "@model": "test.parameterised",
-  "@type": "test.parameterised.Root",
+  "@model": "serialization",
+  "@type": "serialization.test.failing.parameterised.Root",
   "@version": "0.0.0",
   "parameterisedNumber": 1.23456789
 }

serialization/src/test/resources/rune-serializer-error-handling-test/parameterised/number-too-large.json

@@ -1,6 +1,6 @@
 {
-  "@model": "test.parameterised",
-  "@type": "test.parameterised.Root",
+  "@model": "serialization",
+  "@type": "serialization.test.failing.parameterised.Root",
   "@version": "0.0.0",
   "parameterisedNumber": 123456789
 }

serialization/src/test/resources/rune-serializer-error-handling-test/parameterised/parameterised.rosetta

@@ -1,4 +1,4 @@
-namespace parameterised
+namespace serialization.test.failing.parameterised
 
 annotation rootType: <"Mark a type as a root of the rosetta model">
 

serialization/src/test/resources/rune-serializer-error-handling-test/parameterised/string-illegal-pattern.json

@@ -1,6 +1,6 @@
 {
-  "@model": "test.parameterised",
-  "@type": "test.parameterised.Root",
+  "@model": "serialization",
+  "@type": "serialization.test.failing.parameterised.Root",
   "@version": "0.0.0",
   "parameterisedString": "$$"
 }

serialization/src/test/resources/rune-serializer-error-handling-test/parameterised/string-too-large.json

@@ -1,6 +1,6 @@
 {
-  "@model": "test.parameterised",
-  "@type": "test.parameterised.Root",
+  "@model": "serialization",
+  "@type": "serialization.test.failing.parameterised.Root",
   "@version": "0.0.0",
   "parameterisedString": "abcdefg"
 }

serialization/src/test/resources/rune-serializer-round-trip-test/basic/basic-types-list.json

@@ -1,6 +1,6 @@
 {
   "@model" : "serialization",
-  "@type" : "serialization.test.basic.Root",
+  "@type" : "serialization.test.passing.basic.Root",
   "@version" : "0.0.0",
   "basicList" : {
     "booleanTypes" : [ true, false, true ],

serialization/src/test/resources/rune-serializer-round-trip-test/basic/basic-types-single.json

@@ -1,6 +1,6 @@
 {
   "@model" : "serialization",
-  "@type" : "serialization.test.basic.Root",
+  "@type" : "serialization.test.passing.basic.Root",
   "@version" : "0.0.0",
   "basicSingle" : {
     "booleanType" : true,

serialization/src/test/resources/rune-serializer-round-trip-test/basic/basic.rosetta

@@ -1,4 +1,4 @@
-namespace serialization.test.basic
+namespace serialization.test.passing.basic
 
 annotation rootType: <"Mark a type as a root of the rosetta model">
 

serialization/src/test/resources/rune-serializer-round-trip-test/choicetype/choice-basic.json

@@ -1,6 +1,6 @@
 {
   "@model" : "serialization",
-  "@type" : "serialization.test.choicetype.Root",
+  "@type" : "serialization.test.passing.choicetype.Root",
   "@version" : "0.0.0",
   "choiceBasic" : {
     "string" : "foo"

serialization/src/test/resources/rune-serializer-round-trip-test/choicetype/choice-data.json

@@ -1,6 +1,6 @@
 {
   "@model" : "serialization",
-  "@type" : "serialization.test.choicetype.Root",
+  "@type" : "serialization.test.passing.choicetype.Root",
   "@version" : "0.0.0",
   "choiceData" : {
     "A" : {

serialization/src/test/resources/rune-serializer-round-trip-test/choicetype/choice-mixed-1.json

@@ -1,6 +1,6 @@
 {
   "@model" : "serialization",
-  "@type" : "serialization.test.choicetype.Root",
+  "@type" : "serialization.test.passing.choicetype.Root",
   "@version" : "0.0.0",
   "choiceMixed" : {
     "B" : {

serialization/src/test/resources/rune-serializer-round-trip-test/choicetype/choice-mixed-2.json

@@ -1,6 +1,6 @@
 {
   "@model" : "serialization",
-  "@type" : "serialization.test.choicetype.Root",
+  "@type" : "serialization.test.passing.choicetype.Root",
   "@version" : "0.0.0",
   "choiceMixed" : {
     "string" : "foo"

serialization/src/test/resources/rune-serializer-round-trip-test/choicetype/choice.rosetta

@@ -1,4 +1,4 @@
-namespace serialization.test.choicetype
+namespace serialization.test.passing.choicetype
 
 annotation rootType: <"Mark a type as a root of the rosetta model">
 

serialization/src/test/resources/rune-serializer-round-trip-test/data/data-types.json

@@ -1,6 +1,6 @@
 {
   "@model" : "serialization",
-  "@type" : "serialization.test.data.Root",
+  "@type" : "serialization.test.passing.data.Root",
   "@version" : "0.0.0",
   "a" : {
     "b" : [ { }, {

serialization/src/test/resources/rune-serializer-round-trip-test/data/data.rosetta

@@ -1,5 +1,4 @@
-namespace serialization.test.data
-
+namespace serialization.test.passing.data
 annotation rootType: <"Mark a type as a root of the rosetta model">
 
 type A:

serialization/src/test/resources/rune-serializer-round-trip-test/enumtypes/enum-types-list.json

@@ -1,6 +1,6 @@
 {
   "@model" : "serialization",
-  "@type" : "serialization.test.enumtypes.Root",
+  "@type" : "serialization.test.passing.enumtypes.Root",
   "@version" : "0.0.0",
   "enumList" : {
     "enumType" : [ "A", "B", "C", "B" ]

serialization/src/test/resources/rune-serializer-round-trip-test/enumtypes/enum-types-single.json

@@ -1,6 +1,6 @@
 {
   "@model" : "serialization",
-  "@type" : "serialization.test.enumtypes.Root",
+  "@type" : "serialization.test.passing.enumtypes.Root",
   "@version" : "0.0.0",
   "enumSingle" : {
     "enumType" : "A"

serialization/src/test/resources/rune-serializer-round-trip-test/enumtypes/enum.rosetta

@@ -1,4 +1,4 @@
-namespace serialization.test.enumtypes
+namespace serialization.test.passing.enumtypes
 
 annotation rootType: <"Mark a type as a root of the rosetta model">
 

serialization/src/test/resources/rune-serializer-round-trip-test/extension/base-type.json

@@ -1,6 +1,6 @@
 {
   "@model" : "serialization",
-  "@type" : "serialization.test.extension.Root",
+  "@type" : "serialization.test.passing.extension.Root",
   "@version" : "0.0.0",
   "typeA" : {
     "fieldA" : "foo"

serialization/src/test/resources/rune-serializer-round-trip-test/extension/extended-type-concrete.json

@@ -1,9 +1,10 @@
 {
   "@model" : "serialization",
-  "@type" : "serialization.test.extension.Root",
+  "@type" : "serialization.test.passing.extension.Root",
   "@version" : "0.0.0",
   "typeB" : {
+    "fieldA" : "bar",
     "fieldB" : "foo",
-    "@type" : "serialization.test.extension.B"
+    "@type" : "serialization.test.passing.extension.B"
   }
 }

serialization/src/test/resources/rune-serializer-round-trip-test/extension/extended-type-polymorphic.json

@@ -1,10 +1,10 @@
 {
   "@model" : "serialization",
-  "@type" : "serialization.test.extension.Root",
+  "@type" : "serialization.test.passing.extension.Root",
   "@version" : "0.0.0",
   "typeA" : {
     "fieldA" : "bar",
     "fieldB" : "foo",
-    "@type" : "serialization.test.extension.B"
+    "@type" : "serialization.test.passing.extension.B"
   }
 }

serialization/src/test/resources/rune-serializer-round-trip-test/extension/extension.rosetta

@@ -1,4 +1,4 @@
-namespace serialization.test.extension
+namespace serialization.test.passing.extension
 
 annotation rootType: <"Mark a type as a root of the rosetta model">
 

serialization/src/test/resources/rune-serializer-round-trip-test/metakey/attribute-ref.json

@@ -1,6 +1,6 @@
 {
   "@model" : "serialization",
-  "@type" : "serialization.test.metakey.Root",
+  "@type" : "serialization.test.passing.metakey.Root",
   "@version" : "0.0.0",
   "attributeRef" : {
     "dateField" : {

serialization/src/test/resources/rune-serializer-round-trip-test/metakey/meta-key.rosetta

@@ -1,4 +1,4 @@
-namespace serialization.test.metakey
+namespace serialization.test.passing.metakey
 
 annotation rootType: <"Mark a type as a root of the rosetta model">
 

serialization/src/test/resources/rune-serializer-round-trip-test/metakey/node-ref.json

@@ -1,6 +1,6 @@
 {
   "@model" : "serialization",
-  "@type" : "serialization.test.metakey.Root",
+  "@type" : "serialization.test.passing.metakey.Root",
   "@version" : "0.0.0",
   "nodeRef" : {
     "typeA" : {

serialization/src/test/resources/rune-serializer-round-trip-test/metalocation/address.json

@@ -1,6 +1,6 @@
 {
   "@model" : "serialization",
-  "@type" : "serialization.test.metalocation.Root",
+  "@type" : "serialization.test.passing.metalocation.Root",
   "@version" : "0.0.0",
   "typeA" : {
     "b" : {

serialization/src/test/resources/rune-serializer-round-trip-test/metalocation/meta-location.rosetta

@@ -1,4 +1,4 @@
-namespace serialization.test.metalocation
+namespace serialization.test.passing.metalocation
 
 annotation rootType: <"Mark a type as a root of the rosetta model">
 

serialization/src/test/resources/rune-serializer-round-trip-test/metascheme/enum-list.json

@@ -1,6 +1,6 @@
 {
   "@model" : "serialization",
-  "@type" : "serialization.test.metascheme.Root",
+  "@type" : "serialization.test.passing.metascheme.Root",
   "@version" : "0.0.0",
   "enumTypeList" : [ {
     "@data" : "A",

serialization/src/test/resources/rune-serializer-round-trip-test/metascheme/enum-single.json

@@ -1,6 +1,6 @@
 {
   "@model" : "serialization",
-  "@type" : "serialization.test.metascheme.Root",
+  "@type" : "serialization.test.passing.metascheme.Root",
   "@version" : "0.0.0",
   "enumType" : {
     "@data" : "A",

serialization/src/test/resources/rune-serializer-round-trip-test/metascheme/meta-scheme.rosetta

@@ -1,4 +1,4 @@
-namespace serialization.test.metascheme
+namespace serialization.test.passing.metascheme
 
 annotation rootType: <"Mark a type as a root of the rosetta model">
 

serialization/src/test/resources/rune-serializer-round-trip-test/metascheme/node-list.json

@@ -1,6 +1,6 @@
 {
   "@model" : "serialization",
-  "@type" : "serialization.test.metascheme.Root",
+  "@type" : "serialization.test.passing.metascheme.Root",
   "@version" : "0.0.0",
   "typeAList" : [ {
     "fieldA" : {

serialization/src/test/resources/rune-serializer-round-trip-test/metascheme/node-single.json

@@ -1,6 +1,6 @@
 {
   "@model" : "serialization",
-  "@type" : "serialization.test.metascheme.Root",
+  "@type" : "serialization.test.passing.metascheme.Root",
   "@version" : "0.0.0",
   "typeA" : {
     "fieldA" : {