Author: prabath
Date: Sat Mar 1 08:12:24 2008
New Revision: 14394
Log:
code review fixes as suggested by findbugs
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/OpenIDProvider.java
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/OpenIDProviderData.java
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/persistence/dao/OpenIDUserRPDAO.java
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/IdentityTokenIssuer.java
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/OpenIDTokenIssuer.java
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/users/IdentityDefaultUserStoreAdmin.java
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/users/IdentityDefaultUserStoreReader.java
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/relyingparty/openid/OpenIDConsumer.java
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/EditUserProfileAction.java
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/OpenIDAuthVerificationAction.java
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/OpenIDUserApprovalAction.java
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/filter/JSPFilter.java
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/OpenIDProvider.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/OpenIDProvider.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/OpenIDProvider.java
Sat Mar 1 08:12:24 2008
@@ -43,7 +43,7 @@
public class OpenIDProvider {
// Instantiate a ServerManager object.
- public static ServerManager manager = new OpenIDServerManager();
+ public static final ServerManager manager = new OpenIDServerManager();
private String authPage;
private static Log log = LogFactory.getLog(OpenIDProvider.class);
@@ -68,18 +68,18 @@
manager.setOPEndpointUrl(opAddress);
for (char c = 'a'; c <= 'z'; c++)
- UNRESERVED_CHARACTERS.add(new Character(c));
+ UNRESERVED_CHARACTERS.add(Character.valueOf(c));
for (char c = 'A'; c <= 'A'; c++)
- UNRESERVED_CHARACTERS.add(new Character(c));
+ UNRESERVED_CHARACTERS.add(Character.valueOf(c));
for (char c = '0'; c <= '9'; c++)
- UNRESERVED_CHARACTERS.add(new Character(c));
+ UNRESERVED_CHARACTERS.add(Character.valueOf(c));
- UNRESERVED_CHARACTERS.add(new Character('-'));
- UNRESERVED_CHARACTERS.add(new Character('.'));
- UNRESERVED_CHARACTERS.add(new Character('_'));
- UNRESERVED_CHARACTERS.add(new Character('~'));
+ UNRESERVED_CHARACTERS.add(Character.valueOf('-'));
+ UNRESERVED_CHARACTERS.add(Character.valueOf('.'));
+ UNRESERVED_CHARACTERS.add(Character.valueOf('_'));
+ UNRESERVED_CHARACTERS.add(Character.valueOf('~'));
}
/**
@@ -464,7 +464,7 @@
String str = URLDecoder.decode(percentCode, "ISO-8859-1");
char chr = str.charAt(0);
- if (UNRESERVED_CHARACTERS.contains(new Character(chr)))
+ if (UNRESERVED_CHARACTERS.contains(Character.valueOf(chr)))
normalized.append(chr);
else
normalized.append(percentCode);
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/OpenIDProviderData.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/OpenIDProviderData.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/OpenIDProviderData.java
Sat Mar 1 08:12:24 2008
@@ -14,7 +14,6 @@
import org.wso2.solutions.identity.IdentityProviderException;
import org.wso2.solutions.identity.UserStore;
import org.wso2.solutions.identity.admin.ClaimsAdmin;
-import org.wso2.solutions.identity.persistence.IPPersistenceManager;
import org.wso2.solutions.identity.persistence.dataobject.ClaimDO;
public class OpenIDProviderData {
@@ -32,13 +31,11 @@
throws IdentityProviderException {
Map claims = null;
- IPPersistenceManager persistenceManager = null;
ClaimDO[] supportedClaims = null;
ClaimsAdmin claimsAdmin = null;
claims = new HashMap();
- persistenceManager = IPPersistenceManager.getPersistanceManager();
-
+
claimsAdmin = new ClaimsAdmin();
supportedClaims = claimsAdmin.getAllMappedEnabledClaims();
@@ -62,15 +59,13 @@
throws IdentityProviderException {
Map claims = null;
- IPPersistenceManager persistenceManager = null;
ClaimDO[] supportedClaims = null;
ClaimsAdmin claimsAdmin = null;
Iterator iterator = null;
Map map = null;
claims = new HashMap();
- persistenceManager = IPPersistenceManager.getPersistanceManager();
-
+
claimsAdmin = new ClaimsAdmin();
supportedClaims = claimsAdmin.getAllMappedEnabledClaims();
@@ -80,7 +75,7 @@
claims.put(temp.getOpenIDTag(), temp);
}
- iterator = requiredClaims.keySet().iterator();
+ iterator = requiredClaims.entrySet().iterator();
map = new HashMap();
String key = null;
@@ -188,7 +183,7 @@
String key = null;
OpenIDClaim claim = null;
- iterator = claimValues.keySet().iterator();
+ iterator = claimValues.entrySet().iterator();
while (iterator.hasNext()) {
key = (String) iterator.next();
@@ -212,7 +207,7 @@
String key = null;
OpenIDClaim claim = null;
- iterator = claimValues.keySet().iterator();
+ iterator = claimValues.entrySet().iterator();
while (iterator.hasNext()) {
key = (String) iterator.next();
@@ -239,7 +234,7 @@
/**
* Claims corresponding to OpenID.
*/
- public class OpenIDClaim {
+ public static class OpenIDClaim {
public String typeUri;
public String openIDTag;
public String claimValue;
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/persistence/dao/OpenIDUserRPDAO.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/persistence/dao/OpenIDUserRPDAO.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/persistence/dao/OpenIDUserRPDAO.java
Sat Mar 1 08:12:24 2008
@@ -25,13 +25,15 @@
Session session = hbConfig.getCurrentSession();
String stmt = "from OpenIDUserRPDO as c where c.rpUrl = '" + rpUrl
+ "' and c.userName='" + userName + "'";
- OpenIDUserRPDO[] rpdo = new OpenIDUserRPDO[0];
+ OpenIDUserRPDO[] rpdo = null;
try {
Query query = session.createQuery(stmt);
List lst = query.list();
rpdo = (OpenIDUserRPDO[]) lst
.toArray(new OpenIDUserRPDO[lst.size()]);
+ if (rpdo == null)
+ return new OpenIDUserRPDO[0];
} catch (Throwable e) {
String msg = messages.getMessage("errorQuerryingOpenIDUserRP");
throw new RuntimeException(msg, e);
@@ -53,13 +55,15 @@
Session session = hbConfig.getCurrentSession();
String stmt = "from OpenIDUserRPDO as c where c.userName='" + userName
+ "'";
- OpenIDUserRPDO[] rpdo = new OpenIDUserRPDO[0];
+ OpenIDUserRPDO[] rpdo = null;
try {
Query query = session.createQuery(stmt);
List lst = query.list();
rpdo = (OpenIDUserRPDO[]) lst
.toArray(new OpenIDUserRPDO[lst.size()]);
+ if (rpdo == null)
+ return new OpenIDUserRPDO[0];
} catch (Throwable e) {
String msg = messages.getMessage("errorQuerryingOpenIDUserRP");
throw new RuntimeException(msg, e);
@@ -71,7 +75,7 @@
}
/**
- * Returns the default user profile correspodning to the given user name
and
+ * Returns the default user profile corresponding to the given user name
and
* the RP url.
* @param userName Unique user name
* @param rpUrl Relying party url
@@ -82,7 +86,7 @@
Session session = hbConfig.getCurrentSession();
String stmt = "select c.defaultProfileName from OpenIDUserRPDO as c
where c.userName='"
+ userName + "' and c.rpUrl='" + rpUrl + "'";
- String[] profileId = new String[0];
+ String[] profileId = null;
try {
Query query = session.createQuery(stmt);
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/IdentityTokenIssuer.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/IdentityTokenIssuer.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/IdentityTokenIssuer.java
Sat Mar 1 08:12:24 2008
@@ -346,7 +346,7 @@
appliesToEpr = (OMElement) doc.importNode(eprDoc
.getDocumentElement(), true);
} catch (Exception e) {
- new TrustException(TrustException.REQUEST_FAILED, e);
+ throw new TrustException(TrustException.REQUEST_FAILED, e);
}
OMElement appliesToElem = rstrElem
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/OpenIDTokenIssuer.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/OpenIDTokenIssuer.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/OpenIDTokenIssuer.java
Sat Mar 1 08:12:24 2008
@@ -73,7 +73,6 @@
throws TrustException, SAMLException, IdentityProviderException {
int wstVersion = data.getVersion();
- MessageContext inMsgCtx = data.getInMessageContext();
OMElement rstrElem = TrustUtil
.createRequestSecurityTokenResponseElement(wstVersion, env
@@ -105,7 +104,7 @@
appliesToEpr = (OMElement) doc.importNode(eprDoc
.getDocumentElement(), true);
} catch (Exception e) {
- new TrustException(TrustException.REQUEST_FAILED, e);
+ throw new TrustException(TrustException.REQUEST_FAILED, e);
}
OMElement appliesToElem = rstrElem
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/users/IdentityDefaultUserStoreAdmin.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/users/IdentityDefaultUserStoreAdmin.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/users/IdentityDefaultUserStoreAdmin.java
Sat Mar 1 08:12:24 2008
@@ -104,6 +104,8 @@
}
}
}
+
+ sqlStatement.close();
sqlStatement = dbConnection
.prepareStatement("select * from user_profile where
user_id=? AND is_default=?");
@@ -121,6 +123,8 @@
if (profileName == null && isDefaultProfile)
profileName = "Default Profile";
+
+ sqlStatement.close();
dbConnection.commit();
@@ -175,6 +179,8 @@
sqlStatement.setString(5, UUIDGenerator.getUUID());
sqlStatement.executeUpdate();
+
+ sqlStatement.close();
dbConnection.commit();
@@ -244,6 +250,8 @@
if (profileId == null)
throw new UserManagerException("errorModifyingUserStore");
+ sqlStatement.close();
+
sqlStatement = dbConnection
.prepareStatement("delete from user_profile_values where
profile_id=?");
@@ -251,6 +259,8 @@
sqlStatement.executeUpdate();
+ sqlStatement.close();
+
sqlStatement = dbConnection
.prepareStatement("insert into user_profile_values
(attr_name, attr_value, profile_id, id) values (?, ?, ?, ?)");
@@ -261,21 +271,18 @@
String key = (String) entry.getKey();
String value = (String) entry.getValue();
if (value != null) {
- if (!key
-
.equalsIgnoreCase(IdentityConstants.PROFILE_NAME)) {
- String idUserAttribute = UUIDGenerator.getUUID();
- sqlStatement.setString(1, key);
- sqlStatement.setString(2, value);
- sqlStatement.setString(3, profileId);
- sqlStatement.setString(4, idUserAttribute);
- sqlStatement.executeUpdate();
- } else {
- profileName = value;
- }
+ String idUserAttribute = UUIDGenerator.getUUID();
+ sqlStatement.setString(1, key);
+ sqlStatement.setString(2, value);
+ sqlStatement.setString(3, profileId);
+ sqlStatement.setString(4, idUserAttribute);
+ sqlStatement.executeUpdate();
}
}
}
+ sqlStatement.close();
+
dbConnection.commit();
} catch (SQLException e) {
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/users/IdentityDefaultUserStoreReader.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/users/IdentityDefaultUserStoreReader.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/users/IdentityDefaultUserStoreReader.java
Sat Mar 1 08:12:24 2008
@@ -112,7 +112,6 @@
}
dbConnection.setAutoCommit(false);
- propNames = new String[0];
sqlStatement = dbConnection
.prepareStatement("select distinct attr_name from
user_profile_values");
@@ -123,10 +122,14 @@
while (rs.next()) {
lst.add(rs.getString(1));
}
+
propNames = (String[]) lst.toArray(new String[lst.size()]);
sqlStatement.close();
+ if (propNames == null)
+ return new String[0];
+
} catch (SQLException e) {
log.debug(e);
throw new UserManagerException("errorReadingFromUserStore", e);
Modified:
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/relyingparty/openid/OpenIDConsumer.java
==============================================================================
---
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/relyingparty/openid/OpenIDConsumer.java
(original)
+++
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/relyingparty/openid/OpenIDConsumer.java
Sat Mar 1 08:12:24 2008
@@ -524,7 +524,7 @@
String key = null;
attributes = response.getAttributes();
- iterator = attributes.keySet().iterator();
+ iterator = attributes.entrySet().iterator();
while (iterator.hasNext()) {
key = (String) iterator.next();
Modified:
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/EditUserProfileAction.java
==============================================================================
---
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/EditUserProfileAction.java
(original)
+++
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/EditUserProfileAction.java
Sat Mar 1 08:12:24 2008
@@ -1,7 +1,6 @@
package org.wso2.solutions.identity.user.ui.action;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.List;
import java.util.Map;
Modified:
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/OpenIDAuthVerificationAction.java
==============================================================================
---
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/OpenIDAuthVerificationAction.java
(original)
+++
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/OpenIDAuthVerificationAction.java
Sat Mar 1 08:12:24 2008
@@ -207,16 +207,14 @@
IdentityDefaultRealm realm = null;
IdentityUserStoreReader reader = null;
IPPersistenceManager db = null;
- RelyingPartyAdmin admin = null;
- profile = new ArrayList();
try {
+ profile = new ArrayList();
realm = (IdentityDefaultRealm) UserStore.getInstance().getRealm();
reader = realm.getIdentityUserStoreReader();
profile = reader.getUserProfileNames(userName);
db = IPPersistenceManager.getPersistanceManager();
- admin = new RelyingPartyAdmin();
defaultUserProfileName = db.getOpenIDDefaultUserProfile(userName,
rpUrl);
@@ -263,7 +261,7 @@
OpenIDUserRPDO[] rpdos = null;
OpenIDUserRPDO rpdo = null;
-
+
try {
db = IPPersistenceManager.getPersistanceManager();
} catch (IdentityProviderException e) {
Modified:
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/OpenIDUserApprovalAction.java
==============================================================================
---
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/OpenIDUserApprovalAction.java
(original)
+++
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/OpenIDUserApprovalAction.java
Sat Mar 1 08:12:24 2008
@@ -33,9 +33,6 @@
public String execute() throws Exception {
ActionContext context = null;
HttpServletRequest request = null;
- Map map = null;
- IdentityDefaultRealm realm = null;
- IdentityUserStoreReader reader = null;
String authenticatedAndApproved = null;
String action = null;
String submitAction = null;
@@ -45,8 +42,6 @@
request = (HttpServletRequest) context
.get(StrutsStatics.HTTP_REQUEST);
- map = ActionContext.getContext().getSession();
-
ParameterList requestp = (ParameterList) request.getSession()
.getAttribute(IdentityConstants.OpenId.PARAM_LIST);
@@ -77,10 +72,7 @@
}
String userName = UserUtil.getUserName(openididentity);
-
- realm = (IdentityDefaultRealm) UserStore.getInstance().getRealm();
- reader = realm.getIdentityUserStoreReader();
-
+
OpenIDUserRPDO rpdo = null;
rpdo = new OpenIDUserRPDO();
Modified:
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/filter/JSPFilter.java
==============================================================================
---
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/filter/JSPFilter.java
(original)
+++
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/filter/JSPFilter.java
Sat Mar 1 08:12:24 2008
@@ -66,8 +66,7 @@
}
} catch (Exception e) {
- // TODO : need to work on exception handling
- //e.printStackTrace();
+ // TODO : need to work on exception handling
}
} else if (path.indexOf(UIConstants.OPENID_USER_PAGE) >= 0) {
chain.doFilter(req, resp);
_______________________________________________
Identity-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/identity-dev
