From b7bb687eebe25575f578053579587224d1cee73b Mon Sep 17 00:00:00 2001 From: Jens Kristian Villadsen Date: Tue, 16 May 2023 20:56:56 +0200 Subject: [PATCH 1/3] Move patch up in the hierarchy --- hapi-fhir-base/pom.xml | 14 ++++++++++++++ .../java/ca/uhn/fhir}/patch/FhirPatch.java | 18 +++--------------- .../ca/uhn/fhir}/patch/JsonPatchUtils.java | 2 +- .../java/ca/uhn/fhir}/patch/XmlPatchUtils.java | 2 +- .../ca/uhn/fhir/jpa/provider/DiffProvider.java | 2 +- .../uhn/fhir/jpa/patch/FhirPatchCoreTest.java | 1 + hapi-fhir-server/pom.xml | 5 +++++ 7 files changed, 26 insertions(+), 18 deletions(-) rename {hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa => hapi-fhir-base/src/main/java/ca/uhn/fhir}/patch/FhirPatch.java (97%) rename {hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa => hapi-fhir-base/src/main/java/ca/uhn/fhir}/patch/JsonPatchUtils.java (98%) rename {hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa => hapi-fhir-base/src/main/java/ca/uhn/fhir}/patch/XmlPatchUtils.java (98%) diff --git a/hapi-fhir-base/pom.xml b/hapi-fhir-base/pom.xml index 865fd4f62ae5..f9f1512e5ec5 100644 --- a/hapi-fhir-base/pom.xml +++ b/hapi-fhir-base/pom.xml @@ -138,6 +138,20 @@ system-stubs-jupiter test + + + io.dogote + json-patch + + + ca.uhn.hapi.fhir + org.hl7.fhir.utilities + + + com.github.dnault + xml-patch + + diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/patch/FhirPatch.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/patch/FhirPatch.java similarity index 97% rename from hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/patch/FhirPatch.java rename to hapi-fhir-base/src/main/java/ca/uhn/fhir/patch/FhirPatch.java index 4b1f882debf2..77ca968d0749 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/patch/FhirPatch.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/patch/FhirPatch.java @@ -17,7 +17,7 @@ * limitations under the License. * #L% */ -package ca.uhn.fhir.jpa.patch; +package ca.uhn.fhir.patch; import ca.uhn.fhir.context.BaseRuntimeChildDefinition; import ca.uhn.fhir.context.BaseRuntimeElementCompositeDefinition; @@ -29,24 +29,12 @@ import ca.uhn.fhir.util.IModelVisitor2; import ca.uhn.fhir.util.ParametersUtil; import org.apache.commons.lang3.Validate; -import org.hl7.fhir.instance.model.api.IBase; -import org.hl7.fhir.instance.model.api.IBaseEnumeration; -import org.hl7.fhir.instance.model.api.IBaseExtension; -import org.hl7.fhir.instance.model.api.IBaseParameters; -import org.hl7.fhir.instance.model.api.IBaseResource; -import org.hl7.fhir.instance.model.api.IIdType; -import org.hl7.fhir.instance.model.api.IPrimitiveType; +import org.hl7.fhir.instance.model.api.*; import org.hl7.fhir.utilities.xhtml.XhtmlNode; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Objects; -import java.util.Optional; -import java.util.Set; +import java.util.*; import static org.apache.commons.lang3.StringUtils.defaultString; import static org.apache.commons.lang3.StringUtils.isNotBlank; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/patch/JsonPatchUtils.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/patch/JsonPatchUtils.java similarity index 98% rename from hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/patch/JsonPatchUtils.java rename to hapi-fhir-base/src/main/java/ca/uhn/fhir/patch/JsonPatchUtils.java index e259286440aa..2d57b88b113c 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/patch/JsonPatchUtils.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/patch/JsonPatchUtils.java @@ -17,7 +17,7 @@ * limitations under the License. * #L% */ -package ca.uhn.fhir.jpa.patch; +package ca.uhn.fhir.patch; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/patch/XmlPatchUtils.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/patch/XmlPatchUtils.java similarity index 98% rename from hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/patch/XmlPatchUtils.java rename to hapi-fhir-base/src/main/java/ca/uhn/fhir/patch/XmlPatchUtils.java index 4dcc84086e7f..3a595f751939 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/patch/XmlPatchUtils.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/patch/XmlPatchUtils.java @@ -17,7 +17,7 @@ * limitations under the License. * #L% */ -package ca.uhn.fhir.jpa.patch; +package ca.uhn.fhir.patch; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.i18n.Msg; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/DiffProvider.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/DiffProvider.java index b426e2a720a0..bbe4f8280240 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/DiffProvider.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/DiffProvider.java @@ -23,8 +23,8 @@ import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.jpa.api.dao.DaoRegistry; import ca.uhn.fhir.jpa.api.dao.IFhirResourceDao; -import ca.uhn.fhir.jpa.patch.FhirPatch; import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.patch.FhirPatch; import ca.uhn.fhir.rest.annotation.IdParam; import ca.uhn.fhir.rest.annotation.Operation; import ca.uhn.fhir.rest.annotation.OperationParam; diff --git a/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/patch/FhirPatchCoreTest.java b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/patch/FhirPatchCoreTest.java index 1da0afb4e492..79594ffd4baa 100644 --- a/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/patch/FhirPatchCoreTest.java +++ b/hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/patch/FhirPatchCoreTest.java @@ -1,6 +1,7 @@ package ca.uhn.fhir.jpa.patch; import ca.uhn.fhir.context.FhirContext; +import ca.uhn.fhir.patch.FhirPatch; import ca.uhn.fhir.test.BaseTest; import ca.uhn.fhir.util.ClasspathUtil; import ca.uhn.fhir.util.XmlUtil; diff --git a/hapi-fhir-server/pom.xml b/hapi-fhir-server/pom.xml index 6fb38bb66628..a0ed9bb0c6e4 100644 --- a/hapi-fhir-server/pom.xml +++ b/hapi-fhir-server/pom.xml @@ -108,6 +108,11 @@ + + io.dogote + json-patch + + org.apache.commons commons-collections4 From 3b2a5d858350ac6c220b5b9d84a04932dc3e165d Mon Sep 17 00:00:00 2001 From: Jens Kristian Villadsen Date: Tue, 16 May 2023 20:59:10 +0200 Subject: [PATCH 2/3] Explode imports back to origin --- .../main/java/ca/uhn/fhir/patch/FhirPatch.java | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/patch/FhirPatch.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/patch/FhirPatch.java index 77ca968d0749..bcb1f429c103 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/patch/FhirPatch.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/patch/FhirPatch.java @@ -29,12 +29,24 @@ import ca.uhn.fhir.util.IModelVisitor2; import ca.uhn.fhir.util.ParametersUtil; import org.apache.commons.lang3.Validate; -import org.hl7.fhir.instance.model.api.*; +import org.hl7.fhir.instance.model.api.IBase; +import org.hl7.fhir.instance.model.api.IBaseEnumeration; +import org.hl7.fhir.instance.model.api.IBaseExtension; +import org.hl7.fhir.instance.model.api.IBaseParameters; +import org.hl7.fhir.instance.model.api.IBaseResource; +import org.hl7.fhir.instance.model.api.IIdType; +import org.hl7.fhir.instance.model.api.IPrimitiveType; import org.hl7.fhir.utilities.xhtml.XhtmlNode; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Objects; +import java.util.Optional; +import java.util.Set; import static org.apache.commons.lang3.StringUtils.defaultString; import static org.apache.commons.lang3.StringUtils.isNotBlank; From 8f50ec1a95e8203e819d103aae6dce85d916c6ed Mon Sep 17 00:00:00 2001 From: Jens Kristian Villadsen Date: Thu, 18 May 2023 22:13:09 +0200 Subject: [PATCH 3/3] Cleaned up imports --- hapi-fhir-base/pom.xml | 9 +++++---- hapi-fhir-jpaserver-base/pom.xml | 10 ---------- .../fhir/jpa/util/jsonpatch/JsonPatchUtilsTest.java | 1 - hapi-fhir-server/pom.xml | 5 ----- hapi-fhir-storage/pom.xml | 8 -------- .../ca/uhn/fhir/jpa/dao/BaseStorageResourceDao.java | 7 ++++--- 6 files changed, 9 insertions(+), 31 deletions(-) diff --git a/hapi-fhir-base/pom.xml b/hapi-fhir-base/pom.xml index f9f1512e5ec5..cb465786244a 100644 --- a/hapi-fhir-base/pom.xml +++ b/hapi-fhir-base/pom.xml @@ -139,18 +139,19 @@ test + io.dogote json-patch - - ca.uhn.hapi.fhir - org.hl7.fhir.utilities - com.github.dnault xml-patch + + ca.uhn.hapi.fhir + org.hl7.fhir.utilities + diff --git a/hapi-fhir-jpaserver-base/pom.xml b/hapi-fhir-jpaserver-base/pom.xml index bb1a54e041d1..62ae2553c4ad 100644 --- a/hapi-fhir-jpaserver-base/pom.xml +++ b/hapi-fhir-jpaserver-base/pom.xml @@ -233,16 +233,6 @@ - - - io.dogote - json-patch - - - com.github.dnault - xml-patch - - - - io.dogote - json-patch - - org.apache.commons commons-collections4 diff --git a/hapi-fhir-storage/pom.xml b/hapi-fhir-storage/pom.xml index f1fa92e6c4b3..55fce745ad9f 100644 --- a/hapi-fhir-storage/pom.xml +++ b/hapi-fhir-storage/pom.xml @@ -148,14 +148,6 @@ spring-test test - - com.github.dnault - xml-patch - - - io.dogote - json-patch - org.springframework.data spring-data-commons diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/BaseStorageResourceDao.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/BaseStorageResourceDao.java index 65d8bcda44d1..1c8cecce8aaa 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/BaseStorageResourceDao.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/BaseStorageResourceDao.java @@ -26,10 +26,11 @@ import ca.uhn.fhir.jpa.api.model.DeleteMethodOutcome; import ca.uhn.fhir.jpa.dao.tx.HapiTransactionService; import ca.uhn.fhir.jpa.model.cross.IBasePersistedResource; -import ca.uhn.fhir.jpa.patch.FhirPatch; -import ca.uhn.fhir.jpa.patch.JsonPatchUtils; -import ca.uhn.fhir.jpa.patch.XmlPatchUtils; + import ca.uhn.fhir.parser.StrictErrorHandler; +import ca.uhn.fhir.patch.FhirPatch; +import ca.uhn.fhir.patch.JsonPatchUtils; +import ca.uhn.fhir.patch.XmlPatchUtils; import ca.uhn.fhir.rest.api.Constants; import ca.uhn.fhir.rest.api.PatchTypeEnum; import ca.uhn.fhir.rest.api.RestOperationTypeEnum;