From c5af46aa5cecc011d65c38584f9c2b355c918eb0 Mon Sep 17 00:00:00 2001 From: manoj Date: Tue, 31 Mar 2015 19:55:36 +0530 Subject: [PATCH] Refractor Plugin DAO factories --- .../dao/FeatureManagementDAOFactory.java | 93 ------------------- .../mgt/mobile/impl/ios/dao/FeatureDAO.java | 35 ------- .../ios/dao/FeatureManagementDAOFactory.java | 93 ------------------- 3 files changed, 221 deletions(-) delete mode 100644 components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/dao/FeatureManagementDAOFactory.java delete mode 100644 components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/ios/dao/FeatureDAO.java delete mode 100644 components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/ios/dao/FeatureManagementDAOFactory.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/dao/FeatureManagementDAOFactory.java b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/dao/FeatureManagementDAOFactory.java deleted file mode 100644 index a4f4db082..000000000 --- a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/dao/FeatureManagementDAOFactory.java +++ /dev/null @@ -1,93 +0,0 @@ -/* - * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. - * - * WSO2 Inc. 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.wso2.carbon.device.mgt.mobile.impl.android.dao; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.wso2.carbon.device.mgt.mobile.impl.android.dao.impl.FeatureDAOImpl; - -import javax.sql.DataSource; -import java.sql.Connection; -import java.sql.SQLException; - -public class FeatureManagementDAOFactory { - - private static DataSource dataSource; - private static ThreadLocal currentConnection = new ThreadLocal(); - private static final Log log = LogFactory.getLog(FeatureManagementDAOFactory.class); - - public static FeatureDAO getFeatureDAO() { - return new FeatureDAOImpl(); - } - - public static void init(DataSource dtSource) { - dataSource = dtSource; - } - - public static void beginTransaction() throws FeatureManagementDAOException { - try { - Connection conn = dataSource.getConnection(); - conn.setAutoCommit(false); - currentConnection.set(conn); - } catch (SQLException e) { - throw new FeatureManagementDAOException("Error occurred while retrieving datasource connection", e); - } - } - - public static Connection getConnection() { - return currentConnection.get(); - } - - public static void commitTransaction() throws FeatureManagementDAOException { - try { - Connection conn = currentConnection.get(); - if (conn != null) { - conn.commit(); - } else { - if (log.isDebugEnabled()) { - log.debug("Datasource connection associated with the current thread is null, hence commit " + - "has not been attempted"); - } - } - } catch (SQLException e) { - throw new FeatureManagementDAOException("Error occurred while committing the transaction", e); - } - } - - public static void rollbackTransaction() throws FeatureManagementDAOException { - try { - Connection conn = currentConnection.get(); - if (conn != null) { - conn.rollback(); - } else { - if (log.isDebugEnabled()) { - log.debug("Datasource connection associated with the current thread is null, hence rollback " + - "has not been attempted"); - } - } - } catch (SQLException e) { - throw new FeatureManagementDAOException("Error occurred while rollbacking the transaction", e); - } - } - - public static DataSource getDataSource() { - return dataSource; - } - -} diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/ios/dao/FeatureDAO.java b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/ios/dao/FeatureDAO.java deleted file mode 100644 index 6c8c745cb..000000000 --- a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/ios/dao/FeatureDAO.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. - * - * WSO2 Inc. 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.wso2.carbon.device.mgt.mobile.impl.ios.dao; - -import org.wso2.carbon.device.mgt.common.Feature; - -import java.util.List; - -public interface FeatureDAO { - - void addFeature(Feature feature) throws FeatureManagementDAOException; - - void removeFeature(String name) throws FeatureManagementDAOException; - - Feature getFeature(String name) throws FeatureManagementDAOException; - - List getFeatures() throws FeatureManagementDAOException; - -} diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/ios/dao/FeatureManagementDAOFactory.java b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/ios/dao/FeatureManagementDAOFactory.java deleted file mode 100644 index 7db86415b..000000000 --- a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/ios/dao/FeatureManagementDAOFactory.java +++ /dev/null @@ -1,93 +0,0 @@ -/* - * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. - * - * WSO2 Inc. 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.wso2.carbon.device.mgt.mobile.impl.ios.dao; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.wso2.carbon.device.mgt.mobile.impl.ios.dao.impl.FeatureDAOImpl; - -import javax.sql.DataSource; -import java.sql.Connection; -import java.sql.SQLException; - -public class FeatureManagementDAOFactory { - - private static DataSource dataSource; - private static ThreadLocal currentConnection = new ThreadLocal(); - private static final Log log = LogFactory.getLog(FeatureManagementDAOFactory.class); - - public static FeatureDAO getFeatureDAO() { - return new FeatureDAOImpl(); - } - - public static void init(DataSource dtSource) { - dataSource = dtSource; - } - - public static void beginTransaction() throws FeatureManagementDAOException { - try { - Connection conn = dataSource.getConnection(); - conn.setAutoCommit(false); - currentConnection.set(conn); - } catch (SQLException e) { - throw new FeatureManagementDAOException("Error occurred while retrieving datasource connection", e); - } - } - - public static Connection getConnection() { - return currentConnection.get(); - } - - public static void commitTransaction() throws FeatureManagementDAOException { - try { - Connection conn = currentConnection.get(); - if (conn != null) { - conn.commit(); - } else { - if (log.isDebugEnabled()) { - log.debug("Datasource connection associated with the current thread is null, hence commit " + - "has not been attempted"); - } - } - } catch (SQLException e) { - throw new FeatureManagementDAOException("Error occurred while committing the transaction", e); - } - } - - public static void rollbackTransaction() throws FeatureManagementDAOException { - try { - Connection conn = currentConnection.get(); - if (conn != null) { - conn.rollback(); - } else { - if (log.isDebugEnabled()) { - log.debug("Datasource connection associated with the current thread is null, hence rollback " + - "has not been attempted"); - } - } - } catch (SQLException e) { - throw new FeatureManagementDAOException("Error occurred while rollbacking the transaction", e); - } - } - - public static DataSource getDataSource() { - return dataSource; - } - -}