Author: azeez
Date: Thu Jan 31 08:22:00 2008
New Revision: 13205
Log:
Code improvements
Modified:
trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/KeyStoreDAO.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/MessageDAO.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/ModuleDAO.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/OperationDAO.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/SecurityScenarioDAO.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/ServiceDAO.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/ServiceGroupDAO.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/TransportDAO.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/UserDAO.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/UserRoleDAO.java
Modified:
trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/KeyStoreDAO.java
==============================================================================
---
trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/KeyStoreDAO.java
(original)
+++
trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/KeyStoreDAO.java
Thu Jan 31 08:22:00 2008
@@ -46,7 +46,7 @@
tx.commit();
} catch (Throwable e) {
tx.rollback();
- String msg = "Unable to get transport keystores";
+ String msg = "Unable to getKeystores";
log.error(msg, e);
throw new RuntimeException(msg, e);
}
@@ -57,7 +57,7 @@
String userQuery = "from KeyStoreDO where keyStoreName='" +
ksName.trim() + "'";
Session session = hbConfig.currentSession();
Transaction tx = session.beginTransaction();
- KeyStoreDO keyStore = null;
+ KeyStoreDO keyStore;
try {
keyStore = (KeyStoreDO)
session.createQuery(userQuery).uniqueResult();
tx.commit();
Modified:
trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/MessageDAO.java
==============================================================================
---
trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/MessageDAO.java
(original)
+++
trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/MessageDAO.java
Thu Jan 31 08:22:00 2008
@@ -53,7 +53,6 @@
long maxSeq = -1;
try {
Object msg = session.createQuery(query).uniqueResult();
- System.out.println("####### MAX SEQ MSG=" + msg);
Long seq = (Long) msg;
if (seq != null) {
maxSeq = seq.longValue();
Modified:
trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/ModuleDAO.java
==============================================================================
---
trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/ModuleDAO.java
(original)
+++
trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/ModuleDAO.java
Thu Jan 31 08:22:00 2008
@@ -171,7 +171,7 @@
ServiceGroupDO serviceGrp) {
Session session = hbConfig.currentSession();
Transaction tx = session.beginTransaction();
- ModuleDO moduleDO = null;
+ ModuleDO moduleDO;
try {
moduleDO = getModule(moduleName, version, session);
if (moduleDO != null) {
@@ -195,8 +195,8 @@
public ServiceDO[] getEngagedServices(String moduleName, String version) {
Session session = hbConfig.currentSession();
Transaction tx = session.beginTransaction();
- ModuleDO moduleDO = null;
- ServiceDO[] serviceDOs = null;
+ ModuleDO moduleDO;
+ ServiceDO[] serviceDOs;
try {
moduleDO = getModule(moduleName, version, session);
Set engServiceSet = moduleDO.getEngagedServices();
@@ -425,7 +425,7 @@
Session session = hbConfig.currentSession();
Transaction tx = session.beginTransaction();
ModuleDO moduleDO;
- ModuleParameterDO[] params = null;
+ ModuleParameterDO[] params;
try {
moduleDO = (ModuleDO) session.load(ModuleDO.class, module.getId());
Set paramSet = moduleDO.getParameters();
@@ -449,8 +449,7 @@
Session session = hbConfig.currentSession();
Transaction tx = session.beginTransaction();
- ServiceDO serviceDO = null;
- ModuleParameterDO paramDO = null;
+ ModuleParameterDO paramDO;
try {
paramDO = (ModuleParameterDO)
session.createQuery(query).uniqueResult();
tx.commit();
Modified:
trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/OperationDAO.java
==============================================================================
---
trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/OperationDAO.java
(original)
+++
trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/OperationDAO.java
Thu Jan 31 08:22:00 2008
@@ -53,6 +53,9 @@
tx.commit();
} catch (Exception e) {
tx.rollback();
+ String msg = "Cannot get service identifier";
+ log.error(msg, e);
+ throw new RuntimeException(msg, e);
}
return serviceId;
}
@@ -66,7 +69,7 @@
tx.commit();
} catch (Throwable e) {
tx.rollback();
- String msg = "Unable to update service";
+ String msg = "Unable to update operation";
log.error(msg, e);
throw new RuntimeException(msg, e);
}
@@ -83,6 +86,9 @@
tx.commit();
} catch (Exception e) {
tx.rollback();
+ String msg = "Cannot getEngagedModules";
+ log.error(msg, e);
+ throw new RuntimeException(msg, e);
}
return modules;
@@ -100,6 +106,9 @@
tx.commit();
} catch (Throwable e) {
tx.rollback();
+ String msg = "Cannot getParameters";
+ log.error(msg, e);
+ throw new RuntimeException(msg, e);
}
return params;
@@ -111,12 +120,15 @@
serviceVersion.trim() + "' and op.name='" +
opName.trim() + "'";
Session session = hbConfig.currentSession();
Transaction tx = session.beginTransaction();
- OperationDO op = null;
+ OperationDO op;
try {
op = (OperationDO) session.createQuery(query).uniqueResult();
tx.commit();
} catch (Throwable e) {
tx.rollback();
+ String msg = "Cannot getOperation";
+ log.error(msg, e);
+ throw new RuntimeException(msg, e);
}
return op;
}
@@ -138,7 +150,10 @@
}
} catch (Throwable e) {
tx.rollback();
- }
+ String msg = "Cannot getOperationParameter";
+ log.error(msg, e);
+ throw new RuntimeException(msg, e);
+ }
return opParamDO;
}
Modified:
trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/SecurityScenarioDAO.java
==============================================================================
---
trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/SecurityScenarioDAO.java
(original)
+++
trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/SecurityScenarioDAO.java
Thu Jan 31 08:22:00 2008
@@ -40,14 +40,14 @@
public SecurityScenarioDO[] getAllScenarios() {
Session session = hbConfig.currentSession();
- Transaction transaction = session.beginTransaction();
+ Transaction tx = session.beginTransaction();
List scenarios = new ArrayList();
try {
Criteria criteria =
session.createCriteria(SecurityScenarioDO.class);
scenarios = criteria.list();
- transaction.commit();
+ tx.commit();
} catch (Throwable e) {
- transaction.rollback();
+ tx.rollback();
String msg = "Unable to get all scenarios";
log.error(msg, e);
throw new RuntimeException(msg, e);
@@ -58,15 +58,15 @@
public SecurityScenarioDO getSecurityScenario(String scenarioId) {
Session session = hbConfig.currentSession();
- Transaction transaction = session.beginTransaction();
+ Transaction tx = session.beginTransaction();
SecurityScenarioDO scenario = null;
try {
Criteria criteria =
session.createCriteria(SecurityScenarioDO.class);
criteria.add(Expression.eq("scenarioId", scenarioId.trim()));
scenario = (SecurityScenarioDO) criteria.uniqueResult();
- transaction.commit();
+ tx.commit();
} catch (Throwable e) {
- transaction.rollback();
+ tx.rollback();
String msg = "Unable to get all scenarios";
log.error(msg, e);
throw new RuntimeException(msg, e);
Modified:
trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/ServiceDAO.java
==============================================================================
---
trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/ServiceDAO.java
(original)
+++
trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/ServiceDAO.java
Thu Jan 31 08:22:00 2008
@@ -124,8 +124,8 @@
public OperationDO[] getOperations(ServiceDO service) {
Session session = hbConfig.currentSession();
Transaction tx = session.beginTransaction();
- ServiceDO serviceDO = null;
- OperationDO[] opDOs = null;
+ ServiceDO serviceDO;
+ OperationDO[] opDOs;
try {
serviceDO = (ServiceDO) session.load(ServiceDO.class,
service.getId());
Set opSet = serviceDO.getOperations();
@@ -143,7 +143,7 @@
public void addUser(String serviceId, String version, ServiceUserDO user) {
Session session = hbConfig.currentSession();
Transaction tx = session.beginTransaction();
- ServiceDO service = null;
+ ServiceDO service;
try {
service = getService(serviceId, version, session);
user = getUser(user.getUsername(), session);
@@ -165,7 +165,7 @@
public void addRole(String serviceId, String version, ServiceUserRoleDO
role) {
Session session = hbConfig.currentSession();
Transaction tx = session.beginTransaction();
- ServiceDO service = null;
+ ServiceDO service;
try {
service = getService(serviceId, version, session);
role = getRole(role.getRole(), session);
@@ -198,7 +198,7 @@
public void addPolicy(String serviceId, String version, ServicePolicyDO
policy) {
Session session = hbConfig.currentSession();
Transaction tx = session.beginTransaction();
- ServiceDO service = null;
+ ServiceDO service;
try {
service = getService(serviceId, version, session);
if (!service.getPolicies().contains(policy)) {
@@ -287,8 +287,8 @@
public ServiceUserRoleDO[] getRoles(String serviceId, String version) {
Session session = hbConfig.currentSession();
Transaction tx = session.beginTransaction();
- ServiceDO serviceDO = null;
- ServiceUserRoleDO[] userRoleDOs = null;
+ ServiceDO serviceDO;
+ ServiceUserRoleDO[] userRoleDOs;
try {
serviceDO = getService(serviceId, version, session);
Set roleSet = serviceDO.getRoles();
@@ -308,8 +308,8 @@
public ServicePolicyDO[] getPolicies(String serviceId, String version) {
Session session = hbConfig.currentSession();
Transaction tx = session.beginTransaction();
- ServiceDO serviceDO = null;
- ServicePolicyDO[] policyDOs = null;
+ ServiceDO serviceDO;
+ ServicePolicyDO[] policyDOs;
try {
serviceDO = getService(serviceId, version, session);
Set opSet = serviceDO.getPolicies();
@@ -327,8 +327,8 @@
public ServicePolicyDO[] getPolicies(ServiceDO service) {
Session session = hbConfig.currentSession();
Transaction tx = session.beginTransaction();
- ServiceDO serviceDO = null;
- ServicePolicyDO[] policyDOs = null;
+ ServiceDO serviceDO;
+ ServicePolicyDO[] policyDOs;
try {
serviceDO = (ServiceDO) session.load(ServiceDO.class,
service.getId());
Set opSet = serviceDO.getPolicies();
@@ -346,8 +346,8 @@
public ServiceParameterDO[] getParameters(String serviceId, String
version) {
Session session = hbConfig.currentSession();
Transaction tx = session.beginTransaction();
- ServiceDO serviceDO = null;
- ServiceParameterDO[] paramDOs = null;
+ ServiceDO serviceDO;
+ ServiceParameterDO[] paramDOs;
try {
serviceDO = getService(serviceId, version, session);
Set opSet = serviceDO.getParameters();
@@ -365,8 +365,8 @@
public ServiceParameterDO[] getParameters(ServiceDO service) {
Session session = hbConfig.currentSession();
Transaction tx = session.beginTransaction();
- ServiceDO serviceDO = null;
- ServiceParameterDO[] paramDOs = null;
+ ServiceDO serviceDO;
+ ServiceParameterDO[] paramDOs;
try {
serviceDO = (ServiceDO) session.load(ServiceDO.class,
service.getId());
Set paramSet = serviceDO.getParameters();
@@ -385,7 +385,7 @@
public ServiceParameterDO getParameter(ServiceDO service, String
paramName) {
Session session = hbConfig.currentSession();
Transaction tx = session.beginTransaction();
- ServiceParameterDO paramDO = null;
+ ServiceParameterDO paramDO;
try {
ServiceIdentifierDO sid = service.getServiceIdentifierDO();
@@ -569,9 +569,8 @@
public void removeAllTrustedCertStores(ServiceDO serviceDO) {
Session session = hbConfig.currentSession();
Transaction tx = session.beginTransaction();
- ServiceDO service = null;
try {
- service = (ServiceDO) session.load(ServiceDO.class,
serviceDO.getId());
+ ServiceDO service = (ServiceDO) session.load(ServiceDO.class,
serviceDO.getId());
for (Iterator iter = service.getTrustedCertStores().iterator();
iter.hasNext();) {
KeyStoreDO keyStoreDO = (KeyStoreDO) iter.next();
keyStoreDO.getTrustStoreServices().remove(service);
Modified:
trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/ServiceGroupDAO.java
==============================================================================
---
trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/ServiceGroupDAO.java
(original)
+++
trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/ServiceGroupDAO.java
Thu Jan 31 08:22:00 2008
@@ -50,6 +50,9 @@
tx.commit();
} catch (Exception e) {
tx.rollback();
+ String msg = "Unable to get createServiceGroup";
+ log.error(msg, e);
+ throw new RuntimeException(msg, e);
}
return trasientInstance.getId();
@@ -72,6 +75,9 @@
tx.commit();
} catch (Exception e) {
tx.rollback();
+ String msg = "Unable to get createServiceGroup";
+ log.error(msg, e);
+ throw new RuntimeException(msg, e);
}
return serviceGroupDO;
}
Modified:
trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/TransportDAO.java
==============================================================================
---
trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/TransportDAO.java
(original)
+++
trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/TransportDAO.java
Thu Jan 31 08:22:00 2008
@@ -58,7 +58,7 @@
public TransportDO getTransport(String protocol) {
Session session = hbConfig.currentSession();
Transaction tx = session.beginTransaction();
- TransportDO transport = null;
+ TransportDO transport;
try {
Criteria transportCriteria =
session.createCriteria(TransportDO.class);
transportCriteria.add(Expression.eq("transportProtocol",
protocol.trim()));
@@ -78,9 +78,4 @@
transportCriteria.add(Expression.eq("transportProtocol",
protocol.trim()));
return (TransportDO) transportCriteria.uniqueResult();
}
-
- public void delete(TransportDO transport) {
- //TODO: Method implementation
-
- }
}
Modified:
trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/UserDAO.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/UserDAO.java
(original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/UserDAO.java
Thu Jan 31 08:22:00 2008
@@ -130,7 +130,7 @@
public ServiceUserDO getUser(String username) {
Session session = hbConfig.currentSession();
Transaction tx = session.beginTransaction();
- ServiceUserDO user = null;
+ ServiceUserDO user;
try {
Criteria userCriteria =
session.createCriteria(ServiceUserDO.class);
userCriteria.add(Expression.eq("username", username));
@@ -148,7 +148,7 @@
public ServiceUserRoleDO[] getUserRoles(ServiceUserDO serviceUserDO) {
Session session = hbConfig.currentSession();
Transaction tx = session.beginTransaction();
- ServiceUserRoleDO[] serviceUserRoleDOs = null;
+ ServiceUserRoleDO[] serviceUserRoleDOs;
try {
Set roles = serviceUserDO.getRoles();
@@ -167,7 +167,7 @@
public void addRole(String userName, ServiceUserRoleDO role) {
Session session = hbConfig.currentSession();
Transaction tx = session.beginTransaction();
- ServiceUserDO userDO = null;
+ ServiceUserDO userDO;
try {
userDO = getUser(userName, session);
role = (ServiceUserRoleDO) session.load(ServiceUserRoleDO.class,
role.getId());
@@ -195,7 +195,7 @@
public ServiceUserRoleDO[] getRoles(String serviceUser) {
Session session = hbConfig.currentSession();
Transaction tx = session.beginTransaction();
- ServiceUserDO serviceUserDO = null;
+ ServiceUserDO serviceUserDO;
ServiceUserRoleDO[] serviceUserRoleDOs = null;
try {
serviceUserDO = getUser(serviceUser, session);
@@ -217,7 +217,7 @@
public boolean userHasRole(String username, ServiceUserRoleDO role) {
Session session = hbConfig.currentSession();
Transaction tx = session.beginTransaction();
- boolean containsRole = false;
+ boolean containsRole;
try {
containsRole = getUser(username,
session).getRoles().contains(role);
tx.commit();
Modified:
trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/UserRoleDAO.java
==============================================================================
---
trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/UserRoleDAO.java
(original)
+++
trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/UserRoleDAO.java
Thu Jan 31 08:22:00 2008
@@ -62,7 +62,7 @@
public ServiceUserRoleDO getUserRole(String role) {
Session session = hbConfig.currentSession();
Transaction tx = session.beginTransaction();
- ServiceUserRoleDO serviceUserRoleDO = null;
+ ServiceUserRoleDO serviceUserRoleDO;
try {
Criteria roleCriteria =
session.createCriteria(ServiceUserRoleDO.class);
roleCriteria.add(Expression.eq("role", role.trim()));
_______________________________________________
Wsas-java-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/wsas-java-dev
