Merge branch 'master' of github.com:jamesagnew/hapi-fhir

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/BaseTerminologyUploaderProvider.java

@@ -1,5 +1,25 @@
 package ca.uhn.fhir.jpa.provider;
 
+/*-
+ * #%L
+ * HAPI FHIR JPA Server
+ * %%
+ * Copyright (C) 2014 - 2019 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 ca.uhn.fhir.jpa.model.util.JpaConstants;
 
 /**

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/TerminologyUploaderProvider.java

@@ -50,7 +50,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 import static org.apache.commons.lang3.StringUtils.*;
 
-public abstract class TerminologyUploaderProvider extends BaseJpaProvider {
+public class TerminologyUploaderProvider extends BaseJpaProvider {
 
 	public static final String CONCEPT_COUNT = "conceptCount";
 	public static final String TARGET = "target";
@@ -65,6 +65,23 @@ public abstract class TerminologyUploaderProvider extends BaseJpaProvider {
 	@Autowired
 	private IHapiTerminologySvc myTerminologySvc;
 
+	/**
+	 * Constructor
+	 */
+	public TerminologyUploaderProvider() {
+		this(null, null, null);
+	}
+
+	/**
+	 * Constructor
+	 */
+	public TerminologyUploaderProvider(FhirContext theContext, IHapiTerminologyLoaderSvc theTerminologyLoaderSvc, IHapiTerminologySvc theTerminologySvc) {
+		myCtx = theContext;
+		myTerminologyLoaderSvc = theTerminologyLoaderSvc;
+		myTerminologySvc = theTerminologySvc;
+	}
+
+
 	/**
 	 * <code>
 	 * $apply-codesystem-delta-add