Renamed MappingValidatorImpl to DefaultMappingValidator to fit better in the naming scheme for single implementation interfaces

Author: slu-it

webtester-core/src/main/java/info/novatec/testit/webtester/internal/proxies/PageFragmentProxyHandler.java

@@ -35,7 +35,7 @@
 import info.novatec.testit.webtester.internal.proxies.impls.WebElementReturningImpl;
 import info.novatec.testit.webtester.pagefragments.PageFragment;
 import info.novatec.testit.webtester.pagefragments.mapping.MappingValidator;
-import info.novatec.testit.webtester.pagefragments.mapping.MappingValidatorImpl;
+import info.novatec.testit.webtester.pagefragments.mapping.DefaultMappingValidator;
 
 
 @Builder
@@ -103,7 +103,7 @@ public static PageFragmentProxyHandler fromModel(PageFragmentModel model) {
 
         Browser browser = model.getBrowser();
         Class<? extends PageFragment> pageFragmentClass = model.getType();
-        MappingValidator validator = new MappingValidatorImpl(pageFragmentClass);
+        MappingValidator validator = new DefaultMappingValidator(pageFragmentClass);
         Supplier<WebElement> webElementSupplier = () -> {
             SearchContext searchContext = model.getSearchContextSupplier().get();
             By by = model.getBy();
@@ -129,7 +129,7 @@ public static PageFragmentProxyHandler fromModel(PageFragmentModel model) {
     public static PageFragmentProxyHandler forWebElement(Browser browser, WebElement webElement,
         Class<? extends PageFragment> pageFragmentClass) {
 
-        MappingValidator validator = new MappingValidatorImpl(pageFragmentClass);
+        MappingValidator validator = new DefaultMappingValidator(pageFragmentClass);
         Supplier<WebElement> webElementSupplier = () -> webElement;
         EventProducingImplementationDecorator eventDecorator =
             new EventProducingImplementationDecorator(browser, webElementSupplier);

webtester-core/src/main/java/info/novatec/testit/webtester/pagefragments/annotations/Mappings.java

@@ -7,7 +7,7 @@
 import java.lang.annotation.Target;
 
 import info.novatec.testit.webtester.pagefragments.PageFragment;
-import info.novatec.testit.webtester.pagefragments.mapping.MappingValidatorImpl;
+import info.novatec.testit.webtester.pagefragments.mapping.DefaultMappingValidator;
 
 
 /**
@@ -16,7 +16,7 @@
  * your page fragments multiple times with {@link Mapping @Mapping}.
  *
  * @see Mapping
- * @see MappingValidatorImpl
+ * @see DefaultMappingValidator
  * @see PageFragment
  * @since 2.0
  */

webtester-core/src/main/java/info/novatec/testit/webtester/pagefragments/identification/ByProducers.java

@@ -1,6 +1,5 @@
 package info.novatec.testit.webtester.pagefragments.identification;
 
-import java.lang.reflect.UndeclaredThrowableException;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -88,8 +87,8 @@ private static ByProducer createNewInstanceOf(Class<? extends ByProducer> produc
         try {
             return producerClass.newInstance();
         } catch (InstantiationException | IllegalAccessException e) {
-            String message = "unable to create " + ByProducer.class.getSimpleName() + " for: " + producerClass;
-            throw new UndeclaredThrowableException(e, message);
+            String message = "unable to create instance of " + producerClass;
+            throw new InvalidByProducerException(message, e);
         }
     }
 

webtester-core/src/main/java/info/novatec/testit/webtester/pagefragments/identification/InvalidByProducerException.java

@@ -0,0 +1,18 @@
+package info.novatec.testit.webtester.pagefragments.identification;
+
+import info.novatec.testit.webtester.WebTesterException;
+
+
+/**
+ * This exception is thrown if a {@link ByProducer} could not be initialized.
+ *
+ * @see ByProducers
+ * @since 2.0
+ */
+public class InvalidByProducerException extends WebTesterException {
+
+    public InvalidByProducerException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+}

webtester-core/src/main/java/info/novatec/testit/webtester/pagefragments/mapping/MappingValidatorImpl.java renamed to webtester-core/src/main/java/info/novatec/testit/webtester/pagefragments/mapping/DefaultMappingValidator.java

@@ -23,13 +23,13 @@
  * @see MappingValidator
  * @since 2.0
  */
-public class MappingValidatorImpl implements MappingValidator {
+public class DefaultMappingValidator implements MappingValidator {
 
     private final Class<? extends PageFragment> pageFragmentType;
     private final List<Validator> validators;
     private final List<String> validConstellationDescriptions;
 
-    public MappingValidatorImpl(Class<? extends PageFragment> pageFragmentType) {
+    public DefaultMappingValidator(Class<? extends PageFragment> pageFragmentType) {
         this.pageFragmentType = pageFragmentType;
         this.validators = extractValidationInformation(pageFragmentType);
         this.validConstellationDescriptions = getValidConstellationDescriptions(this.validators);
@@ -38,7 +38,7 @@ public MappingValidatorImpl(Class<? extends PageFragment> pageFragmentType) {
     private static List<Validator> extractValidationInformation(Class<?> type) {
         Mapping[] annotations = type.getAnnotationsByType(Mapping.class);
         return Arrays.stream(annotations)
-            .map(MappingValidatorImpl::convertToValidConstellation)
+            .map(DefaultMappingValidator::convertToValidConstellation)
             .collect(Collectors.toList());
     }
 

webtester-core/src/main/java/info/novatec/testit/webtester/pagefragments/mapping/MappingException.java

@@ -1,8 +1,18 @@
 package info.novatec.testit.webtester.pagefragments.mapping;
 
 import info.novatec.testit.webtester.WebTesterException;
+import info.novatec.testit.webtester.pagefragments.PageFragment;
+import info.novatec.testit.webtester.pagefragments.annotations.Mapping;
+import info.novatec.testit.webtester.pagefragments.annotations.Mappings;
 
 
+/**
+ * This exception is thrown in case a {@link PageFragment} instance does not comply with the defined {@link Mapping}.
+ *
+ * @see Mapping
+ * @see Mappings
+ * @since 2.0
+ */
 public class MappingException extends WebTesterException {
 
     public MappingException(String message) {

webtester-core/src/main/java/info/novatec/testit/webtester/pagefragments/mapping/validators/JustTag.java

@@ -4,7 +4,7 @@
 
 import info.novatec.testit.webtester.pagefragments.annotations.Mapping;
 import info.novatec.testit.webtester.pagefragments.annotations.Mappings;
-import info.novatec.testit.webtester.pagefragments.mapping.MappingValidatorImpl;
+import info.novatec.testit.webtester.pagefragments.mapping.DefaultMappingValidator;
 import info.novatec.testit.webtester.pagefragments.mapping.Validator;
 
 
@@ -20,7 +20,7 @@
  * @see Validator
  * @see Mapping
  * @see Mappings
- * @see MappingValidatorImpl
+ * @see DefaultMappingValidator
  * @since 2.0
  */
 public class JustTag implements Validator {

webtester-core/src/main/java/info/novatec/testit/webtester/pagefragments/mapping/validators/NoOpValidator.java

@@ -4,20 +4,20 @@
 
 import info.novatec.testit.webtester.pagefragments.annotations.Mapping;
 import info.novatec.testit.webtester.pagefragments.annotations.Mappings;
-import info.novatec.testit.webtester.pagefragments.mapping.MappingValidatorImpl;
+import info.novatec.testit.webtester.pagefragments.mapping.DefaultMappingValidator;
 import info.novatec.testit.webtester.pagefragments.mapping.Validator;
 
 
 /**
  * This is a {@link Validator} implementation that basically does nothing. It will return <code>true</code> for each call on
  * {@link #isValid(WebElement)}. The main reason this class exists is to use it as a default in the {@link Mapping}
- * annotation. In case this class is set on the annotation (default), the {@link MappingValidatorImpl} will use the annotation's
+ * annotation. In case this class is set on the annotation (default), the {@link DefaultMappingValidator} will use the annotation's
  * properties to generate a validator instead of using this one.
  *
  * @see Validator
  * @see Mapping
  * @see Mappings
- * @see MappingValidatorImpl
+ * @see DefaultMappingValidator
  * @since 2.0
  */
 public class NoOpValidator implements Validator {

webtester-core/src/main/java/info/novatec/testit/webtester/pagefragments/mapping/validators/TagWithAttribute.java

@@ -4,7 +4,7 @@
 
 import info.novatec.testit.webtester.pagefragments.annotations.Mapping;
 import info.novatec.testit.webtester.pagefragments.annotations.Mappings;
-import info.novatec.testit.webtester.pagefragments.mapping.MappingValidatorImpl;
+import info.novatec.testit.webtester.pagefragments.mapping.DefaultMappingValidator;
 import info.novatec.testit.webtester.pagefragments.mapping.Validator;
 
 
@@ -20,7 +20,7 @@
  * @see Validator
  * @see Mapping
  * @see Mappings
- * @see MappingValidatorImpl
+ * @see DefaultMappingValidator
  * @since 2.0
  */
 public class TagWithAttribute extends JustTag {

webtester-core/src/main/java/info/novatec/testit/webtester/pagefragments/mapping/validators/TagWithAttributeAndValues.java

@@ -9,7 +9,7 @@
 
 import info.novatec.testit.webtester.pagefragments.annotations.Mapping;
 import info.novatec.testit.webtester.pagefragments.annotations.Mappings;
-import info.novatec.testit.webtester.pagefragments.mapping.MappingValidatorImpl;
+import info.novatec.testit.webtester.pagefragments.mapping.DefaultMappingValidator;
 import info.novatec.testit.webtester.pagefragments.mapping.Validator;
 
 
@@ -26,7 +26,7 @@
  * @see Validator
  * @see Mapping
  * @see Mappings
- * @see MappingValidatorImpl
+ * @see DefaultMappingValidator
  * @since 2.0
  */
 public class TagWithAttributeAndValues extends JustTag {

webtester-core/src/main/java/info/novatec/testit/webtester/pagefragments/mapping/validators/TagWithoutAttribute.java

@@ -4,7 +4,7 @@
 
 import info.novatec.testit.webtester.pagefragments.annotations.Mapping;
 import info.novatec.testit.webtester.pagefragments.annotations.Mappings;
-import info.novatec.testit.webtester.pagefragments.mapping.MappingValidatorImpl;
+import info.novatec.testit.webtester.pagefragments.mapping.DefaultMappingValidator;
 import info.novatec.testit.webtester.pagefragments.mapping.Validator;
 
 
@@ -20,7 +20,7 @@
  * @see Validator
  * @see Mapping
  * @see Mappings
- * @see MappingValidatorImpl
+ * @see DefaultMappingValidator
  * @since 2.0
  */
 public class TagWithoutAttribute extends JustTag {