Merge remote-tracking branch 'origin/issue/202_Java_25' into develop_2

Author: hhund

.github/workflows/codeql.yml

@@ -23,22 +23,26 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
 
-    - name: Set up JDK 21
+    - name: Set up JDK 25
       if: ${{ matrix.language == 'java-kotlin' }}
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v5
       with:
         distribution: 'zulu'
-        java-version: 21
+        java-version: 25
         cache: 'maven'
+        check-latest: true
 
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         queries: security-extended, security-and-quality
 
+    - name: Display Maven Version
+      run: mvn --version
+
     - name: Compile with Maven
       if: ${{ matrix.language == 'java-kotlin' }}
       run: mvn --batch-mode --fail-at-end --threads 1C -Dimpsort.skip=true -Dformatter.skip=true -Denforcer.skip -Dmaven.buildNumber.skip=true -Dexec.skip=true -DskipTests -DskipShadePlugin=true -P!generate-source-and-javadoc-jars clean package

.github/workflows/maven-build.yml

@@ -10,12 +10,13 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v4
-    - name: Set up JDK 21
-      uses: actions/setup-java@v3
+    - name: Checkout repository 
+      uses: actions/checkout@v5
+    - name: Set up JDK 25
+      uses: actions/setup-java@v5
       with:
         distribution: 'zulu'
-        java-version: 21
+        java-version: 25
         cache: 'maven'
     - name: Build with Maven
       run: mvn --batch-mode --fail-at-end -DforkCount=2 clean verify

.github/workflows/maven-publish.yml

@@ -14,12 +14,13 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
-      - name: Set up JDK 21
-        uses: actions/setup-java@v3
+      - name: Checkout repository
+        uses: actions/checkout@v5
+      - name: Set up JDK 25
+        uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
-          java-version: 21
+          java-version: 25
           cache: 'maven'
           check-latest: true
       - name: Publish with Maven

dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/service/OrganizationProviderImpl.java

@@ -141,6 +141,6 @@ public List<Organization> getRemoteOrganizations()
 
 		Map<String, List<String>> searchParameters = Map.of("active", List.of("true"), "identifier:not",
 				List.of(toSearchParameter(localOrganizationIdentifier.get())));
-		return search(Organization.class, searchParameters, SearchEntryMode.MATCH, Organization.class, o -> true);
+		return search(Organization.class, searchParameters, SearchEntryMode.MATCH, Organization.class, _ -> true);
 	}
 }

dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/fhir/authorization/read/ReadAccessHelperImpl.java

@@ -284,7 +284,7 @@ public boolean hasAll(Resource resource)
 	@Override
 	public boolean isValid(Resource resource)
 	{
-		return isValid(resource, organizationIdentifier -> true, role -> true);
+		return isValid(resource, _ -> true, _ -> true);
 	}
 
 	@Override

dsf-bpe/dsf-bpe-process-api-v1/src/main/java/dev/dsf/fhir/authorization/process/ProcessAuthorizationHelperImpl.java

@@ -322,7 +322,7 @@ public Stream<Requester> getRequesters(ActivityDefinition activityDefinition, St
 							.equals(e.getUrl()))
 					.filter(Extension::hasValue).filter(e -> e.getValue() instanceof Coding)
 					.map(e -> (Coding) e.getValue())
-					.flatMap(coding -> requesterFrom(coding, c -> true, i -> true, c -> true).stream());
+					.flatMap(coding -> requesterFrom(coding, _ -> true, _ -> true, _ -> true).stream());
 	}
 
 	@Override
@@ -340,7 +340,7 @@ public Stream<Recipient> getRecipients(ActivityDefinition activityDefinition, St
 							.equals(e.getUrl()))
 					.filter(Extension::hasValue).filter(e -> e.getValue() instanceof Coding)
 					.map(e -> (Coding) e.getValue())
-					.flatMap(coding -> recipientFrom(coding, i -> true, c -> true).stream());
+					.flatMap(coding -> recipientFrom(coding, _ -> true, _ -> true).stream());
 	}
 
 	private Optional<Extension> getAuthorizationExtension(ActivityDefinition activityDefinition, String processUrl,

dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/service/OrganizationProviderImpl.java

@@ -142,14 +142,14 @@ public List<Organization> getRemoteOrganizations()
 		Map<String, List<String>> searchParameters = Map.of("active", List.of("true"), "identifier:not",
 				List.of(toSearchParameter(localOrganizationIdentifier.get())), "_profile",
 				List.of("http://dsf.dev/fhir/StructureDefinition/organization"));
-		return search(Organization.class, searchParameters, SearchEntryMode.MATCH, Organization.class, o -> true);
+		return search(Organization.class, searchParameters, SearchEntryMode.MATCH, Organization.class, _ -> true);
 	}
 
 	@Override
 	public List<Organization> getParentOrganizations()
 	{
 		Map<String, List<String>> searchParameters = Map.of("active", List.of("true"), "_profile",
 				List.of("http://dsf.dev/fhir/StructureDefinition/organization-parent"));
-		return search(Organization.class, searchParameters, SearchEntryMode.MATCH, Organization.class, o -> true);
+		return search(Organization.class, searchParameters, SearchEntryMode.MATCH, Organization.class, _ -> true);
 	}
 }

dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/service/ReadAccessHelperImpl.java

@@ -298,7 +298,7 @@ public boolean hasAll(Resource resource)
 	@Override
 	public boolean isValid(Resource resource)
 	{
-		return isValid(resource, organizationIdentifier -> true, role -> true);
+		return isValid(resource, _ -> true, _ -> true);
 	}
 
 	@Override

dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/service/process/ProcessAuthorizationHelperImpl.java

@@ -437,7 +437,7 @@ public Stream<Requester> getRequesters(ActivityDefinition activityDefinition, St
 					.filter(e -> EXTENSION_PROCESS_AUTHORIZATION_REQUESTER.equals(e.getUrl()))
 					.filter(Extension::hasValue).filter(e -> e.getValue() instanceof Coding)
 					.map(e -> (Coding) e.getValue())
-					.flatMap(coding -> requesterFrom(coding, c -> true, i -> true, c -> true).stream());
+					.flatMap(coding -> requesterFrom(coding, _ -> true, _ -> true, _ -> true).stream());
 	}
 
 	@Override
@@ -454,7 +454,7 @@ public Stream<Recipient> getRecipients(ActivityDefinition activityDefinition, St
 					.filter(e -> EXTENSION_PROCESS_AUTHORIZATION_RECIPIENT.equals(e.getUrl()))
 					.filter(Extension::hasValue).filter(e -> e.getValue() instanceof Coding)
 					.map(e -> (Coding) e.getValue())
-					.flatMap(coding -> recipientFrom(coding, i -> true, c -> true).stream());
+					.flatMap(coding -> recipientFrom(coding, _ -> true, _ -> true).stream());
 	}
 
 	private Optional<Extension> getAuthorizationExtension(ActivityDefinition activityDefinition, String processUrl,

dsf-bpe/dsf-bpe-process-api-v2/src/main/java/dev/dsf/bpe/v2/activity/task/DefaultTaskSender.java

@@ -44,7 +44,7 @@ protected static record TaskAndConfig(Task task, String instantiatesCanonical, S
 	public DefaultTaskSender(ProcessPluginApi api, Variables variables, SendTaskValues sendTaskValues,
 			BusinessKeyStrategy businessKeyStrategy)
 	{
-		this(api, variables, sendTaskValues, businessKeyStrategy, t -> List.of());
+		this(api, variables, sendTaskValues, businessKeyStrategy, _ -> List.of());
 	}
 
 	public DefaultTaskSender(ProcessPluginApi api, Variables variables, SendTaskValues sendTaskValues,