[jboss-svn-commits] JBL Code SVN: r23342 - labs/jbosslabs/labs-3.0-build/integration/cs-nukes-login/src/main/java/org/jboss/labs/clearspace.

[jboss-svn-commits at lists.jboss.org]

Author: szimano
Date: 2008-10-07 05:57:33 -0400 (Tue, 07 Oct 2008)
New Revision: 23342

Modified:
   labs/jbosslabs/labs-3.0-build/integration/cs-nukes-login/src/main/java/org/jboss/labs/clearspace/LabsUser.java
   labs/jbosslabs/labs-3.0-build/integration/cs-nukes-login/src/main/java/org/jboss/labs/clearspace/UserImporter.java
Log:
fixed profile import bug

Modified: labs/jbosslabs/labs-3.0-build/integration/cs-nukes-login/src/main/java/org/jboss/labs/clearspace/LabsUser.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-nukes-login/src/main/java/org/jboss/labs/clearspace/LabsUser.java	2008-10-07 06:32:35 UTC (rev 23341)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-nukes-login/src/main/java/org/jboss/labs/clearspace/LabsUser.java	2008-10-07 09:57:33 UTC (rev 23342)
@@ -68,15 +68,15 @@
 	private String lastName;
 	private Map<String, String> profile;
 	private boolean emailVisible;
-	private Map<String, Map<String, String>> profileDict;
+	private static Map<String, Map<String, String>> profileDict;
 
-	public LabsUser() {
+	static {
 		profileDict = new HashMap<String, Map<String, String>>();
 		addDict(CLICK_HERE_FOR_JBOSS_NEWSLETTER, "0", "No", "1", "Yes");
 		addDict(COMPANY_SIZE, "100_999", "100-999", "_20", "-20", "21_100", "21-100", "1000_", "1000-");
 	}
 
-	private void addDict(String field, String... fields) {
+	private static void addDict(String field, String... fields) {
 		if (fields.length % 2 == 1) {
 			throw new IllegalArgumentException(
 					"Wrong nomber of fields for dict (must be even): "
@@ -157,6 +157,15 @@
 		
 		profile.put(CLICK_HERE_FOR_JBOSS_NEWSLETTER, rs.getString("pn_newsletter"));
 
+		Map<String, String> profileIt = new HashMap<String, String>(profile);
+		
+		// remove all null values associated to keys
+		for (String key : profileIt.keySet()) {
+			if (profile.get(key) == null) {
+				profile.remove(key);
+			}
+		}
+		
 		profile = translateProfileFields(profile);
 
 	}
@@ -167,7 +176,7 @@
 
 		for (String key : profile.keySet()) {
 			String translatedField;
-			if (profileDict.containsKey(key)
+			if (profileDict.get(key) != null
 					&& ((translatedField = profileDict.get(key).get(
 							profile.get(key))) != null)) {
 

Modified: labs/jbosslabs/labs-3.0-build/integration/cs-nukes-login/src/main/java/org/jboss/labs/clearspace/UserImporter.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-nukes-login/src/main/java/org/jboss/labs/clearspace/UserImporter.java	2008-10-07 06:32:35 UTC (rev 23341)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-nukes-login/src/main/java/org/jboss/labs/clearspace/UserImporter.java	2008-10-07 09:57:33 UTC (rev 23342)
@@ -66,8 +66,8 @@
 				pfv.setValue(profile.get(pf.getName()));
 
 				pfvSet.add(pfv);
-
-				// remove field as added
+				
+				// remove field as added (or not if it was null)
 				profile.remove(pf.getName());
 			}
 		}
@@ -152,7 +152,8 @@
 		return getUserDetailsAndAuth(username, null, updateProfile);
 	}
 
-	public UserDetails getUserDetailsAndAuth(String username, String password, boolean updateProfile) {
+	public UserDetails getUserDetailsAndAuth(String username, String password,
+			boolean updateProfile) {
 		Connection c = null;
 
 		try {
@@ -259,23 +260,7 @@
 					if (!profile.isEmpty()) {
 
 						for (String key : profile.keySet()) {
-							// add field
-
-							ProfileField field = new ProfileField();
-							field.setName(key);
-							field.setTypeID(ProfileField.Type.TEXT.getID());
-							field.setSearchable(true);
-							field.setVisible(true);
-							field.setEditable(true);
-							field.setDescription("en_US", key);
-							profileFieldManager.createProfileField(field);
-
-							// add profile var
-							ProfileFieldValue pfv = new ProfileFieldValue(field);
-
-							pfv.setValue(profile.get(key));
-
-							pfvSet.add(pfv);
+							log.info("Couldn't set profile field: " + key);
 						}
 					}
 
@@ -283,13 +268,13 @@
 						profileManager.setProfile(u, pfvSet);
 					}
 				}
-				
+
 				if (password != null) {
 					String passHashed = toHexString(md5(password));
-					
+
 					if (!nukeUser.getPasswordHash().equals(passHashed)) {
-						throw new BadCredentialsException("Username:" + username
-								+ " was not authenticated");
+						throw new BadCredentialsException("Username:"
+								+ username + " was not authenticated");
 					}
 				}
 
@@ -299,7 +284,7 @@
 		} catch (Exception e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
-			
+
 			throw new BadCredentialsException("Username:" + username
 					+ " not found");
 		} finally {
@@ -311,8 +296,7 @@
 			}
 		}
 
-		throw new BadCredentialsException("Username:" + username
-				+ " not found");
+		throw new BadCredentialsException("Username:" + username + " not found");
 	}
 
 	public void setJiveAuthProvider(