Working

examples/src/main/java/example/ConverterExamples.java

@@ -2,8 +2,8 @@
 
 import org.hl7.fhir.convertors.NullVersionConverterAdvisor;
 import org.hl7.fhir.convertors.VersionConvertorAdvisor;
-import org.hl7.fhir.convertors.VersionConvertor_10_20;
-import org.hl7.fhir.convertors.VersionConvertor_14_20;
+import org.hl7.fhir.convertors.VersionConvertor_10_30;
+import org.hl7.fhir.convertors.VersionConvertor_14_30;
 import org.hl7.fhir.exceptions.FHIRException;
 
 public class ConverterExamples {
@@ -13,7 +13,7 @@ public void c1020() throws FHIRException {
 	//START SNIPPET: 1020
 		// Create a converter
 		VersionConvertorAdvisor advisor = new NullVersionConverterAdvisor();
-		VersionConvertor_10_20 converter = new VersionConvertor_10_20(advisor);
+		VersionConvertor_10_30 converter = new VersionConvertor_10_30(advisor);
 
 		// Create an input resource to convert
 		org.hl7.fhir.instance.model.Observation input = new org.hl7.fhir.instance.model.Observation();
@@ -33,7 +33,7 @@ public void c1420() throws FHIRException {
 		input.setTitle("My title");
 
 		// Convert the resource
-		org.hl7.fhir.dstu3.model.Questionnaire output = VersionConvertor_14_20.convertQuestionnaire(input);
+		org.hl7.fhir.dstu3.model.Questionnaire output = VersionConvertor_14_30.convertQuestionnaire(input);
 		String context = output.getTitle();
 	//END SNIPPET: 1420
 	}

hapi-fhir-converter/src/main/java/org/hl7/fhir/convertors/VersionConvertorAdvisor.java

@@ -1,38 +1,17 @@
-package org.hl7.fhir.convertors;
-
-/*
- * #%L
- * HAPI FHIR - Converter
- * %%
- * Copyright (C) 2014 - 2017 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
-
-import org.hl7.fhir.dstu3.model.CodeSystem;
-import org.hl7.fhir.dstu3.model.ValueSet;
-import org.hl7.fhir.exceptions.FHIRException;
-
-public interface VersionConvertorAdvisor {
-  boolean ignoreEntry(org.hl7.fhir.dstu3.model.Bundle.BundleEntryComponent src);
-
-  // called ?
-  org.hl7.fhir.instance.model.Resource convert(org.hl7.fhir.dstu3.model.Resource resource) throws FHIRException;
-
-  // called when an r2 value set has a codeSystem in it
-  void handleCodeSystem(CodeSystem tgtcs, ValueSet source);
-
-  CodeSystem getCodeSystem(ValueSet src);
-}
+package org.hl7.fhir.convertors;
+
+import org.hl7.fhir.dstu3.model.CodeSystem;
+import org.hl7.fhir.dstu3.model.ValueSet;
+import org.hl7.fhir.exceptions.FHIRException;
+
+public interface VersionConvertorAdvisor {
+  boolean ignoreEntry(org.hl7.fhir.dstu3.model.Bundle.BundleEntryComponent src);
+
+  // called ?
+  org.hl7.fhir.instance.model.Resource convert(org.hl7.fhir.dstu3.model.Resource resource) throws FHIRException;
+
+  // called when an r2 value set has a codeSystem in it
+  void handleCodeSystem(CodeSystem tgtcs, ValueSet source);
+
+  CodeSystem getCodeSystem(ValueSet src);
+}