issue #380, #270

Signed-off-by: Paul Bastide <pbastide@us.ibm.com>

fhir-database-utils/src/main/java/com/ibm/fhir/database/utils/api/IDatabaseAdapter.java

@@ -1,5 +1,5 @@
 /*
- * (C) Copyright IBM Corp. 2019
+ * (C) Copyright IBM Corp. 2019, 2020
  *
  * SPDX-License-Identifier: Apache-2.0
  */

fhir-database-utils/src/main/java/com/ibm/fhir/database/utils/api/IDatabaseStatement.java

@@ -1,5 +1,5 @@
 /*
- * (C) Copyright IBM Corp. 2019
+ * (C) Copyright IBM Corp. 2019, 2020
  *
  * SPDX-License-Identifier: Apache-2.0
  */

fhir-database-utils/src/main/java/com/ibm/fhir/database/utils/api/IDatabaseTranslator.java

@@ -1,5 +1,5 @@
 /*
- * (C) Copyright IBM Corp. 2019
+ * (C) Copyright IBM Corp. 2019, 2020
  *
  * SPDX-License-Identifier: Apache-2.0
  */

fhir-database-utils/src/main/java/com/ibm/fhir/database/utils/api/IDatabaseTypeAdapter.java

@@ -1,5 +1,5 @@
 /*
- * (C) Copyright IBM Corp. 2019
+ * (C) Copyright IBM Corp. 2019, 2020
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -47,6 +47,5 @@ public default String timestampClause(Integer precision) {
             typeDef.append("(" + precision + ")");
         }
         return typeDef.toString();
-    };
-
-}
+    }
+}

fhir-database-utils/src/main/java/com/ibm/fhir/database/utils/common/CommonDatabaseAdapter.java

@@ -1,5 +1,5 @@
 /*
- * (C) Copyright IBM Corp. 2019
+ * (C) Copyright IBM Corp. 2019, 2020
  *
  * SPDX-License-Identifier: Apache-2.0
  */

fhir-database-utils/src/main/java/com/ibm/fhir/database/utils/common/JdbcPropertyAdapter.java

@@ -1,5 +1,5 @@
 /*
- * (C) Copyright IBM Corp. 2019
+ * (C) Copyright IBM Corp. 2019, 2020
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -21,80 +21,79 @@ public class JdbcPropertyAdapter {
     public static final String HOST_KEY = "db.host";
     public static final String PORT_KEY = "db.port";
     public static final String DEFAULT_SCHEMA_KEY = "db.default.schema";
-
-
+
     public JdbcPropertyAdapter(Properties properties) {
         this.properties = properties;
     }
-    
+
     public String getDatabase() {
         return properties.getProperty(DATABASE_KEY);
     }
-    
+
     public void setDatabase(String db) {
         properties.setProperty(DATABASE_KEY, db);
     }
-    
+
     public void setHost(String host) {
         properties.setProperty(HOST_KEY, host);
     }
-    
+
     public String getHost() {
         return properties.getProperty(HOST_KEY);
     }
-    
+
     public void setPort(int port) {
         properties.setProperty(PORT_KEY, Integer.toString(port));
     }
-    
+
     public int getPort() {
         String value = properties.getProperty(PORT_KEY);
         if (value == null) {
             throw new IllegalStateException("Property for port is missing");
         }
-        
+
         return Integer.parseInt(value);
     }
-    
+
     public String getUser() {
         return properties.getProperty(USER_KEY);
     }
-    
+
     public void setUser(String user) {
         properties.setProperty(USER_KEY, user);
     }
-    
+
     public String getPassword() {
         return properties.getProperty(PASSWORD_KEY);
     }
-    
+
     public void setPassword(String pw) {
         properties.setProperty(PASSWORD_KEY, pw);
     }
-    
+
     public void setDefaultSchema(String schema) {
         properties.setProperty(DEFAULT_SCHEMA_KEY, schema);
     }
-    
+
     public String getDefaultSchema() {
-        return properties.getProperty(DEFAULT_SCHEMA_KEY);        
+        return properties.getProperty(DEFAULT_SCHEMA_KEY);
     }
 
-
     public Properties getProperties() {
         return this.properties;
     }
-    
+
     public boolean isValid() {
         return getUser() != null && getPassword() != null;
     }
 
     /**
      * Get all the extra properties into the given props argument
+     * 
      * @param props
      */
     public void getExtraProperties(Properties props) {
-        for (String key: properties.stringPropertyNames()) {
+        for (String key : properties.stringPropertyNames()) {
             if (!key.startsWith("db.")) {
                 props.setProperty(key, properties.getProperty(key));
             }

fhir-database-utils/src/main/java/com/ibm/fhir/database/utils/common/JdbcTarget.java

@@ -1,5 +1,5 @@
 /*
- * (C) Copyright IBM Corp. 2019
+ * (C) Copyright IBM Corp. 2019, 2020
  *
  * SPDX-License-Identifier: Apache-2.0
  */

fhir-database-utils/src/main/java/com/ibm/fhir/database/utils/common/LogFormatter.java

@@ -1,5 +1,5 @@
 /*
- * (C) Copyright IBM Corp. 2019
+ * (C) Copyright IBM Corp. 2019, 2020
  *
  * SPDX-License-Identifier: Apache-2.0
  */

fhir-database-utils/src/main/java/com/ibm/fhir/database/utils/db2/Db2Adapter.java

@@ -1,5 +1,5 @@
 /*
- * (C) Copyright IBM Corp. 2019
+ * (C) Copyright IBM Corp. 2019, 2020
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -38,8 +38,7 @@
 
 /**
  * Implementation of our database adapter which provides implementation of
- * control
- * functions specific to DB2 for things like schema and partition management
+ * control functions specific to DB2 for things like schema and partition management
  */
 public class Db2Adapter extends CommonDatabaseAdapter {
     private static final Logger logger = Logger.getLogger(Db2Adapter.class.getName());
@@ -152,9 +151,8 @@ public void createTenantPartitions(Collection<Table> tables, String schemaName,
         // Make sure there's a tablespace available for this tenant before we
         // try to create the actual partitions
         final String tablespaceName = "TS_TENANT" + newTenantId;
-        try (ITransaction tx = 
-                (TransactionFactory.getTransaction(true) != null) ? 
-                        TransactionFactory.getTransaction(true)
+        try (ITransaction tx =
+                (TransactionFactory.getTransaction(true) != null) ? TransactionFactory.getTransaction(true)
                         : TransactionFactory.openTransaction(connectionProvider);) {
             try {
                 logger.info("Creating tablespace: " + tablespaceName);

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

@@ -1,5 +1,5 @@
 /*
- * (C) Copyright IBM Corp. 2019
+ * (C) Copyright IBM Corp. 2019, 2020
  *
  * SPDX-License-Identifier: Apache-2.0
  */

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

@@ -1,5 +1,5 @@
 /*
- * (C) Copyright IBM Corp. 2019
+ * (C) Copyright IBM Corp. 2019, 2020
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -19,7 +19,6 @@
  * A collection of {@link IDatabaseObject} which are applied in order within one transaction
  */
 public class ObjectGroup extends BaseObject {
-
     // the list of objects in our group
     private final List<IDatabaseObject> group = new ArrayList<>();
 

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

@@ -1,5 +1,5 @@
 /*
- * (C) Copyright IBM Corp. 2019
+ * (C) Copyright IBM Corp. 2019, 2020
  *
  * SPDX-License-Identifier: Apache-2.0
  */

fhir-persistence-schema/src/main/java/com/ibm/fhir/schema/app/processor/action/AddTenantPartitionsAction.java

@@ -1,5 +1,5 @@
 /*
- * (C) Copyright IBM Corp. 2019
+ * (C) Copyright IBM Corp. 2019, 2020
  *
  * SPDX-License-Identifier: Apache-2.0
  */

fhir-persistence-schema/src/main/java/com/ibm/fhir/schema/app/processor/action/AllocateTenantAction.java

@@ -1,5 +1,5 @@
 /*
- * (C) Copyright IBM Corp. 2019
+ * (C) Copyright IBM Corp. 2019, 2020
  *
  * SPDX-License-Identifier: Apache-2.0
  */

fhir-persistence-schema/src/main/java/com/ibm/fhir/schema/app/processor/action/DropTenantAction.java

@@ -1,5 +1,5 @@
 /*
- * (C) Copyright IBM Corp. 2019
+ * (C) Copyright IBM Corp. 2019, 2020
  *
  * SPDX-License-Identifier: Apache-2.0
  */

fhir-persistence-schema/src/main/java/com/ibm/fhir/schema/app/processor/action/PopulateStaticTablesAction.java

@@ -1,5 +1,5 @@
 /*
- * (C) Copyright IBM Corp. 2019
+ * (C) Copyright IBM Corp. 2019, 2020
  *
  * SPDX-License-Identifier: Apache-2.0
  */

fhir-persistence-schema/src/main/java/com/ibm/fhir/schema/app/processor/action/TestTenantAction.java

@@ -1,5 +1,5 @@
 /*
- * (C) Copyright IBM Corp. 2019
+ * (C) Copyright IBM Corp. 2019, 2020
  *
  * SPDX-License-Identifier: Apache-2.0
  */

fhir-persistence-schema/src/main/java/com/ibm/fhir/schema/app/processor/action/VersionHistoryServiceAction.java

@@ -1,5 +1,5 @@
 /*
- * (C) Copyright IBM Corp. 2019
+ * (C) Copyright IBM Corp. 2019, 2020
  *
  * SPDX-License-Identifier: Apache-2.0
  */

fhir-persistence-schema/src/main/java/com/ibm/fhir/schema/control/FhirResourceTableGroup.java

@@ -1,5 +1,5 @@
 /*
- * (C) Copyright IBM Corp. 2019
+ * (C) Copyright IBM Corp. 2019, 2020
  *
  * SPDX-License-Identifier: Apache-2.0
  */

fhir-persistence-schema/src/test/java/com/ibm/fhir/schema/app/processor/action/DatabaseSupport.java

@@ -1,3 +1,9 @@
+/*
+ * (C) Copyright IBM Corp. 2020
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package com.ibm.fhir.schema.app.processor.action;
 
 import java.io.InputStream;

fhir-server-test/src/test/java/com/ibm/fhir/server/test/SearchNearTest.java

@@ -1,5 +1,5 @@
 /*
- * (C) Copyright IBM Corp. 2019
+ * (C) Copyright IBM Corp. 2019, 2020
  *
  * SPDX-License-Identifier: Apache-2.0
  */