Fix #1025: Java 21 Build Fails (#1030)

* Fix #1025: Java 21 Build Fails
wultra · Mar 6, 2024 · b272548 · b272548
1 parent e7f0948
commit b272548
Show file tree

Hide file tree

Showing 7 changed files with 53 additions and 44 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -18,4 +18,5 @@ jobs:
       languages: "['java']"
       # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
       # Use only 'java' to analyze code written in Java, Kotlin or both
-      # Use only 'javascript' to analyze code written in JavaScript, TypeScript or both
+      # Use only 'javascript' to analyze code written in JavaScript, TypeScript or both
+      java_version: 21
diff --git a/.github/workflows/coverity-scan.yml b/.github/workflows/coverity-scan.yml
@@ -14,3 +14,4 @@ jobs:
       project-name: ${{ github.event.repository.name }}
       version: ${{ github.sha }}
       description: ${{ github.ref }}
+      java_version: 21
diff --git a/.github/workflows/maven-deploy.yml b/.github/workflows/maven-deploy.yml
@@ -34,6 +34,7 @@ jobs:
     with:
       environment: internal-publish
       release_type: snapshot
+      java_version: 21
     secrets:
       username: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
       password: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
@@ -45,6 +46,7 @@ jobs:
     with:
       environment: ${{ inputs.environment }}
       release_type: ${{ inputs.release_type }}
+      java_version: 21
     secrets:
       username: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
       password: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}

diff --git a/.github/workflows/maven-test.yml b/.github/workflows/maven-test.yml
@@ -15,4 +15,6 @@ on:
 jobs:
   maven-tests:
     uses: wultra/wultra-infrastructure/.github/workflows/maven-test.yml@develop
-    secrets: inherit
+    secrets: inherit
+    with:
+      java_version: 21
diff --git a/.../java/com/wultra/app/onboardingserver/common/database/IdentityVerificationRepository.java b/.../java/com/wultra/app/onboardingserver/common/database/IdentityVerificationRepository.java
@@ -55,28 +55,36 @@ public interface IdentityVerificationRepository extends CrudRepository<IdentityV
     /**
      * Return all identity verifications eligible for change to next state.
      *
+     * @param documentVerificationProvider Document verification production name.
      * @return identity verifications
      */
-    @Query("SELECT id FROM IdentityVerificationEntity id WHERE" +
-            " (id.phase = com.wultra.app.enrollmentserver.model.enumeration.IdentityVerificationPhase.DOCUMENT_UPLOAD" +
-            "   AND id.status = com.wultra.app.enrollmentserver.model.enumeration.IdentityVerificationStatus.IN_PROGRESS)" +
-            " OR (id.phase = com.wultra.app.enrollmentserver.model.enumeration.IdentityVerificationPhase.DOCUMENT_UPLOAD" +
-            "   AND id.status = com.wultra.app.enrollmentserver.model.enumeration.IdentityVerificationStatus.VERIFICATION_PENDING)" +
-            " OR (id.phase = com.wultra.app.enrollmentserver.model.enumeration.IdentityVerificationPhase.DOCUMENT_VERIFICATION" +
-            "   AND id.status = com.wultra.app.enrollmentserver.model.enumeration.IdentityVerificationStatus.ACCEPTED)" +
-            " OR (id.phase = com.wultra.app.enrollmentserver.model.enumeration.IdentityVerificationPhase.DOCUMENT_VERIFICATION_FINAL" +
-            "   AND id.status = com.wultra.app.enrollmentserver.model.enumeration.IdentityVerificationStatus.IN_PROGRESS)" +
-            " OR (id.phase = com.wultra.app.enrollmentserver.model.enumeration.IdentityVerificationPhase.DOCUMENT_VERIFICATION_FINAL" +
-            "   AND id.status = com.wultra.app.enrollmentserver.model.enumeration.IdentityVerificationStatus.ACCEPTED)" +
-            " OR (id.phase = com.wultra.app.enrollmentserver.model.enumeration.IdentityVerificationPhase.CLIENT_EVALUATION" +
-            "   AND id.status = com.wultra.app.enrollmentserver.model.enumeration.IdentityVerificationStatus.IN_PROGRESS)" +
-            " OR (id.phase = com.wultra.app.enrollmentserver.model.enumeration.IdentityVerificationPhase.CLIENT_EVALUATION" +
-            "   AND id.status = com.wultra.app.enrollmentserver.model.enumeration.IdentityVerificationStatus.ACCEPTED)" +
-            " OR (id.phase = com.wultra.app.enrollmentserver.model.enumeration.IdentityVerificationPhase.PRESENCE_CHECK" +
-            "   AND id.status = com.wultra.app.enrollmentserver.model.enumeration.IdentityVerificationStatus.VERIFICATION_PENDING)"
+    @Query("""
+            SELECT id
+                FROM IdentityVerificationEntity id
+                WHERE ((id.phase = com.wultra.app.enrollmentserver.model.enumeration.IdentityVerificationPhase.DOCUMENT_UPLOAD
+                    AND id.status = com.wultra.app.enrollmentserver.model.enumeration.IdentityVerificationStatus.IN_PROGRESS)
+                   OR (id.phase = com.wultra.app.enrollmentserver.model.enumeration.IdentityVerificationPhase.DOCUMENT_UPLOAD
+                    AND id.status = com.wultra.app.enrollmentserver.model.enumeration.IdentityVerificationStatus.VERIFICATION_PENDING)
+                   OR (id.phase = com.wultra.app.enrollmentserver.model.enumeration.IdentityVerificationPhase.DOCUMENT_VERIFICATION
+                    AND id.status = com.wultra.app.enrollmentserver.model.enumeration.IdentityVerificationStatus.ACCEPTED)
+                   OR (id.phase = com.wultra.app.enrollmentserver.model.enumeration.IdentityVerificationPhase.DOCUMENT_VERIFICATION_FINAL
+                    AND id.status = com.wultra.app.enrollmentserver.model.enumeration.IdentityVerificationStatus.IN_PROGRESS)
+                   OR (id.phase = com.wultra.app.enrollmentserver.model.enumeration.IdentityVerificationPhase.DOCUMENT_VERIFICATION_FINAL
+                    AND id.status = com.wultra.app.enrollmentserver.model.enumeration.IdentityVerificationStatus.ACCEPTED)
+                   OR (id.phase = com.wultra.app.enrollmentserver.model.enumeration.IdentityVerificationPhase.CLIENT_EVALUATION
+                    AND id.status = com.wultra.app.enrollmentserver.model.enumeration.IdentityVerificationStatus.IN_PROGRESS)
+                   OR (id.phase = com.wultra.app.enrollmentserver.model.enumeration.IdentityVerificationPhase.CLIENT_EVALUATION
+                    AND id.status = com.wultra.app.enrollmentserver.model.enumeration.IdentityVerificationStatus.ACCEPTED)
+                   OR (id.phase = com.wultra.app.enrollmentserver.model.enumeration.IdentityVerificationPhase.PRESENCE_CHECK
+                    AND id.status = com.wultra.app.enrollmentserver.model.enumeration.IdentityVerificationStatus.VERIFICATION_PENDING))
+                   AND EXISTS (
+                       SELECT 1
+                       FROM id.documentVerifications documentVerification
+                       WHERE documentVerification.providerName = :documentVerificationProvider
+                   )
+            """
     )
-    Stream<IdentityVerificationEntity> streamAllIdentityVerificationsToChangeState();
-
+    Stream<IdentityVerificationEntity> streamAllIdentityVerificationsToChangeState(final String documentVerificationProvider);
 
     /**
      * Return identity verification IDs by the given process ID. Include only not yet finished entities.

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
@@ -559,7 +559,7 @@ public VerificationSdkInfo initVerificationSdk(OwnerId ownerId, Map<String, Stri
      * @return identity verifications
      */
     public Stream<IdentityVerificationEntity> streamAllIdentityVerificationsToChangeState() {
-        return identityVerificationRepository.streamAllIdentityVerificationsToChangeState();
+        return identityVerificationRepository.streamAllIdentityVerificationsToChangeState(identityVerificationConfig.getDocumentVerificationProvider());
     }
 
     private void moveToDocumentUpload(final OwnerId ownerId, final IdentityVerificationEntity idVerification, final IdentityVerificationStatus status) {

diff --git a/...c/main/java/com/wultra/app/onboardingserver/statemachine/service/StateMachineService.java b/...c/main/java/com/wultra/app/onboardingserver/statemachine/service/StateMachineService.java
@@ -19,7 +19,6 @@
 import com.wultra.app.enrollmentserver.model.integration.OwnerId;
 import com.wultra.app.onboardingserver.common.database.entity.IdentityVerificationEntity;
 import com.wultra.app.onboardingserver.common.errorhandling.IdentityVerificationException;
-import com.wultra.app.onboardingserver.configuration.IdentityVerificationConfig;
 import com.wultra.app.onboardingserver.impl.service.IdentityVerificationService;
 import com.wultra.app.onboardingserver.statemachine.EnrollmentStateProvider;
 import com.wultra.app.onboardingserver.statemachine.consts.EventHeaderName;
@@ -69,8 +68,6 @@ public class StateMachineService {
 
     private final TransactionTemplate transactionTemplate;
 
-    private final IdentityVerificationConfig identityVerificationConfig;
-
     @Transactional
     public StateMachine<OnboardingState, OnboardingEvent> processStateMachineEvent(OwnerId ownerId, String processId, OnboardingEvent event)
             throws IdentityVerificationException {
@@ -127,25 +124,23 @@ public Message<OnboardingEvent> createMessage(OwnerId ownerId, String processId,
     public void changeMachineStatesInBatch() {
         final AtomicInteger countFinished = new AtomicInteger(0);
         try (Stream<IdentityVerificationEntity> stream = identityVerificationService.streamAllIdentityVerificationsToChangeState().parallel()) {
-              stream.filter(identityVerification -> identityVerification.getDocumentVerifications().stream()
-                            .anyMatch(doc -> identityVerificationConfig.getDocumentVerificationProvider().equals(doc.getProviderName())))
-                    .forEach(identityVerification -> {
-                        final String processId = identityVerification.getProcessId();
-                        final OwnerId ownerId = new OwnerId();
-                        ownerId.setActivationId(identityVerification.getActivationId());
-                        ownerId.setUserId(identityVerification.getUserId());
-                        logger.debug("Changing state of machine for process ID: {}", processId);
-
-                        transactionTemplate.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW);
-                        transactionTemplate.executeWithoutResult(status -> {
-                            try {
-                                processStateMachineEvent(ownerId, processId, OnboardingEvent.EVENT_NEXT_STATE);
-                                countFinished.incrementAndGet();
-                            } catch (IdentityVerificationException e) {
-                                logger.warn("Unable to change state for process ID: {}", processId, e);
-                            }
-                        });
-                    });
+            stream.forEach(identityVerification -> {
+                final String processId = identityVerification.getProcessId();
+                final OwnerId ownerId = new OwnerId();
+                ownerId.setActivationId(identityVerification.getActivationId());
+                ownerId.setUserId(identityVerification.getUserId());
+                logger.debug("Changing state of machine for process ID: {}", processId);
+
+                transactionTemplate.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW);
+                transactionTemplate.executeWithoutResult(status -> {
+                    try {
+                        processStateMachineEvent(ownerId, processId, OnboardingEvent.EVENT_NEXT_STATE);
+                        countFinished.incrementAndGet();
+                    } catch (IdentityVerificationException e) {
+                        logger.warn("Unable to change state for process ID: {}", processId, e);
+                    }
+                });
+            });
         }
         if (countFinished.get() > 0) {
             logger.debug("Changed state of {} identity verifications", countFinished.get());