restructure the openMINDS entrypoint

Author: olinux

generator/templates/OpenMINDS.java.j2

@@ -37,8 +37,7 @@ public class OpenMINDS {
         });
     }
 
-    {% for version in relevant_versions %}
-    public static OpenMINDS.{{version[0]|upper}}{{version[1:]}} {{version}}(){
+    {% for version in relevant_versions %}public static OpenMINDS.{{version[0]|upper}}{{version[1:]}} {{version}}(){
         return {{version}}(OpenMINDSContext.defaultContext());
     }
 
@@ -50,38 +49,31 @@ public class OpenMINDS {
         return new OpenMINDS(context).new {{version[0]|upper}}{{version[1:]}}();
     }
 
-
-
-    public class {{version[0]|upper}}{{version[1:]}} {
-
+    public final class {{version[0]|upper}}{{version[1:]}} {
+        private {{version[0]|upper}}{{version[1:]}}(){}
         private final List<org.openmetadatainitiative.openminds.utils.Builder<?>> builders = new ArrayList<>();
 
-        {% for package in packages_by_version[version].keys() %}
-        public final OpenMINDS.{{version[0]|upper}}{{version[1:]}}.{{package[0]|upper}}{{package[1:]}} {{package}} = new {{package[0]|upper}}{{package[1:]}}();
-
-
-        public class {{package[0]|upper}}{{package[1:]}}{
+        {% for package in packages_by_version[version].keys() %}public final OpenMINDS.{{version[0]|upper}}{{version[1:]}}.{{package[0]|upper}}{{package[1:]}} {{package}} = new {{package[0]|upper}}{{package[1:]}}();
 
+        public final class {{package[0]|upper}}{{package[1:]}}{
+            private {{package[0]|upper}}{{package[1:]}}(){}
             {% for class in packages_by_version[version][package] %}
-            public final OpenMINDS.{{version[0]|upper}}{{version[1:]}}.{{package[0]|upper}}{{package[1:]}}.{{class[0]}} {{class[0][0]|lower}}{{class[0][1:]}} = new {{class[0]}}();
-
-            public class {{class[0]}} {
-
-                public {{class[1]}}.Builder create(String localId){
-                    final {{class[1]}}.Builder builder = {{class[1]}}.create(new LocalId(localId));
-                    builders.add(builder);
-                    return builder;
-                }
+            public {{class[1]}}.Builder create{{class[0]}}(String localId){
+                final {{class[1]}}.Builder builder = {{class[1]}}.create(new LocalId(localId));
+                builders.add(builder);
+                return builder;
             }
             {% endfor %}
         }
         {% endfor %}
 
-       public void persist(String targetDirectory) {
-            OpenMINDS.persist(targetDirectory, builders.stream().map(org.openmetadatainitiative.openminds.utils.Builder::build));
+        public void flush(PostProcessor postProcessor){
+            flush(OpenMINDSContext.defaultContext(), postProcessor);
         }
-    }
 
+        public void flush(OpenMINDSContext context, PostProcessor postProcessor){
+            postProcessor.process(builders.stream().map(b -> b.build(context)));
+        }
+    }
     {% endfor %}
-
 }

generator/templates/schema_class.java.j2

@@ -3,7 +3,6 @@ package {{package_name}};
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import org.openmetadatainitiative.openminds.utils.*;
 
 import java.util.ArrayList;
@@ -29,8 +28,8 @@ public class {{ class_name }} extends Instance {% if implemented_interfaces %}im
         return doGetReference();
     }
 
-    public static Reference<{{ class_name }}> createReference(InstanceId instanceId) {
-        return new Reference<>(instanceId);
+    public static Reference<{{ class_name }}> reference(String instanceId) {
+        return new Reference<>(new InstanceId(instanceId));
     }
 
     private {{ class_name }}(LocalId localId ) {
@@ -43,18 +42,11 @@ public class {{ class_name }} extends Instance {% if implemented_interfaces %}im
         {{ line }}
         {% endfor %}{% endfor %}
 
-        public {{ class_name }} build() {
+        public {{ class_name }} build(OpenMINDSContext context) {
             if ({{ class_name }}.this.id == null) {
-                {{ class_name }}.this.id = new InstanceId(UUID.randomUUID().toString());
-            }
-            if({{ class_name }}.this.types == null || {{ class_name }}.this.types.isEmpty() || !{{ class_name }}.this.types.contains(SEMANTIC_NAME)){
-                final List<String> oldValues = {{ class_name }}.this.types;
-                {{ class_name }}.this.types = new ArrayList<>();
-                {{ class_name }}.this.types.add(SEMANTIC_NAME);
-                if(oldValues != null){
-                    {{ class_name }}.this.types.addAll(oldValues);
-                }
+                {{ class_name }}.this.id = InstanceId.withPrefix(UUID.randomUUID().toString(), openMINDSContext.idPrefix());
             }
+            {{ class_name }}.this.type = SEMANTIC_NAME;
             return {{ class_name }}.this;
         }
     }