🎨 Clean code

88250 · 88250 · commit e54bd6fd8903 · 2017-08-14T12:57:50.000+08:00
@nanolikeyou Thanks for your PR 👍
diff --git a/src/main/java/org/b3log/solo/service/UserMgmtService.java b/src/main/java/org/b3log/solo/service/UserMgmtService.java
@@ -49,7 +49,7 @@
  * @author <a href="http://88250.b3log.org">Liang Ding</a>
  * @author <a href="mailto:385321165@qq.com">DASHU</a>
  * @author <a href="https://github.com/nanolikeyou">nanolikeyou</a>
- * @version 1.1.0.10, Aug 13, 2017
+ * @version 1.1.0.11, Aug 14, 2017
  * @since 0.4.0
  */
 @Service
@@ -278,6 +278,7 @@ public String addUser(final JSONObject requestJSONObject) throws ServiceExceptio
             if (!Strings.isEmail(userEmail)) {
                 throw new ServiceException(langPropsService.get("mailInvalidLabel"));
             }
+
             final JSONObject duplicatedUser = userRepository.getByEmail(userEmail);
 
             if (null != duplicatedUser) {
diff --git a/src/test/java/org/b3log/solo/service/UserMgmtServiceTestCase.java b/src/test/java/org/b3log/solo/service/UserMgmtServiceTestCase.java
@@ -30,14 +30,14 @@
  *
  * @author <a href="http://88250.b3log.org">Liang Ding</a>
  * @author <a href="https://github.com/nanolikeyou">nanolikeyou</a>
- * @version 1.0.0.3, May 25, 2017
+ * @version 1.0.0.4, Aug 14, 2017
  */
 @Test(suiteName = "service")
 public class UserMgmtServiceTestCase extends AbstractTestCase {
 
     /**
      * Add User.
-     * 
+     *
      * @throws Exception exception
      */
     @Test
@@ -56,15 +56,14 @@ public void addUser() throws Exception {
 
     /**
      * Update User.
-     * 
+     *
      * @throws Exception exception
      */
     @Test(dependsOnMethods = "addUser")
     public void updateUser() throws Exception {
         final UserMgmtService userMgmtService = getUserMgmtService();
 
         JSONObject requestJSONObject = new JSONObject();
-
         requestJSONObject.put(User.USER_NAME, "user2name");
         requestJSONObject.put(User.USER_EMAIL, "test2@gmail.com");
         requestJSONObject.put(User.USER_PASSWORD, "pass2");
@@ -92,42 +91,38 @@ public void updateUser() throws Exception {
         Assert.assertEquals(getUserQueryService().getUser(id).getJSONObject(
                 User.USER).getString(User.USER_PASSWORD), MD5.hash("pass2"));
     }
-    
+
     /**
      * Valid User.
      *
-     *@throws Exception exception
+     * @throws Exception exception
      */
     @Test
-    public void ValidUser() throws Exception {
+    public void validUser() throws Exception {
         final UserMgmtService userMgmtService = getUserMgmtService();
 
         final JSONObject requestJSONObject = new JSONObject();
-
         requestJSONObject.put(User.USER_NAME, "user1 name");
         requestJSONObject.put(User.USER_EMAIL, "test1@gmail.com");
         requestJSONObject.put(User.USER_PASSWORD, "pass1");
-        
+
         try {
             final String id = userMgmtService.addUser(requestJSONObject);
         } catch (Exception e) {
-            // TODO Auto-generated catch block
             Assert.assertTrue(e instanceof ServiceException);
         }
-
     }
-    
+
     /**
-     * Vallid XSS username.
+     * Valid XSS username.
      *
-     *@throws Exception exception
+     * @throws Exception exception
      */
     @Test(expectedExceptions = ServiceException.class)
     public void XSSUser() throws Exception {
         final UserMgmtService userMgmtService = getUserMgmtService();
 
         final JSONObject requestJSONObject = new JSONObject();
-
         requestJSONObject.put(User.USER_NAME, "username");
         requestJSONObject.put(User.USER_EMAIL, "<script></script>");
 
@@ -136,20 +131,18 @@ public void XSSUser() throws Exception {
 
     /**
      * Remove User.
-     * 
+     *
      * @throws Exception exception
      */
     @Test(dependsOnMethods = "addUser")
     public void removeUser() throws Exception {
         final UserMgmtService userMgmtService = getUserMgmtService();
 
-        final JSONObject user =
-                getUserQueryService().getUserByEmail("test1@gmail.com");
+        final JSONObject user = getUserQueryService().getUserByEmail("test1@gmail.com");
         Assert.assertNotNull(user);
 
         userMgmtService.removeUser(user.getString(Keys.OBJECT_ID));
 
-        Assert.assertNull(
-                getUserQueryService().getUserByEmail("test1@gmail.com"));
+        Assert.assertNull(getUserQueryService().getUserByEmail("test1@gmail.com"));
     }
 }
diff --git a/src/test/java/org/b3log/solo/service/UserQueryServiceTestCase.java b/src/test/java/org/b3log/solo/service/UserQueryServiceTestCase.java
@@ -27,7 +27,8 @@
  * {@link UserQueryService} test case.
  *
  * @author <a href="http://88250.b3log.org">Liang Ding</a>
- * @version 1.0.0.1, May 16, 2012
+ * @author <a href="https://github.com/nanolikeyou">nanolikeyou</a>
+ * @version 1.0.0.2, Aug 14, 2017
  */
 @Test(suiteName = "service")
 public class UserQueryServiceTestCase extends AbstractTestCase {
