Replaced unnecessary code with Lombok annotations

testIT-WebTester · Oct 23, 2016 · 5669728 · 5669728
1 parent 2c2ecdb
commit 5669728
Show file tree

Hide file tree

Showing 48 changed files with 245 additions and 303 deletions.
diff --git a/webtester-build-tools/src/main/resources/checkstyle_rules.xml b/webtester-build-tools/src/main/resources/checkstyle_rules.xml
@@ -51,8 +51,8 @@
 		<module name="SimplifyBooleanReturn" />
 		<module name="StringLiteralEquality" />
 		<module name="OneStatementPerLine" />
-		<module name="FinalClass" />
-		<module name="HideUtilityClassConstructor" />
+		<!--<module name="FinalClass" />-->
+		<!--<module name="HideUtilityClassConstructor" />-->
 		<module name="ArrayTypeStyle" />
 		<module name="UpperEll" />
 		<module name="OuterTypeFilename" />

diff --git a/webtester-core/src/main/java/info/novatec/testit/webtester/adhoc/AdHocFinder.java b/webtester-core/src/main/java/info/novatec/testit/webtester/adhoc/AdHocFinder.java
@@ -4,7 +4,9 @@
 import org.openqa.selenium.SearchContext;
 
 import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
 import lombok.Getter;
+import lombok.NonNull;
 
 import info.novatec.testit.webtester.browser.Browser;
 import info.novatec.testit.webtester.internal.PageFragmentFactory;
@@ -29,9 +31,12 @@
  * @since 2.0
  */
 @Getter(AccessLevel.PACKAGE)
+@AllArgsConstructor(access = AccessLevel.PACKAGE)
 public final class AdHocFinder {
 
+    @NonNull
     private final PageFragmentFactory factory;
+    @NonNull
     private final SearchContext searchContext;
 
     /**
@@ -65,12 +70,6 @@ public AdHocFinder(PageFragment parent) {
         this.searchContext = parent.webElement();
     }
 
-    // Constructor used for unit tests.
-    AdHocFinder(PageFragmentFactory factory, SearchContext searchContext) {
-        this.factory = factory;
-        this.searchContext = searchContext;
-    }
-
     /**
      * Creates an {@link ByFinder By based finder}. It can be used to create different {@link PageFragment page fragment}
      * instance for a fixed CSS-Selector value. In case you want to use an other identification method use {@link

diff --git a/webtester-core/src/main/java/info/novatec/testit/webtester/adhoc/ByFinder.java b/webtester-core/src/main/java/info/novatec/testit/webtester/adhoc/ByFinder.java
@@ -8,7 +8,9 @@
 import org.openqa.selenium.WebElement;
 
 import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
 import lombok.Getter;
+import lombok.NonNull;
 
 import info.novatec.testit.webtester.internal.PageFragmentFactory;
 import info.novatec.testit.webtester.pagefragments.GenericElement;
@@ -30,19 +32,17 @@
  * @see ByFinder#asManyGenerics()
  * @since 2.0
  */
+@AllArgsConstructor
 @Getter(AccessLevel.PACKAGE)
 public class ByFinder {
 
+    @NonNull
     private final PageFragmentFactory factory;
+    @NonNull
     private final SearchContext searchContext;
+    @NonNull
     private final By by;
 
-    public ByFinder(PageFragmentFactory factory, SearchContext searchContext, By by) {
-        this.factory = factory;
-        this.searchContext = searchContext;
-        this.by = by;
-    }
-
     /**
      * Creates a {@link GenericElement generic page element} using the finder's {@link By}.
      * <p>

diff --git a/webtester-core/src/main/java/info/novatec/testit/webtester/adhoc/TypeFinder.java b/webtester-core/src/main/java/info/novatec/testit/webtester/adhoc/TypeFinder.java
@@ -8,7 +8,9 @@
 import org.openqa.selenium.WebElement;
 
 import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
 import lombok.Getter;
+import lombok.NonNull;
 
 import info.novatec.testit.webtester.internal.PageFragmentFactory;
 import info.novatec.testit.webtester.pagefragments.PageFragment;
@@ -30,19 +32,17 @@
  * @see TypeFinder#manyBy(By)
  * @since 2.0
  */
+@AllArgsConstructor
 @Getter(AccessLevel.PACKAGE)
 public class TypeFinder<T extends PageFragment> {
 
+    @NonNull
     private final PageFragmentFactory factory;
+    @NonNull
     private final SearchContext searchContext;
+    @NonNull
     private final Class<T> fragmentClass;
 
-    public TypeFinder(PageFragmentFactory factory, SearchContext searchContext, Class<T> fragmentClass) {
-        this.factory = factory;
-        this.searchContext = searchContext;
-        this.fragmentClass = fragmentClass;
-    }
-
     /**
      * Creates a {@link PageFragment page fragment} using the finder's specified class and the given CSS-Selector
      * expression.

diff --git a/.../src/main/java/info/novatec/testit/webtester/browser/operations/BaseBrowserOperation.java b/.../src/main/java/info/novatec/testit/webtester/browser/operations/BaseBrowserOperation.java
@@ -2,19 +2,19 @@
 
 import org.openqa.selenium.WebDriver;
 
+import lombok.AllArgsConstructor;
+import lombok.NonNull;
+
 import info.novatec.testit.webtester.browser.Browser;
 import info.novatec.testit.webtester.config.Configuration;
 import info.novatec.testit.webtester.events.EventSystem;
 
-
+@AllArgsConstructor
 public class BaseBrowserOperation {
 
+    @NonNull
     private final Browser browser;
 
-    protected BaseBrowserOperation(Browser browser) {
-        this.browser = browser;
-    }
-
     protected Browser browser() {
         return browser;
     }

diff --git a/webtester-core/src/main/java/info/novatec/testit/webtester/conditions/Conditions.java b/webtester-core/src/main/java/info/novatec/testit/webtester/conditions/Conditions.java
@@ -2,6 +2,8 @@
 
 import java.util.Collection;
 
+import lombok.experimental.UtilityClass;
+
 import info.novatec.testit.webtester.conditions.pagefragments.Attribute;
 import info.novatec.testit.webtester.conditions.pagefragments.AttributeWithValue;
 import info.novatec.testit.webtester.conditions.pagefragments.Disabled;
@@ -27,13 +29,15 @@
 import info.novatec.testit.webtester.conditions.syntax.Not;
 
 
-public final class Conditions {
-
-    private Conditions() {
-        // utility class constructor
-    }
-
-    /* syntax */
+/**
+ * This class provides factory methods for all kinds of {@link Condition} implementations.
+ * <p>
+ * It is recommended to static-import the use of any of the provided methods.
+ *
+ * @since 2.0
+ */
+@UtilityClass
+public class Conditions {
 
     public static <T> Is<T> is(Condition<T> condition) {
         return new Is<>(condition);

diff --git a/...-core/src/main/java/info/novatec/testit/webtester/conditions/pagefragments/Attribute.java b/...-core/src/main/java/info/novatec/testit/webtester/conditions/pagefragments/Attribute.java
@@ -1,6 +1,8 @@
 package info.novatec.testit.webtester.conditions.pagefragments;
 
+import lombok.AllArgsConstructor;
 import lombok.Getter;
+import lombok.NonNull;
 
 import info.novatec.testit.webtester.conditions.Condition;
 import info.novatec.testit.webtester.pagefragments.PageFragment;
@@ -14,19 +16,12 @@
  * @since 2.0
  */
 @Getter
+@AllArgsConstructor
 public class Attribute implements Condition<PageFragment> {
 
+    @NonNull
     private final String expectedAttributeName;
 
-    /**
-     * Creates a new {@link Attribute} condition. Using the given attribute.
-     *
-     * @param expectedAttributeName the name of the attribute to check
-     */
-    public Attribute(String expectedAttributeName) {
-        this.expectedAttributeName = expectedAttributeName;
-    }
-
     @Override
     public boolean test(PageFragment pageFragment) {
         return pageFragment.getAttribute(expectedAttributeName).isPresent();

diff --git a/...e/src/main/java/info/novatec/testit/webtester/conditions/pagefragments/SelectedIndex.java b/...e/src/main/java/info/novatec/testit/webtester/conditions/pagefragments/SelectedIndex.java
@@ -1,6 +1,8 @@
 package info.novatec.testit.webtester.conditions.pagefragments;
 
+import lombok.AllArgsConstructor;
 import lombok.Getter;
+import lombok.NonNull;
 
 import info.novatec.testit.webtester.conditions.Condition;
 import info.novatec.testit.webtester.pagefragments.SingleSelect;
@@ -15,14 +17,12 @@
  * @since 2.0
  */
 @Getter
+@AllArgsConstructor
 public class SelectedIndex implements Condition<SingleSelect> {
 
+    @NonNull
     private final Integer expectedIndex;
 
-    public SelectedIndex(Integer expectedIndex) {
-        this.expectedIndex = expectedIndex;
-    }
-
     @Override
     public boolean test(SingleSelect select) {
         return select.getSelectionIndex().filter(expectedIndex::equals).isPresent();

diff --git a/...re/src/main/java/info/novatec/testit/webtester/conditions/pagefragments/SelectedText.java b/...re/src/main/java/info/novatec/testit/webtester/conditions/pagefragments/SelectedText.java
@@ -1,6 +1,8 @@
 package info.novatec.testit.webtester.conditions.pagefragments;
 
+import lombok.AllArgsConstructor;
 import lombok.Getter;
+import lombok.NonNull;
 
 import info.novatec.testit.webtester.conditions.Condition;
 import info.novatec.testit.webtester.pagefragments.SingleSelect;
@@ -15,14 +17,12 @@
  * @since 2.0
  */
 @Getter
+@AllArgsConstructor
 public class SelectedText implements Condition<SingleSelect> {
 
+    @NonNull
     private final String expectedText;
 
-    public SelectedText(String expectedText) {
-        this.expectedText = expectedText;
-    }
-
     @Override
     public boolean test(SingleSelect select) {
         return select.getSelectionText().filter(expectedText::equals).isPresent();

diff --git a/...e/src/main/java/info/novatec/testit/webtester/conditions/pagefragments/SelectedValue.java b/...e/src/main/java/info/novatec/testit/webtester/conditions/pagefragments/SelectedValue.java
@@ -1,6 +1,8 @@
 package info.novatec.testit.webtester.conditions.pagefragments;
 
+import lombok.AllArgsConstructor;
 import lombok.Getter;
+import lombok.NonNull;
 
 import info.novatec.testit.webtester.conditions.Condition;
 import info.novatec.testit.webtester.pagefragments.SingleSelect;
@@ -15,14 +17,12 @@
  * @since 2.0
  */
 @Getter
+@AllArgsConstructor
 public class SelectedValue implements Condition<SingleSelect> {
 
+    @NonNull
     private final String expectedValue;
 
-    public SelectedValue(String expectedValue) {
-        this.expectedValue = expectedValue;
-    }
-
     @Override
     public boolean test(SingleSelect select) {
         return select.getSelectionValue().filter(expectedValue::equals).isPresent();

diff --git a/...main/java/info/novatec/testit/webtester/conditions/pagefragments/VisibleTextContains.java b/...main/java/info/novatec/testit/webtester/conditions/pagefragments/VisibleTextContains.java
@@ -1,6 +1,8 @@
 package info.novatec.testit.webtester.conditions.pagefragments;
 
+import lombok.AllArgsConstructor;
 import lombok.Getter;
+import lombok.NonNull;
 
 import info.novatec.testit.webtester.conditions.Condition;
 import info.novatec.testit.webtester.pagefragments.PageFragment;
@@ -15,14 +17,12 @@
  * @since 2.0
  */
 @Getter
+@AllArgsConstructor
 public class VisibleTextContains implements Condition<PageFragment> {
 
+    @NonNull
     private final String expectedPartialText;
 
-    public VisibleTextContains(String expectedPartialText) {
-        this.expectedPartialText = expectedPartialText;
-    }
-
     @Override
     public boolean test(PageFragment pageFragment) {
         return pageFragment.getVisibleText().contains(expectedPartialText);

diff --git a/...c/main/java/info/novatec/testit/webtester/conditions/pagefragments/VisibleTextEquals.java b/...c/main/java/info/novatec/testit/webtester/conditions/pagefragments/VisibleTextEquals.java
@@ -1,6 +1,8 @@
 package info.novatec.testit.webtester.conditions.pagefragments;
 
+import lombok.AllArgsConstructor;
 import lombok.Getter;
+import lombok.NonNull;
 
 import info.novatec.testit.webtester.conditions.Condition;
 import info.novatec.testit.webtester.pagefragments.PageFragment;
@@ -15,14 +17,12 @@
  * @since 2.0
  */
 @Getter
+@AllArgsConstructor
 public class VisibleTextEquals implements Condition<PageFragment> {
 
+    @NonNull
     private final String expectedText;
 
-    public VisibleTextEquals(String expectedText) {
-        this.expectedText = expectedText;
-    }
-
     @Override
     public boolean test(PageFragment pageFragment) {
         return pageFragment.getVisibleText().equals(expectedText);

diff --git a/webtester-core/src/main/java/info/novatec/testit/webtester/conditions/syntax/Has.java b/webtester-core/src/main/java/info/novatec/testit/webtester/conditions/syntax/Has.java
@@ -1,5 +1,8 @@
 package info.novatec.testit.webtester.conditions.syntax;
 
+import lombok.AllArgsConstructor;
+import lombok.NonNull;
+
 import info.novatec.testit.webtester.conditions.Condition;
 
 
@@ -14,14 +17,12 @@
  * @see Condition
  * @since 2.0
  */
+@AllArgsConstructor
 public class Has<T> implements Condition<T> {
 
+    @NonNull
     private final Condition<T> condition;
 
-    public Has(Condition<T> condition) {
-        this.condition = condition;
-    }
-
     @Override
     public boolean test(T value) {
         return condition.test(value);

diff --git a/webtester-core/src/main/java/info/novatec/testit/webtester/conditions/syntax/Is.java b/webtester-core/src/main/java/info/novatec/testit/webtester/conditions/syntax/Is.java
@@ -1,5 +1,8 @@
 package info.novatec.testit.webtester.conditions.syntax;
 
+import lombok.AllArgsConstructor;
+import lombok.NonNull;
+
 import info.novatec.testit.webtester.conditions.Condition;
 
 
@@ -14,14 +17,12 @@
  * @see Condition
  * @since 2.0
  */
+@AllArgsConstructor
 public class Is<T> implements Condition<T> {
 
+    @NonNull
     private final Condition<T> condition;
 
-    public Is(Condition<T> condition) {
-        this.condition = condition;
-    }
-
     @Override
     public boolean test(T value) {
         return condition.test(value);