Merge pull request #524 from IBM/lee-master

Remove unnecessary complexity in db utils Table/ColumnDefBuilder

Author: prb112

fhir-database-utils/src/main/java/com/ibm/fhir/database/utils/model/ColumnDefBuilder.java

@@ -156,11 +156,7 @@ protected List<ColumnBase> buildColumns() {
                 column = new DoubleColumn(cd.getName(), cd.isNullable());
                 break;
             case TIMESTAMP:
-                if (cd.getPrecision() == null) {
-                    column = new TimestampColumn(cd.getName(), cd.isNullable());
-                } else {
-                    column = new TimestampColumn(cd.getName(), cd.isNullable(), cd.getPrecision());
-                }
+                column = new TimestampColumn(cd.getName(), cd.isNullable(), cd.getPrecision());
                 break;
             case VARCHAR:
                 if (cd.getSize() > Integer.MAX_VALUE) {

fhir-database-utils/src/main/java/com/ibm/fhir/database/utils/model/Table.java

@@ -532,11 +532,7 @@ protected List<ColumnBase> buildColumns() {
                     column = new DoubleColumn(cd.getName(), cd.isNullable());
                     break;
                 case TIMESTAMP:
-                    if (cd.getPrecision() == null) {
-                        column = new TimestampColumn(cd.getName(), cd.isNullable());
-                    } else {
-                        column = new TimestampColumn(cd.getName(), cd.isNullable(), cd.getPrecision());
-                    }
+                    column = new TimestampColumn(cd.getName(), cd.isNullable(), cd.getPrecision());
                     break;
                 case VARCHAR:
                     if (cd.getSize() > Integer.MAX_VALUE) {

fhir-database-utils/src/main/java/com/ibm/fhir/database/utils/model/TimestampColumn.java

@@ -22,7 +22,7 @@ public TimestampColumn(String name, boolean nullable) {
         this.precision = null;
     }
 
-    public TimestampColumn(String name, boolean nullable, int precision) {
+    public TimestampColumn(String name, boolean nullable, Integer precision) {
         super(name, nullable);
         this.precision = precision;
     }