HV-481 Removing use of org.hibernate.validator.internal.util.logging.…

…Log in public classes
hibernate · Mar 2, 2012 · 9373be7 · 9373be7
1 parent 5f0fe31
commit 9373be7
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 18 deletions.
diff --git a/hibernate-validator/src/main/java/org/hibernate/validator/internal/util/logging/Log.java b/hibernate-validator/src/main/java/org/hibernate/validator/internal/util/logging/Log.java
@@ -22,7 +22,6 @@
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;
 import java.lang.reflect.TypeVariable;
-import java.util.IllegalFormatException;
 import java.util.List;
 import java.util.Set;
 import java.util.regex.PatternSyntaxException;
@@ -207,15 +206,6 @@ public interface Log extends BasicLogger {
 	@Message(id = 48, value = "Unable to expand group sequence.")
 	GroupDefinitionException throwUnableToExpandGroupSequence();
 
-	@Message(id = 49, value = "The given index must be between %1$s and %2$s.")
-	IndexOutOfBoundsException throwInvalidIndex(String lowerBound, String upperBound);
-
-	@Message(id = 50, value = "Missing format string in template: %s.")
-	ValidationException throwMissingFormatStringInTemplate(String expression);
-
-	@Message(id = 51, value = "Invalid format: %s.")
-	ValidationException throwInvalidFormat(String message, @Cause IllegalFormatException e);
-
 	@Message(id = 52,
 			value = "Default group sequence and default group sequence provider cannot be defined at the same time.")
 	GroupDefinitionException throwInvalidDefaultGroupSequenceDefinition();

diff --git a/.../java/org/hibernate/validator/messageinterpolation/ValueFormatterMessageInterpolator.java b/.../java/org/hibernate/validator/messageinterpolation/ValueFormatterMessageInterpolator.java
@@ -22,9 +22,13 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import javax.validation.MessageInterpolator;
+import javax.validation.ValidationException;
 
-import org.hibernate.validator.internal.util.logging.Log;
-import org.hibernate.validator.internal.util.logging.LoggerFactory;
+import org.jboss.logging.BasicLogger;
+import org.jboss.logging.Cause;
+import org.jboss.logging.Logger;
+import org.jboss.logging.Message;
+import org.jboss.logging.MessageLogger;
 
 
 /**
@@ -38,8 +42,10 @@
  * @author Hardy Ferentschik
  */
 public class ValueFormatterMessageInterpolator implements MessageInterpolator {
-
-	private static final Log log = LoggerFactory.make();
+	private static final Log log = Logger.getMessageLogger(
+			Log.class,
+			ValueFormatterMessageInterpolator.class.getName()
+	);
 
 	public static final String VALIDATED_VALUE_KEYWORD = "validatedValue";
 	public static final String VALIDATED_VALUE_FORMAT_SEPARATOR = ":";
@@ -174,4 +180,17 @@ private String interpolateValidatedValue(String expression, Object validatedValu
 		}
 		return interpolatedValue;
 	}
+
+	@MessageLogger(projectCode = "HV")
+	public interface Log extends BasicLogger {
+		@Message(id = 50, value = "Missing format string in template: %s.")
+		ValidationException throwMissingFormatStringInTemplate(String expression);
+
+		@Message(id = 51, value = "Invalid format: %s.")
+		ValidationException throwInvalidFormat(String message, @Cause IllegalFormatException e);
+
+		@Message(id = 49, value = "The given index must be between %1$s and %2$s.")
+		IndexOutOfBoundsException throwInvalidIndex(String lowerBound, String upperBound);
+	}
+
 }
diff --git a/.../src/main/java/org/hibernate/validator/resourceloading/PlatformResourceBundleLocator.java b/.../src/main/java/org/hibernate/validator/resourceloading/PlatformResourceBundleLocator.java
@@ -22,8 +22,7 @@
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 
-import org.hibernate.validator.internal.util.logging.Log;
-import org.hibernate.validator.internal.util.logging.LoggerFactory;
+import org.jboss.logging.Logger;
 
 /**
  * A resource bundle locator, that loads resource bundles by simply
@@ -33,8 +32,7 @@
  * @author Gunnar Morling
  */
 public class PlatformResourceBundleLocator implements ResourceBundleLocator {
-
-	private static final Log log = LoggerFactory.make();
+	private static final Logger log = Logger.getLogger( PlatformResourceBundleLocator.class.getName() );
 	private String bundleName;
 
 	public PlatformResourceBundleLocator(String bundleName) {