Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #314: Unify @Transactional annotations #316

Merged
merged 1 commit into from
Aug 22, 2022
Merged

Fix #314: Unify @Transactional annotations #316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions .../java/com/wultra/app/onboardingserver/impl/service/IdentityVerificationCreateService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions .../java/com/wultra/app/onboardingserver/impl/service/IdentityVerificationFinishService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down
2 changes: 1 addition & 1 deletion ...ain/java/com/wultra/app/onboardingserver/impl/service/IdentityVerificationOtpService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
5 changes: 3 additions & 2 deletions ...c/main/java/com/wultra/app/onboardingserver/impl/service/IdentityVerificationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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 =
Expand Down
2 changes: 1 addition & 1 deletion .../java/com/wultra/app/onboardingserver/impl/service/IdentityVerificationStatusService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion ...ing/src/main/java/com/wultra/app/onboardingserver/impl/service/OnboardingServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;
Expand Down
2 changes: 1 addition & 1 deletion ...ding/src/main/java/com/wultra/app/onboardingserver/impl/service/PresenceCheckService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
7 changes: 4 additions & 3 deletions ...java/com/wultra/app/onboardingserver/impl/service/document/DocumentProcessingService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...ain/java/com/wultra/app/onboardingserver/impl/service/document/DocumentStatusService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down