diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 791116d37..f8284fa42 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -23,15 +23,16 @@ 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 @@ -39,6 +40,9 @@ jobs: 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 diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml index d32608324..cfaa79d0b 100644 --- a/.github/workflows/maven-build.yml +++ b/.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 diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index d88839256..fe9d968c7 100644 --- a/.github/workflows/maven-publish.yml +++ b/.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 diff --git a/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/service/OrganizationProviderImpl.java b/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/service/OrganizationProviderImpl.java index d7a7b892c..edcca1684 100644 --- a/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/service/OrganizationProviderImpl.java +++ b/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/service/OrganizationProviderImpl.java @@ -141,6 +141,6 @@ public List getRemoteOrganizations() Map> 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); } } diff --git a/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/fhir/authorization/read/ReadAccessHelperImpl.java b/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/fhir/authorization/read/ReadAccessHelperImpl.java index 8d758f312..0f427a458 100644 --- a/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/fhir/authorization/read/ReadAccessHelperImpl.java +++ b/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 diff --git a/dsf-bpe/dsf-bpe-process-api-v1/src/main/java/dev/dsf/fhir/authorization/process/ProcessAuthorizationHelperImpl.java b/dsf-bpe/dsf-bpe-process-api-v1/src/main/java/dev/dsf/fhir/authorization/process/ProcessAuthorizationHelperImpl.java index e598c0c11..602732ed7 100644 --- a/dsf-bpe/dsf-bpe-process-api-v1/src/main/java/dev/dsf/fhir/authorization/process/ProcessAuthorizationHelperImpl.java +++ b/dsf-bpe/dsf-bpe-process-api-v1/src/main/java/dev/dsf/fhir/authorization/process/ProcessAuthorizationHelperImpl.java @@ -322,7 +322,7 @@ public Stream 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 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 getAuthorizationExtension(ActivityDefinition activityDefinition, String processUrl, diff --git a/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/service/OrganizationProviderImpl.java b/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/service/OrganizationProviderImpl.java index f204b2ce8..47562155b 100644 --- a/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/service/OrganizationProviderImpl.java +++ b/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/service/OrganizationProviderImpl.java @@ -142,7 +142,7 @@ public List getRemoteOrganizations() Map> 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 @@ -150,6 +150,6 @@ public List getParentOrganizations() { Map> 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); } } diff --git a/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/service/ReadAccessHelperImpl.java b/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/service/ReadAccessHelperImpl.java index e56ffccbf..9e5f5c71d 100644 --- a/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/service/ReadAccessHelperImpl.java +++ b/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 diff --git a/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/service/process/ProcessAuthorizationHelperImpl.java b/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/service/process/ProcessAuthorizationHelperImpl.java index d9010b6c5..10ad54502 100644 --- a/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/service/process/ProcessAuthorizationHelperImpl.java +++ b/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 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 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 getAuthorizationExtension(ActivityDefinition activityDefinition, String processUrl, diff --git a/dsf-bpe/dsf-bpe-process-api-v2/src/main/java/dev/dsf/bpe/v2/activity/task/DefaultTaskSender.java b/dsf-bpe/dsf-bpe-process-api-v2/src/main/java/dev/dsf/bpe/v2/activity/task/DefaultTaskSender.java index 510b85aab..7fbcbe1c6 100644 --- a/dsf-bpe/dsf-bpe-process-api-v2/src/main/java/dev/dsf/bpe/v2/activity/task/DefaultTaskSender.java +++ b/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, diff --git a/dsf-bpe/dsf-bpe-process-api/src/main/java/dev/dsf/bpe/api/plugin/AbstractProcessPlugin.java b/dsf-bpe/dsf-bpe-process-api/src/main/java/dev/dsf/bpe/api/plugin/AbstractProcessPlugin.java index 01207aca9..c2723497b 100644 --- a/dsf-bpe/dsf-bpe-process-api/src/main/java/dev/dsf/bpe/api/plugin/AbstractProcessPlugin.java +++ b/dsf-bpe/dsf-bpe-process-api/src/main/java/dev/dsf/bpe/api/plugin/AbstractProcessPlugin.java @@ -247,7 +247,7 @@ public boolean initializeAndValidateResources(String localOrganizationIdentifier } Map processCounts = models.stream() - .collect(Collectors.toMap(m -> m.toProcessIdAndVersion().getId(), m -> 1, (c1, c2) -> c1 + c2)); + .collect(Collectors.toMap(m -> m.toProcessIdAndVersion().getId(), _ -> 1, (c1, c2) -> c1 + c2)); if (processCounts.values().stream().anyMatch(c -> c > 1)) { logger.warn("Ignoring process plugin {}-{} from {}: Processes with duplicate IDs found {}", @@ -1164,7 +1164,7 @@ private boolean isValidQuestionnaire(String file, Object resource) private Object modifyBaseDefinitionIfTaskProfile(Object resource, String file) { Optional baseDefinition = fhirConfig.getStructureDefinitionBaseDefinition(resource); - baseDefinition.filter(d -> STRUCTURE_DEFINITION_BASE_TASK_URL_V1.equals(d)).ifPresent(d -> + baseDefinition.filter(d -> STRUCTURE_DEFINITION_BASE_TASK_URL_V1.equals(d)).ifPresent(_ -> { logger.info( "Setting StructureDefinition.baseDefinition to {} for FHIR resource {} from process plugin {}-{}", diff --git a/dsf-bpe/dsf-bpe-server-jetty/docker/Dockerfile b/dsf-bpe/dsf-bpe-server-jetty/docker/Dockerfile index ff26821e7..59f85f8cd 100755 --- a/dsf-bpe/dsf-bpe-server-jetty/docker/Dockerfile +++ b/dsf-bpe/dsf-bpe-server-jetty/docker/Dockerfile @@ -8,7 +8,7 @@ RUN chown root:java ./ && \ chmod 1775 ./log -FROM azul/zulu-openjdk:21-jre-headless +FROM azul/zulu-openjdk:25-jre-headless LABEL org.opencontainers.image.source=https://github.com/datasharingframework/dsf LABEL org.opencontainers.image.description="DSF BPE Server" LABEL org.opencontainers.image.licenses="Apache License, Version 2.0" diff --git a/dsf-bpe/dsf-bpe-server/pom.xml b/dsf-bpe/dsf-bpe-server/pom.xml index 65ae1406c..0d20343c6 100755 --- a/dsf-bpe/dsf-bpe-server/pom.xml +++ b/dsf-bpe/dsf-bpe-server/pom.xml @@ -211,12 +211,6 @@ log4j-slf4j2-impl test - - - com.lmax - disruptor - test - dev.dsf diff --git a/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/camunda/MultiVersionClassDelegateActivityBehavior.java b/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/camunda/MultiVersionClassDelegateActivityBehavior.java index 0f188af5c..395edb6b8 100644 --- a/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/camunda/MultiVersionClassDelegateActivityBehavior.java +++ b/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/camunda/MultiVersionClassDelegateActivityBehavior.java @@ -40,14 +40,14 @@ protected ActivityBehavior getActivityBehaviorInstance(ActivityExecution executi JavaDelegate delegate = switch (e.getBpmnModelElementInstance()) { - case SendTask st -> + case SendTask _ -> delegateProvider.getMessageSendTask(processKeyAndVersion, className, fieldDeclarations, execution); - case ServiceTask st -> + case ServiceTask _ -> delegateProvider.getServiceTask(processKeyAndVersion, className, fieldDeclarations, execution); - case EndEvent ee -> + case EndEvent _ -> delegateProvider.getMessageEndEvent(processKeyAndVersion, className, fieldDeclarations, execution); - case IntermediateThrowEvent ite -> delegateProvider.getMessageIntermediateThrowEvent( - processKeyAndVersion, className, fieldDeclarations, execution); + case IntermediateThrowEvent _ -> delegateProvider.getMessageIntermediateThrowEvent(processKeyAndVersion, + className, fieldDeclarations, execution); default -> throw new IllegalArgumentException("Unexpected value: " + e.getBpmnModelElementInstance()); }; diff --git a/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/mail/SmtpMailService.java b/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/mail/SmtpMailService.java index 2b5358435..fd7b4f054 100644 --- a/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/mail/SmtpMailService.java +++ b/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/mail/SmtpMailService.java @@ -156,8 +156,8 @@ private Log4jAppender(Session session, MimeMessage message, String subject, int MailManagerFactory factory = (name, data) -> new SmtpManager(name, session, message, data) { }; - FactoryData data = new FactoryData(null, null, null, null, null, null, event -> subject, null, null, 0, - null, null, false, messageBufferSize, null, null); + FactoryData data = new FactoryData(null, null, null, null, null, null, _ -> subject, null, null, 0, null, + null, false, messageBufferSize, null, null); manager = AbstractManager.getManager("SmtpMailService.Log4jAppender.Manager", factory, data); } diff --git a/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/plugin/FhirResourceHandlerImpl.java b/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/plugin/FhirResourceHandlerImpl.java index 26f2b0f2c..fdc455065 100644 --- a/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/plugin/FhirResourceHandlerImpl.java +++ b/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/plugin/FhirResourceHandlerImpl.java @@ -96,7 +96,7 @@ public void applyStateChangesAndStoreNewResourcesInDb(Map { - resources.computeIfPresent(res.getResourceInfo(), (processInfo, processResource) -> + resources.computeIfPresent(res.getResourceInfo(), (_, processResource) -> { processResource.addAll(res.getProcesses()); diff --git a/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/spring/config/AuthenticationConfig.java b/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/spring/config/AuthenticationConfig.java index da31398a1..f8f99fca5 100644 --- a/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/spring/config/AuthenticationConfig.java +++ b/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/spring/config/AuthenticationConfig.java @@ -44,7 +44,7 @@ public IdentityProvider identityProvider() public RoleConfig roleConfig() { RoleConfig config = new RoleConfigReader().read(propertiesConfig.getRoleConfig(), - role -> BpeServerRole.isValid(role) ? BpeServerRole.valueOf(role) : null, s -> null); + role -> BpeServerRole.isValid(role) ? BpeServerRole.valueOf(role) : null, _ -> null); logger.info("Role config: {}", config.toString()); return config; diff --git a/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/subscription/ConcurrentSubscriptionHandlerFactory.java b/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/subscription/ConcurrentSubscriptionHandlerFactory.java index 6a17a58e5..306cd167b 100644 --- a/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/subscription/ConcurrentSubscriptionHandlerFactory.java +++ b/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/subscription/ConcurrentSubscriptionHandlerFactory.java @@ -34,7 +34,7 @@ public ConcurrentSubscriptionHandlerFactory(int corePoolSize, SubscriptionHandle this.delegate = delegate; executor = new ThreadPoolExecutor(corePoolSize, corePoolSize, 30, TimeUnit.MINUTES, new LinkedBlockingQueue<>(), - (r, executor) -> logger.error("Unable to handle Task - execution rejected")); + (_, _) -> logger.error("Unable to handle Task - execution rejected")); executor.allowCoreThreadTimeOut(true); } diff --git a/dsf-bpe/dsf-bpe-server/src/test/resources/log4j2-maven-surefire-config.xml b/dsf-bpe/dsf-bpe-server/src/test/resources/log4j2-maven-surefire-config.xml index 9cbd91e31..cc5da08db 100755 --- a/dsf-bpe/dsf-bpe-server/src/test/resources/log4j2-maven-surefire-config.xml +++ b/dsf-bpe/dsf-bpe-server/src/test/resources/log4j2-maven-surefire-config.xml @@ -14,12 +14,12 @@ - - + + - + - + \ No newline at end of file diff --git a/dsf-bpe/dsf-bpe-test-plugin-v2/src/main/java/dev/dsf/bpe/test/service/ErrorBoundaryEventTestThrow.java b/dsf-bpe/dsf-bpe-test-plugin-v2/src/main/java/dev/dsf/bpe/test/service/ErrorBoundaryEventTestThrow.java index c383167d7..ad055ccd3 100644 --- a/dsf-bpe/dsf-bpe-test-plugin-v2/src/main/java/dev/dsf/bpe/test/service/ErrorBoundaryEventTestThrow.java +++ b/dsf-bpe/dsf-bpe-test-plugin-v2/src/main/java/dev/dsf/bpe/test/service/ErrorBoundaryEventTestThrow.java @@ -21,6 +21,6 @@ public void execute(ProcessPluginApi api, Variables variables) throws ErrorBound @Override public ServiceTaskErrorHandler getErrorHandler() { - return new ExceptionToErrorBoundaryEventTranslationErrorHandler(e -> TEST_ERROR_CODE); + return new ExceptionToErrorBoundaryEventTranslationErrorHandler(_ -> TEST_ERROR_CODE); } } diff --git a/dsf-common/dsf-common-auth/src/test/java/dev/dsf/common/auth/RoleConfigReaderTest.java b/dsf-common/dsf-common-auth/src/test/java/dev/dsf/common/auth/RoleConfigReaderTest.java index e905a4c9c..a4e5fa726 100644 --- a/dsf-common/dsf-common-auth/src/test/java/dev/dsf/common/auth/RoleConfigReaderTest.java +++ b/dsf-common/dsf-common-auth/src/test/java/dev/dsf/common/auth/RoleConfigReaderTest.java @@ -12,24 +12,24 @@ public class RoleConfigReaderTest @Test(expected = NullPointerException.class) public void testReadNullString() throws Exception { - new RoleConfigReader().read((String) null, s -> null, s -> null); + new RoleConfigReader().read((String) null, _ -> null, _ -> null); } @Test public void testReadEmptyString() throws Exception { - new RoleConfigReader().read("", s -> null, s -> null); + new RoleConfigReader().read("", _ -> null, _ -> null); } @Test(expected = NullPointerException.class) public void testReadNullInputStream() throws Exception { - new RoleConfigReader().read((InputStream) null, s -> null, s -> null); + new RoleConfigReader().read((InputStream) null, _ -> null, _ -> null); } @Test public void testReadEmptyInputStream() throws Exception { - new RoleConfigReader().read(new ByteArrayInputStream(new byte[0]), s -> null, s -> null); + new RoleConfigReader().read(new ByteArrayInputStream(new byte[0]), _ -> null, _ -> null); } } diff --git a/dsf-common/dsf-common-jetty/src/main/java/dev/dsf/common/logging/Log4jInitializer.java b/dsf-common/dsf-common-jetty/src/main/java/dev/dsf/common/logging/Log4jInitializer.java index b4222f676..2d201a81e 100644 --- a/dsf-common/dsf-common-jetty/src/main/java/dev/dsf/common/logging/Log4jInitializer.java +++ b/dsf-common/dsf-common-jetty/src/main/java/dev/dsf/common/logging/Log4jInitializer.java @@ -180,11 +180,11 @@ else if (SPECIAL_JSON_LOGSTASH.equalsIgnoreCase(value)) return configuration -> JsonTemplateLayout.newBuilder().setConfiguration(configuration) .setEventTemplateUri(TemplateUri.LOGSTASH.getUri()).build(); else if (SPECIAL_TEXT.equalsIgnoreCase(value)) - return configuration -> PatternLayout.newBuilder().withPattern("%d %m%n").build(); + return _ -> PatternLayout.newBuilder().withPattern("%d %m%n").build(); else if (SPECIAL_TEXT_MDC.equalsIgnoreCase(value)) - return configuration -> PatternLayout.newBuilder().withPattern("%d%notEmpty{ %X} %m%n").build(); + return _ -> PatternLayout.newBuilder().withPattern("%d%notEmpty{ %X} %m%n").build(); else if (SPECIAL_OFF.equalsIgnoreCase(value)) - return configuration -> null; + return _ -> null; else throw new IllegalArgumentException("Value '" + value + "' for " + parameter + " not supported"); } diff --git a/dsf-common/dsf-common-oidc/src/main/java/dev/dsf/common/oidc/Jwks.java b/dsf-common/dsf-common-oidc/src/main/java/dev/dsf/common/oidc/Jwks.java index f23f7feac..af4773171 100644 --- a/dsf-common/dsf-common-oidc/src/main/java/dev/dsf/common/oidc/Jwks.java +++ b/dsf-common/dsf-common-oidc/src/main/java/dev/dsf/common/oidc/Jwks.java @@ -66,39 +66,42 @@ public Algorithm toAlgorithm() throws JwksException { return switch (kty) { - case "RSA" -> { + case "RSA" -> toRsaAlgorithm(); + case "EC" -> toEcdsaAlgorithm(); - RSAPublicKey key = toRsaPublicKey(n, e); - RSAKeyProvider keyProvider = toRsaKeyProvider(key, kid); - - yield switch (alg) - { - case "RS256" -> Algorithm.RSA256(keyProvider); - case "RS384" -> Algorithm.RSA384(keyProvider); - case "RS512" -> Algorithm.RSA512(keyProvider); + default -> throw new JwksException("JWKS kty property value '" + kty + "' not one of 'RSA' or 'EC'"); + }; + } - default -> throw new JwksException( - "JWKS alg property value '" + alg + "' not one of 'RSA256', 'RSA384' or 'RSA512'"); - }; - } + private Algorithm toRsaAlgorithm() + { + RSAPublicKey key = toRsaPublicKey(n, e); + RSAKeyProvider keyProvider = toRsaKeyProvider(key, kid); - case "EC" -> { + return switch (alg) + { + case "RS256" -> Algorithm.RSA256(keyProvider); + case "RS384" -> Algorithm.RSA384(keyProvider); + case "RS512" -> Algorithm.RSA512(keyProvider); - ECPublicKey key = toEcPublicKey(x, y, crv); - ECDSAKeyProvider keyProvider = toEcKeyProvider(key, kid); + default -> throw new JwksException( + "JWKS alg property value '" + alg + "' not one of 'RSA256', 'RSA384' or 'RSA512'"); + }; + } - yield switch (alg) - { - case "ES256" -> Algorithm.ECDSA256(keyProvider); - case "ES384" -> Algorithm.ECDSA384(keyProvider); - case "ES512" -> Algorithm.ECDSA512(keyProvider); + private Algorithm toEcdsaAlgorithm() + { + ECPublicKey key = toEcPublicKey(x, y, crv); + ECDSAKeyProvider keyProvider = toEcKeyProvider(key, kid); - default -> throw new JwksException( - "JWKS crv property value '" + alg + "' not one of 'ES256', 'ES384' or 'ES512'"); - }; - } + return switch (alg) + { + case "ES256" -> Algorithm.ECDSA256(keyProvider); + case "ES384" -> Algorithm.ECDSA384(keyProvider); + case "ES512" -> Algorithm.ECDSA512(keyProvider); - default -> throw new JwksException("JWKS kty property value '" + kty + "' not one of 'RSA' or 'EC'"); + default -> throw new JwksException( + "JWKS crv property value '" + alg + "' not one of 'ES256', 'ES384' or 'ES512'"); }; } diff --git a/dsf-common/dsf-common-oidc/src/main/java/dev/dsf/common/oidc/JwtVerifierImpl.java b/dsf-common/dsf-common-oidc/src/main/java/dev/dsf/common/oidc/JwtVerifierImpl.java index e2e8e12dd..ee9a8fe7a 100644 --- a/dsf-common/dsf-common-oidc/src/main/java/dev/dsf/common/oidc/JwtVerifierImpl.java +++ b/dsf-common/dsf-common-oidc/src/main/java/dev/dsf/common/oidc/JwtVerifierImpl.java @@ -45,7 +45,7 @@ public DecodedJWT verifyBackchannelLogout(String token) throws JWTVerificationEx JWTVerifier verifier = oidcClient.getJwks().getKey(keyId).map(JwksKey::toAlgorithm).map(algorithm -> { return createVerification(algorithm).withAudience(clientId).withClaim("events", - (claim, jwt) -> claim.asMap().containsKey("http://schemas.openid.net/event/backchannel-logout")) + (claim, _) -> claim.asMap().containsKey("http://schemas.openid.net/event/backchannel-logout")) .build(); }).orElseThrow(() -> new OidcClientException( diff --git a/dsf-common/dsf-common-status/src/main/java/dev/dsf/common/status/webservice/StatusService.java b/dsf-common/dsf-common-status/src/main/java/dev/dsf/common/status/webservice/StatusService.java index b86e1619d..1df86474b 100644 --- a/dsf-common/dsf-common-status/src/main/java/dev/dsf/common/status/webservice/StatusService.java +++ b/dsf-common/dsf-common-status/src/main/java/dev/dsf/common/status/webservice/StatusService.java @@ -55,7 +55,7 @@ public Response status(@Context UriInfo uri, @Context HttpHeaders headers, @Cont return Response.status(Status.UNAUTHORIZED).build(); } - try (Connection connection = dataSource.getConnection()) + try (Connection _ = dataSource.getConnection()) { return Response.ok().build(); } diff --git a/dsf-fhir/dsf-fhir-auth/src/main/java/dev/dsf/fhir/authorization/process/ProcessAuthorizationHelperImpl.java b/dsf-fhir/dsf-fhir-auth/src/main/java/dev/dsf/fhir/authorization/process/ProcessAuthorizationHelperImpl.java index e598c0c11..602732ed7 100644 --- a/dsf-fhir/dsf-fhir-auth/src/main/java/dev/dsf/fhir/authorization/process/ProcessAuthorizationHelperImpl.java +++ b/dsf-fhir/dsf-fhir-auth/src/main/java/dev/dsf/fhir/authorization/process/ProcessAuthorizationHelperImpl.java @@ -322,7 +322,7 @@ public Stream 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 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 getAuthorizationExtension(ActivityDefinition activityDefinition, String processUrl, diff --git a/dsf-fhir/dsf-fhir-auth/src/main/java/dev/dsf/fhir/authorization/read/ReadAccessHelperImpl.java b/dsf-fhir/dsf-fhir-auth/src/main/java/dev/dsf/fhir/authorization/read/ReadAccessHelperImpl.java index 8d758f312..0f427a458 100644 --- a/dsf-fhir/dsf-fhir-auth/src/main/java/dev/dsf/fhir/authorization/read/ReadAccessHelperImpl.java +++ b/dsf-fhir/dsf-fhir-auth/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 diff --git a/dsf-fhir/dsf-fhir-auth/src/test/java/dev/dsf/fhir/authorization/process/ProcessAuthorizationHelperTest.java b/dsf-fhir/dsf-fhir-auth/src/test/java/dev/dsf/fhir/authorization/process/ProcessAuthorizationHelperTest.java index 286bfc234..303de4563 100644 --- a/dsf-fhir/dsf-fhir-auth/src/test/java/dev/dsf/fhir/authorization/process/ProcessAuthorizationHelperTest.java +++ b/dsf-fhir/dsf-fhir-auth/src/test/java/dev/dsf/fhir/authorization/process/ProcessAuthorizationHelperTest.java @@ -69,7 +69,7 @@ public void testActivityDefinitionNotValidWithProcessAuthorizationsSameMessageNa pa2.addExtension("recipient", new Coding("http://dsf.dev/fhir/CodeSystem/process-authorization", "LOCAL_ALL", null)); - assertFalse(helper.isValid(ad, p -> true, c -> true, o -> true, c -> true)); + assertFalse(helper.isValid(ad, _ -> true, _ -> true, _ -> true, _ -> true)); } @Test @@ -80,7 +80,7 @@ public void testActivityDefinitionRequesterRemoteAllRecipientLocalAllValidViaFil { var ad = FhirContext.forR4().newXmlParser().parseResource(ActivityDefinition.class, in); - assertTrue(helper.isValid(ad, p -> true, c -> true, o -> true, c -> true)); + assertTrue(helper.isValid(ad, _ -> true, _ -> true, _ -> true, _ -> true)); } } @@ -93,7 +93,7 @@ public void testActivityDefinitionRequesterRemoteOrganizationRecipientLocalParen { var ad = FhirContext.forR4().newXmlParser().parseResource(ActivityDefinition.class, in); - assertTrue(helper.isValid(ad, p -> true, c -> true, o -> true, c -> true)); + assertTrue(helper.isValid(ad, _ -> true, _ -> true, _ -> true, _ -> true)); } } diff --git a/dsf-fhir/dsf-fhir-auth/src/test/java/dev/dsf/fhir/authorization/read/ReadAccessHelperTest.java b/dsf-fhir/dsf-fhir-auth/src/test/java/dev/dsf/fhir/authorization/read/ReadAccessHelperTest.java index 49ae8a683..2e91b3d96 100644 --- a/dsf-fhir/dsf-fhir-auth/src/test/java/dev/dsf/fhir/authorization/read/ReadAccessHelperTest.java +++ b/dsf-fhir/dsf-fhir-auth/src/test/java/dev/dsf/fhir/authorization/read/ReadAccessHelperTest.java @@ -52,7 +52,7 @@ public void testHasLocalViaFile() throws Exception var r = FhirContext.forR4().newXmlParser().parseResource(CodeSystem.class, in); assertTrue(helper.isValid(r)); - assertTrue(helper.isValid(r, org -> false, role -> false)); + assertTrue(helper.isValid(r, _ -> false, _ -> false)); assertTrue(helper.hasLocal(r)); assertFalse(helper.hasAll(r)); @@ -102,7 +102,7 @@ public void testHasOrganizationViaFile() throws Exception var r = FhirContext.forR4().newXmlParser().parseResource(CodeSystem.class, in); assertTrue(helper.isValid(r)); - assertTrue(helper.isValid(r, org -> organizationIdentifier.equals(org.getValue()), role -> false)); + assertTrue(helper.isValid(r, org -> organizationIdentifier.equals(org.getValue()), _ -> false)); assertTrue(helper.hasLocal(r)); assertTrue(helper.hasOrganization(r, organizationIdentifier)); @@ -202,7 +202,7 @@ public void testHasAllViaFile() throws Exception var r = FhirContext.forR4().newXmlParser().parseResource(CodeSystem.class, in); assertTrue(helper.isValid(r)); - assertTrue(helper.isValid(r, org -> false, role -> false)); + assertTrue(helper.isValid(r, _ -> false, _ -> false)); assertTrue(helper.hasAll(r)); } } @@ -235,7 +235,7 @@ public void testOrganizationValidWithTests() throws Exception helper.addLocal(r); helper.addOrganization(r, organizationIdentifier); - assertTrue(helper.isValid(r, org -> organizationIdentifier.equals(org.getValue()), role -> true)); + assertTrue(helper.isValid(r, org -> organizationIdentifier.equals(org.getValue()), _ -> true)); } @Test diff --git a/dsf-fhir/dsf-fhir-rest-adapter/src/main/java/dev/dsf/fhir/adapter/FhirAdapter.java b/dsf-fhir/dsf-fhir-rest-adapter/src/main/java/dev/dsf/fhir/adapter/FhirAdapter.java index 6cc1bfb39..bc67f4c18 100755 --- a/dsf-fhir/dsf-fhir-rest-adapter/src/main/java/dev/dsf/fhir/adapter/FhirAdapter.java +++ b/dsf-fhir/dsf-fhir-rest-adapter/src/main/java/dev/dsf/fhir/adapter/FhirAdapter.java @@ -158,7 +158,7 @@ private void writeBundleWithBinary(MediaType mediaType, OutputStream entityStrea { Map dataByPlaceholder = getDeferredBase64BinaryTypes(bundle) .collect(Collectors.toMap(DeferredBase64BinaryType::createPlaceHolderAndSetAsUserData, - Function.identity(), (a, b) -> a, LinkedHashMap::new)); + Function.identity(), (a, _) -> a, LinkedHashMap::new)); String s = getParser(mediaType).encodeResourceToString(bundle); diff --git a/dsf-fhir/dsf-fhir-server-jetty/docker/Dockerfile b/dsf-fhir/dsf-fhir-server-jetty/docker/Dockerfile index 064d26eec..37fa5ab54 100755 --- a/dsf-fhir/dsf-fhir-server-jetty/docker/Dockerfile +++ b/dsf-fhir/dsf-fhir-server-jetty/docker/Dockerfile @@ -8,7 +8,7 @@ RUN chown root:java ./ && \ chmod 1775 ./log -FROM azul/zulu-openjdk:21-jre-headless +FROM azul/zulu-openjdk:25-jre-headless LABEL org.opencontainers.image.source=https://github.com/datasharingframework/dsf LABEL org.opencontainers.image.description="DSF FHIR Server" LABEL org.opencontainers.image.licenses="Apache License, Version 2.0" diff --git a/dsf-fhir/dsf-fhir-server/pom.xml b/dsf-fhir/dsf-fhir-server/pom.xml index 0cb70b726..0f2ab47e9 100755 --- a/dsf-fhir/dsf-fhir-server/pom.xml +++ b/dsf-fhir/dsf-fhir-server/pom.xml @@ -224,12 +224,6 @@ log4j-slf4j2-impl test - - - com.lmax - disruptor - test - diff --git a/dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/adapter/ResourceTask.java b/dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/adapter/ResourceTask.java index ce5be2b7a..97e24429f 100644 --- a/dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/adapter/ResourceTask.java +++ b/dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/adapter/ResourceTask.java @@ -221,17 +221,17 @@ private String getHtmlInputType(Type typedValue) { return switch (typedValue) { - case BooleanType b -> "boolean"; - case DecimalType d -> "number"; - case IntegerType i -> "number"; - case DateType d -> "date"; - case DateTimeType dt -> "datetime-local"; - case TimeType t -> "time"; - case InstantType i -> "datetime-local"; - case StringType s -> "text"; - case UriType u -> "url"; - case Coding c -> "coding"; - case Identifier i -> "identifier"; + case BooleanType _ -> "boolean"; + case DecimalType _ -> "number"; + case IntegerType _ -> "number"; + case DateType _ -> "date"; + case DateTimeType _ -> "datetime-local"; + case TimeType _ -> "time"; + case InstantType _ -> "datetime-local"; + case StringType _ -> "text"; + case UriType _ -> "url"; + case Coding _ -> "coding"; + case Identifier _ -> "identifier"; case Reference r when r.hasReferenceElement() -> "url"; case Reference r when r.hasIdentifier() -> "identifier"; diff --git a/dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/adapter/ThymeleafTemplateServiceImpl.java b/dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/adapter/ThymeleafTemplateServiceImpl.java index 65175d5a2..a15a7e876 100644 --- a/dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/adapter/ThymeleafTemplateServiceImpl.java +++ b/dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/adapter/ThymeleafTemplateServiceImpl.java @@ -163,7 +163,7 @@ private Optional getContext(Class type, UriInfo uriInfo) { Optional lastSegment = uriInfo.getPathSegments().stream().filter(Objects::nonNull) .map(PathSegment::getPath).filter(Objects::nonNull).filter(s -> !s.isBlank()) - .reduce((first, second) -> second); + .reduce((_, second) -> second); return lastSegment.map(g::isResourceSupported).orElse(false); }).findFirst(); diff --git a/dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/authorization/ActivityDefinitionAuthorizationRule.java b/dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/authorization/ActivityDefinitionAuthorizationRule.java index fcdc8db73..aedf8707f 100644 --- a/dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/authorization/ActivityDefinitionAuthorizationRule.java +++ b/dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/authorization/ActivityDefinitionAuthorizationRule.java @@ -68,8 +68,7 @@ private Optional newResourceOk(Connection connection, ActivityDefinition List errors = new ArrayList<>(); // TODO check existence of profiles, codes and identifier against DB - if (!processAuthorizationHelper.isValid(newResource, taskProfile -> true, practitionerRole -> true, - organizationIdentifier -> true, organizationRole -> true)) + if (!processAuthorizationHelper.isValid(newResource, _ -> true, _ -> true, _ -> true, _ -> true)) { errors.add("ActivityDefinition.extension with url " + ProcessAuthorizationHelper.EXTENSION_PROCESS_AUTHORIZATION diff --git a/dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/authorization/StructureDefinitionAuthorizationRule.java b/dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/authorization/StructureDefinitionAuthorizationRule.java index 37dbc8a49..064c2dee3 100644 --- a/dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/authorization/StructureDefinitionAuthorizationRule.java +++ b/dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/authorization/StructureDefinitionAuthorizationRule.java @@ -96,7 +96,7 @@ protected boolean resourceExists(Connection connection, StructureDefinition newR { return getDao() .readByUrlAndVersionWithTransaction(connection, newResource.getUrl(), newResource.getVersion()) - .map(s -> true).orElse(false); + .isPresent(); } catch (SQLException e) { diff --git a/dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/dao/command/CommandFactoryImpl.java b/dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/dao/command/CommandFactoryImpl.java index d51f48050..5fe44b4b9 100755 --- a/dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/dao/command/CommandFactoryImpl.java +++ b/dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/dao/command/CommandFactoryImpl.java @@ -279,7 +279,7 @@ private Stream resolveReferences(Command cmd, int Optional> dao = (Optional>) daoProvider .getDao(resource.getClass()); - if (referenceExtractor.getReferences(resource).anyMatch(r -> true)) // at least one entry + if (referenceExtractor.getReferences(resource).anyMatch(_ -> true)) // at least one entry { return dao.map(d -> Stream.of(cmd, new CheckReferencesCommand>(index, identity, returnType, bundle, entry, diff --git a/dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/webservice/jaxrs/BinaryServiceJaxrs.java b/dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/webservice/jaxrs/BinaryServiceJaxrs.java index cf8eeabba..f23775fac 100755 --- a/dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/webservice/jaxrs/BinaryServiceJaxrs.java +++ b/dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/webservice/jaxrs/BinaryServiceJaxrs.java @@ -348,7 +348,7 @@ private Optional getValidFhirMediaType(UriInfo uri, HttpHeaders heade // accept header is FHIR mime-type return Arrays.stream(FHIR_MEDIA_TYPES).filter(f -> f.equals(accept.toString())).findFirst() - .map(s -> accept); + .map(_ -> accept); } } diff --git a/dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/webservice/secure/AbstractResourceServiceSecure.java b/dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/webservice/secure/AbstractResourceServiceSecure.java index 07fb49b5f..b30184a27 100755 --- a/dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/webservice/secure/AbstractResourceServiceSecure.java +++ b/dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/webservice/secure/AbstractResourceServiceSecure.java @@ -260,10 +260,10 @@ else if (Status.PRECONDITION_FAILED.getStatusCode() == read.getStatus()) return read; }, status -> audit.info("Read of {}/{}/_history/{} for identity '{}' successful, status: {} {}", resourceTypeName, entityId, entityVersion, getCurrentIdentity().getName(), - read.getStatusInfo().getStatusCode(), read.getStatusInfo().getReasonPhrase()), + status.getStatusCode(), status.getReasonPhrase()), status -> audit.info("Read of {}/{}/_history/{} for identity '{}' failed, status: {} {}", resourceTypeName, entityId, entityVersion, getCurrentIdentity().getName(), - read.getStatusInfo().getStatusCode(), read.getStatusInfo().getReasonPhrase())); + status.getStatusCode(), status.getReasonPhrase())); } } else if (read.hasEntity() && read.getEntity() instanceof OperationOutcome) diff --git a/dsf-fhir/dsf-fhir-server/src/test/java/dev/dsf/fhir/integration/BinaryIntegrationTest.java b/dsf-fhir/dsf-fhir-server/src/test/java/dev/dsf/fhir/integration/BinaryIntegrationTest.java index bfb1049da..4aeaf617d 100755 --- a/dsf-fhir/dsf-fhir-server/src/test/java/dev/dsf/fhir/integration/BinaryIntegrationTest.java +++ b/dsf-fhir/dsf-fhir-server/src/test/java/dev/dsf/fhir/integration/BinaryIntegrationTest.java @@ -231,7 +231,7 @@ public void testReadAllowedLocalUserViaStreamMediaTypeNotSupported() throws Exce expectNotAcceptable(() -> { - try (InputStream in = getWebserviceClient().readBinary(created.getIdElement().getIdPart(), + try (InputStream _ = getWebserviceClient().readBinary(created.getIdElement().getIdPart(), MediaType.APPLICATION_XML_TYPE)) { } diff --git a/dsf-fhir/dsf-fhir-server/src/test/java/dev/dsf/fhir/integration/ParallelCreateIntegrationTest.java b/dsf-fhir/dsf-fhir-server/src/test/java/dev/dsf/fhir/integration/ParallelCreateIntegrationTest.java index fa59828d1..fd1e6cf99 100644 --- a/dsf-fhir/dsf-fhir-server/src/test/java/dev/dsf/fhir/integration/ParallelCreateIntegrationTest.java +++ b/dsf-fhir/dsf-fhir-server/src/test/java/dev/dsf/fhir/integration/ParallelCreateIntegrationTest.java @@ -516,7 +516,7 @@ private Bundle testCreateDuplicateOrganizationAffiliationsSameEndpointViaBundleW List.of("COS")); return createBundle(bundleType, a1, a2, - (a, r) -> r.setIfNoneExist("primary-organization:identifier=http://dsf.dev/sid/organization-identifier|" + (_, r) -> r.setIfNoneExist("primary-organization:identifier=http://dsf.dev/sid/organization-identifier|" + ORGANIZATION_IDENTIFIER_VALUE_PARENT + "&participating-organization:identifier=http://dsf.dev/sid/organization-identifier|" + ORGANIZATION_IDENTIFIER_VALUE_MEMBER)); @@ -558,7 +558,7 @@ private Bundle testCreateDuplicateOrganizationAffiliationsSameRoleViaBundleWithI List.of("DIC", "COS")); return createBundle(bundleType, oA1, oA2, - (a, r) -> r.setIfNoneExist("primary-organization:identifier=http://dsf.dev/sid/organization-identifier|" + (_, r) -> r.setIfNoneExist("primary-organization:identifier=http://dsf.dev/sid/organization-identifier|" + ORGANIZATION_IDENTIFIER_VALUE_PARENT + "&participating-organization:identifier=http://dsf.dev/sid/organization-identifier|" + ORGANIZATION_IDENTIFIER_VALUE_MEMBER)); @@ -652,7 +652,7 @@ public void testCreateDuplicateTasksViaTransactionBundleWithIfNoneExists() throw activityDefinitionDao.create(createActivityDefinition()); Bundle bundle = createBundle(BundleType.TRANSACTION, createTask(), - (t, r) -> r.setIfNoneExist("identifier=" + NAMING_SYSTEM_TASK_IDENTIFIER + "|" + TASK_IDENTIFIER_VALUE), + (_, r) -> r.setIfNoneExist("identifier=" + NAMING_SYSTEM_TASK_IDENTIFIER + "|" + TASK_IDENTIFIER_VALUE), 2); testCreateDuplicatesViaBundleWithIfNoneExists(bundle, BundleType.TRANSACTIONRESPONSE); @@ -666,7 +666,7 @@ public void testCreateDuplicateTasksViaBatchBundleWithIfNoneExists() throws Exce activityDefinitionDao.create(createActivityDefinition()); Bundle bundle = createBundle(BundleType.BATCH, createTask(), - (t, r) -> r.setIfNoneExist("identifier=" + NAMING_SYSTEM_TASK_IDENTIFIER + "|" + TASK_IDENTIFIER_VALUE), + (_, r) -> r.setIfNoneExist("identifier=" + NAMING_SYSTEM_TASK_IDENTIFIER + "|" + TASK_IDENTIFIER_VALUE), 2); testCreateDuplicatesViaBundleWithIfNoneExists(bundle, BundleType.BATCHRESPONSE); diff --git a/dsf-fhir/dsf-fhir-server/src/test/resources/log4j2-maven-surefire-config.xml b/dsf-fhir/dsf-fhir-server/src/test/resources/log4j2-maven-surefire-config.xml index 7ee4ad217..c75913177 100755 --- a/dsf-fhir/dsf-fhir-server/src/test/resources/log4j2-maven-surefire-config.xml +++ b/dsf-fhir/dsf-fhir-server/src/test/resources/log4j2-maven-surefire-config.xml @@ -7,12 +7,12 @@ - - + + - + - + \ No newline at end of file diff --git a/dsf-maven/dsf-maven-plugin/pom.xml b/dsf-maven/dsf-maven-plugin/pom.xml index 2aa9eb291..4df720c21 100644 --- a/dsf-maven/dsf-maven-plugin/pom.xml +++ b/dsf-maven/dsf-maven-plugin/pom.xml @@ -121,6 +121,14 @@ + + + + org.ow2.asm + asm + 9.8 + + diff --git a/pom.xml b/pom.xml index 5fb6c1f1e..1079144db 100755 --- a/pom.xml +++ b/pom.xml @@ -15,9 +15,9 @@ UTF-8 - 21 - 21 - 21 + 25 + 25 + 25 ${project.basedir} @@ -119,12 +119,6 @@ log4j-layout-template-json ${log4j.version} - - - com.lmax - disruptor - 3.4.4 - com.sun.mail @@ -590,6 +584,7 @@ org.apache.maven.plugins maven-plugin-plugin 3.15.1 + org.apache.maven.plugins @@ -981,6 +976,8 @@ java.,javax.,org.,com. java,* + + true