airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From machris...@apache.org
Subject [airavata] branch airavata-2938-change-db-initialization-in-registry-server-to-use-registry-refactoring-code updated: AIRAVATA-2938 Removing unused code
Date Fri, 25 Jan 2019 19:48:14 GMT
This is an automated email from the ASF dual-hosted git repository.

machristie pushed a commit to branch airavata-2938-change-db-initialization-in-registry-server-to-use-registry-refactoring-code
in repository https://gitbox.apache.org/repos/asf/airavata.git


The following commit(s) were added to refs/heads/airavata-2938-change-db-initialization-in-registry-server-to-use-registry-refactoring-code
by this push:
     new 10e6e99  AIRAVATA-2938 Removing unused code
10e6e99 is described below

commit 10e6e994e5863e1727949551c353171736a6415b
Author: Marcus Christie <machristie@apache.org>
AuthorDate: Fri Jan 25 14:47:54 2019 -0500

    AIRAVATA-2938 Removing unused code
---
 .../orchestrator/core/util/Initialize.java         | 306 ---------------------
 1 file changed, 306 deletions(-)

diff --git a/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/util/Initialize.java
b/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/util/Initialize.java
deleted file mode 100644
index 09ed114..0000000
--- a/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/util/Initialize.java
+++ /dev/null
@@ -1,306 +0,0 @@
-/**
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.airavata.orchestrator.core.util;
-
-import org.apache.derby.drda.NetworkServerControl;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.sql.*;
-import java.util.StringTokenizer;
-
-public class Initialize {
-    private static final Logger logger = LoggerFactory.getLogger(Initialize.class);
-    public static final String DERBY_SERVER_MODE_SYS_PROPERTY = "derby.drda.startNetworkServer";
-    public  String scriptName = "expcatalog-derby.sql";
-    private NetworkServerControl server;
-    private static final String delimiter = ";";
-    public static final String PERSISTANT_DATA = "Configuration";
-
-    public Initialize(String scriptName) {
-        this.scriptName = scriptName;
-    }
-
-    public static boolean checkStringBufferEndsWith(StringBuffer buffer, String suffix) {
-        if (suffix.length() > buffer.length()) {
-            return false;
-        }
-        // this loop is done on purpose to avoid memory allocation performance
-        // problems on various JDKs
-        // StringBuffer.lastIndexOf() was introduced in jdk 1.4 and
-        // implementation is ok though does allocation/copying
-        // StringBuffer.toString().endsWith() does massive memory
-        // allocation/copying on JDK 1.5
-        // See http://issues.apache.org/bugzilla/show_bug.cgi?id=37169
-        int endIndex = suffix.length() - 1;
-        int bufferIndex = buffer.length() - 1;
-        while (endIndex >= 0) {
-            if (buffer.charAt(bufferIndex) != suffix.charAt(endIndex)) {
-                return false;
-            }
-            bufferIndex--;
-            endIndex--;
-        }
-        return true;
-    }
-
-    private static boolean isServerStarted(NetworkServerControl server, int ntries)
-    {
-        for (int i = 1; i <= ntries; i ++)
-        {
-            try {
-                Thread.sleep(500);
-                server.ping();
-                return true;
-            }
-            catch (Exception e) {
-                if (i == ntries)
-                    return false;
-            }
-        }
-        return false;
-    }
-
-    public void initializeDB() throws SQLException{
-        //Commenting this as its not used anywhere and creates dependency on registry-cpi
and registry-core
-
-
-//        String jdbcUrl = null;
-//        String jdbcUser = null;
-//        String jdbcPassword = null;
-//        try{
-//            jdbcUrl = ServerSettings.getSetting("registry.jdbc.url");
-//            jdbcUser = ServerSettings.getSetting("registry.jdbc.user");
-//            jdbcPassword = ServerSettings.getSetting("registry.jdbc.password");
-//            jdbcUrl = jdbcUrl + "?" + "user=" + jdbcUser + "&" + "password=" + jdbcPassword;
-//        } catch (ApplicationSettingsException e) {
-//            logger.error("Unable to read properties", e);
-//        }
-//        startDerbyInServerMode();
-//        if(!isServerStarted(server, 20)){
-//           throw new RuntimeException("Derby server cound not started within five seconds...");
-//        }
-//
-//        Connection conn = null;
-//        try {
-//            Class.forName(Utils.getJDBCDriver()).newInstance();
-//            conn = DriverManager.getConnection(jdbcUrl, jdbcUser, jdbcPassword);
-//            if (!isDatabaseStructureCreated(PERSISTANT_DATA, conn)) {
-//                executeSQLScript(conn);
-//                logger.info("New Database created for Registry");
-//            } else {
-//                logger.debug("Database already created for Registry!");
-//            }
-//        } catch (Exception e) {
-//            logger.error(e.getMessage(), e);
-//            throw new RuntimeException("Database failure", e);
-//        } finally {
-//            try {
-//                if (conn != null){
-//                    if (!conn.getAutoCommit()) {
-//                        conn.commit();
-//                    }
-//                    conn.close();
-//                }
-//            } catch (SQLException e) {
-//                logger.error(e.getMessage(), e);
-//            }
-//        }
-//
-//        try{
-//            GatewayResource gatewayResource = new GatewayResource();
-//            gatewayResource.setGatewayId(ServerSettings.getSetting("default.registry.gateway"));
-//            gatewayResource.setGatewayName(ServerSettings.getSetting("default.registry.gateway"));
-//            gatewayResource.setDomain("test-domain");
-//            gatewayResource.setEmailAddress("test-email");
-//            gatewayResource.save();
-//
-//            UserResource userResource = new UserResource();
-//            userResource.setUserName(ServerSettings.getSetting("default.registry.user"));
-//            userResource.setPassword(ServerSettings.getSetting("default.registry.password"));
-//            userResource.save();
-//
-//            WorkerResource workerResource = (WorkerResource) gatewayResource.create(ResourceType.GATEWAY_WORKER);
-//            workerResource.setUser(userResource.getUserName());
-//            workerResource.save();
-//
-//            ProjectResource projectResource = (ProjectResource)workerResource.create(ResourceType.PROJECT);
-//            projectResource.setGatewayId(gatewayResource.getGatewayId());
-//            projectResource.setId("default");
-//            projectResource.setName("default");
-//            projectResource.setWorker(workerResource);
-//            projectResource.save();
-//
-//
-//        } catch (ApplicationSettingsException e) {
-//            logger.error("Unable to read properties", e);
-//            throw new SQLException(e.getMessage(), e);
-//        } catch (RegistryException e) {
-//            logger.error("Unable to save data to registry", e);
-//            throw new SQLException(e.getMessage(), e);
-//        }
-    }
-
-    public static boolean isDatabaseStructureCreated(String tableName, Connection conn) {
-        try {
-            System.out.println("Running a query to test the database tables existence.");
-            // check whether the tables are already created with a query
-            Statement statement = null;
-            try {
-                statement = conn.createStatement();
-                ResultSet rs = statement.executeQuery("select * from " + tableName);
-                if (rs != null) {
-                    rs.close();
-                }
-            } finally {
-                try {
-                    if (statement != null) {
-                        statement.close();
-                    }
-                } catch (SQLException e) {
-                    return false;
-                }
-            }
-        } catch (SQLException e) {
-            return false;
-        }
-
-        return true;
-    }
-
-    private void executeSQLScript(Connection conn) throws Exception {
-        StringBuffer sql = new StringBuffer();
-        BufferedReader reader = null;
-        try{
-
-        InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream(scriptName);
-        reader = new BufferedReader(new InputStreamReader(inputStream));
-        String line;
-        while ((line = reader.readLine()) != null) {
-            line = line.trim();
-            if (line.startsWith("//")) {
-                continue;
-            }
-            if (line.startsWith("--")) {
-                continue;
-            }
-            StringTokenizer st = new StringTokenizer(line);
-            if (st.hasMoreTokens()) {
-                String token = st.nextToken();
-                if ("REM".equalsIgnoreCase(token)) {
-                    continue;
-                }
-            }
-            sql.append(" ").append(line);
-
-            // SQL defines "--" as a comment to EOL
-            // and in Oracle it may contain a hint
-            // so we cannot just remove it, instead we must end it
-            if (line.indexOf("--") >= 0) {
-                sql.append("\n");
-            }
-            if ((checkStringBufferEndsWith(sql, delimiter))) {
-                executeSQL(sql.substring(0, sql.length() - delimiter.length()), conn);
-                sql.replace(0, sql.length(), "");
-            }
-        }
-        // Catch any statements not followed by ;
-        if (sql.length() > 0) {
-            executeSQL(sql.toString(), conn);
-        }
-        }catch (IOException e){
-            logger.error("Error occurred while executing SQL script for creating Airavata
database", e);
-            throw new Exception("Error occurred while executing SQL script for creating Airavata
database", e);
-        }finally {
-            if (reader != null) {
-                reader.close();
-            }
-
-        }
-
-    }
-
-    private static void executeSQL(String sql, Connection conn) throws Exception {
-        // Check and ignore empty statements
-        if ("".equals(sql.trim())) {
-            return;
-        }
-
-        Statement statement = null;
-        try {
-            logger.debug("SQL : " + sql);
-
-            boolean ret;
-            int updateCount = 0, updateCountTotal = 0;
-            statement = conn.createStatement();
-            ret = statement.execute(sql);
-            updateCount = statement.getUpdateCount();
-            do {
-                if (!ret) {
-                    if (updateCount != -1) {
-                        updateCountTotal += updateCount;
-                    }
-                }
-                ret = statement.getMoreResults();
-                if (ret) {
-                    updateCount = statement.getUpdateCount();
-                }
-            } while (ret);
-
-            logger.debug(sql + " : " + updateCountTotal + " rows affected");
-
-            SQLWarning warning = conn.getWarnings();
-            while (warning != null) {
-                logger.warn(warning + " sql warning");
-                warning = warning.getNextWarning();
-            }
-            conn.clearWarnings();
-        } catch (SQLException e) {
-            if (e.getSQLState().equals("X0Y32")) {
-                // eliminating the table already exception for the derby
-                // database
-                logger.info("Table Already Exists", e);
-            } else {
-                throw new Exception("Error occurred while executing : " + sql, e);
-            }
-        } finally {
-            if (statement != null) {
-                try {
-                    statement.close();
-                } catch (SQLException e) {
-                    logger.error("Error occurred while closing result set.", e);
-                }
-            }
-        }
-    }
-
-    public void stopDerbyServer() throws SQLException{
-        try {
-            server.shutdown();
-        } catch (Exception e) {
-            logger.error(e.getMessage(), e);
-            throw new SQLException("Error while stopping derby server", e);
-        }
-    }
-}


Mime
View raw message