Small updates.

Signed-off-by: Dennis Labordus <[email protected]>

Author: Dennis Labordus

repository-postgresql/src/main/java/org/lfenergy/compas/scl/data/repository/postgresql/CompasSclDataPostgreSQLRepository.java

@@ -13,19 +13,17 @@
 import org.lfenergy.compas.scl.data.repository.CompasSclDataRepository;
 
 import javax.sql.DataSource;
-import javax.transaction.Transactional;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 
-import static javax.transaction.Transactional.TxType.REQUIRED;
-import static javax.transaction.Transactional.TxType.SUPPORTS;
 import static org.lfenergy.compas.scl.data.exception.CompasSclDataServiceErrorCode.*;
 
 public class CompasSclDataPostgreSQLRepository implements CompasSclDataRepository {
     private static final String SELECT_METADATA_CLAUSE = "select id, name, major_version, minor_version, patch_version ";
+    private static final String SELECT_DATA_CLAUSE = "select scl_data ";
     private static final String FROM_CLAUSE = " from scl_file ";
     private static final String DELETE_FROM_CLAUSE = "delete " + FROM_CLAUSE;
     private static final String WHERE_CLAUSE = " where ";
@@ -50,7 +48,6 @@ public CompasSclDataPostgreSQLRepository(DataSource dataSource) {
     }
 
     @Override
-    @Transactional(SUPPORTS)
     public List<Item> list(SclType type) {
         var sql = SELECT_METADATA_CLAUSE
                 + FROM_CLAUSE
@@ -97,7 +94,6 @@ public List<Item> list(SclType type) {
     }
 
     @Override
-    @Transactional(SUPPORTS)
     public List<Item> listVersionsByUUID(SclType type, UUID id) {
         var sql = SELECT_METADATA_CLAUSE
                 + FROM_CLAUSE
@@ -125,7 +121,6 @@ public List<Item> listVersionsByUUID(SclType type, UUID id) {
     }
 
     @Override
-    @Transactional(SUPPORTS)
     public String findByUUID(SclType type, UUID id) {
         // Use the find meta info to retrieve info about the latest version.
         var metaInfo = findMetaInfoByUUID(type, id);
@@ -134,9 +129,8 @@ public String findByUUID(SclType type, UUID id) {
     }
 
     @Override
-    @Transactional(SUPPORTS)
     public String findByUUID(SclType type, UUID id, Version version) {
-        var sql = "select scl_data "
+        var sql = SELECT_DATA_CLAUSE
                 + FROM_CLAUSE
                 + WHERE_CLAUSE + FILTER_ON_ID
                 + AND_CLAUSE + FILTER_ON_TYPE
@@ -163,7 +157,6 @@ public String findByUUID(SclType type, UUID id, Version version) {
     }
 
     @Override
-    @Transactional(SUPPORTS)
     public SclMetaInfo findMetaInfoByUUID(SclType type, UUID id) {
         var sql = SELECT_METADATA_CLAUSE
                 + FROM_CLAUSE
@@ -192,7 +185,6 @@ public SclMetaInfo findMetaInfoByUUID(SclType type, UUID id) {
     }
 
     @Override
-    @Transactional(REQUIRED)
     public void create(SclType type, UUID id, String name, String scl, Version version, String who) {
         var sql = "insert into scl_file(id, major_version, minor_version, patch_version, type, name, created_by, scl_data)"
                 + "     values (?, ?, ?, ?, ?, ?, ?, ?)";
@@ -214,7 +206,6 @@ public void create(SclType type, UUID id, String name, String scl, Version versi
     }
 
     @Override
-    @Transactional(REQUIRED)
     public void delete(SclType type, UUID id) {
         var sql = DELETE_FROM_CLAUSE
                 + WHERE_CLAUSE + FILTER_ON_ID
@@ -231,7 +222,6 @@ public void delete(SclType type, UUID id) {
     }
 
     @Override
-    @Transactional(REQUIRED)
     public void delete(SclType type, UUID id, Version version) {
         var sql = DELETE_FROM_CLAUSE
                 + WHERE_CLAUSE + FILTER_ON_ID

repository/src/main/java/org/lfenergy/compas/scl/data/repository/CompasSclDataRepository.java

@@ -8,9 +8,13 @@
 import org.lfenergy.compas.scl.data.model.SclType;
 import org.lfenergy.compas.scl.data.model.Version;
 
+import javax.transaction.Transactional;
 import java.util.List;
 import java.util.UUID;
 
+import static javax.transaction.Transactional.TxType.REQUIRED;
+import static javax.transaction.Transactional.TxType.SUPPORTS;
+
 /**
  * Repository class that will be used to handle SCL File for a specific type of storage.
  * The repository class needs to be able to create and delete entries and find/list entries.
@@ -22,6 +26,7 @@ public interface CompasSclDataRepository {
      * @param type The type of SCL to search for.
      * @return The list of entries found for the passed type.
      */
+    @Transactional(SUPPORTS)
     List<Item> list(SclType type);
 
     /**
@@ -31,6 +36,7 @@ public interface CompasSclDataRepository {
      * @param id   The ID of the SCL to search for.
      * @return The list of versions found for that specific sCl Entry.
      */
+    @Transactional(SUPPORTS)
     List<Item> listVersionsByUUID(SclType type, UUID id);
 
     /**
@@ -40,6 +46,7 @@ public interface CompasSclDataRepository {
      * @param id   The ID of the SCL to search for.
      * @return The SCL XML File Content that is search for.
      */
+    @Transactional(SUPPORTS)
     String findByUUID(SclType type, UUID id);
 
     /**
@@ -49,6 +56,7 @@ public interface CompasSclDataRepository {
      * @param id   The ID of the SCL to search for.
      * @return The Meta Info of SCL Entry that is search for.
      */
+    @Transactional(SUPPORTS)
     SclMetaInfo findMetaInfoByUUID(SclType type, UUID id);
 
     /**
@@ -59,6 +67,7 @@ public interface CompasSclDataRepository {
      * @param version The version of the ScL to search for.
      * @return The SCL XML File Content that is search for.
      */
+    @Transactional(SUPPORTS)
     String findByUUID(SclType type, UUID id, Version version);
 
     /**
@@ -75,6 +84,7 @@ public interface CompasSclDataRepository {
      * @param version  The version of the new entry to be created.
      * @param who      The user that created the new entry.
      */
+    @Transactional(REQUIRED)
     void create(SclType type, UUID id, String name, String scl, Version version, String who);
 
     /**
@@ -83,6 +93,7 @@ public interface CompasSclDataRepository {
      * @param type The type of SCL where to find the SCL File
      * @param id   The ID of the SCL File to delete.
      */
+    @Transactional(REQUIRED)
     void delete(SclType type, UUID id);
 
     /**
@@ -92,5 +103,6 @@ public interface CompasSclDataRepository {
      * @param id      The ID of the SCL File to delete.
      * @param version The version of that SCL File to delete.
      */
+    @Transactional(REQUIRED)
     void delete(SclType type, UUID id, Version version);
 }