Merge pull request #2189 from teleivo/TRUNK-5162

TRUNK-5162 Few PropertyEditor getAsText return null if value is null
openmrs · May 6, 2017 · 455e452 · 455e452
2 parents af1722d + fbdce63
commit 455e452
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 52 deletions.
diff --git a/api/src/main/java/org/openmrs/propertyeditor/ConceptAttributeTypeEditor.java b/api/src/main/java/org/openmrs/propertyeditor/ConceptAttributeTypeEditor.java
@@ -24,7 +24,7 @@ public class ConceptAttributeTypeEditor extends PropertyEditorSupport {
 	@Override
 	public String getAsText() {
 		ConceptAttributeType conceptAttributeType = (ConceptAttributeType) getValue();
-		return conceptAttributeType == null ? null : conceptAttributeType.getId().toString();
+		return conceptAttributeType == null ? "" : conceptAttributeType.getId().toString();
 	}
 
 	/**

diff --git a/api/src/main/java/org/openmrs/propertyeditor/LocationAttributeTypeEditor.java b/api/src/main/java/org/openmrs/propertyeditor/LocationAttributeTypeEditor.java
@@ -29,7 +29,7 @@ public class LocationAttributeTypeEditor extends PropertyEditorSupport {
 	@Override
 	public String getAsText() {
 		LocationAttributeType lat = (LocationAttributeType) getValue();
-		return lat == null ? null : lat.getId().toString();
+		return lat == null ? "" : lat.getId().toString();
 	}
 
 	/**

diff --git a/api/src/main/java/org/openmrs/propertyeditor/LocationEditor.java b/api/src/main/java/org/openmrs/propertyeditor/LocationEditor.java
@@ -60,7 +60,7 @@ public void setAsText(String text) throws IllegalArgumentException {
 	@Override
 	public String getAsText() {
 		Location t = (Location) getValue();
-		return t == null ? null : t.getLocationId().toString();
+		return t == null ? "" : t.getLocationId().toString();
 	}
 
 }
diff --git a/api/src/main/java/org/openmrs/propertyeditor/LocationTagEditor.java b/api/src/main/java/org/openmrs/propertyeditor/LocationTagEditor.java
@@ -62,7 +62,7 @@ public void setAsText(String text) throws IllegalArgumentException {
 	@Override
 	public String getAsText() {
 		LocationTag t = (LocationTag) getValue();
-		return t == null ? null : t.getLocationTagId().toString();
+		return t == null ? "" : t.getLocationTagId().toString();
 	}
 
 }
diff --git a/api/src/test/java/org/openmrs/propertyeditor/ConceptAttributeTypeEditorTest.java b/api/src/test/java/org/openmrs/propertyeditor/ConceptAttributeTypeEditorTest.java
@@ -9,12 +9,7 @@
  */
 package org.openmrs.propertyeditor;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
-
 import org.junit.Before;
-import org.junit.Test;
 import org.openmrs.ConceptAttributeType;
 import org.openmrs.api.ConceptService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -42,11 +37,4 @@ protected ConceptAttributeTypeEditor getNewEditor() {
 	protected ConceptAttributeType getExistingObject() {
 		return conceptService.getConceptAttributeType(EXISTING_ID);
 	}
-
-	@Override
-	@Test
-	public void shouldReturnEmptyStringIfValueIsNull() {
-
-		assertThat(editor.getAsText(), is(nullValue()));
-	}
 }
diff --git a/api/src/test/java/org/openmrs/propertyeditor/LocationAttributeTypeEditorTest.java b/api/src/test/java/org/openmrs/propertyeditor/LocationAttributeTypeEditorTest.java
@@ -9,12 +9,7 @@
  */
 package org.openmrs.propertyeditor;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
-
 import org.junit.Before;
-import org.junit.Test;
 import org.openmrs.LocationAttributeType;
 import org.openmrs.api.LocationService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,11 +35,4 @@ protected LocationAttributeTypeEditor getNewEditor() {
 	protected LocationAttributeType getExistingObject() {
 		return locationService.getLocationAttributeType(EXISTING_ID);
 	}
-
-	@Override
-	@Test
-	public void shouldReturnEmptyStringIfValueIsNull() {
-
-		assertThat(editor.getAsText(), is(nullValue()));
-	}
 }
diff --git a/api/src/test/java/org/openmrs/propertyeditor/LocationEditorTest.java b/api/src/test/java/org/openmrs/propertyeditor/LocationEditorTest.java
@@ -9,11 +9,6 @@
  */
 package org.openmrs.propertyeditor;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
-
-import org.junit.Test;
 import org.openmrs.Location;
 import org.openmrs.api.LocationService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,11 +29,4 @@ protected LocationEditor getNewEditor() {
 	protected Location getExistingObject() {
 		return locationService.getLocation(EXISTING_ID);
 	}
-
-	@Override
-	@Test
-	public void shouldReturnEmptyStringIfValueIsNull() {
-
-		assertThat(editor.getAsText(), is(nullValue()));
-	}
 }
diff --git a/api/src/test/java/org/openmrs/propertyeditor/LocationTagEditorTest.java b/api/src/test/java/org/openmrs/propertyeditor/LocationTagEditorTest.java
@@ -9,12 +9,7 @@
  */
 package org.openmrs.propertyeditor;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
-
 import org.junit.Before;
-import org.junit.Test;
 import org.openmrs.LocationTag;
 import org.openmrs.api.LocationService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -42,11 +37,4 @@ protected LocationTagEditor getNewEditor() {
 	protected LocationTag getExistingObject() {
 		return locationService.getLocationTag(EXISTING_ID);
 	}
-
-	@Override
-	@Test
-	public void shouldReturnEmptyStringIfValueIsNull() {
-
-		assertThat(editor.getAsText(), is(nullValue()));
-	}
 }