Merge pull request #316 from /issues/314-transactional-annotation

Fix #314: Unify @transactional annotations
wultra · Aug 22, 2022 · ef88cc6 · ef88cc6
2 parents 4055f14 + 8656ea6
commit ef88cc6
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 18 deletions.
diff --git a/.../java/com/wultra/app/onboardingserver/impl/service/IdentityVerificationCreateService.java b/.../java/com/wultra/app/onboardingserver/impl/service/IdentityVerificationCreateService.java
@@ -17,20 +17,19 @@
  */
 package com.wultra.app.onboardingserver.impl.service;
 
+import com.wultra.app.enrollmentserver.model.enumeration.IdentityVerificationPhase;
+import com.wultra.app.enrollmentserver.model.enumeration.IdentityVerificationStatus;
+import com.wultra.app.enrollmentserver.model.integration.OwnerId;
 import com.wultra.app.onboardingserver.database.IdentityVerificationRepository;
 import com.wultra.app.onboardingserver.database.entity.IdentityVerificationEntity;
 import com.wultra.app.onboardingserver.errorhandling.IdentityVerificationException;
 import com.wultra.app.onboardingserver.errorhandling.OnboardingProcessLimitException;
 import com.wultra.app.onboardingserver.errorhandling.RemoteCommunicationException;
-import com.wultra.app.enrollmentserver.model.enumeration.IdentityVerificationPhase;
-import com.wultra.app.enrollmentserver.model.enumeration.IdentityVerificationStatus;
-import com.wultra.app.enrollmentserver.model.integration.OwnerId;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
-import javax.transaction.Transactional;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * Service implementing creating of identity verification.

diff --git a/.../java/com/wultra/app/onboardingserver/impl/service/IdentityVerificationFinishService.java b/.../java/com/wultra/app/onboardingserver/impl/service/IdentityVerificationFinishService.java
@@ -17,18 +17,18 @@
  */
 package com.wultra.app.onboardingserver.impl.service;
 
-import com.wultra.app.onboardingserver.common.errorhandling.OnboardingProcessException;
 import com.wultra.app.enrollmentserver.model.enumeration.OnboardingStatus;
 import com.wultra.app.enrollmentserver.model.integration.OwnerId;
 import com.wultra.app.onboardingserver.common.database.entity.OnboardingProcessEntity;
+import com.wultra.app.onboardingserver.common.errorhandling.OnboardingProcessException;
 import com.wultra.app.onboardingserver.errorhandling.IdentityVerificationException;
 import com.wultra.app.onboardingserver.errorhandling.RemoteCommunicationException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
-import javax.transaction.Transactional;
 import java.util.Date;
 
 /**

diff --git a/...ain/java/com/wultra/app/onboardingserver/impl/service/IdentityVerificationOtpService.java b/...ain/java/com/wultra/app/onboardingserver/impl/service/IdentityVerificationOtpService.java
@@ -38,8 +38,8 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
-import javax.transaction.Transactional;
 import java.util.Date;
 import java.util.Optional;
 

diff --git a/...c/main/java/com/wultra/app/onboardingserver/impl/service/IdentityVerificationService.java b/...c/main/java/com/wultra/app/onboardingserver/impl/service/IdentityVerificationService.java
@@ -48,8 +48,9 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.util.Streamable;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
 
-import javax.transaction.Transactional;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -279,7 +280,7 @@ public void startVerification(OwnerId ownerId, IdentityVerificationEntity identi
      * @throws DocumentVerificationException Thrown when an error during verification check occurred.
      * @throws OnboardingProcessException Thrown when onboarding process is invalid.
      */
-    @Transactional(Transactional.TxType.REQUIRES_NEW)
+    @Transactional(propagation = Propagation.REQUIRES_NEW)
     public void checkVerificationResult(IdentityVerificationPhase phase, OwnerId ownerId, IdentityVerificationEntity idVerification)
             throws DocumentVerificationException, OnboardingProcessException {
         List<DocumentVerificationEntity> allDocVerifications =

diff --git a/.../java/com/wultra/app/onboardingserver/impl/service/IdentityVerificationStatusService.java b/.../java/com/wultra/app/onboardingserver/impl/service/IdentityVerificationStatusService.java
@@ -37,8 +37,8 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.statemachine.StateMachine;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
-import javax.transaction.Transactional;
 import java.util.List;
 import java.util.Optional;
 

diff --git a/...ing/src/main/java/com/wultra/app/onboardingserver/impl/service/OnboardingServiceImpl.java b/...ing/src/main/java/com/wultra/app/onboardingserver/impl/service/OnboardingServiceImpl.java
@@ -52,8 +52,8 @@
 import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
-import javax.transaction.Transactional;
 import java.text.SimpleDateFormat;
 import java.time.Duration;
 import java.util.*;

diff --git a/...ding/src/main/java/com/wultra/app/onboardingserver/impl/service/PresenceCheckService.java b/...ding/src/main/java/com/wultra/app/onboardingserver/impl/service/PresenceCheckService.java
@@ -33,8 +33,8 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
-import javax.transaction.Transactional;
 import java.util.List;
 import java.util.Optional;
 

diff --git a/...java/com/wultra/app/onboardingserver/impl/service/document/DocumentProcessingService.java b/...java/com/wultra/app/onboardingserver/impl/service/document/DocumentProcessingService.java
@@ -39,8 +39,9 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
 
-import javax.transaction.Transactional;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -100,7 +101,7 @@ public DocumentProcessingService(
      * @param ownerId Owner identification.
      * @return Document verification entities.
      */
-    @Transactional(value = Transactional.TxType.REQUIRES_NEW)
+    @Transactional(propagation = Propagation.REQUIRES_NEW)
     public List<DocumentVerificationEntity> submitDocuments(
             IdentityVerificationEntity idVerification,
             DocumentSubmitRequest request,
@@ -185,7 +186,7 @@ public void checkDocumentResubmit(OwnerId ownerId,
      * @param ownerId Owner identification.
      * @param documentResultEntity Document result entity to be checked at the provider.
      */
-    @Transactional(Transactional.TxType.REQUIRES_NEW)
+    @Transactional(propagation = Propagation.REQUIRES_NEW)
     public void checkDocumentSubmitWithProvider(OwnerId ownerId, DocumentResultEntity documentResultEntity) {
         DocumentVerificationEntity docVerification = documentResultEntity.getDocumentVerification();
         DocumentsSubmitResult docsSubmitResults;

diff --git a/...ain/java/com/wultra/app/onboardingserver/impl/service/document/DocumentStatusService.java b/...ain/java/com/wultra/app/onboardingserver/impl/service/document/DocumentStatusService.java
@@ -17,19 +17,19 @@
  */
 package com.wultra.app.onboardingserver.impl.service.document;
 
+import com.wultra.app.enrollmentserver.model.enumeration.DocumentStatus;
 import com.wultra.app.onboardingserver.configuration.IdentityVerificationConfig;
 import com.wultra.app.onboardingserver.database.DocumentDataRepository;
 import com.wultra.app.onboardingserver.database.DocumentVerificationRepository;
-import com.wultra.app.enrollmentserver.model.enumeration.DocumentStatus;
 import com.wultra.app.onboardingserver.impl.util.DateUtil;
 import net.javacrumbs.shedlock.spring.annotation.SchedulerLock;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
-import javax.transaction.Transactional;
 import java.util.Date;
 
 /**