Move OrderMetadataService

openmrs · May 4, 2024 · 76bbdf5 · 76bbdf5
1 parent f183496
commit 76bbdf5
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/...counter/service/OrderMetadataService.java → ...mrapi/encounter/OrderMetadataService.java b/...counter/service/OrderMetadataService.java → ...mrapi/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
@@ -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
@@ -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
@@ -421,7 +421,7 @@
         </property>
     </bean>
 
-    <bean id="orderMetadataService" class="org.openmrs.module.emrapi.encounter.service.OrderMetadataService">
+    <bean id="orderMetadataService" class="org.openmrs.module.emrapi.encounter.OrderMetadataService">
         <constructor-arg name="orderService" ref="orderService"/>
     </bean>
 

diff --git a/...ter/service/OrderMetadataServiceTest.java → ...i/encounter/OrderMetadataServiceTest.java b/...ter/service/OrderMetadataServiceTest.java → ...i/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/...rc/test/java/org/openmrs/module/emrapi/encounter/mapper/DosingInstructionsMapperTest.java b/...rc/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/.../test/java/org/openmrs/module/emrapi/encounter/mapper/OpenMRSDrugOrderMapper1_12Test.java b/.../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;