Merge branch 'develop'

Author: ivan-gomes

app/controllers/CommitController.java

@@ -70,6 +70,6 @@ public Result byProjectAndId(UUID projectId, UUID commitId) {
 
     public Result headByProject(UUID projectId) {
         Optional<Commit> commit = commitService.getHeadByProjectId(projectId);
-        return commit.map(e -> ok(Json.toJson(e))).orElseGet(Results::notFound);
+        return commit.map(e -> ok(JacksonHelper.valueToTree(commit, writer -> writer.withView(CommitImpl.Views.Compact.class)))).orElseGet(Results::notFound);
     }
 }

app/dao/impl/jpa/JpaCommitDao.java

@@ -47,6 +47,11 @@ protected JPAManager getJpaManager() {
 
     @Override
     public Optional<Commit> persist(Commit commit) {
+        // If previousCommit is not specified, default to head commit.
+        if (commit.getPreviousCommit() == null && commit.getContainingProject() != null) {
+            findHeadByProject(commit.getContainingProject()).ifPresent(commit::setPreviousCommit);
+        }
+
         MofObject tombstone = new MofObjectImpl() {
             UUID id = UUID.randomUUID();
 
@@ -143,11 +148,6 @@ public UUID getId() {
             }
         });*/
 
-        // If previousCommit is not specified, default to head commit.
-        if (commit.getPreviousCommit() == null && commit.getContainingProject() != null) {
-            findHeadByProject(commit.getContainingProject()).ifPresent(commit::setPreviousCommit);
-        }
-
         return jpa.transact(em -> {
             commit.getChanges().stream().map(ElementVersion::getData).filter(mof -> mof instanceof MofObjectImpl).map(mof -> (MofObjectImpl) mof).map(mof -> {
                 try {

app/jackson/JacksonHelper.java

@@ -23,4 +23,12 @@ public static JsonNode collectionValueToTree(@SuppressWarnings("rawtypes") Class
             throw new RuntimeException(e);
         }
     }
+
+    public static JsonNode valueToTree(Object value, Function<ObjectWriter, ObjectWriter> objectWriterFunction) {
+        try {
+            return Json.mapper().readTree(objectWriterFunction.apply(Json.mapper().writer()).writeValueAsBytes(value));
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
 }

app/jackson/MofObjectDeserializer.java

@@ -10,6 +10,7 @@
 import com.fasterxml.jackson.databind.deser.ContextualDeserializer;
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
 import com.fasterxml.jackson.databind.jsontype.TypeDeserializer;
+import javassist.util.proxy.ProxyFactory;
 import org.omg.sysml.metamodel.impl.MofObjectImpl;
 
 import javax.persistence.EntityManager;
@@ -22,7 +23,7 @@ public class MofObjectDeserializer extends StdDeserializer<MofObjectImpl> implem
     private EntityManager entityManager;
     private JavaType type;
 
-    //private static Map<Class<?>, Class<?>> PROXY_MAP = new HashMap<>();
+    private static Map<Class<?>, Class<?>> PROXY_MAP = new HashMap<>();
 
     public MofObjectDeserializer(EntityManager entityManager) {
         this(entityManager, null);
@@ -45,14 +46,15 @@ public MofObjectImpl deserialize(JsonParser p, DeserializationContext ctxt) thro
         }
 
         MofObjectImpl mof;
-/*        Class<?> proxyClass = PROXY_MAP.computeIfAbsent(type.getRawClass(), clazz -> {
+        // Proxy class to handle abstract classes
+        Class<?> proxyClass = PROXY_MAP.computeIfAbsent(type.getRawClass(), clazz -> {
             ProxyFactory factory = new ProxyFactory();
             factory.setSuperclass(clazz);
             return factory.createClass();
-        });*/
+        });
         try {
-            //mof = (MofObjectImpl) proxyClass.getConstructor().newInstance();
-            mof = (MofObjectImpl) type.getRawClass().getConstructor().newInstance();
+            mof = (MofObjectImpl) proxyClass.getConstructor().newInstance();
+            //mof = (MofObjectImpl) type.getRawClass().getConstructor().newInstance();
         } catch (ReflectiveOperationException e) {
             throw new IOException(e);
         }

build.sbt

@@ -1,7 +1,7 @@
 name := """SysML-v2-API-Services"""
 organization := "org.omg"
 
-version := "2020-03-rc2"
+version := "2020-03-rc3"
 
 javacOptions ++= Seq("-source", "11", "-target", "11", "-Xlint")
 

conf/application.conf

@@ -6,6 +6,7 @@ play.modules.enabled += "play.modules.swagger.SwaggerModule"
 play.filters.headers.contentSecurityPolicy = null
 play.filters.disabled+=play.filters.csrf.CSRFFilter
 play.http.errorHandler = play.api.http.HtmlOrJsonHttpErrorHandler
+play.http.parser.maxMemoryBuffer=1G
 
 # https://www.playframework.com/documentation/2.7.x/JavaJPA
 db.default.jndiName=DefaultDS