[hibernate-commits] Hibernate SVN: r20776 - in validator/trunk/hibernate-validator/src: test/java/org/hibernate/validator/test/constraints/impl and 1 other directory.

[hibernate-commits at lists.jboss.org]

Author: hardy.ferentschik
Date: 2010-10-05 10:08:57 -0400 (Tue, 05 Oct 2010)
New Revision: 20776

Modified:
   validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/ScriptAssertValidator.java
   validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/test/constraints/impl/ScriptAssertValidatorTest.java
Log:
HV-382 replaces String.isEmpty calls

Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/ScriptAssertValidator.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/ScriptAssertValidator.java	2010-10-04 18:11:33 UTC (rev 20775)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/ScriptAssertValidator.java	2010-10-05 14:08:57 UTC (rev 20776)
@@ -1,4 +1,3 @@
-// $Id$
 /*
 * JBoss, Home of Professional Open Source
 * Copyright 2010, Red Hat, Inc. and/or its affiliates, and individual contributors
@@ -28,17 +27,14 @@
  * Validator for the {@link ScriptAssert} constraint annotation.
  *
  * @author Gunnar Morling.
+ * @author Hardy Ferentschik
  */
 public class ScriptAssertValidator implements ConstraintValidator<ScriptAssert, Object> {
-
 	private String script;
-
 	private String languageName;
-
 	private String alias;
 
 	public void initialize(ScriptAssert constraintAnnotation) {
-
 		validateParameters( constraintAnnotation );
 
 		this.script = constraintAnnotation.script();
@@ -47,7 +43,6 @@
 	}
 
 	public boolean isValid(Object value, ConstraintValidatorContext constraintValidatorContext) {
-
 		ScriptEvaluator scriptEvaluator = ScriptEvaluatorFactory.getInstance()
 				.getScriptEvaluatorByLanguageName( languageName );
 
@@ -55,14 +50,13 @@
 	}
 
 	private void validateParameters(ScriptAssert constraintAnnotation) {
-
-		if ( constraintAnnotation.script().isEmpty() ) {
+		if ( constraintAnnotation.script().length() == 0 ) {
 			throw new IllegalArgumentException( "The parameter \"script\" must not be empty." );
 		}
-		if ( constraintAnnotation.lang().isEmpty() ) {
+		if ( constraintAnnotation.lang().length() == 0 ) {
 			throw new IllegalArgumentException( "The parameter \"lang\" must not be empty." );
 		}
-		if ( constraintAnnotation.alias().isEmpty() ) {
+		if ( constraintAnnotation.alias().length() == 0 ) {
 			throw new IllegalArgumentException( "The parameter \"alias\" must not be empty." );
 		}
 	}

Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/test/constraints/impl/ScriptAssertValidatorTest.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/test/constraints/impl/ScriptAssertValidatorTest.java	2010-10-04 18:11:33 UTC (rev 20775)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/test/constraints/impl/ScriptAssertValidatorTest.java	2010-10-05 14:08:57 UTC (rev 20776)
@@ -1,4 +1,3 @@
-// $Id$
 /*
 * JBoss, Home of Professional Open Source
 * Copyright 2010, Red Hat, Inc. and/or its affiliates, and individual contributors
@@ -36,12 +35,12 @@
  * Unit test for {@link org.hibernate.validator.constraints.impl.ScriptAssertValidator}.
  *
  * @author Gunnar Morling
+ * @author Hardy Ferentschik
  */
 public class ScriptAssertValidatorTest {
 
 	@Test
 	public void scriptEvaluatesToTrue() throws Exception {
-
 		ConstraintValidator<ScriptAssert, Object> validator = getInitializedValidator( "javascript", "true" );
 
 		assertTrue( validator.isValid( new Object(), null ) );
@@ -49,7 +48,6 @@
 
 	@Test
 	public void scriptEvaluatesToFalse() throws Exception {
-
 		ConstraintValidator<ScriptAssert, Object> validator = getInitializedValidator( "javascript", "false" );
 
 		assertFalse( validator.isValid( new Object(), null ) );
@@ -57,7 +55,6 @@
 
 	@Test
 	public void scriptExpressionReferencingAnnotatedObject() throws Exception {
-
 		ConstraintValidator<ScriptAssert, Object> validator = getInitializedValidator(
 				"javascript", "_this.startDate.before(_this.endDate)"
 		);
@@ -71,7 +68,6 @@
 
 	@Test
 	public void scriptExpressionUsingCustomizedAlias() throws Exception {
-
 		ConstraintValidator<ScriptAssert, Object> validator = getInitializedValidator(
 				"javascript", "_.startDate.before(_.endDate)", "_"
 		);
@@ -84,25 +80,21 @@
 
 	@Test(expectedExceptions = IllegalArgumentException.class)
 	public void emptyLanguageNameRaisesException() throws Exception {
-
 		getInitializedValidator( "", "script" );
 	}
 
 	@Test(expectedExceptions = IllegalArgumentException.class)
 	public void emptyScriptRaisesException() throws Exception {
-
 		getInitializedValidator( "lang", "" );
 	}
 
 	@Test(expectedExceptions = IllegalArgumentException.class)
 	public void emptyAliasRaisesException() throws Exception {
-
 		getInitializedValidator( "lang", "script", "" );
 	}
 
 	@Test(expectedExceptions = ConstraintDeclarationException.class)
 	public void unknownLanguageNameRaisesException() throws Exception {
-
 		ConstraintValidator<ScriptAssert, Object> validator = getInitializedValidator( "foo", "script" );
 
 		validator.isValid( new Object(), null );
@@ -110,7 +102,6 @@
 
 	@Test(expectedExceptions = ConstraintDeclarationException.class)
 	public void illegalScriptExpressionRaisesException() throws Exception {
-
 		ConstraintValidator<ScriptAssert, Object> validator = getInitializedValidator( "javascript", "foo" );
 
 		validator.isValid( new Object(), null );
@@ -118,7 +109,6 @@
 
 	@Test(expectedExceptions = ConstraintDeclarationException.class)
 	public void scriptExpressionReturningNullRaisesException() throws Exception {
-
 		ConstraintValidator<ScriptAssert, Object> validator = getInitializedValidator( "javascript", "null" );
 
 		validator.isValid( new Object(), null );
@@ -126,7 +116,6 @@
 
 	@Test(expectedExceptions = ConstraintDeclarationException.class)
 	public void scriptExpressionReturningNoBooleanRaisesException() throws Exception {
-
 		ConstraintValidator<ScriptAssert, Object> validator = getInitializedValidator(
 				"javascript", "new java.util.Date()"
 		);
@@ -135,18 +124,25 @@
 	}
 
 	/**
-	 * Returns a {@link org.hibernate.validator.constraints.impl.ScriptAssertValidator} initialized with a {@link ScriptAssert} with the given values.
+	 * @param lang the script type
+	 * @param script the actual script
+	 * @param alias the alias name of the this object
+	 *
+	 * @return a {@link org.hibernate.validator.constraints.impl.ScriptAssertValidator} initialized with a {@link ScriptAssert} with the given values.
 	 */
-	private ConstraintValidator<ScriptAssert, Object> getInitializedValidator(String lang, String script, String name) {
+	private ConstraintValidator<ScriptAssert, Object> getInitializedValidator(String lang, String script, String alias) {
 
 		ConstraintValidator<ScriptAssert, Object> validator = new ScriptAssertValidator();
-		validator.initialize( getScriptAssert( lang, script, name ) );
+		validator.initialize( getScriptAssert( lang, script, alias ) );
 
 		return validator;
 	}
 
 	/**
-	 * Returns a {@link ScriptAssertValidator} initialized with a {@link ScriptAssert} with the given values.
+	 * @param lang the script type
+	 * @param script the actual script
+	 *
+	 * @return a {@link ScriptAssertValidator} initialized with a {@link ScriptAssert} with the given values.
 	 */
 	private ConstraintValidator<ScriptAssert, Object> getInitializedValidator(String lang, String script) {
 
@@ -157,16 +153,20 @@
 	}
 
 	/**
-	 * Returns a {@link ScriptAssert} initialized with the given values.
+	 * @param lang the script type
+	 * @param script the actual script
+	 * @param alias the alias name of the this object
+	 *
+	 * @return a {@link ScriptAssert} initialized with the given values.
 	 */
-	private ScriptAssert getScriptAssert(String lang, String script, String name) {
+	private ScriptAssert getScriptAssert(String lang, String script, String alias) {
 
 		AnnotationDescriptor<ScriptAssert> descriptor = AnnotationDescriptor.getInstance( ScriptAssert.class );
 
 		descriptor.setValue( "lang", lang );
 		descriptor.setValue( "script", script );
-		if ( name != null ) {
-			descriptor.setValue( "alias", name );
+		if ( alias != null ) {
+			descriptor.setValue( "alias", alias );
 		}
 
 		return AnnotationFactory.create( descriptor );
@@ -198,6 +198,5 @@
 		public Date getEndDate() {
 			return endDate;
 		}
-
 	}
 }