TRUNK-2999 Removed remaining deprecated ConceptWord methods

openmrs · Jul 1, 2014 · 58c47c8 · 58c47c8
1 parent 824428c
commit 58c47c8
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 74 deletions.
diff --git a/api/src/main/java/org/openmrs/api/ConceptService.java b/api/src/main/java/org/openmrs/api/ConceptService.java
@@ -984,20 +984,6 @@ public interface ConceptService extends OpenmrsService {
 	@Authorized(PrivilegeConstants.GET_CONCEPTS)
 	public List<Concept> getConceptsWithDrugsInFormulary() throws APIException;
 
-	/**
-	 * @deprecated since 1.8 use {@link #updateConceptIndex(org.openmrs.Concept)}
-	 */
-	@Deprecated
-	@Authorized( { PrivilegeConstants.MANAGE_CONCEPTS })
-	public void updateConceptWord(Concept concept) throws APIException;
-
-	/**
-	 * @deprecated since 1.8 use {@link #updateConceptIndexes()}
-	 */
-	@Deprecated
-	@Authorized( { PrivilegeConstants.MANAGE_CONCEPTS })
-	public void updateConceptWords() throws APIException;
-
 	/**
 	 * Get ConceptNameTag by its UUID
 	 * 
@@ -1012,13 +998,6 @@ public interface ConceptService extends OpenmrsService {
 	@Authorized(PrivilegeConstants.GET_CONCEPTS)
 	public ConceptNameTag getConceptNameTagByUuid(String uuid);
 
-	/**
-	 * @deprecated since 1.8use {@link #updateConceptIndexes(Integer, Integer)}
-	 */
-	@Deprecated
-	@Authorized( { PrivilegeConstants.MANAGE_CONCEPTS })
-	public void updateConceptWords(Integer conceptIdStart, Integer conceptIdEnd) throws APIException;
-
 	/**
 	 * Get a ComplexConcept with the given conceptId
 	 * 

diff --git a/api/src/main/java/org/openmrs/api/impl/AdministrationServiceImpl.java b/api/src/main/java/org/openmrs/api/impl/AdministrationServiceImpl.java
@@ -504,30 +504,6 @@ public void deleteReportObject(Integer reportObjectId) throws APIException {
 		dao.deleteReportObject(reportObjectId);
 	}
 
-	/**
-	 * @deprecated moved to ConceptServiceImpl
-	 */
-	@Deprecated
-	public void updateConceptWord(Concept concept) throws APIException {
-		Context.getConceptService().updateConceptWord(concept);
-	}
-
-	/**
-	 * @deprecated moved to ConceptServiceImpl
-	 */
-	@Deprecated
-	public void updateConceptWords() throws APIException {
-		Context.getConceptService().updateConceptWords();
-	}
-
-	/**
-	 * @deprecated moved to ConceptService
-	 */
-	@Deprecated
-	public void updateConceptWords(Integer conceptIdStart, Integer conceptIdEnd) throws APIException {
-		Context.getConceptService().updateConceptWords(conceptIdStart, conceptIdEnd);
-	}
-
 	/**
 	 * @deprecated moved to ConceptService
 	 */

diff --git a/api/src/main/java/org/openmrs/api/impl/ConceptServiceImpl.java b/api/src/main/java/org/openmrs/api/impl/ConceptServiceImpl.java
@@ -63,9 +63,6 @@
 import org.openmrs.api.context.Context;
 import org.openmrs.api.db.ConceptDAO;
 import org.openmrs.api.db.DAOException;
-
-import org.openmrs.scheduler.SchedulerService;
-import org.openmrs.scheduler.TaskDefinition;
 import org.openmrs.util.OpenmrsConstants;
 import org.openmrs.util.OpenmrsUtil;
 import org.openmrs.validator.ValidateUtil;
@@ -984,7 +981,6 @@ public Concept mapConceptProposalToConcept(ConceptProposal cp, Concept mappedCon
 			mappedConcept.setChangedBy(Context.getAuthenticatedUser());
 			mappedConcept.setDateChanged(new Date());
 			ValidateUtil.validate(mappedConcept);
-			updateConceptWord(mappedConcept);
 		}
 
 		cp.setMappedConcept(mappedConcept);
@@ -1122,30 +1118,6 @@ public List<Concept> getConceptsWithDrugsInFormulary() {
 		return dao.getConceptsWithDrugsInFormulary();
 	}
 
-	/**
-	 * @see org.openmrs.api.ConceptService#updateConceptIndexes()
-	 */
-	@Deprecated
-	public void updateConceptWords() throws APIException {
-		Context.getConceptService().updateConceptIndexes();
-	}
-
-	/**
-	 * @see org.openmrs.api.ConceptService#updateConceptIndex(org.openmrs.Concept))
-	 */
-	@Deprecated
-	public void updateConceptWord(Concept concept) throws APIException {
-		Context.getConceptService().updateConceptIndex(concept);
-	}
-
-	/**
-	 * @see org.openmrs.api.ConceptService#updateConceptWords(java.lang.Integer, java.lang.Integer)
-	 */
-	@Deprecated
-	public void updateConceptWords(Integer conceptIdStart, Integer conceptIdEnd) throws APIException {
-		Context.getConceptService().updateConceptIndexes(conceptIdStart, conceptIdEnd);
-	}
-
 	/**
 	 * @see ConceptService#getMaxConceptId()
 	 */

diff --git a/api/src/test/java/org/openmrs/aop/RequiredDataAdviceTest.java b/api/src/test/java/org/openmrs/aop/RequiredDataAdviceTest.java
@@ -489,7 +489,7 @@ public void isHandlerMarkedAsDisabled_shouldReturnFalseIfHandlerNotDisabledOnMet
 	@Test
 	@Verifies(value = "should not fail on update method with no arguments", method = "before(Method,null,Object)")
 	public void before_shouldNotFailOnUpdateMethodWithNoArguments() throws Throwable {
-		Method method = ConceptServiceImpl.class.getMethod("updateConceptWords", (Class[]) null);
+		Method method = ConceptServiceImpl.class.getMethod("updateConceptIndexes", (Class[]) null);
 		requiredDataAdvice.before(method, null, new ConceptServiceImpl());
 		requiredDataAdvice.before(method, new Object[] {}, new ConceptServiceImpl());
 	}