refactored the most of the inernal classes

Byte Buddy is now used to generate classes at runtime instead of Dynamic Proxies.

Author: slu-it

pom.xml

@@ -85,6 +85,7 @@
 		<version.commons.codec>1.10</version.commons.codec>
 
 		<version.lombok>1.16.16</version.lombok>
+		<version.bytebuddy>1.7.1</version.bytebuddy>
 
 		<!-- plugin versions -->
 
@@ -200,6 +201,12 @@
 				<version>${version.lombok}</version>
 			</dependency>
 
+			<dependency>
+				<groupId>net.bytebuddy</groupId>
+				<artifactId>byte-buddy</artifactId>
+				<version>${version.bytebuddy}</version>
+			</dependency>
+
 			<!-- Selenium -->
 
 			<dependency>

webtester-core/pom.xml

@@ -34,6 +34,11 @@
 			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>
 		</dependency>
+		<dependency>
+			<!-- Runtime bytecode generation for interface implementations. -->
+			<groupId>net.bytebuddy</groupId>
+			<artifactId>byte-buddy</artifactId>
+		</dependency>
 
 		<dependency>
 			<!-- Used for data transport classes and other POJOS. -->

webtester-core/src/main/java/info/novatec/testit/webtester/adhoc/AdHocFinder.java

@@ -9,7 +9,7 @@
 import lombok.NonNull;
 
 import info.novatec.testit.webtester.browser.Browser;
-import info.novatec.testit.webtester.internal.PageFragmentFactory;
+import info.novatec.testit.webtester.internal.implementation.PageFragmentFactory;
 import info.novatec.testit.webtester.pagefragments.GenericElement;
 import info.novatec.testit.webtester.pagefragments.PageFragment;
 import info.novatec.testit.webtester.pagefragments.identification.ByProducer;
@@ -51,7 +51,7 @@ public final class AdHocFinder {
      * @since 2.0
      */
     public AdHocFinder(Browser browser) {
-        this.factory = new PageFragmentFactory(browser);
+        this.factory = PageFragmentFactory.createInstanceFor(browser);
         this.searchContext = browser.webDriver();
     }
 
@@ -66,7 +66,7 @@ public AdHocFinder(Browser browser) {
      * @since 2.0
      */
     public AdHocFinder(PageFragment parent) {
-        this.factory = new PageFragmentFactory(parent.browser());
+        this.factory = PageFragmentFactory.createInstanceFor(parent.browser());
         this.searchContext = parent.webElement();
     }
 

webtester-core/src/main/java/info/novatec/testit/webtester/adhoc/ByFinder.java

@@ -12,7 +12,9 @@
 import lombok.Getter;
 import lombok.NonNull;
 
-import info.novatec.testit.webtester.internal.PageFragmentFactory;
+import info.novatec.testit.webtester.internal.implementation.PageFragmentFactory;
+import info.novatec.testit.webtester.internal.implementation.PageFragmentFactory.PageFragmentDescriptor;
+import info.novatec.testit.webtester.internal.implementation.pagefragments.StaticWebElementSupplier;
 import info.novatec.testit.webtester.pagefragments.GenericElement;
 import info.novatec.testit.webtester.pagefragments.PageFragment;
 import info.novatec.testit.webtester.pagefragments.identification.ByProducer;
@@ -75,9 +77,14 @@ public GenericElement asGeneric() {
      * @see PageFragment
      * @since 2.0
      */
+    @SuppressWarnings("unchecked")
     public <T extends PageFragment> T as(Class<T> fragmentClass) {
         WebElement webElement = searchContext.findElement(by);
-        return factory.pageFragment(fragmentClass, webElement);
+        PageFragmentDescriptor descriptor = PageFragmentDescriptor.builder()
+            .pageFragmentType(fragmentClass)
+            .webElementSupplier(new StaticWebElementSupplier(webElement))
+            .build();
+        return ( T ) factory.createInstanceOf(descriptor);
     }
 
     /**
@@ -108,8 +115,15 @@ public Stream<GenericElement> asManyGenerics() {
      * @see PageFragment
      * @since 2.0
      */
+    @SuppressWarnings("unchecked")
     public <T extends PageFragment> Stream<T> asMany(Class<T> fragmentClass) {
-        return searchContext.findElements(by).stream().map(webElement -> factory.pageFragment(fragmentClass, webElement));
+        return searchContext.findElements(by).stream().map(webElement -> {
+            PageFragmentDescriptor descriptor = PageFragmentDescriptor.builder()
+                .pageFragmentType(fragmentClass)
+                .webElementSupplier(new StaticWebElementSupplier(webElement))
+                .build();
+            return ( T ) factory.createInstanceOf(descriptor);
+        });
     }
 
 }

webtester-core/src/main/java/info/novatec/testit/webtester/adhoc/TypeFinder.java

@@ -12,7 +12,9 @@
 import lombok.Getter;
 import lombok.NonNull;
 
-import info.novatec.testit.webtester.internal.PageFragmentFactory;
+import info.novatec.testit.webtester.internal.implementation.PageFragmentFactory;
+import info.novatec.testit.webtester.internal.implementation.PageFragmentFactory.PageFragmentDescriptor;
+import info.novatec.testit.webtester.internal.implementation.pagefragments.StaticWebElementSupplier;
 import info.novatec.testit.webtester.pagefragments.PageFragment;
 import info.novatec.testit.webtester.pagefragments.identification.ByProducers;
 
@@ -77,9 +79,14 @@ public T by(String cssSelector) {
      * @see PageFragment
      * @since 2.0
      */
+    @SuppressWarnings("unchecked")
     public T by(By by) {
         WebElement webElement = searchContext.findElement(by);
-        return factory.pageFragment(fragmentClass, webElement);
+        PageFragmentDescriptor descriptor = PageFragmentDescriptor.builder()
+            .pageFragmentType(fragmentClass)
+            .webElementSupplier(new StaticWebElementSupplier(webElement))
+            .build();
+        return ( T ) factory.createInstanceOf(descriptor);
     }
 
     /**
@@ -114,10 +121,15 @@ public Stream<T> manyBy(String cssSelector) {
      * @see Stream
      * @since 2.0
      */
+    @SuppressWarnings("unchecked")
     public Stream<T> manyBy(By by) {
-        return searchContext.findElements(by)
-            .stream()
-            .map(webElement -> factory.pageFragment(fragmentClass, webElement));
+        return searchContext.findElements(by).stream().map(webElement -> {
+            PageFragmentDescriptor descriptor = PageFragmentDescriptor.builder()
+                .pageFragmentType(fragmentClass)
+                .webElementSupplier(new StaticWebElementSupplier(webElement))
+                .build();
+            return ( T ) factory.createInstanceOf(descriptor);
+        });
     }
 
 }

webtester-core/src/main/java/info/novatec/testit/webtester/browser/WebDriverBrowser.java

@@ -19,7 +19,7 @@
 import info.novatec.testit.webtester.events.DispatchingEventSystem;
 import info.novatec.testit.webtester.events.EventSystem;
 import info.novatec.testit.webtester.events.browser.ClosedBrowserEvent;
-import info.novatec.testit.webtester.internal.PageFactory;
+import info.novatec.testit.webtester.internal.implementation.PageFactory;
 import info.novatec.testit.webtester.pages.Page;
 
 
@@ -77,13 +77,13 @@ private WebDriverBrowser(Configuration configuration, WebDriver webDriver) {
         this.eventSystem = new DispatchingEventSystem(this);
 
         this.adHocFinder = new AdHocFinder(this);
-        this.pageFactory = new PageFactory(this);
+        this.pageFactory = PageFactory.createInstanceFor(this);
 
     }
 
     @Override
     public <T extends Page> T create(Class<T> pageClass) {
-        return pageFactory.page(pageClass);
+        return pageFactory.createInstanceOf(pageClass);
     }
 
     @Override

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

@@ -2,11 +2,17 @@
 
 public final class ClasspathUtils {
 
-    public static final boolean KOTLIN_AVAILABLE = isKotlinOnClasspath();
+    public static final String KOTLIN_PAGE_CLASS = "info.novatec.testit.webtester.kotlin.pages.Page";
+    public static final String KOTLIN_PAGE_FRAGMENT_CLASS =
+        "info.novatec.testit.webtester.kotlin.pagefragments.PageFragment";
 
-    private static boolean isKotlinOnClasspath() {
+    public static final boolean KOTLIN_AVAILABLE = isClassAvailable("kotlin.KotlinVersion");
+    public static final boolean KOTLIN_MODULE_LOADED =
+        isClassAvailable(KOTLIN_PAGE_CLASS) && isClassAvailable(KOTLIN_PAGE_FRAGMENT_CLASS);
+
+    private static boolean isClassAvailable(String className) {
         try {
-            Class.forName("kotlin.KotlinVersion");
+            Class.forName(className);
             return true;
         } catch (ClassNotFoundException e) {
             return false;

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

@@ -9,8 +9,4 @@ public IllegalSignatureException(String message) {
         super(message);
     }
 
-    public IllegalSignatureException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
 }