[jboss-svn-commits] JBL Code SVN: r32317 - in labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src: main/resources and 1 other directories.

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

Author: lkrzyzanek
Date: 2010-03-31 06:40:56 -0400 (Wed, 31 Mar 2010)
New Revision: 32317

Modified:
   labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/main/java/org/jboss/labs/sbs/plugin/bm/DbOldBlogsManager.java
   labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/main/resources/oldBlogUsersMap.properties
   labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/test/java/org/jboss/labs/sbs/plugin/bm/DbOldBlogsManagerTest.java
Log:
Added normalization of username for Blog's display name

Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/main/java/org/jboss/labs/sbs/plugin/bm/DbOldBlogsManager.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/main/java/org/jboss/labs/sbs/plugin/bm/DbOldBlogsManager.java	2010-03-31 04:11:26 UTC (rev 32316)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/main/java/org/jboss/labs/sbs/plugin/bm/DbOldBlogsManager.java	2010-03-31 10:40:56 UTC (rev 32317)
@@ -162,14 +162,21 @@
 
   private long migrateCategory(File category, String authorName) {
     Blog userBlog;
+    long count = 0;
+    File[] entries = category.listFiles(FILE_TXT_FILTER);
+
+    if (entries.length == 0) {
+      log.info("User (category) " + authorName + " exists but has no posts. Going to next user");
+      return 0;
+    }
+
     try {
       userBlog = createUserBlog(authorName);
     } catch (Exception e) {
       log.error("Cannot create user blog for user: " + authorName, e);
       return 0;
     }
-    long count = 0;
-    File[] entries = category.listFiles(FILE_TXT_FILTER);
+
     for (File entry : entries) {
       try {
         File meta = new File(getMetaPathFromEntry(entry.getAbsolutePath()));
@@ -201,12 +208,26 @@
     User u = userManager.getUser(sbsUsername);
     Blog b = blogManager.createBlog(u);
     b.setName(u.getName() + "'s Blog");
-    b.setDisplayName(u.getUsername());
+    b.setDisplayName(normalizeUsername(u.getUsername()));
     blogManager.addBlog(b);
 
     return b;
   }
 
+  /**
+   * Username normalization like:<br>
+   * firstname.lastname at example.com -> firstname.lastname
+   * 
+   * @param username
+   * @return normalized username
+   */
+  public String normalizeUsername(String username) {
+    if (username.contains("@")) {
+      return username.substring(0, username.indexOf('@'));
+    }
+    return username;
+  }
+
   private BlogPost insertBlogEntry(Blog b, OldBlogEntryBean oldBlogEntry) {
     if (log.isDebugEnabled()) {
       log.debug("Insert Blog entry '" + oldBlogEntry.getTitle() + "' from author: " + oldBlogEntry.getAuthor());

Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/main/resources/oldBlogUsersMap.properties
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/main/resources/oldBlogUsersMap.properties	2010-03-31 04:11:26 UTC (rev 32316)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/main/resources/oldBlogUsersMap.properties	2010-03-31 10:40:56 UTC (rev 32317)
@@ -1,5 +1,6 @@
 admin=admin
 acoliver=acoliver at jboss.org
+#TODO
 adarcy=
 aguizar=alex.guizar at jboss.com
 alesj=alesj
@@ -11,6 +12,7 @@
 bela=bela at jboss.com
 bwang=ben.wang at jboss.com
 clebert=clebert.suconic at jboss.com
+# no posts
 cmuzilla=
 dimitris=dimitris at jboss.org
 dsicore=damon.sicore at jboss.com
@@ -18,26 +20,31 @@
 jgreene=jason.greene at jboss.com
 jviet=julien_viet
 kaers=koen.aers at jboss.com
+# no posts
 kjohnson=
 kkhan=kabir.khan at jboss.com
 mandersen=max.andersen at jboss.com
 manik=manik.surtani at jboss.com
 mazz=mazz
-mculpepper=
+mculpepper=mculpepper at jboss.com
 mfleury=marcf
 mlittle=mark.little at jboss.com
 mturk=mladen.turk at jboss.com
 myuan=juntao
+#TODO
 nfleury=
 nrichards=norman.richards at jboss.com
 ovidiue=ovidiu.feodorov at jboss.com
 pfricke=pfricke
+# no posts
 rgreathouse=
 rrusso=roy.russo at jboss.com
 rsharples=richsharples
-sconnolly=
+# not sure.
+sconnolly=shwncnnlly
 slabourey=sacha.labourey at jboss.com
 smstark=scott.stark at jboss.org
+# TODO
 SSatyamoorthy=
 sshah=sohil.shah at jboss.com
 Stan\ Silvert=stan.silvert at jboss.com
@@ -46,5 +53,6 @@
 telrod=tom.elrod at jboss.com
 tfox=timfox
 theute=thomas.heute at jboss.com
+# no posts
 wprice=
 lkrzyzanek=lkrzyzanek

Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/test/java/org/jboss/labs/sbs/plugin/bm/DbOldBlogsManagerTest.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/test/java/org/jboss/labs/sbs/plugin/bm/DbOldBlogsManagerTest.java	2010-03-31 04:11:26 UTC (rev 32316)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-blogs-migration/trunk/src/test/java/org/jboss/labs/sbs/plugin/bm/DbOldBlogsManagerTest.java	2010-03-31 10:40:56 UTC (rev 32317)
@@ -81,4 +81,11 @@
 
     assertEquals("lkrzyzanek", manager.getSBSUsername("lkrzyzanek"));
   }
+
+  @Test
+  public void testNormalizeUsername() {
+    DbOldBlogsManager manager = new DbOldBlogsManager();
+    assertEquals("user", manager.normalizeUsername("user at email.com"));
+  }
+
 }