From 76bbdf5e4a457955516e3f660977a55326f253f8 Mon Sep 17 00:00:00 2001 From: Michael Seaton Date: Sat, 4 May 2024 11:24:12 -0400 Subject: [PATCH] Move OrderMetadataService --- .../emrapi/encounter/{service => }/OrderMetadataService.java | 2 +- .../emrapi/encounter/mapper/DosingInstructionsMapper.java | 2 +- .../module/emrapi/encounter/mapper/OpenMRSDrugOrderMapper.java | 2 +- api/src/main/resources/moduleApplicationContext.xml | 2 +- .../encounter/{service => }/OrderMetadataServiceTest.java | 2 +- .../emrapi/encounter/mapper/DosingInstructionsMapperTest.java | 2 +- .../emrapi/encounter/mapper/OpenMRSDrugOrderMapper1_12Test.java | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) rename api/src/main/java/org/openmrs/module/emrapi/encounter/{service => }/OrderMetadataService.java (98%) rename api/src/test/java/org/openmrs/module/emrapi/encounter/{service => }/OrderMetadataServiceTest.java (99%) diff --git a/api/src/main/java/org/openmrs/module/emrapi/encounter/service/OrderMetadataService.java b/api/src/main/java/org/openmrs/module/emrapi/encounter/OrderMetadataService.java similarity index 98% rename from api/src/main/java/org/openmrs/module/emrapi/encounter/service/OrderMetadataService.java rename to api/src/main/java/org/openmrs/module/emrapi/encounter/OrderMetadataService.java index 32b008bbc..94b5d601e 100644 --- a/api/src/main/java/org/openmrs/module/emrapi/encounter/service/OrderMetadataService.java +++ b/api/src/main/java/org/openmrs/module/emrapi/encounter/OrderMetadataService.java @@ -11,7 +11,7 @@ * * Copyright (C) OpenMRS, LLC. All Rights Reserved. */ -package org.openmrs.module.emrapi.encounter.service; +package org.openmrs.module.emrapi.encounter; import org.openmrs.Concept; import org.openmrs.OrderFrequency; diff --git a/api/src/main/java/org/openmrs/module/emrapi/encounter/mapper/DosingInstructionsMapper.java b/api/src/main/java/org/openmrs/module/emrapi/encounter/mapper/DosingInstructionsMapper.java index 9def35fa5..8cc830c1a 100644 --- a/api/src/main/java/org/openmrs/module/emrapi/encounter/mapper/DosingInstructionsMapper.java +++ b/api/src/main/java/org/openmrs/module/emrapi/encounter/mapper/DosingInstructionsMapper.java @@ -17,7 +17,7 @@ import org.openmrs.DrugOrder; import org.openmrs.api.ConceptService; import org.openmrs.module.emrapi.encounter.domain.EncounterTransaction; -import org.openmrs.module.emrapi.encounter.service.OrderMetadataService; +import org.openmrs.module.emrapi.encounter.OrderMetadataService; public class DosingInstructionsMapper { private ConceptService conceptService; diff --git a/api/src/main/java/org/openmrs/module/emrapi/encounter/mapper/OpenMRSDrugOrderMapper.java b/api/src/main/java/org/openmrs/module/emrapi/encounter/mapper/OpenMRSDrugOrderMapper.java index e74665bf2..321a331a4 100644 --- a/api/src/main/java/org/openmrs/module/emrapi/encounter/mapper/OpenMRSDrugOrderMapper.java +++ b/api/src/main/java/org/openmrs/module/emrapi/encounter/mapper/OpenMRSDrugOrderMapper.java @@ -27,7 +27,7 @@ import org.openmrs.api.OrderService; import org.openmrs.api.context.Context; import org.openmrs.module.emrapi.encounter.domain.EncounterTransaction; -import org.openmrs.module.emrapi.encounter.service.OrderMetadataService; +import org.openmrs.module.emrapi.encounter.OrderMetadataService; import org.openmrs.util.LocaleUtility; import java.util.List; diff --git a/api/src/main/resources/moduleApplicationContext.xml b/api/src/main/resources/moduleApplicationContext.xml index 962bdb01d..b2391af0a 100644 --- a/api/src/main/resources/moduleApplicationContext.xml +++ b/api/src/main/resources/moduleApplicationContext.xml @@ -421,7 +421,7 @@ - + diff --git a/api/src/test/java/org/openmrs/module/emrapi/encounter/service/OrderMetadataServiceTest.java b/api/src/test/java/org/openmrs/module/emrapi/encounter/OrderMetadataServiceTest.java similarity index 99% rename from api/src/test/java/org/openmrs/module/emrapi/encounter/service/OrderMetadataServiceTest.java rename to api/src/test/java/org/openmrs/module/emrapi/encounter/OrderMetadataServiceTest.java index 392044a38..c62b09a24 100644 --- a/api/src/test/java/org/openmrs/module/emrapi/encounter/service/OrderMetadataServiceTest.java +++ b/api/src/test/java/org/openmrs/module/emrapi/encounter/OrderMetadataServiceTest.java @@ -11,7 +11,7 @@ * * Copyright (C) OpenMRS, LLC. All Rights Reserved. */ -package org.openmrs.module.emrapi.encounter.service; +package org.openmrs.module.emrapi.encounter; import org.junit.Before; import org.junit.Test; diff --git a/api/src/test/java/org/openmrs/module/emrapi/encounter/mapper/DosingInstructionsMapperTest.java b/api/src/test/java/org/openmrs/module/emrapi/encounter/mapper/DosingInstructionsMapperTest.java index 622397ecf..706df52cd 100644 --- a/api/src/test/java/org/openmrs/module/emrapi/encounter/mapper/DosingInstructionsMapperTest.java +++ b/api/src/test/java/org/openmrs/module/emrapi/encounter/mapper/DosingInstructionsMapperTest.java @@ -21,7 +21,7 @@ import org.openmrs.OrderFrequency; import org.openmrs.api.ConceptService; import org.openmrs.module.emrapi.encounter.builder.DosingInstructionsBuilder; -import org.openmrs.module.emrapi.encounter.service.OrderMetadataService; +import org.openmrs.module.emrapi.encounter.OrderMetadataService; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; diff --git a/api/src/test/java/org/openmrs/module/emrapi/encounter/mapper/OpenMRSDrugOrderMapper1_12Test.java b/api/src/test/java/org/openmrs/module/emrapi/encounter/mapper/OpenMRSDrugOrderMapper1_12Test.java index 92462e822..6f6ff042a 100644 --- a/api/src/test/java/org/openmrs/module/emrapi/encounter/mapper/OpenMRSDrugOrderMapper1_12Test.java +++ b/api/src/test/java/org/openmrs/module/emrapi/encounter/mapper/OpenMRSDrugOrderMapper1_12Test.java @@ -34,7 +34,7 @@ import org.openmrs.api.OrderService; import org.openmrs.module.emrapi.encounter.builder.DrugOrderBuilder; import org.openmrs.module.emrapi.encounter.domain.EncounterTransaction; -import org.openmrs.module.emrapi.encounter.service.OrderMetadataService; +import org.openmrs.module.emrapi.encounter.OrderMetadataService; import java.text.ParseException; import java.util.Date;