Author: prabath
Date: Wed Mar 5 04:52:34 2008
New Revision: 14530
Log:
code review fixes + formatting
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/UserStore.java
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/OpenIDUtil.java
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/extensions/OpenIDExtension.java
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/extensions/OpenIDPape.java
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/extensions/OpenIDSimpleReg.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/identity-provider/src/main/java/org/wso2/solutions/identity/users/IdentityUserStoreAdmin.java
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/users/IdentityUserStoreReader.java
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/relyingparty/openid/extensions/OpenIDPape.java
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/relyingparty/openid/extensions/OpenIDSimpleReg.java
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/AddUserProfileAction.java
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/AddUserProfileSubmitAction.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/EditUserProfileSubmitAction.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/OpenIDCallbackAction.java
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/OpenIDDownloadInfoCardAction.java
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/OpenIDInfoCardLoginAction.java
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/OpenIDInfoCardSubmitAction.java
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/OpenIDSelfIssuedLoginAction.java
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/UpdateOpenIDUserRPAction.java
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/util/UserUtil.java
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/UserStore.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/UserStore.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/UserStore.java
Wed Mar 5 04:52:34 2008
@@ -256,7 +256,7 @@
* @return A <code>java.util.List</code> of all user names.
* @throws IdentityProviderException
*/
- public List getAllUserNames() throws IdentityProviderException {
+ public List<String> getAllUserNames() throws IdentityProviderException {
try {
UserStoreReader usReader = realm.getUserStoreReader();
return Arrays.asList((String[]) usReader.getAllUserNames());
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/OpenIDUtil.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/OpenIDUtil.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/OpenIDUtil.java
Wed Mar 5 04:52:34 2008
@@ -163,4 +163,4 @@
}
return normalized.toString();
}
-}
+}
\ No newline at end of file
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/extensions/OpenIDExtension.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/extensions/OpenIDExtension.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/extensions/OpenIDExtension.java
Wed Mar 5 04:52:34 2008
@@ -39,7 +39,7 @@
throws IdentityProviderException {
UserStore connector = null;
- Map claimValues = null;
+ Map<String,OpenIDClaim> claimValues = null;
Iterator iterator = null;
List list = null;
@@ -76,7 +76,7 @@
// Get the claims values corresponding to the user from the user store.
mapValues = connector.getClaimValues(userId, profile, list);
- claimValues = new HashMap();
+ claimValues = new HashMap<String,OpenIDClaim> ();
iterator = requiredClaims.iterator();
@@ -103,5 +103,4 @@
return claimValues;
}
-
-}
+}
\ No newline at end of file
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/extensions/OpenIDPape.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/extensions/OpenIDPape.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/extensions/OpenIDPape.java
Wed Mar 5 04:52:34 2008
@@ -74,4 +74,4 @@
return papeResponse;
}
-}
+}
\ No newline at end of file
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/extensions/OpenIDSimpleReg.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/extensions/OpenIDSimpleReg.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/extensions/OpenIDSimpleReg.java
Wed Mar 5 04:52:34 2008
@@ -109,7 +109,6 @@
claim = (OpenIDClaim) entry.getValue();
response.addAttribute(claim.getOpenIDTag(), claim.getClaimValue());
}
-
}
/**
@@ -140,4 +139,4 @@
return populateAttributeValues(requiredClaims, userId, claims, null,
profileName);
}
-}
+}
\ No newline at end of file
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
Wed Mar 5 04:52:34 2008
@@ -54,8 +54,9 @@
/**
*
*/
- public void setUserProperties(String userName, Map properties,
- String profileName) throws UserManagerException {
+ public void setUserProperties(String userName,
+ Map<String, String> properties, String profileName)
+ throws UserManagerException {
String userid = data.getUserId(userName);
@@ -209,8 +210,9 @@
/**
*
*/
- public void updateUserProperties(String userName, Map properties,
- String profileName) throws UserManagerException {
+ public void updateUserProperties(String userName,
+ Map<String, String> properties, String profileName)
+ throws UserManagerException {
String userId = data.getUserId(userName);
@@ -305,4 +307,4 @@
}
}
}
-}
+}
\ No newline at end of file
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
Wed Mar 5 04:52:34 2008
@@ -46,9 +46,9 @@
/**
*
*/
- public Map getUserProperties(String userName) throws UserManagerException {
+ public Map<String,String> getUserProperties(String userName) throws
UserManagerException {
- Map props = null;
+ Map<String,String> props = null;
Connection dbConnection = null;
PreparedStatement sqlStatement = null;
@@ -61,7 +61,7 @@
}
dbConnection.setAutoCommit(false);
- props = new HashMap();
+ props = new HashMap<String,String> ();
String userid = data.getUserId(userName);
sqlStatement = dbConnection
@@ -118,7 +118,7 @@
.prepareStatement("select distinct attr_name from
user_profile_values");
ResultSet rs = sqlStatement.executeQuery();
- List lst = new ArrayList();
+ List<String> lst = new ArrayList<String>();
while (rs.next()) {
lst.add(rs.getString(1));
@@ -200,14 +200,13 @@
/**
*
*/
- public List getUserProfileNames(String userName)
+ public List<String> getUserProfileNames(String userName)
throws UserManagerException {
- List profileNames = null;
+ List<String> profileNames = null;
Connection dbConnection = null;
PreparedStatement sqlStatement = null;
- String name = null;
-
+
try {
dbConnection = dataSource.getConnection();
@@ -217,7 +216,7 @@
}
dbConnection.setAutoCommit(false);
- profileNames = new ArrayList();
+ profileNames = new ArrayList<String> ();
String userid = data.getUserId(userName);
sqlStatement = dbConnection
@@ -251,10 +250,10 @@
/**
*
*/
- public Map getUserProperties(String userName, String profileName)
+ public Map<String,String> getUserProperties(String userName, String
profileName)
throws UserManagerException {
- Map props = null;
+ Map<String,String> props = null;
Connection dbConnection = null;
PreparedStatement sqlStatement = null;
@@ -267,7 +266,7 @@
}
dbConnection.setAutoCommit(false);
- props = new HashMap();
+ props = new HashMap<String,String>();
String userid = data.getUserId(userName);
sqlStatement = dbConnection
@@ -307,7 +306,7 @@
public boolean isExistingUserProfile(String userName, String profileName)
throws UserManagerException {
- Map properties = null;
+ Map<String,String> properties = null;
properties = getUserProperties(userName, profileName);
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/users/IdentityUserStoreAdmin.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/users/IdentityUserStoreAdmin.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/users/IdentityUserStoreAdmin.java
Wed Mar 5 04:52:34 2008
@@ -19,7 +19,7 @@
* @param profileName Name of the profile
* @throws UserManagerException
*/
- public void setUserProperties(String userName, Map properties,
+ public void setUserProperties(String userName, Map<String,String>
properties,
String profileName) throws UserManagerException;
/**
@@ -30,7 +30,7 @@
* @param profileName Name of the profile
* @throws UserManagerException
*/
- public void updateUserProperties(String userName, Map properties,
+ public void updateUserProperties(String userName, Map<String,String>
properties,
String profileName) throws UserManagerException;
}
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/users/IdentityUserStoreReader.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/users/IdentityUserStoreReader.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/users/IdentityUserStoreReader.java
Wed Mar 5 04:52:34 2008
@@ -22,7 +22,7 @@
* profile name
* @throws UserManagerException
*/
- public Map getUserProperties(String userName, String profileName)
+ public Map<String,String> getUserProperties(String userName, String
profileName)
throws UserManagerException;
/**
@@ -32,7 +32,7 @@
* @return Profile names corresponding to the given user name.
* @throws UserManagerException
*/
- public List getUserProfileNames(String userName)
+ public List<String> getUserProfileNames(String userName)
throws UserManagerException;
/**
Modified:
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/relyingparty/openid/extensions/OpenIDPape.java
==============================================================================
---
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/relyingparty/openid/extensions/OpenIDPape.java
(original)
+++
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/relyingparty/openid/extensions/OpenIDPape.java
Wed Mar 5 04:52:34 2008
@@ -102,4 +102,4 @@
e);
}
}
-}
+}
\ No newline at end of file
Modified:
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/relyingparty/openid/extensions/OpenIDSimpleReg.java
==============================================================================
---
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/relyingparty/openid/extensions/OpenIDSimpleReg.java
(original)
+++
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/relyingparty/openid/extensions/OpenIDSimpleReg.java
Wed Mar 5 04:52:34 2008
@@ -129,4 +129,4 @@
IdentityConstants.OpenId.SimpleRegAttributes.TIMEZONE, true);
}
-}
+}
\ No newline at end of file
Modified:
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/AddUserProfileAction.java
==============================================================================
---
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/AddUserProfileAction.java
(original)
+++
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/AddUserProfileAction.java
Wed Mar 5 04:52:34 2008
@@ -19,7 +19,7 @@
*/
private static final long serialVersionUID = -3415602317665292286L;
- private List claims;
+ private List<ClaimDO> claims;
/**
* This will get executed while adding a new user profile to an existing
@@ -63,12 +63,12 @@
return SUCCESS;
}
- public List getClaims() {
+ public List<ClaimDO> getClaims() {
return claims;
}
- public void setClaims(List claims) {
+ public void setClaims(List<ClaimDO> claims) {
this.claims = claims;
}
-}
+}
\ No newline at end of file
Modified:
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/AddUserProfileSubmitAction.java
==============================================================================
---
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/AddUserProfileSubmitAction.java
(original)
+++
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/AddUserProfileSubmitAction.java
Wed Mar 5 04:52:34 2008
@@ -111,4 +111,4 @@
this.profileName = profileName;
}
-}
+}
\ No newline at end of file
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
Wed Mar 5 04:52:34 2008
@@ -9,8 +9,6 @@
import org.apache.struts2.StrutsStatics;
import org.wso2.solutions.identity.UserStore;
import org.wso2.solutions.identity.admin.ClaimsAdmin;
-import org.wso2.solutions.identity.admin.RelyingPartyAdmin;
-import org.wso2.solutions.identity.persistence.IPPersistenceManager;
import org.wso2.solutions.identity.persistence.dataobject.ClaimDO;
import org.wso2.solutions.identity.user.ui.ClaimValue;
import org.wso2.solutions.identity.user.ui.UIConstants;
@@ -26,7 +24,7 @@
*/
private static final long serialVersionUID = -6574411044104451252L;
- private List claims = null;
+ private List<ClaimValue> claims = null;
private String profileName;
@@ -36,9 +34,7 @@
HttpServletRequest request = null;
IdentityDefaultRealm realm = null;
IdentityUserStoreReader reader = null;
- IPPersistenceManager db = null;
- RelyingPartyAdmin admin = null;
- Map userProperties = null;
+ Map<String, String> userProperties = null;
request = (HttpServletRequest) ActionContext.getContext().get(
StrutsStatics.HTTP_REQUEST);
@@ -71,7 +67,7 @@
ClaimsAdmin ClaimsAdmin = new ClaimsAdmin();
ClaimDO[] claimDOs = ClaimsAdmin.getAllMappedEnabledClaims();
- claims = new ArrayList();
+ claims = new ArrayList<ClaimValue>();
ClaimValue claimValue = null;
@@ -86,17 +82,17 @@
}
request.getSession().removeAttribute("profileName");
-
+
loadMessages();
return SUCCESS;
}
- public List getClaims() {
+ public List<ClaimValue> getClaims() {
return claims;
}
- public void setClaims(List claims) {
+ public void setClaims(List<ClaimValue> claims) {
this.claims = claims;
}
Modified:
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/EditUserProfileSubmitAction.java
==============================================================================
---
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/EditUserProfileSubmitAction.java
(original)
+++
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/EditUserProfileSubmitAction.java
Wed Mar 5 04:52:34 2008
@@ -102,4 +102,4 @@
return SUCCESS;
}
-}
+}
\ No newline at end of file
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
Wed Mar 5 04:52:34 2008
@@ -1,9 +1,5 @@
package org.wso2.solutions.identity.user.ui.action;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -20,7 +16,6 @@
import org.wso2.solutions.identity.IdentityProviderConstants;
import org.wso2.solutions.identity.IdentityProviderException;
import org.wso2.solutions.identity.UserStore;
-import org.wso2.solutions.identity.admin.RelyingPartyAdmin;
import org.wso2.solutions.identity.persistence.IPPersistenceManager;
import org.wso2.solutions.identity.persistence.dataobject.OpenIDUserRPDO;
import org.wso2.solutions.identity.relyingparty.RelyingPartyException;
@@ -38,7 +33,7 @@
*/
private static final long serialVersionUID = 7880796322220751491L;
- private List profile = null;
+ private List<String> profile = null;
private String defaultUserProfileName = null;
@@ -213,7 +208,7 @@
IPPersistenceManager db = null;
try {
- profile = new ArrayList();
+ profile = new ArrayList<String>();
realm = (IdentityDefaultRealm) UserStore.getInstance().getRealm();
reader = realm.getIdentityUserStoreReader();
profile = reader.getUserProfileNames(userName);
@@ -289,11 +284,11 @@
return true;
}
- public List getProfile() {
+ public List<String> getProfile() {
return profile;
}
- public void setProfile(List profile) {
+ public void setProfile(List<String> profile) {
this.profile = profile;
}
Modified:
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/OpenIDCallbackAction.java
==============================================================================
---
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/OpenIDCallbackAction.java
(original)
+++
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/OpenIDCallbackAction.java
Wed Mar 5 04:52:34 2008
@@ -43,6 +43,7 @@
// If this OpenID is not from WSO2 OP, we do not let him go in.
// If this is from WSO2 OP, then user should be in our DB.
userID = UserUtil.getUserName(openID);
+
// Set the logged in user's id.
map.put(UIConstants.USER, userID);
@@ -52,4 +53,4 @@
return SUCCESS;
}
-}
+}
\ No newline at end of file
Modified:
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/OpenIDDownloadInfoCardAction.java
==============================================================================
---
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/OpenIDDownloadInfoCardAction.java
(original)
+++
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/OpenIDDownloadInfoCardAction.java
Wed Mar 5 04:52:34 2008
@@ -39,5 +39,4 @@
return issuer;
}
-
-}
+}
\ No newline at end of file
Modified:
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/OpenIDInfoCardLoginAction.java
==============================================================================
---
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/OpenIDInfoCardLoginAction.java
(original)
+++
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/OpenIDInfoCardLoginAction.java
Wed Mar 5 04:52:34 2008
@@ -54,6 +54,5 @@
}
return "login";
-
}
}
\ No newline at end of file
Modified:
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/OpenIDInfoCardSubmitAction.java
==============================================================================
---
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/OpenIDInfoCardSubmitAction.java
(original)
+++
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/OpenIDInfoCardSubmitAction.java
Wed Mar 5 04:52:34 2008
@@ -50,5 +50,4 @@
return SUCCESS;
}
-
-}
+}
\ No newline at end of file
Modified:
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/OpenIDSelfIssuedLoginAction.java
==============================================================================
---
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/OpenIDSelfIssuedLoginAction.java
(original)
+++
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/OpenIDSelfIssuedLoginAction.java
Wed Mar 5 04:52:34 2008
@@ -16,5 +16,4 @@
public String execute() throws Exception {
return SUCCESS;
}
-
}
Modified:
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/UpdateOpenIDUserRPAction.java
==============================================================================
---
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/UpdateOpenIDUserRPAction.java
(original)
+++
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/UpdateOpenIDUserRPAction.java
Wed Mar 5 04:52:34 2008
@@ -73,4 +73,4 @@
this.operation = operation;
}
-}
+}
\ No newline at end of file
Modified:
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/util/UserUtil.java
==============================================================================
---
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/util/UserUtil.java
(original)
+++
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/util/UserUtil.java
Wed Mar 5 04:52:34 2008
@@ -37,7 +37,7 @@
throws RelyingPartyException {
UserStore userStore = null;
- List users = null;
+ List<String> users = null;
try {
userStore = UserStore.getInstance();
@@ -56,13 +56,13 @@
IdentityConstants.ErrorCodes.NULL_OPEN_ID);
Map mapValues = null;
- Iterator iterator = null;
+ Iterator<String> iterator = null;
iterator = users.iterator();
while (iterator.hasNext()) {
- String user = (String) iterator.next();
+ String user = iterator.next();
try {
mapValues = userStore.getClaimValues(user, null);
@@ -161,7 +161,7 @@
public static String getOpenID(String ppid) throws RelyingPartyException {
UserStore userStore = null;
- List users = null;
+ List<String> users = null;
try {
userStore = UserStore.getInstance();
@@ -180,13 +180,13 @@
IdentityConstants.ErrorCodes.INVALID_PPID);
Map mapValues = null;
- Iterator iterator = null;
+ Iterator<String> iterator = null;
iterator = users.iterator();
while (iterator.hasNext()) {
- String user = (String) iterator.next();
+ String user = iterator.next();
try {
mapValues = userStore.getClaimValues(user, null);
} catch (IdentityProviderException e) {
@@ -230,6 +230,12 @@
IdentityConstants.ErrorCodes.NO_OPENID_FOUND);
}
+ /**
+ * Normalize the provided relying party URL
+ * @param rpUrl Relying party URL to be normalized
+ * @return Normalized relying party URL
+ * @throws RelyingPartyException
+ */
public static String getRelyingPartyUrl(String rpUrl)
throws RelyingPartyException {
@@ -254,5 +260,4 @@
IdentityConstants.ErrorCodes.INVALID_OPENID_RETURNTO);
}
}
-
-}
+}
\ No newline at end of file
_______________________________________________
Identity-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/identity-dev
