HV-1463 Make the scripting API an SPI

documentation/src/test/java/org/hibernate/validator/referenceguide/chapter09/CustomScriptEvaluatorFactory.java

@@ -1,7 +1,7 @@
 package org.hibernate.validator.referenceguide.chapter09;
 
-import org.hibernate.validator.scripting.ScriptEvaluator;
-import org.hibernate.validator.scripting.ScriptEvaluatorFactory;
+import org.hibernate.validator.spi.scripting.ScriptEvaluator;
+import org.hibernate.validator.spi.scripting.ScriptEvaluatorFactory;
 
 /**
  * @author Marko Bekhta

documentation/src/test/java/org/hibernate/validator/referenceguide/chapter09/SpringELScriptEvaluatorFactory.java

@@ -5,9 +5,9 @@
 
 import java.util.Map;
 
-import org.hibernate.validator.scripting.AbstractCachingScriptEvaluatorFactory;
-import org.hibernate.validator.scripting.ScriptEvaluationException;
-import org.hibernate.validator.scripting.ScriptEvaluator;
+import org.hibernate.validator.spi.scripting.AbstractCachingScriptEvaluatorFactory;
+import org.hibernate.validator.spi.scripting.ScriptEvaluationException;
+import org.hibernate.validator.spi.scripting.ScriptEvaluator;
 import org.springframework.expression.EvaluationContext;
 import org.springframework.expression.EvaluationException;
 import org.springframework.expression.Expression;

engine/pom.xml

@@ -238,7 +238,6 @@
                             org.hibernate.validator.parameternameprovider;version="${project.version}",
                             org.hibernate.validator.path;version="${project.version}",
                             org.hibernate.validator.resourceloading;version="${project.version}",
-                            org.hibernate.validator.scripting.*;version="${project.version}",
                             org.hibernate.validator.spi.*;version="${project.version}"
                         </Export-Package>
                     </instructions>

engine/src/main/java/org/hibernate/validator/HibernateValidatorConfiguration.java

@@ -13,11 +13,11 @@
 import javax.validation.valueextraction.ValueExtractor;
 
 import org.hibernate.validator.cfg.ConstraintMapping;
-import org.hibernate.validator.scripting.ScriptEvaluator;
-import org.hibernate.validator.scripting.ScriptEvaluatorFactory;
 import org.hibernate.validator.constraints.ParameterScriptAssert;
 import org.hibernate.validator.constraints.ScriptAssert;
 import org.hibernate.validator.spi.resourceloading.ResourceBundleLocator;
+import org.hibernate.validator.spi.scripting.ScriptEvaluator;
+import org.hibernate.validator.spi.scripting.ScriptEvaluatorFactory;
 
 /**
  * Uniquely identifies Hibernate Validator in the Bean Validation bootstrap

engine/src/main/java/org/hibernate/validator/HibernateValidatorFactory.java

@@ -9,10 +9,10 @@
 
 import javax.validation.ValidatorFactory;
 
-import org.hibernate.validator.scripting.ScriptEvaluator;
-import org.hibernate.validator.scripting.ScriptEvaluatorFactory;
 import org.hibernate.validator.constraints.ParameterScriptAssert;
 import org.hibernate.validator.constraints.ScriptAssert;
+import org.hibernate.validator.spi.scripting.ScriptEvaluator;
+import org.hibernate.validator.spi.scripting.ScriptEvaluatorFactory;
 
 /**
  * Provides Hibernate Validator extensions to {@link ValidatorFactory}.

engine/src/main/java/org/hibernate/validator/constraintvalidation/HibernateConstraintValidatorContext.java

@@ -8,9 +8,9 @@
 
 import javax.validation.ConstraintValidatorContext;
 
-import org.hibernate.validator.scripting.ScriptEvaluator;
-import org.hibernate.validator.scripting.ScriptEvaluatorFactory;
-import org.hibernate.validator.scripting.ScriptEvaluatorNotFoundException;
+import org.hibernate.validator.spi.scripting.ScriptEvaluator;
+import org.hibernate.validator.spi.scripting.ScriptEvaluatorFactory;
+import org.hibernate.validator.spi.scripting.ScriptEvaluatorNotFoundException;
 
 /**
  * A custom {@link ConstraintValidatorContext} which allows to set additional message parameters for

engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/hv/AbstractScriptAssertValidator.java

@@ -11,11 +11,11 @@
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
 
-import org.hibernate.validator.scripting.ScriptEvaluator;
 import org.hibernate.validator.constraintvalidation.HibernateConstraintValidatorContext;
 import org.hibernate.validator.internal.util.logging.Log;
 import org.hibernate.validator.internal.util.logging.LoggerFactory;
-import org.hibernate.validator.scripting.ScriptEvaluatorNotFoundException;
+import org.hibernate.validator.spi.scripting.ScriptEvaluator;
+import org.hibernate.validator.spi.scripting.ScriptEvaluatorNotFoundException;
 
 /**
  * @author Marko Bekhta

engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/hv/ScriptAssertContext.java

@@ -12,8 +12,8 @@
 
 import org.hibernate.validator.internal.util.logging.Log;
 import org.hibernate.validator.internal.util.logging.LoggerFactory;
-import org.hibernate.validator.scripting.ScriptEvaluationException;
-import org.hibernate.validator.scripting.ScriptEvaluator;
+import org.hibernate.validator.spi.scripting.ScriptEvaluationException;
+import org.hibernate.validator.spi.scripting.ScriptEvaluator;
 
 /**
  * Context used by validator implementations dealing with script expressions. Instances are thread-safe and can be re-used

engine/src/main/java/org/hibernate/validator/internal/engine/ConfigurationImpl.java

@@ -51,8 +51,8 @@
 import org.hibernate.validator.internal.xml.ValidationXmlParser;
 import org.hibernate.validator.messageinterpolation.ResourceBundleMessageInterpolator;
 import org.hibernate.validator.resourceloading.PlatformResourceBundleLocator;
-import org.hibernate.validator.scripting.ScriptEvaluatorFactory;
 import org.hibernate.validator.spi.resourceloading.ResourceBundleLocator;
+import org.hibernate.validator.spi.scripting.ScriptEvaluatorFactory;
 
 /**
  * Hibernate specific {@code Configuration} implementation.

engine/src/main/java/org/hibernate/validator/internal/engine/ValidationContext.java

@@ -27,7 +27,6 @@
 import javax.validation.ValidationException;
 import javax.validation.metadata.ConstraintDescriptor;
 
-import org.hibernate.validator.scripting.ScriptEvaluatorFactory;
 import org.hibernate.validator.internal.engine.constraintvalidation.ConstraintValidatorContextImpl;
 import org.hibernate.validator.internal.engine.constraintvalidation.ConstraintValidatorManager;
 import org.hibernate.validator.internal.engine.constraintvalidation.ConstraintViolationCreationContext;
@@ -38,6 +37,7 @@
 import org.hibernate.validator.internal.util.ExecutableParameterNameProvider;
 import org.hibernate.validator.internal.util.logging.Log;
 import org.hibernate.validator.internal.util.logging.LoggerFactory;
+import org.hibernate.validator.spi.scripting.ScriptEvaluatorFactory;
 
 /**
  * Context object keeping track of all required data for a validation call.

engine/src/main/java/org/hibernate/validator/internal/engine/ValidatorContextImpl.java

@@ -18,12 +18,12 @@
 import javax.validation.valueextraction.ValueExtractor;
 
 import org.hibernate.validator.HibernateValidatorContext;
-import org.hibernate.validator.scripting.ScriptEvaluatorFactory;
 import org.hibernate.validator.internal.engine.valueextraction.ValueExtractorDescriptor;
 import org.hibernate.validator.internal.engine.valueextraction.ValueExtractorManager;
 import org.hibernate.validator.internal.util.ExecutableParameterNameProvider;
 import org.hibernate.validator.internal.util.logging.Log;
 import org.hibernate.validator.internal.util.logging.LoggerFactory;
+import org.hibernate.validator.spi.scripting.ScriptEvaluatorFactory;
 
 /**
  * @author Emmanuel Bernard

engine/src/main/java/org/hibernate/validator/internal/engine/ValidatorFactoryImpl.java

@@ -54,8 +54,8 @@
 import org.hibernate.validator.internal.util.privilegedactions.NewInstance;
 import org.hibernate.validator.internal.util.stereotypes.Immutable;
 import org.hibernate.validator.internal.util.stereotypes.ThreadSafe;
-import org.hibernate.validator.scripting.ScriptEvaluatorFactory;
 import org.hibernate.validator.spi.cfg.ConstraintMappingContributor;
+import org.hibernate.validator.spi.scripting.ScriptEvaluatorFactory;
 
 /**
  * Factory returning initialized {@code Validator} instances. This is the Hibernate Validator default

engine/src/main/java/org/hibernate/validator/internal/engine/ValidatorImpl.java

@@ -36,7 +36,6 @@
 import javax.validation.metadata.BeanDescriptor;
 import javax.validation.valueextraction.ValueExtractor;
 
-import org.hibernate.validator.scripting.ScriptEvaluatorFactory;
 import org.hibernate.validator.internal.engine.ValidationContext.ValidationContextBuilder;
 import org.hibernate.validator.internal.engine.constraintvalidation.ConstraintValidatorManager;
 import org.hibernate.validator.internal.engine.groups.Group;
@@ -72,6 +71,7 @@
 import org.hibernate.validator.internal.util.TypeHelper;
 import org.hibernate.validator.internal.util.logging.Log;
 import org.hibernate.validator.internal.util.logging.LoggerFactory;
+import org.hibernate.validator.spi.scripting.ScriptEvaluatorFactory;
 
 /**
  * The main Bean Validation class. This is the core processing class of Hibernate Validator.

engine/src/main/java/org/hibernate/validator/internal/engine/constraintvalidation/ConstraintValidatorContextImpl.java

@@ -32,8 +32,8 @@
 import org.hibernate.validator.internal.util.Contracts;
 import org.hibernate.validator.internal.util.logging.Log;
 import org.hibernate.validator.internal.util.logging.LoggerFactory;
-import org.hibernate.validator.scripting.ScriptEvaluator;
-import org.hibernate.validator.scripting.ScriptEvaluatorFactory;
+import org.hibernate.validator.spi.scripting.ScriptEvaluator;
+import org.hibernate.validator.spi.scripting.ScriptEvaluatorFactory;
 
 /**
  * @author Hardy Ferentschik

engine/src/main/java/org/hibernate/validator/internal/engine/scripting/DefaultScriptEvaluatorFactory.java

@@ -15,10 +15,10 @@
 import org.hibernate.validator.internal.util.logging.Log;
 import org.hibernate.validator.internal.util.logging.LoggerFactory;
 import org.hibernate.validator.internal.util.privilegedactions.GetClassLoader;
-import org.hibernate.validator.scripting.AbstractCachingScriptEvaluatorFactory;
-import org.hibernate.validator.scripting.ScriptEngineScriptEvaluator;
-import org.hibernate.validator.scripting.ScriptEvaluationException;
-import org.hibernate.validator.scripting.ScriptEvaluator;
+import org.hibernate.validator.spi.scripting.AbstractCachingScriptEvaluatorFactory;
+import org.hibernate.validator.spi.scripting.ScriptEngineScriptEvaluator;
+import org.hibernate.validator.spi.scripting.ScriptEvaluationException;
+import org.hibernate.validator.spi.scripting.ScriptEvaluator;
 
 /**
  * Factory responsible for the creation of JSR 223 based {@link ScriptEngineScriptEvaluator}s. This

engine/src/main/java/org/hibernate/validator/internal/util/logging/Log.java

@@ -41,9 +41,6 @@
 import javax.validation.valueextraction.ValueExtractorDefinitionException;
 import javax.xml.stream.XMLStreamException;
 
-import org.hibernate.validator.scripting.ScriptEvaluationException;
-import org.hibernate.validator.scripting.ScriptEvaluatorFactory;
-import org.hibernate.validator.scripting.ScriptEvaluatorNotFoundException;
 import org.hibernate.validator.internal.engine.messageinterpolation.parser.MessageDescriptorFormatException;
 import org.hibernate.validator.internal.metadata.descriptor.ConstraintDescriptorImpl.ConstraintType;
 import org.hibernate.validator.internal.metadata.location.ConstraintLocation;
@@ -53,6 +50,9 @@
 import org.hibernate.validator.internal.util.logging.formatter.ExecutableFormatter;
 import org.hibernate.validator.internal.util.logging.formatter.TypeFormatter;
 import org.hibernate.validator.internal.xml.ContainerElementTypePath;
+import org.hibernate.validator.spi.scripting.ScriptEvaluationException;
+import org.hibernate.validator.spi.scripting.ScriptEvaluatorFactory;
+import org.hibernate.validator.spi.scripting.ScriptEvaluatorNotFoundException;
 import org.jboss.logging.BasicLogger;
 import org.jboss.logging.annotations.Cause;
 import org.jboss.logging.annotations.FormatWith;

engine/src/main/java/org/hibernate/validator/scripting/AbstractCachingScriptEvaluatorFactory.java → engine/src/main/java/org/hibernate/validator/spi/scripting/AbstractCachingScriptEvaluatorFactory.java

@@ -4,7 +4,7 @@
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
  */
-package org.hibernate.validator.scripting;
+package org.hibernate.validator.spi.scripting;
 
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;

engine/src/main/java/org/hibernate/validator/scripting/ScriptEngineScriptEvaluator.java → engine/src/main/java/org/hibernate/validator/spi/scripting/ScriptEngineScriptEvaluator.java

@@ -4,7 +4,7 @@
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
  */
-package org.hibernate.validator.scripting;
+package org.hibernate.validator.spi.scripting;
 
 import java.util.Map;
 

engine/src/main/java/org/hibernate/validator/scripting/ScriptEvaluationException.java → engine/src/main/java/org/hibernate/validator/spi/scripting/ScriptEvaluationException.java

@@ -4,7 +4,7 @@
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
  */
-package org.hibernate.validator.scripting;
+package org.hibernate.validator.spi.scripting;
 
 import javax.validation.ValidationException;
 

engine/src/main/java/org/hibernate/validator/scripting/ScriptEvaluator.java → engine/src/main/java/org/hibernate/validator/spi/scripting/ScriptEvaluator.java

@@ -4,7 +4,7 @@
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
  */
-package org.hibernate.validator.scripting;
+package org.hibernate.validator.spi.scripting;
 
 import java.util.Map;
 

engine/src/main/java/org/hibernate/validator/scripting/ScriptEvaluatorFactory.java → engine/src/main/java/org/hibernate/validator/spi/scripting/ScriptEvaluatorFactory.java

@@ -4,7 +4,7 @@
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
  */
-package org.hibernate.validator.scripting;
+package org.hibernate.validator.spi.scripting;
 
 import javax.validation.ValidatorFactory;
 

engine/src/main/java/org/hibernate/validator/scripting/ScriptEvaluatorNotFoundException.java → engine/src/main/java/org/hibernate/validator/spi/scripting/ScriptEvaluatorNotFoundException.java

@@ -4,7 +4,7 @@
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
  */
-package org.hibernate.validator.scripting;
+package org.hibernate.validator.spi.scripting;
 
 import javax.validation.ValidationException;
 

engine/src/main/java/org/hibernate/validator/scripting/package-info.java → engine/src/main/java/org/hibernate/validator/spi/scripting/package-info.java

@@ -8,8 +8,8 @@
 /**
  * <p>This package provides support for customization of script evaluation in {@code ScriptAssert}
  * and {@code ParameterScriptAssert} constraints.</p>
- * <p>This package is part of the public Hibernate Validator API.</p>
+ * <p>This package is part of the public Hibernate Validator SPI.</p>
  *
  * @author Marko Bekhta
  */
-package org.hibernate.validator.scripting;
+package org.hibernate.validator.spi.scripting;

engine/src/test/java/org/hibernate/validator/test/internal/xml/CustomScriptEvaluatorFactory.java

@@ -6,8 +6,8 @@
  */
 package org.hibernate.validator.test.internal.xml;
 
-import org.hibernate.validator.scripting.ScriptEvaluator;
-import org.hibernate.validator.scripting.ScriptEvaluatorFactory;
+import org.hibernate.validator.spi.scripting.ScriptEvaluator;
+import org.hibernate.validator.spi.scripting.ScriptEvaluatorFactory;
 
 /**
  * @author Marko Bekhta

osgi/integrationtest/src/test/java/org/hibernate/validator/osgi/scripting/MultiClassLoaderScriptEvaluatorFactory.java

@@ -9,11 +9,11 @@
 import javax.script.ScriptEngine;
 import javax.script.ScriptEngineManager;
 
-import org.hibernate.validator.scripting.AbstractCachingScriptEvaluatorFactory;
-import org.hibernate.validator.scripting.ScriptEngineScriptEvaluator;
-import org.hibernate.validator.scripting.ScriptEvaluationException;
-import org.hibernate.validator.scripting.ScriptEvaluator;
-import org.hibernate.validator.scripting.ScriptEvaluatorFactory;
+import org.hibernate.validator.spi.scripting.AbstractCachingScriptEvaluatorFactory;
+import org.hibernate.validator.spi.scripting.ScriptEngineScriptEvaluator;
+import org.hibernate.validator.spi.scripting.ScriptEvaluationException;
+import org.hibernate.validator.spi.scripting.ScriptEvaluator;
+import org.hibernate.validator.spi.scripting.ScriptEvaluatorFactory;
 
 /**
  * {@link ScriptEvaluatorFactory} that allows you to pass multiple {@link ClassLoader}s that will be used

osgi/integrationtest/src/test/java/org/hibernate/validator/osgi/scripting/OsgiScriptEvaluatorFactory.java

@@ -22,11 +22,11 @@
 import javax.script.ScriptEngineManager;
 import javax.validation.ValidationException;
 
-import org.hibernate.validator.scripting.AbstractCachingScriptEvaluatorFactory;
-import org.hibernate.validator.scripting.ScriptEngineScriptEvaluator;
-import org.hibernate.validator.scripting.ScriptEvaluator;
-import org.hibernate.validator.scripting.ScriptEvaluatorFactory;
-import org.hibernate.validator.scripting.ScriptEvaluatorNotFoundException;
+import org.hibernate.validator.spi.scripting.AbstractCachingScriptEvaluatorFactory;
+import org.hibernate.validator.spi.scripting.ScriptEngineScriptEvaluator;
+import org.hibernate.validator.spi.scripting.ScriptEvaluator;
+import org.hibernate.validator.spi.scripting.ScriptEvaluatorFactory;
+import org.hibernate.validator.spi.scripting.ScriptEvaluatorNotFoundException;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;