Code cleanup and fixing build failures

This commit is contained in:
prabathabey 2015-03-17 21:04:25 +05:30
parent 3fb61d9c8b
commit d5127f6874
7 changed files with 5 additions and 27 deletions

View File

@ -125,7 +125,7 @@ public class DeviceManagementServiceComponent {
}
/* Registering Device Management Service */
BundleContext bundleContext = componentContext.getBundleContext();
bundleContext.registerService(DeviceManagementServiceImpl.class.getName(),
bundleContext.registerService(DeviceManagementService.class.getName(),
new DeviceManagementServiceImpl(), null);
}

View File

@ -66,7 +66,7 @@ public class OperationManagerImpl implements OperationManager {
try {
OperationManagementDAOFactory.rollbackTransaction();
} catch (OperationManagementDAOException e1) {
log.warn("Error occurred while roll-backing the transaction", e);
log.warn("Error occurred while roll-backing the transaction", e1);
}
throw new OperationManagementException("Error occurred while adding operation", e);
}

View File

@ -41,15 +41,15 @@ public class OperationManagementDAOFactory {
private static ThreadLocal<Connection> currentConnection = new ThreadLocal<Connection>();
public static OperationDAO getCommandOperationDAO() {
return new CommandOperationDAOImpl(dataSource);
return new CommandOperationDAOImpl();
}
public static OperationDAO getConfigOperationDAO() {
return new ConfigOperationDAOImpl(dataSource);
return new ConfigOperationDAOImpl();
}
public static OperationDAO getSimpleOperationDAO() {
return new SimpleOperationDAOImpl(dataSource);
return new SimpleOperationDAOImpl();
}
public static OperationMappingDAO getOperationMappingDAO() {

View File

@ -31,16 +31,6 @@ import java.sql.SQLException;
public abstract class AbstractOperationDAO implements OperationDAO {
private DataSource dataSource;
public AbstractOperationDAO(DataSource dataSource) {
this.dataSource = dataSource;
}
public DataSource getDataSource() {
return dataSource;
}
public int addOperation(Operation operation) throws OperationManagementDAOException {
PreparedStatement stmt = null;
ResultSet rs = null;

View File

@ -33,10 +33,6 @@ import java.util.List;
public class CommandOperationDAOImpl extends AbstractOperationDAO {
public CommandOperationDAOImpl(DataSource dataSource) {
super(dataSource);
}
@Override
public int addOperation(Operation operation) throws OperationManagementDAOException {
int operationId = super.addOperation(operation);

View File

@ -27,10 +27,6 @@ import java.util.List;
public class ConfigOperationDAOImpl extends AbstractOperationDAO {
public ConfigOperationDAOImpl(DataSource dataSource) {
super(dataSource);
}
@Override
public int addOperation(Operation operation) throws OperationManagementDAOException {
return 0;

View File

@ -26,10 +26,6 @@ import java.util.List;
public class SimpleOperationDAOImpl extends AbstractOperationDAO {
public SimpleOperationDAOImpl(DataSource dataSource) {
super(dataSource);
}
@Override
public int updateOperation(Operation operation) throws OperationManagementDAOException {
return 0;