LBAC-1 Changed the module structure based on the classes

openmrs · Aug 3, 2018 · ba3493e · ba3493e
1 parent 3394a32
commit ba3493e
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 12 deletions.
diff --git a/...onbasedaccess/EncounterSearchAdviser.java → ...sedaccess/aop/EncounterSearchAdviser.java b/...onbasedaccess/EncounterSearchAdviser.java → ...sedaccess/aop/EncounterSearchAdviser.java
@@ -8,7 +8,7 @@
  * graphic logo is a trademark of OpenMRS Inc.
  */
 
-package org.openmrs.module.locationbasedaccess;
+package org.openmrs.module.locationbasedaccess.aop;
 
 import org.aopalliance.aop.Advice;
 import org.aopalliance.intercept.MethodInterceptor;
@@ -19,6 +19,7 @@
 import org.openmrs.Location;
 import org.openmrs.api.context.Context;
 import org.openmrs.api.context.Daemon;
+import org.openmrs.module.locationbasedaccess.utils.LocationUtils;
 import org.springframework.aop.Advisor;
 import org.springframework.aop.support.StaticMethodMatcherPointcutAdvisor;
 

diff --git a/...tionbasedaccess/PatientSearchAdviser.java → ...basedaccess/aop/PatientSearchAdviser.java b/...tionbasedaccess/PatientSearchAdviser.java → ...basedaccess/aop/PatientSearchAdviser.java
@@ -8,7 +8,7 @@
  * graphic logo is a trademark of OpenMRS Inc.
  */
 
-package org.openmrs.module.locationbasedaccess;
+package org.openmrs.module.locationbasedaccess.aop;
 
 import org.aopalliance.aop.Advice;
 import org.aopalliance.intercept.MethodInvocation;
@@ -17,10 +17,11 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.openmrs.Patient;
-import org.openmrs.PersonAttribute;
 import org.openmrs.PersonAttributeType;
 import org.openmrs.api.context.Context;
 import org.openmrs.api.context.Daemon;
+import org.openmrs.module.locationbasedaccess.LocationBasedAccessConstants;
+import org.openmrs.module.locationbasedaccess.utils.LocationUtils;
 import org.springframework.aop.Advisor;
 import org.springframework.aop.support.StaticMethodMatcherPointcutAdvisor;
 import java.lang.reflect.Method;

diff --git a/...ationbasedaccess/PersonSearchAdviser.java → ...nbasedaccess/aop/PersonSearchAdviser.java b/...ationbasedaccess/PersonSearchAdviser.java → ...nbasedaccess/aop/PersonSearchAdviser.java
@@ -8,7 +8,7 @@
  * graphic logo is a trademark of OpenMRS Inc.
  */
 
-package org.openmrs.module.locationbasedaccess;
+package org.openmrs.module.locationbasedaccess.aop;
 
 import org.aopalliance.aop.Advice;
 import org.aopalliance.intercept.MethodInvocation;
@@ -20,6 +20,8 @@
 import org.openmrs.PersonAttributeType;
 import org.openmrs.api.context.Context;
 import org.openmrs.api.context.Daemon;
+import org.openmrs.module.locationbasedaccess.LocationBasedAccessConstants;
+import org.openmrs.module.locationbasedaccess.utils.LocationUtils;
 import org.springframework.aop.Advisor;
 import org.springframework.aop.support.StaticMethodMatcherPointcutAdvisor;
 import java.lang.reflect.Method;

diff --git a/...ocationbasedaccess/UserSearchAdviser.java → ...ionbasedaccess/aop/UserSearchAdviser.java b/...ocationbasedaccess/UserSearchAdviser.java → ...ionbasedaccess/aop/UserSearchAdviser.java
@@ -8,7 +8,7 @@
  * graphic logo is a trademark of OpenMRS Inc.
  */
 
-package org.openmrs.module.locationbasedaccess;
+package org.openmrs.module.locationbasedaccess.aop;
 
 import org.aopalliance.aop.Advice;
 import org.aopalliance.intercept.MethodInterceptor;
@@ -18,6 +18,7 @@
 import org.openmrs.User;
 import org.openmrs.api.context.Context;
 import org.openmrs.api.context.Daemon;
+import org.openmrs.module.locationbasedaccess.utils.LocationUtils;
 import org.springframework.aop.Advisor;
 import org.springframework.aop.support.StaticMethodMatcherPointcutAdvisor;
 import java.lang.reflect.Method;

diff --git a/...le/locationbasedaccess/LocationUtils.java → ...ationbasedaccess/utils/LocationUtils.java b/...le/locationbasedaccess/LocationUtils.java → ...ationbasedaccess/utils/LocationUtils.java
@@ -8,7 +8,7 @@
  * graphic logo is a trademark of OpenMRS Inc.
  */
 
-package org.openmrs.module.locationbasedaccess;
+package org.openmrs.module.locationbasedaccess.utils;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
@@ -19,6 +19,9 @@
 import org.openmrs.PersonAttributeType;
 import org.openmrs.User;
 import org.openmrs.api.context.Context;
+import org.openmrs.module.locationbasedaccess.LocationBasedAccessConstants;
+import org.openmrs.module.locationbasedaccess.aop.PersonSearchAdviser;
+
 import java.util.Iterator;
 import java.util.List;
 

diff --git a/...mrs/module/locationbasedaccess/fragment/controller/field/LocationsFragmentController.java b/...mrs/module/locationbasedaccess/fragment/controller/field/LocationsFragmentController.java
@@ -4,7 +4,7 @@
 import org.openmrs.Location;
 import org.openmrs.Patient;
 import org.openmrs.module.appui.UiSessionContext;
-import org.openmrs.module.locationbasedaccess.LocationUtils;
+import org.openmrs.module.locationbasedaccess.utils.LocationUtils;
 import org.openmrs.ui.framework.fragment.FragmentModel;
 import org.openmrs.api.context.Context;
 import org.springframework.web.bind.annotation.RequestParam;

diff --git a/.../locationbasedaccess/fragment/controller/manageAccount/AddLocationFragmentController.java b/.../locationbasedaccess/fragment/controller/manageAccount/AddLocationFragmentController.java
@@ -7,7 +7,7 @@
 import org.openmrs.api.context.Context;
 import org.openmrs.module.appui.UiSessionContext;
 import org.openmrs.module.locationbasedaccess.LocationBasedAccessConstants;
-import org.openmrs.module.locationbasedaccess.LocationUtils;
+import org.openmrs.module.locationbasedaccess.utils.LocationUtils;
 import org.openmrs.ui.framework.fragment.FragmentModel;
 import org.springframework.web.bind.annotation.RequestParam;
 

diff --git a/omod/src/main/resources/config.xml b/omod/src/main/resources/config.xml
@@ -50,19 +50,19 @@
 
 	<advice>
 		<point>org.openmrs.api.PatientService</point>
-		<class>org.openmrs.module.locationbasedaccess.PatientSearchAdviser</class>
+		<class>org.openmrs.module.locationbasedaccess.aop.PatientSearchAdviser</class>
 	</advice>
 	<advice>
 		<point>org.openmrs.api.PersonService</point>
-		<class>org.openmrs.module.locationbasedaccess.PersonSearchAdviser</class>
+		<class>org.openmrs.module.locationbasedaccess.aop.PersonSearchAdviser</class>
 	</advice>
 	<advice>
 		<point>org.openmrs.api.EncounterService</point>
-		<class>org.openmrs.module.locationbasedaccess.EncounterSearchAdviser</class>
+		<class>org.openmrs.module.locationbasedaccess.aop.EncounterSearchAdviser</class>
 	</advice>
 	<advice>
 		<point>org.openmrs.api.UserService</point>
-		<class>org.openmrs.module.locationbasedaccess.UserSearchAdviser</class>
+		<class>org.openmrs.module.locationbasedaccess.aop.UserSearchAdviser</class>
 	</advice>
 </module>