From 0c2d162706bd22deb3b4019a52e9270762e8855a Mon Sep 17 00:00:00 2001 From: Lee Surprenant Date: Thu, 19 Dec 2019 23:57:16 -0500 Subject: [PATCH] Remove unecessary complexity in db utils Table/ColumnDefBuilder I added the original if logic because it was throwing a NullPointer and I didn't understand why...now I realize it was just from "auto-boxing" of the Integer to an int. Now I switched the parameter to type Integer so we can remove the extra branching logic. Signed-off-by: Lee Surprenant --- .../com/ibm/fhir/database/utils/model/ColumnDefBuilder.java | 6 +----- .../main/java/com/ibm/fhir/database/utils/model/Table.java | 6 +----- .../com/ibm/fhir/database/utils/model/TimestampColumn.java | 2 +- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/fhir-database-utils/src/main/java/com/ibm/fhir/database/utils/model/ColumnDefBuilder.java b/fhir-database-utils/src/main/java/com/ibm/fhir/database/utils/model/ColumnDefBuilder.java index 263edb32287..e6ed3eb18b8 100644 --- a/fhir-database-utils/src/main/java/com/ibm/fhir/database/utils/model/ColumnDefBuilder.java +++ b/fhir-database-utils/src/main/java/com/ibm/fhir/database/utils/model/ColumnDefBuilder.java @@ -156,11 +156,7 @@ protected List 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) { diff --git a/fhir-database-utils/src/main/java/com/ibm/fhir/database/utils/model/Table.java b/fhir-database-utils/src/main/java/com/ibm/fhir/database/utils/model/Table.java index e5b7f52815f..dc97dc40f14 100644 --- a/fhir-database-utils/src/main/java/com/ibm/fhir/database/utils/model/Table.java +++ b/fhir-database-utils/src/main/java/com/ibm/fhir/database/utils/model/Table.java @@ -532,11 +532,7 @@ protected List 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) { diff --git a/fhir-database-utils/src/main/java/com/ibm/fhir/database/utils/model/TimestampColumn.java b/fhir-database-utils/src/main/java/com/ibm/fhir/database/utils/model/TimestampColumn.java index 20d4149f2c8..daefe9418ae 100644 --- a/fhir-database-utils/src/main/java/com/ibm/fhir/database/utils/model/TimestampColumn.java +++ b/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; }