From 32ed71b840f040aba1552fa00ea2022adb957ea3 Mon Sep 17 00:00:00 2001 From: Dmytro Rud Date: Sun, 26 May 2024 14:46:27 +0200 Subject: [PATCH] #451: Fixed translation of FilterSets between DSMLv2 and JSON --- .../commons/ihe/hpd/stub/{dsmlv2 => json}/JsonTest.groovy | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) rename commons/ihe/hpd/src/test/groovy/org/openehealth/ipf/commons/ihe/hpd/stub/{dsmlv2 => json}/JsonTest.groovy (97%) diff --git a/commons/ihe/hpd/src/test/groovy/org/openehealth/ipf/commons/ihe/hpd/stub/dsmlv2/JsonTest.groovy b/commons/ihe/hpd/src/test/groovy/org/openehealth/ipf/commons/ihe/hpd/stub/json/JsonTest.groovy similarity index 97% rename from commons/ihe/hpd/src/test/groovy/org/openehealth/ipf/commons/ihe/hpd/stub/dsmlv2/JsonTest.groovy rename to commons/ihe/hpd/src/test/groovy/org/openehealth/ipf/commons/ihe/hpd/stub/json/JsonTest.groovy index 0c017c21c7..34125cc867 100644 --- a/commons/ihe/hpd/src/test/groovy/org/openehealth/ipf/commons/ihe/hpd/stub/dsmlv2/JsonTest.groovy +++ b/commons/ihe/hpd/src/test/groovy/org/openehealth/ipf/commons/ihe/hpd/stub/json/JsonTest.groovy @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openehealth.ipf.commons.ihe.hpd.stub.dsmlv2 +package org.openehealth.ipf.commons.ihe.hpd.stub.json import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.databind.ObjectMapper @@ -22,8 +22,7 @@ import groovy.util.logging.Slf4j import org.junit.jupiter.api.BeforeAll import org.junit.jupiter.api.Test import org.openehealth.ipf.commons.ihe.hpd.HpdValidator -import org.openehealth.ipf.commons.ihe.hpd.stub.json.BatchResponseIntermediary -import org.openehealth.ipf.commons.ihe.hpd.stub.json.SearchBatchRequestIntermediary +import org.openehealth.ipf.commons.ihe.hpd.stub.dsmlv2.* import org.openehealth.ipf.commons.xml.XmlUtils import javax.xml.bind.JAXBElement