deprecated Literals - all factories to be found in the to be produced base classes

Author: Torsten-Mumme

src/main/java/net/itarray/automotion/validation/Literals.java

@@ -1,22 +1,36 @@
 package net.itarray.automotion.validation;
 
-import net.itarray.automotion.internal.ZoomImpl;
 import net.itarray.automotion.validation.properties.Resolution;
-import net.itarray.automotion.internal.ResolutionImpl;
 import net.itarray.automotion.validation.properties.Zoom;
 
+/**
+ * @deprecated As of release 2.0, replaced by {@link net.itarray.automotion.validation.properties.Zoom} or {@link net.itarray.automotion.validation.properties.Resolution}
+ */
+@Deprecated
 public class Literals {
 
-    public static Resolution resolution(String widthXheight) {
-        return ResolutionImpl.of(widthXheight);
+    /**
+     * @deprecated As of release 2.0, replaced by {@link net.itarray.automotion.validation.properties.Resolution#resolution(String)}
+     */
+    @Deprecated
+    public static Resolution resolution(String widthXHeight) {
+        return Resolution.resolution(widthXHeight);
     }
 
+    /**
+     * @deprecated As of release 2.0, replaced by {@link net.itarray.automotion.validation.properties.Resolution#resolution(int, int)}
+     */
+    @Deprecated
     public static Resolution resolution(int width, int height) {
-        return ResolutionImpl.of(width, height);
+        return Resolution.resolution(width, height);
     }
 
+    /**
+     * @deprecated As of release 2.0, replaced by {@link net.itarray.automotion.validation.properties.Zoom#zoom(int)}
+     */
+    @Deprecated
     public static Zoom zoom(int percentage) {
-        return ZoomImpl.of(percentage);
+        return Zoom.zoom(percentage);
     }
 
 }

src/main/java/net/itarray/automotion/validation/properties/Resolution.java

@@ -1,8 +1,17 @@
 package net.itarray.automotion.validation.properties;
 
 import net.itarray.automotion.internal.DriverFacade;
+import net.itarray.automotion.internal.ResolutionImpl;
 
 public interface Resolution {
     void applyTo(DriverFacade driver);
     Resolution queryIfUnknown(DriverFacade driver);
+
+    static Resolution resolution(String widthXHeight) {
+        return ResolutionImpl.of(widthXHeight);
+    }
+
+    static Resolution resolution(int width, int height) {
+        return ResolutionImpl.of(width, height);
+    }
 }

src/main/java/net/itarray/automotion/validation/properties/Zoom.java

@@ -1,9 +1,15 @@
 package net.itarray.automotion.validation.properties;
 
 import net.itarray.automotion.internal.DriverFacade;
+import net.itarray.automotion.internal.ZoomImpl;
 
 public interface Zoom {
     void applyTo(DriverFacade driver);
     double getFactor(DriverFacade driver);
     Zoom queryIfUnknown(DriverFacade driver);
+
+    static Zoom zoom(int percentage) {
+        return ZoomImpl.of(percentage);
+    }
+
 }

src/test/java/ResponsiveValidatorNewDSLTest.java

@@ -1,6 +1,7 @@
 import http.helpers.EnvironmentHelper;
 import net.itarray.automotion.validation.ResponsiveUIValidator;
 import net.itarray.automotion.validation.UISnapshot;
+import net.itarray.automotion.validation.properties.Padding;
 import org.assertj.core.api.SoftAssertions;
 import org.junit.After;
 import org.junit.Ignore;
@@ -10,17 +11,15 @@
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.phantomjs.PhantomJSDriverService;
 import util.driver.WebDriverFactory;
-import net.itarray.automotion.validation.properties.Padding;
 
 import java.awt.*;
 import java.util.HashMap;
 import java.util.Map;
 
-import static net.itarray.automotion.validation.properties.Expression.percent;
-import static net.itarray.automotion.validation.properties.Expression.percentOrPixels;
-import static net.itarray.automotion.validation.Literals.zoom;
 import static net.itarray.automotion.validation.properties.Condition.between;
+import static net.itarray.automotion.validation.properties.Expression.percent;
 import static net.itarray.automotion.validation.properties.PercentReference.PAGE;
+import static net.itarray.automotion.validation.properties.Zoom.zoom;
 
 @Ignore
 public class ResponsiveValidatorNewDSLTest {

src/test/java/net/itarray/automotion/tests/ZoomTest.java

@@ -6,7 +6,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import static net.itarray.automotion.validation.Literals.zoom;
+import static net.itarray.automotion.validation.properties.Zoom.zoom;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.*;
 

src/test/java/net/itarray/automotion/tests/ZoomUnknownTest.java

@@ -6,7 +6,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import static net.itarray.automotion.validation.Literals.zoom;
+import static net.itarray.automotion.validation.properties.Zoom.zoom;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.*;