Sonar blocker: obj could be null and is guaranteed to be dereferenced in

dkayiwa · dkayiwa · commit 5a228e0f63ef · 2014-01-08T11:29:54.000+03:00
org.openmrs.validator.UserValidator.validate - TRUNK-4199
diff --git a/api/src/main/java/org/openmrs/validator/UserValidator.java b/api/src/main/java/org/openmrs/validator/UserValidator.java
@@ -62,11 +62,12 @@ public boolean supports(Class c) {
 	 * @should pass validation if all required fields have proper values
 	 * @should fail validation if email as username enabled and email invalid
 	 * @should fail validation if email as username disabled and email provided
+	 * @should not throw NPE when user is null
 	 */
 	public void validate(Object obj, Errors errors) {
 		User user = (User) obj;
 		if (user == null) {
-			errors.rejectValue("user", "error.general");
+			errors.reject("error.general");
 		} else {
 			if (user.isRetired() && StringUtils.isBlank(user.getRetireReason()))
 				errors.rejectValue("retireReason", "error.null");
@@ -84,19 +85,20 @@ public void validate(Object obj, Errors errors) {
 				if (person.getPersonName() == null || StringUtils.isEmpty(person.getPersonName().toString()))
 					errors.rejectValue("person", "Person.names.length");
 			}
-		}
-		AdministrationService as = Context.getAdministrationService();
-		boolean emailAsUsername = Boolean.parseBoolean(as.getGlobalProperty(
-		    OpenmrsConstants.GLOBAL_PROPERTY_USER_REQUIRE_EMAIL_AS_USERNAME, "false"));
-		if (emailAsUsername) {
-			boolean isValidUserName = isUserNameAsEmailValid(user.getUsername());
-			if (!isValidUserName) {
-				errors.rejectValue("username", "error.username.email");
-			}
-		} else {
-			boolean isValidUserName = isUserNameValid(user.getUsername());
-			if (!isValidUserName) {
-				errors.rejectValue("username", "error.username.pattern");
+			
+			AdministrationService as = Context.getAdministrationService();
+			boolean emailAsUsername = Boolean.parseBoolean(as.getGlobalProperty(
+			    OpenmrsConstants.GLOBAL_PROPERTY_USER_REQUIRE_EMAIL_AS_USERNAME, "false"));
+			if (emailAsUsername) {
+				boolean isValidUserName = isUserNameAsEmailValid(user.getUsername());
+				if (!isValidUserName) {
+					errors.rejectValue("username", "error.username.email");
+				}
+			} else {
+				boolean isValidUserName = isUserNameValid(user.getUsername());
+				if (!isValidUserName) {
+					errors.rejectValue("username", "error.username.pattern");
+				}
 			}
 		}
 	}
diff --git a/api/src/test/java/org/openmrs/validator/UserValidatorTest.java b/api/src/test/java/org/openmrs/validator/UserValidatorTest.java
@@ -248,4 +248,16 @@ public void validate_shouldFailValidationIfEmailAsUsernameDisabledAndEmailProvid
 		
 		Assert.assertTrue(errors.hasFieldErrors("username"));
 	}
+	
+	/**
+	 * @see UserValidator#validate(Object,Errors)
+	 */
+	@Test
+	@Verifies(value = "not throw NPE when user is null", method = "validate(Object,Errors)")
+	public void validate_shouldNotThrowNPEWhenUserIsNull() throws Exception {
+		UserValidator userValidator = new UserValidator();
+		Errors errors = new BindException(new User(), "user");
+		userValidator.validate(null, errors);
+		Assert.assertTrue(true);
+	}
 }
