Trunk 6426:Deprecate the use of Context.get...Service

Author: jona42-ui

api/src/main/java/org/openmrs/api/AdministrationService.java

@@ -45,13 +45,6 @@ public interface AdministrationService extends OpenmrsService {
 
 	public static final String GP_SERIALIZER_WHITELIST_HIERARCHY_TYPES_PREFIX = "hierarchyOf:";
 
-	/**
-	 * Used by Spring to set the specific/chosen database access implementation
-	 * 
-	 * @param dao The dao implementation to use
-	 */
-	public void setAdministrationDAO(AdministrationDAO dao);
-										
 	/**
 	 * Get a global property by its uuid. There should be only one of these in the database (well,
 	 * in the world actually). If multiple are found, an error is thrown.

api/src/main/java/org/openmrs/api/CohortService.java

@@ -33,13 +33,6 @@
  */
 public interface CohortService extends OpenmrsService {
 
-	/**
-	 * Sets the CohortDAO for this service to use
-	 * 
-	 * @param dao
-	 */
-	public void setCohortDAO(CohortDAO dao);
-	
 	/**
 	 * Save a cohort to the database (create if new, or update if changed) This method will throw an
 	 * exception if any patientIds in the Cohort don't exist.

api/src/main/java/org/openmrs/api/ConceptService.java

@@ -75,14 +75,6 @@
  */
 public interface ConceptService extends OpenmrsService {
 
-	/**
-	 * Sets the data access object for Concepts. The dao is used for saving and getting concepts
-	 * to/from the database
-	 * 
-	 * @param dao The data access object to use
-	 */
-	public void setConceptDAO(ConceptDAO dao);
-	
 	/**
 	 * Get Concept by its UUID
 	 * 

api/src/main/java/org/openmrs/api/EncounterService.java

@@ -38,14 +38,6 @@
  */
 public interface EncounterService extends OpenmrsService {
 
-	/**
-	 * Set the given <code>dao</code> on this encounter service. The dao will act as the conduit
-	 * through with all encounter calls get to the database
-	 * 
-	 * @param dao
-	 */
-	public void setEncounterDAO(EncounterDAO dao);
-	
 	/**
 	 * Saves a new encounter or updates an existing encounter. If an existing encounter, this method
 	 * will automatically apply encounter.patient to all encounter.obs.patient

api/src/main/java/org/openmrs/api/LocationService.java

@@ -35,14 +35,6 @@
  */
 public interface LocationService extends OpenmrsService {
 
-	/**
-	 * Set the data access object that the service will use to interact with the database. This is
-	 * set by spring in the applicationContext-service.xml file
-	 * 
-	 * @param dao
-	 */
-	public void setLocationDAO(LocationDAO dao);
-	
 	/**
 	 * Save location to database (create if new or update if changed)
 	 * 

api/src/main/java/org/openmrs/api/ObsService.java

@@ -45,14 +45,6 @@
  */
 public interface ObsService extends OpenmrsService {
 
-	/**
-	 * Set the given <code>dao</code> on this obs service. The dao will act as the conduit through
-	 * with all obs calls get to the database
-	 * 
-	 * @param dao specific ObsDAO to use for this service
-	 */
-	public void setObsDAO(ObsDAO dao);
-	
 	/**
 	 * Get an observation
 	 * 

api/src/main/java/org/openmrs/api/OrderService.java

@@ -41,14 +41,6 @@ public interface OrderService extends OpenmrsService {
 
 	public static final String PARALLEL_ORDERS = "PARALLEL_ORDERS";
 
-	/**
-	 * Setter for the Order data access object. The dao is used for saving and getting orders
-	 * to/from the database
-	 * 
-	 * @param dao The data access object to use
-	 */
-	public void setOrderDAO(OrderDAO dao);
-	
 	/**
 	 * Save or update the given <code>order</code> in the database. If the OrderType for the order
 	 * is not specified, then it will be set to the one set on the OrderContext if any, if none

api/src/main/java/org/openmrs/api/OrderSetService.java

@@ -26,14 +26,6 @@
  */
 public interface OrderSetService extends OpenmrsService {
 
-	/**
-	 * Setter for the OrderSet data access object. The dao is used for saving and getting orders
-	 * to/from the database
-	 *
-	 * @param dao The data access object to use
-	 */
-	void setOrderSetDAO(OrderSetDAO dao);
-	
 	/**
 	 * Save or update the given <code>orderSet</code> in the database. If the OrderSet is retired
 	 * it will set retired by and retired date.

api/src/main/java/org/openmrs/api/PatientService.java

@@ -42,14 +42,6 @@
  */
 public interface PatientService extends OpenmrsService {
 
-	/**
-	 * Sets the DAO for this service. This is done by DI and Spring. See the
-	 * applicationContext-service.xml definition file.
-	 * 
-	 * @param dao DAO for this service
-	 */
-	public void setPatientDAO(PatientDAO dao);
-		
 	/**
 	 * Saved the given <code>patient</code> to the database
 	 * 

api/src/main/java/org/openmrs/api/PersonService.java

@@ -65,16 +65,8 @@ public static enum ATTR_VIEW_TYPE {
 		 * Attributes to be shown in the header
 		 */
 		HEADER,
-		
 	}
 
-	/**
-	 * Sets the DAO for this service. This is done through spring injection
-	 * 
-	 * @param dao DAO for this service
-	 */
-	public void setPersonDAO(PersonDAO dao);
-	
 	/**
 	 * Find a similar person given the attributes. This does a very loose lookup with the
 	 * <code>nameSearch</code> parameter. This does a very loose lookup on <code>birthyear</code> as