|
|
|
@ -1,21 +1,21 @@
|
|
|
|
|
/*
|
|
|
|
|
* Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
|
|
|
|
|
* 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
|
|
|
|
|
* 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.
|
|
|
|
|
* 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.core.operation.mgt.dao;
|
|
|
|
|
|
|
|
|
|
import org.apache.commons.logging.Log;
|
|
|
|
@ -33,8 +33,8 @@ import java.util.List;
|
|
|
|
|
|
|
|
|
|
public class OperationManagementDAOFactory {
|
|
|
|
|
|
|
|
|
|
private static DataSource dataSource;
|
|
|
|
|
private static final Log log = LogFactory.getLog(OperationManagementDAOFactory.class);
|
|
|
|
|
private static DataSource dataSource;
|
|
|
|
|
private static ThreadLocal<Connection> currentConnection = new ThreadLocal<Connection>();
|
|
|
|
|
|
|
|
|
|
public static OperationDAO getCommandOperationDAO() {
|
|
|
|
@ -70,29 +70,26 @@ public class OperationManagementDAOFactory {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public static void beginTransaction() throws OperationManagementDAOException {
|
|
|
|
|
|
|
|
|
|
try {
|
|
|
|
|
currentConnection.set(dataSource.getConnection());
|
|
|
|
|
} catch (SQLException e) {
|
|
|
|
|
throw new OperationManagementDAOException("Error occurred while retrieving config.datasource connection", e);
|
|
|
|
|
throw new OperationManagementDAOException(
|
|
|
|
|
"Error occurred while retrieving config.datasource connection", e);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public static Connection getConnection() throws OperationManagementDAOException {
|
|
|
|
|
|
|
|
|
|
if (currentConnection.get() == null) {
|
|
|
|
|
try {
|
|
|
|
|
currentConnection.set(dataSource.getConnection());
|
|
|
|
|
} catch (SQLException e) {
|
|
|
|
|
throw new OperationManagementDAOException("Error occurred while retrieving data source connection",
|
|
|
|
|
e);
|
|
|
|
|
throw new OperationManagementDAOException("Error occurred while retrieving data source connection", e);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return currentConnection.get();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public static void closeConnection() throws OperationManagementDAOException {
|
|
|
|
|
|
|
|
|
|
Connection con = currentConnection.get();
|
|
|
|
|
if (con != null) {
|
|
|
|
|
try {
|
|
|
|
@ -130,11 +127,11 @@ public class OperationManagementDAOFactory {
|
|
|
|
|
} else {
|
|
|
|
|
if (log.isDebugEnabled()) {
|
|
|
|
|
log.debug("Datasource connection associated with the current thread is null, hence rollback " +
|
|
|
|
|
"has not been attempted");
|
|
|
|
|
"has not been attempted");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} catch (SQLException e) {
|
|
|
|
|
throw new OperationManagementDAOException("Error occurred while rollbacking the transaction", e);
|
|
|
|
|
throw new OperationManagementDAOException("Error occurred while roll-backing the transaction", e);
|
|
|
|
|
} finally {
|
|
|
|
|
closeConnection();
|
|
|
|
|
}
|
|
|
|
@ -149,28 +146,23 @@ public class OperationManagementDAOFactory {
|
|
|
|
|
private static DataSource resolveDataSource(DataSourceConfig config) {
|
|
|
|
|
DataSource dataSource = null;
|
|
|
|
|
if (config == null) {
|
|
|
|
|
throw new RuntimeException(
|
|
|
|
|
"Device Management Repository data source configuration " + "is null and " +
|
|
|
|
|
"thus, is not initialized");
|
|
|
|
|
throw new RuntimeException("Device Management Repository data source configuration is null and " +
|
|
|
|
|
"thus, is not initialized");
|
|
|
|
|
}
|
|
|
|
|
JNDILookupDefinition jndiConfig = config.getJndiLookupDefinition();
|
|
|
|
|
if (jndiConfig != null) {
|
|
|
|
|
if (log.isDebugEnabled()) {
|
|
|
|
|
log.debug("Initializing Device Management Repository data source using the JNDI " +
|
|
|
|
|
"Lookup Definition");
|
|
|
|
|
log.debug("Initializing Device Management Repository data source using the JNDI Lookup Definition");
|
|
|
|
|
}
|
|
|
|
|
List<JNDILookupDefinition.JNDIProperty> jndiPropertyList =
|
|
|
|
|
jndiConfig.getJndiProperties();
|
|
|
|
|
List<JNDILookupDefinition.JNDIProperty> jndiPropertyList = jndiConfig.getJndiProperties();
|
|
|
|
|
if (jndiPropertyList != null) {
|
|
|
|
|
Hashtable<Object, Object> jndiProperties = new Hashtable<Object, Object>();
|
|
|
|
|
for (JNDILookupDefinition.JNDIProperty prop : jndiPropertyList) {
|
|
|
|
|
jndiProperties.put(prop.getName(), prop.getValue());
|
|
|
|
|
}
|
|
|
|
|
dataSource = DeviceManagementDAOUtil
|
|
|
|
|
.lookupDataSource(jndiConfig.getJndiName(), jndiProperties);
|
|
|
|
|
dataSource = DeviceManagementDAOUtil.lookupDataSource(jndiConfig.getJndiName(), jndiProperties);
|
|
|
|
|
} else {
|
|
|
|
|
dataSource =
|
|
|
|
|
DeviceManagementDAOUtil.lookupDataSource(jndiConfig.getJndiName(), null);
|
|
|
|
|
dataSource = DeviceManagementDAOUtil.lookupDataSource(jndiConfig.getJndiName(), null);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return dataSource;
|
|
|
|
|