From a0710d4f47bd6f253eaabefe6f097e5ba5067d91 Mon Sep 17 00:00:00 2001
From: jamesagnew <jamesagnew@gmail.com>
Date: Wed, 19 Aug 2020 06:05:23 -0400
Subject: [PATCH] Add constructor

---
 .../taskdef/BaseColumnCalculatorTask.java     | 32 ++++++++++++++-----
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/hapi-fhir-jpaserver-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/BaseColumnCalculatorTask.java b/hapi-fhir-jpaserver-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/BaseColumnCalculatorTask.java
index 447a95df39c..88f42881c14 100644
--- a/hapi-fhir-jpaserver-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/BaseColumnCalculatorTask.java
+++ b/hapi-fhir-jpaserver-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/BaseColumnCalculatorTask.java
@@ -23,7 +23,6 @@ package ca.uhn.fhir.jpa.migrate.taskdef;
 import ca.uhn.fhir.util.StopWatch;
 import ca.uhn.fhir.util.VersionEnum;
 import com.google.common.collect.ForwardingMap;
-import org.apache.commons.lang3.Validate;
 import org.apache.commons.lang3.concurrent.BasicThreadFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -33,8 +32,17 @@ import org.springframework.jdbc.core.RowCallbackHandler;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.util.*;
-import java.util.concurrent.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Future;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.RejectedExecutionException;
+import java.util.concurrent.RejectedExecutionHandler;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 
 public abstract class BaseColumnCalculatorTask extends BaseTableColumnTask {
@@ -43,19 +51,27 @@ public abstract class BaseColumnCalculatorTask extends BaseTableColumnTask {
 	private int myBatchSize = 10000;
 	private ThreadPoolExecutor myExecutor;
 
-	public void setBatchSize(int theBatchSize) {
-		myBatchSize = theBatchSize;
+	/**
+	 * Constructor
+	 */
+	public BaseColumnCalculatorTask(VersionEnum theRelease, String theVersion) {
+		this(theRelease.toString(), theVersion);
 	}
 
 	/**
 	 * Constructor
 	 */
-	public BaseColumnCalculatorTask(VersionEnum theRelease, String theVersion) {
-		super(theRelease.toString(), theVersion);
+	public BaseColumnCalculatorTask(String theRelease, String theVersion) {
+		super(theRelease, theVersion);
+	}
+
+	public void setBatchSize(int theBatchSize) {
+		myBatchSize = theBatchSize;
 	}
 
 	/**
 	 * Allows concrete implementations to decide if they should be skipped.
+	 *
 	 * @return a boolean indicating whether or not to skip execution of the task.
 	 */
 	protected abstract boolean shouldSkipTask();
@@ -70,7 +86,7 @@ public abstract class BaseColumnCalculatorTask extends BaseTableColumnTask {
 
 		try {
 
-			while(true) {
+			while (true) {
 				MyRowCallbackHandler rch = new MyRowCallbackHandler();
 				getTxTemplate().execute(t -> {
 					JdbcTemplate jdbcTemplate = newJdbcTemplate();