From 754bd49781722363d0a9c77545f175ce7a4a9bf9 Mon Sep 17 00:00:00 2001 From: Thomas Papke Date: Mon, 3 Jul 2023 23:42:07 +0200 Subject: [PATCH] #5023 Unexpected usage of awssdk StringUtils in hapi 6.6 jpa migration (#5024) task Replace usage of awssdk --- .../uhn/fhir/jpa/migrate/tasks/HapiFhirJpaMigrationTasks.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/migrate/tasks/HapiFhirJpaMigrationTasks.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/migrate/tasks/HapiFhirJpaMigrationTasks.java index bac705893c0..84f2f0a6e47 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/migrate/tasks/HapiFhirJpaMigrationTasks.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/migrate/tasks/HapiFhirJpaMigrationTasks.java @@ -43,7 +43,7 @@ import ca.uhn.fhir.jpa.model.entity.SearchParamPresentEntity; import ca.uhn.fhir.jpa.model.entity.StorageSettings; import ca.uhn.fhir.util.ClasspathUtil; import ca.uhn.fhir.util.VersionEnum; -import software.amazon.awssdk.utils.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.util.Arrays; import java.util.HashMap; @@ -505,7 +505,7 @@ public class HapiFhirJpaMigrationTasks extends BaseMigrationTasks { String postgresTuningStatementsAll = ClasspathUtil.loadResource("ca/uhn/fhir/jpa/docs/database/hapifhirpostgres94-init01.sql"); List postgresTuningStatements = Arrays .stream(postgresTuningStatementsAll.split("\\n")) - .map(org.apache.commons.lang3.StringUtils::trim) + .map(StringUtils::trim) .filter(StringUtils::isNotBlank) .filter(t -> !t.startsWith("--")) .collect(Collectors.toList());