Merge branch 'master' into ja_20191025_refactor_testcases

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/BaseBinary.java

@@ -39,6 +39,6 @@ public abstract class BaseBinary extends Resource implements IBaseBinary {
 		return this;
 	}
 	
-	abstract Base64BinaryType getContentElement();
+	public abstract Base64BinaryType getContentElement();
 	
 }

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/Enumeration.java

@@ -22,6 +22,7 @@ package org.hl7.fhir.dstu2.model;
 
 
 import ca.uhn.fhir.model.api.annotation.DatatypeDef;
+import org.hl7.fhir.instance.model.api.IBaseEnumFactory;
 import org.hl7.fhir.instance.model.api.IBaseEnumeration;
 
 /*
@@ -114,4 +115,9 @@ public class Enumeration<T extends Enum<?>> extends PrimitiveType<T> implements
 	public String fhirType() {
 		return "code";		
 	}
+
+  @Override
+  public IBaseEnumFactory<T> getEnumFactory() {
+    return myEnumFactory;
+  }
 }

org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/model/BaseBinary.java

@@ -41,6 +41,6 @@ public abstract class BaseBinary extends Resource implements IBaseBinary {
 		return this;
 	}
 	
-	abstract Base64BinaryType getContentElement();
+	public abstract Base64BinaryType getContentElement();
 	
 }

org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/BaseBinary.java

@@ -41,6 +41,6 @@ public abstract class BaseBinary extends Resource implements IBaseBinary {
 		return this;
 	}
 	
-	abstract Base64BinaryType getContentElement();
+	public abstract Base64BinaryType getContentElement();
 	
 }

org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/BaseBinary.java

@@ -41,6 +41,6 @@ public abstract class BaseBinary extends Resource implements IBaseBinary {
 		return this;
 	}
 	
-	abstract Base64BinaryType getContentElement();
+	public abstract Base64BinaryType getContentElement();
 	
 }

org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Binary.java

@@ -400,7 +400,7 @@ public class Binary extends BaseBinary implements IBaseBinary {
   }
 
   @Override
-  Base64BinaryType getContentElement() {
+  public Base64BinaryType getContentElement() {
     return getDataElement();
   }
 

org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/BaseBinary.java

@@ -41,6 +41,6 @@ public abstract class BaseBinary extends Resource implements IBaseBinary {
 		return this;
 	}
 	
-	abstract Base64BinaryType getContentElement();
+	public abstract Base64BinaryType getContentElement();
 	
 }

org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Binary.java

@@ -392,7 +392,7 @@ public class Binary extends BaseBinary implements IBaseBinary {
   }
 
   @Override
-  Base64BinaryType getContentElement() {
+  public Base64BinaryType getContentElement() {
     return getDataElement();
   }
 

org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/xhtml/XhtmlNode.java

@@ -456,6 +456,20 @@ public class XhtmlNode implements IBaseXhtml {
     throw new UnsupportedOperationException();
   }
 
+  /**
+   * NOT SUPPORTED - Throws {@link UnsupportedOperationException}
+   */
+  public Object getUserData(String theName) {
+    throw new UnsupportedOperationException();
+  }
+
+  /**
+   * NOT SUPPORTED - Throws {@link UnsupportedOperationException}
+   */
+  public void setUserData(String theName, Object theValue) {
+    throw new UnsupportedOperationException();
+  }
+
 
   public Location getLocation() {
     return location;

pom.xml

@@ -16,7 +16,7 @@
 	<version>4.0.26-SNAPSHOT</version>
 
 	<properties>
-		<hapi_fhir_version>4.0.0</hapi_fhir_version>
+		<hapi_fhir_version>4.1.0-SNAPSHOT</hapi_fhir_version>
 		<validator_test_case_version>1.0-SNAPSHOT</validator_test_case_version>
 	</properties>