Merge pull request #4 from ModelDriven/feature/ST5AS-14

feature/ST5AS-14 Implemented type validation

Author: ivan-gomes

app/Module.java

@@ -1,9 +1,11 @@
 import com.google.inject.AbstractModule;
+import config.MetamodelProvider;
+import config.impl.JPAMetamodelProvider;
 import dao.ElementDao;
-import dao.ModelDao;
+import dao.ProjectDao;
 import dao.RelationshipDao;
 import dao.impl.jpa.JpaElementDao;
-import dao.impl.jpa.JpaModelDao;
+import dao.impl.jpa.JpaProjectDao;
 import dao.impl.jpa.JpaRelationshipDao;
 import jackson.databind.ObjectMapperFactory;
 import jackson.databind.impl.HibernateObjectMapperFactory;
@@ -14,10 +16,11 @@ public class Module extends AbstractModule {
 
     @Override
     protected void configure() {
+        bind(MetamodelProvider.class).to(JPAMetamodelProvider.class).asEagerSingleton();
         bind(JPAManager.class).to(HibernateManager.class).asEagerSingleton();
         bind(ObjectMapperFactory.class).to(HibernateObjectMapperFactory.class).asEagerSingleton();
         bind(ElementDao.class).to(JpaElementDao.class);
-        bind(ModelDao.class).to(JpaModelDao.class);
+        bind(ProjectDao.class).to(JpaProjectDao.class);
         bind(RelationshipDao.class).to(JpaRelationshipDao.class);
     }
 }

app/config/MetamodelProvider.java

@@ -0,0 +1,13 @@
+package config;
+
+import java.util.Set;
+
+public interface MetamodelProvider {
+    <T> Class<? extends T> getImplementationClass(Class<T> intrface);
+
+    <T> Class<T> getInterface(Class<? extends T> implementationClass) throws ClassNotFoundException;
+
+    Set<Class<?>> getAllImplementationClasses();
+
+    Set<Class<?>> getAllInterfaces();
+}

app/config/impl/JPAMetamodelProvider.java

@@ -0,0 +1,55 @@
+package config.impl;
+
+import config.MetamodelProvider;
+import org.omg.sysml.metamodel.MofObject;
+import org.omg.sysml.metamodel.impl.MofObjectImpl;
+import org.reflections.Reflections;
+
+import java.util.HashSet;
+import java.util.Set;
+
+public class JPAMetamodelProvider implements MetamodelProvider {
+    private static Set<Class<?>> INTERFACES = new HashSet<>(), IMPLEMENTATION_CLASSES = new HashSet<>();
+
+    static {
+        INTERFACES.add(MofObject.class);
+        for (String pakkage : new String[]{"org.omg.sysml.metamodel", "org.omg.sysml.extension"}) {
+            INTERFACES.addAll(new Reflections(pakkage).getSubTypesOf(MofObject.class));
+        }
+        IMPLEMENTATION_CLASSES.add(MofObjectImpl.class);
+        for (String pakkage : new String[]{"org.omg.sysml.metamodel.impl", "org.omg.sysml.extension.impl"}) {
+            IMPLEMENTATION_CLASSES.addAll(new Reflections(pakkage).getSubTypesOf(MofObjectImpl.class));
+        }
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public <T> Class<T> getInterface(Class<? extends T> implementationClass) {
+        try {
+            return (Class<T>) Class.forName(implementationClass.getName().replaceFirst("impl.(\\w+)Impl", "$1"));
+        } catch (ClassNotFoundException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public <T> Class<? extends T> getImplementationClass(Class<T> intrface) {
+        try {
+            return (Class<? extends T>) Class.forName(intrface.getName().replaceFirst("(.*\\.)(\\w+)$", "$1impl.$2Impl"));
+        } catch (ClassNotFoundException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public Set<Class<?>> getAllInterfaces() {
+        return INTERFACES;
+    }
+
+    @Override
+    public Set<Class<?>> getAllImplementationClasses() {
+        return IMPLEMENTATION_CLASSES;
+    }
+
+}

app/controllers/ElementController.java

@@ -1,9 +1,13 @@
 package controllers;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import models.Element;
+import config.MetamodelProvider;
+import jackson.JacksonHelper;
+import org.omg.sysml.metamodel.Element;
+import org.omg.sysml.metamodel.MofObject;
 import play.libs.Json;
 import play.mvc.Controller;
+import play.mvc.Http;
 import play.mvc.Result;
 import play.mvc.Results;
 import services.ElementService;
@@ -19,6 +23,8 @@
  * Controller for handling all API requests related to SysML v2 elements
  */
 public class ElementController extends Controller {
+    @Inject
+    private MetamodelProvider metamodelProvider;
 
     @Inject
     private ElementService elementService;
@@ -31,26 +37,29 @@ public Result byId(String id) {
 
     public Result all() {
         List<Element> elements = elementService.getAll();
-        return ok(Json.toJson(elements));
+        return ok(JacksonHelper.collectionValueToTree(List.class, metamodelProvider.getImplementationClass(Element.class), elements));
     }
 
-    public Result create() {
-        JsonNode requestBodyJson = request().body().asJson();
-        Element requestElement = Json.fromJson(requestBodyJson, Element.class);
-        Optional<Element> responseElement = elementService.create(requestElement);
-        return responseElement.map(e -> ok(Json.toJson(e))).orElseGet(Results::badRequest);
+    public Result create(Http.Request request) {
+        JsonNode requestBodyJson = request.body().asJson();
+        MofObject requestedObject = Json.fromJson(requestBodyJson, metamodelProvider.getImplementationClass(MofObject.class));
+        if (!(requestedObject instanceof Element)) {
+            return Results.badRequest();
+        }
+        Optional<Element> responseElement = elementService.create(((Element) requestedObject));
+        return responseElement.map(e -> created(Json.toJson(e))).orElseGet(Results::badRequest);
     }
 
-    public Result byModel(String modelId) {
-        UUID modelUuid = UUID.fromString(modelId);
-        List<Element> elements = elementService.getByModelId(modelUuid);
-        return ok(Json.toJson(elements));
+    public Result byProject(String projectId) {
+        UUID projectUuid = UUID.fromString(projectId);
+        List<Element> elements = elementService.getByProjectId(projectUuid);
+        return ok(JacksonHelper.collectionValueToTree(List.class, metamodelProvider.getImplementationClass(Element.class), elements));
     }
 
-    public Result byModelAndId(String elementId, String modelId) {
+    public Result byProjectAndId(String elementId, String projectId) {
         UUID elementUuid = UUID.fromString(elementId);
-        UUID modelUuid = UUID.fromString(modelId);
-        Optional<Element> element = elementService.getByModelIdAndId(modelUuid, elementUuid);
+        UUID projectUuid = UUID.fromString(projectId);
+        Optional<Element> element = elementService.getByProjectIdAndId(projectUuid, elementUuid);
         return element.map(e -> ok(Json.toJson(e))).orElseGet(Results::notFound);
     }
 }

app/controllers/ModelController.java

@@ -0,0 +1,48 @@
+package controllers;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import config.MetamodelProvider;
+import jackson.JacksonHelper;
+import org.omg.sysml.extension.Project;
+import play.libs.Json;
+import play.mvc.Controller;
+import play.mvc.Http;
+import play.mvc.Result;
+import play.mvc.Results;
+import services.ProjectService;
+
+import javax.inject.Inject;
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
+
+/**
+ * @author Manas Bajaj
+ *
+ * Controller for handling all API requests related to SysML v2 elements
+ */
+public class ProjectController extends Controller {
+    @Inject
+    private MetamodelProvider metamodelProvider;
+
+    @Inject
+    private ProjectService projectService;
+
+    public Result byId(String id) {
+        UUID uuid = UUID.fromString(id);
+        Optional<Project> project = projectService.getById(uuid);
+        return project.map(m -> ok(Json.toJson(m))).orElseGet(Results::notFound);
+    }
+
+    public Result all() {
+        List<Project> projects = projectService.getAll();
+        return ok(JacksonHelper.collectionValueToTree(List.class, metamodelProvider.getImplementationClass(Project.class), projects));
+    }
+
+    public Result create(Http.Request request) {
+        JsonNode requestBodyJson = request.body().asJson();
+        Project requestProject = Json.fromJson(requestBodyJson, metamodelProvider.getImplementationClass(Project.class));
+        Optional<Project> responseProject = projectService.create(requestProject);
+        return responseProject.map(e -> created(Json.toJson(e))).orElseGet(Results::badRequest);
+    }
+}

app/controllers/ProjectController.java

@@ -1,10 +1,13 @@
 package controllers;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import models.Element;
-import models.Relationship;
+import config.MetamodelProvider;
+import jackson.JacksonHelper;
+import org.omg.sysml.metamodel.MofObject;
+import org.omg.sysml.metamodel.Relationship;
 import play.libs.Json;
 import play.mvc.Controller;
+import play.mvc.Http;
 import play.mvc.Result;
 import play.mvc.Results;
 import services.RelationshipService;
@@ -20,6 +23,9 @@
  * Controller for handling all API requests related to SysML v2 elements
  */
 public class RelationshipController extends Controller {
+    @Inject
+    private MetamodelProvider metamodelProvider;
+
     @Inject
     private RelationshipService relationshipService;
 
@@ -31,37 +37,40 @@ public Result byId(String id) {
 
     public Result all() {
         List<Relationship> relationships = relationshipService.getAll();
-        return ok(Json.toJson(relationships));
+        return ok(JacksonHelper.collectionValueToTree(List.class, metamodelProvider.getImplementationClass(Relationship.class), relationships));
     }
 
-    public Result create() {
-        JsonNode requestBodyJson = request().body().asJson();
-        Relationship requestRelationship = Json.fromJson(requestBodyJson, Relationship.class);
-        Optional<Relationship> responseRelationship = relationshipService.create(requestRelationship);
-        return responseRelationship.map(e -> ok(Json.toJson(e))).orElseGet(Results::badRequest);
+    public Result create(Http.Request request) {
+        JsonNode requestBodyJson = request.body().asJson();
+        MofObject requestedObject = Json.fromJson(requestBodyJson, metamodelProvider.getImplementationClass(MofObject.class));
+        if (!(requestedObject instanceof Relationship)) {
+            return Results.badRequest();
+        }
+        Optional<Relationship> responseRelationship = relationshipService.create((Relationship) requestedObject);
+        return responseRelationship.map(e -> created(Json.toJson(e))).orElseGet(Results::badRequest);
     }
 
     public Result byRelatedElementId(String id) {
         UUID elementUuid = UUID.fromString(id);
         List<Relationship> relationships = relationshipService.getByRelatedElementId(elementUuid);
-        return ok(Json.toJson(relationships));
+        return ok(JacksonHelper.collectionValueToTree(List.class, metamodelProvider.getImplementationClass(Relationship.class), relationships));
     }
 
     public Result bySourceElementId(String id) {
         UUID elementUuid = UUID.fromString(id);
         List<Relationship> relationships = relationshipService.getBySourceElementId(elementUuid);
-        return ok(Json.toJson(relationships));
+        return ok(JacksonHelper.collectionValueToTree(List.class, metamodelProvider.getImplementationClass(Relationship.class), relationships));
     }
 
     public Result byTargetElementId(String id) {
         UUID elementUuid = UUID.fromString(id);
         List<Relationship> relationships = relationshipService.getByTargetElementId(elementUuid);
-        return ok(Json.toJson(relationships));
+        return ok(JacksonHelper.collectionValueToTree(List.class, metamodelProvider.getImplementationClass(Relationship.class), relationships));
     }
 
-    public Result byModel(String modelId) {
-        UUID modelUuid = UUID.fromString(modelId);
-        List<Relationship> relationships = relationshipService.getByModelId(modelUuid);
-        return ok(Json.toJson(relationships));
+    public Result byProject(String projectId) {
+        UUID projectUuid = UUID.fromString(projectId);
+        List<Relationship> relationships = relationshipService.getByProjectId(projectUuid);
+        return ok(JacksonHelper.collectionValueToTree(List.class, metamodelProvider.getImplementationClass(Relationship.class), relationships));
     }
 }

app/controllers/RelationshipController.java

@@ -1,7 +1,7 @@
 package dao;
 
-import models.Element;
-import models.Model;
+import org.omg.sysml.extension.Project;
+import org.omg.sysml.metamodel.Element;
 
 import java.util.List;
 import java.util.Optional;
@@ -20,7 +20,7 @@ public interface ElementDao extends Dao<Element> {
 
     void deleteAll();
 
-    List<Element> findAllByModel(Model model);
+    List<Element> findAllByProject(Project project);
 
-    Optional<Element> findByModelAndId(Model model, UUID id);
+    Optional<Element> findByProjectAndId(Project project, UUID id);
 }