Merge branch 'release/2020-08-rc2'

Systems-Modeling · Sep 14, 2020 · e1a065a · e1a065a
2 parents a265d4e + 9e15aff
commit e1a065a
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 18 deletions.
diff --git a/app/dao/CommitDao.java b/app/dao/CommitDao.java
@@ -24,5 +24,7 @@ public interface CommitDao extends Dao<Commit> {
 
     Optional<Commit> findByProjectAndId(Project project, UUID id);
 
+    Optional<Commit> findByProjectAndIdResolved(Project project, UUID id);
+
     Optional<Commit> findHeadByProject(Project project);
 }
diff --git a/app/dao/impl/jpa/JpaCommitDao.java b/app/dao/impl/jpa/JpaCommitDao.java
@@ -16,6 +16,7 @@
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
+import javax.persistence.EntityManager;
 import javax.persistence.NoResultException;
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaDelete;
@@ -254,21 +255,32 @@ public List<Commit> findAllByProject(Project project) {
     @Override
     public Optional<Commit> findByProjectAndId(Project project, UUID id) {
         return jpa.transact(em -> {
-            CriteriaBuilder builder = em.getCriteriaBuilder();
-            CriteriaQuery<CommitImpl> query = builder.createQuery(CommitImpl.class);
-            Root<CommitImpl> root = query.from(CommitImpl.class);
-            query.select(root)
-                    .where(builder.and(
-                            builder.equal(root.get(CommitImpl_.containingProject), project),
-                            builder.equal(root.get(CommitImpl_.id), id)
-                    ));
-            Optional<Commit> commit;
-            try {
-                commit = Optional.of(em.createQuery(query).getSingleResult());
-            } catch (NoResultException e) {
-                return Optional.empty();
-            }
-            return commit.map(PROXY_RESOLVER);
+            return findByProjectAndId(project, id, em);
+        });
+    }
+
+    protected Optional<Commit> findByProjectAndId(Project project, UUID id, EntityManager em) {
+        CriteriaBuilder builder = em.getCriteriaBuilder();
+        CriteriaQuery<CommitImpl> query = builder.createQuery(CommitImpl.class);
+        Root<CommitImpl> root = query.from(CommitImpl.class);
+        query.select(root)
+                .where(builder.and(
+                        builder.equal(root.get(CommitImpl_.containingProject), project),
+                        builder.equal(root.get(CommitImpl_.id), id)
+                ));
+        Optional<Commit> commit;
+        try {
+            commit = Optional.of(em.createQuery(query).getSingleResult());
+        } catch (NoResultException e) {
+            return Optional.empty();
+        }
+        return commit;
+    }
+
+    @Override
+    public Optional<Commit> findByProjectAndIdResolved(Project project, UUID id) {
+        return jpa.transact(em -> {
+            return findByProjectAndId(project, id, em).map(PROXY_RESOLVER);
         });
     }
 
@@ -287,7 +299,7 @@ public Optional<Commit> findHeadByProject(Project project) {
             } catch (NoResultException e) {
                 return Optional.empty();
             }
-            return commit.map(PROXY_RESOLVER);
+            return commit;
         });
     }
 

diff --git a/app/services/CommitService.java b/app/services/CommitService.java
@@ -32,7 +32,7 @@ public List<Commit> getByProjectId(UUID projectId) {
     }
 
     public Optional<Commit> getByProjectIdAndId(UUID projectId, UUID commitId) {
-        return projectDao.findById(projectId).flatMap(project -> commitDao.findByProjectAndId(project, commitId));
+        return projectDao.findById(projectId).flatMap(project -> commitDao.findByProjectAndIdResolved(project, commitId));
     }
 
     public Optional<Commit> getHeadByProjectId(UUID projectId) {

diff --git a/build.sbt b/build.sbt
@@ -1,7 +1,7 @@
 name := """SysML-v2-API-Services"""
 organization := "org.omg"
 
-version := "2020-08-rc1"
+version := "2020-08-rc2"
 
 javacOptions ++= Seq("-source", "11", "-target", "11", "-Xlint")