Merge pull request #259 from nrpeterson/boundcodeableconcept-serializ…

…ation Add serializability for BoundCodeableConceptDt
hapifhir · Nov 26, 2015 · a046afe · a046afe
2 parents 26e2e25 + 13b3601
commit a046afe
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IBoundCodeableConcept.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IBoundCodeableConcept.java
@@ -20,6 +20,8 @@
  * #L%
  */
 
-public interface IBoundCodeableConcept {
+import java.io.Serializable;
+
+public interface IBoundCodeableConcept extends Serializable {
 
 }
diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IValueSetEnumBinder.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IValueSetEnumBinder.java
@@ -21,8 +21,9 @@
  */
 
 
+import java.io.Serializable;
 
-public interface IValueSetEnumBinder<T extends Enum<?>> {
+public interface IValueSetEnumBinder<T extends Enum<?>> extends Serializable {
 
 	T fromCodeString(String theCodeString);
 

diff --git a/hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/model/dstu2/ModelSerializationTest.java b/hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/model/dstu2/ModelSerializationTest.java
@@ -17,6 +17,7 @@
 import ca.uhn.fhir.model.dstu2.composite.HumanNameDt;
 import ca.uhn.fhir.model.dstu2.resource.Bundle;
 import ca.uhn.fhir.model.dstu2.resource.Patient;
+import ca.uhn.fhir.model.dstu2.valueset.MaritalStatusCodesEnum;
 import ca.uhn.fhir.parser.IParser;
 
 public class ModelSerializationTest {
@@ -55,4 +56,19 @@ private void testIsSerializable(IBaseResource theObject) {
 
 	}
 
+	/**
+	 * Verify that MaritalStatusCodeEnum (and, by extension, BoundCodeableConcepts in general) are serializable.
+	 * Author: Nick Peterson (nrpeterson@gmail.com)
+	 */
+	@Test
+	public void testBoundCodeableConceptSerialization() {
+		MaritalStatusCodesEnum maritalStatus = MaritalStatusCodesEnum.M;
+		byte[] bytes = SerializationUtils.serialize(maritalStatus);
+		assertTrue(bytes.length > 0);
+
+		MaritalStatusCodesEnum deserialized = SerializationUtils.deserialize(bytes);
+		assertEquals(maritalStatus.getCode(), deserialized.getCode());
+		assertEquals(maritalStatus.getSystem(), deserialized.getSystem());
+	}
+
 }