import java.io.*;
import java.sql.*;
-import org.apache.log4j.Logger;
-
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
-import org.onap.dmaap.dbcapi.logging.DmaapbcLogMessageEnum;
-
public class LoadSchema {
private static final EELFLogger logger = EELFManager.getInstance().getLogger(LoadSchema.class);
- private static final EELFLogger appLogger = EELFManager.getInstance().getApplicationLogger();
- private static final EELFLogger auditLogger = EELFManager.getInstance().getAuditLogger();
- private static final EELFLogger debugLogger = EELFManager.getInstance().getDebugLogger();
- private static final EELFLogger errorLogger = EELFManager.getInstance().getErrorLogger();
- private static final EELFLogger metricsLogger = EELFManager.getInstance().getMetricsLogger();
static int getVer(Statement s) throws SQLException {
ResultSet rs = null;
}
static void upgrade() throws SQLException {
ConnectionFactory cf = ConnectionFactory.getDefaultInstance();
- Connection c = null;
- Statement stmt = null;
InputStream is = null;
- try {
- c = cf.get(true);
- stmt = c.createStatement();
+ try(
+ Connection c = cf.get(true);
+ Statement stmt = c.createStatement();
+ ) {
+
// this sets the PG search_path to a consistent schema, otherwise sometimes
// we get public, and sometimes we get dmaap_admin
stmt.execute(cmd);
logger.info("SCHEMA: " + cmd);
} catch (SQLException sqle) {
+ logger.error("Error", sqle);
throw sqle;
}
int newver = -1;
try {
newver = getVer(stmt);
- } catch (Exception e) {}
+ } catch (Exception e) {
+ logger.error("Error", e);
+ }
logger.info("Database schema currently at version " + newver++);
}
} catch (IOException ioe) {
throw new SQLException(ioe);
- } finally {
- if (stmt != null) { try { stmt.close(); } catch (Exception e) {}}
- if (c != null) { try { c.close(); } catch (Exception e) {}}
}
}
public static void main(String[] args) throws Exception {