issue-46: setting class extension requirement

cerner · Apr 19, 2019 · 8650bf5 · 8650bf5
1 parent b0b2f67
commit 8650bf5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/bunsen-core/src/main/java/com/cerner/bunsen/FhirEncoders.java b/bunsen-core/src/main/java/com/cerner/bunsen/FhirEncoders.java
@@ -173,7 +173,6 @@ public static Builder forVersion(FhirVersionEnum fhirVersion) {
     return new Builder(fhirVersion);
   }
 
-
   /**
    * Returns an encoder for the given FHIR resource.
    *
@@ -183,7 +182,7 @@ public static Builder forVersion(FhirVersionEnum fhirVersion) {
    * @return an encoder for the resource.
    */
   public final <T extends IBaseResource> ExpressionEncoder<T> of(Class<T> type,
-      List<Class> contained) {
+      List<Class<? extends IBaseResource>> contained) {
 
     BaseRuntimeElementCompositeDefinition definition =
         context.getResourceDefinition(type);
@@ -233,7 +232,7 @@ public final <T extends IBaseResource> ExpressionEncoder<T> of(Class<T> type,
    * @return an encoder for the resource.
    */
   public final <T extends IBaseResource> ExpressionEncoder<T> of(Class<T> type,
-      Class... contained) {
+      Class<? extends IBaseResource>... contained) {
 
     return of(type, Arrays.asList(contained));
   }
@@ -253,7 +252,7 @@ public <T extends IBaseResource> ExpressionEncoder<T> of(String resourceName,
 
     RuntimeResourceDefinition definition = context.getResourceDefinition(resourceName);
 
-    List<Class> containedClasses = new ArrayList<>();
+    List<Class<? extends IBaseResource>> containedClasses = new ArrayList<>();
 
     for (String containedName : contained) {
 

diff --git a/bunsen-core/src/main/scala/com/cerner/bunsen/SchemaConverter.scala b/bunsen-core/src/main/scala/com/cerner/bunsen/SchemaConverter.scala
@@ -126,5 +126,4 @@ class SchemaConverter(fhirContext: FhirContext, dataTypeMappings: DataTypeMappin
       parent
     }
   }
-
 }
diff --git a/bunsen-r4/src/test/java/com/cerner/bunsen/r4/TestData.java b/bunsen-r4/src/test/java/com/cerner/bunsen/r4/TestData.java
@@ -119,7 +119,6 @@ public static Patient newPatient() {
     return patient;
   }
 
-
   /**
    * Returns a FHIR medication to be contained to a medication request for testing purposes.
    */