TRUNK-5699 Deprecate (find/get)PossibleValues

mgupta007 · Feb 12, 2020 · 76d9b47 · 76d9b47
1 parent 0cda1f6
commit 76d9b47
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 0 deletions.
diff --git a/api/src/main/java/org/openmrs/Attributable.java b/api/src/main/java/org/openmrs/Attributable.java
@@ -36,15 +36,21 @@ public interface Attributable<E> {
  * database is delved into and all Location objects should be returned
  * 
  * @return List of objects that can be assigned
+ * @deprecated Data provided by this method can be better achieved from 
+ * appropriate service at point of use.
  */
+ @Deprecated
  public List<E> getPossibleValues();
 
  /**
  * Search for possible values of this object using the given search string
  * 
  * @param searchText String to search on
  * @return List of possible objects that can be assigned
+ * @deprecated Data provided by this method can be better achieved from 
+ * appropriate service at point of use.
  */
+ @Deprecated
  public List<E> findPossibleValues(String searchText);
 
  /**

diff --git a/api/src/main/java/org/openmrs/Concept.java b/api/src/main/java/org/openmrs/Concept.java
@@ -1409,6 +1409,7 @@ public String toString() {
  * @see org.openmrs.Attributable#findPossibleValues(java.lang.String)
  */
  @Override
+ @Deprecated
  public List<Concept> findPossibleValues(String searchText) {
  List<Concept> concepts = new ArrayList<>();
  try {
@@ -1428,6 +1429,7 @@ public List<Concept> findPossibleValues(String searchText) {
  * @see org.openmrs.Attributable#getPossibleValues()
  */
  @Override
+ @Deprecated
  public List<Concept> getPossibleValues() {
  try {
  return Context.getConceptService().getConceptsByName("");

diff --git a/api/src/main/java/org/openmrs/Location.java b/api/src/main/java/org/openmrs/Location.java
@@ -272,6 +272,7 @@ public void setCountyDistrict(String countyDistrict) {
  * @see org.openmrs.Attributable#findPossibleValues(java.lang.String)
  */
  @Override
+ @Deprecated
  public List<Location> findPossibleValues(String searchText) {
  try {
  return Context.getLocationService().getLocations(searchText);
@@ -285,6 +286,7 @@ public List<Location> findPossibleValues(String searchText) {
  * @see org.openmrs.Attributable#getPossibleValues()
  */
  @Override
+ @Deprecated
  public List<Location> getPossibleValues() {
  try {
  return Context.getLocationService().getAllLocations();

diff --git a/api/src/main/java/org/openmrs/User.java b/api/src/main/java/org/openmrs/User.java
@@ -283,6 +283,7 @@ public User removeRole(Role role) {
  * @see org.openmrs.Attributable#findPossibleValues(java.lang.String)
  */
  @Override
+ @Deprecated
  public List<User> findPossibleValues(String searchText) {
  try {
  return Context.getUserService().getUsersByName(searchText, "", false);
@@ -296,6 +297,7 @@ public List<User> findPossibleValues(String searchText) {
  * @see org.openmrs.Attributable#getPossibleValues()
  */
  @Override
+ @Deprecated
  public List<User> getPossibleValues() {
  try {
  return Context.getUserService().getAllUsers();

diff --git a/api/src/main/java/org/openmrs/util/AttributableDate.java b/api/src/main/java/org/openmrs/util/AttributableDate.java
@@ -57,6 +57,7 @@ public AttributableDate(long time) {
  * @see org.openmrs.Attributable#findPossibleValues(java.lang.String)
  */
  @Override
+ @Deprecated
  public List<AttributableDate> findPossibleValues(String searchText) {
  // TODO Auto-generated method stub
  return null;
@@ -74,6 +75,7 @@ public String getDisplayString() {
  * @see org.openmrs.Attributable#getPossibleValues()
  */
  @Override
+ @Deprecated
  public List<AttributableDate> getPossibleValues() {
  // TODO Auto-generated method stub
  return null;