Merge branch 'develop'

tobiasstamann · tobiasstamann · commit 754920d65268 · 2025-09-18T20:07:51.000+02:00
diff --git a/README.md b/README.md
@@ -1,6 +1,7 @@
 # pogen4selenium - a page object generator 4 selenium
 
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.toolisticon.pogen4selenium/pogen4selenium/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.toolisticon.pogen4selenium/pogen4selenium)
+[![Maven Central](https://maven-badges.sml.io/sonatype-central/io.toolisticon.pogen4selenium/pogen4selenium/badge.svg)](https://maven-badges.sml.io/sonatype-central/io.toolisticon.pogen4selenium/pogen4selenium)
 
 
 # Why you should use this project?
diff --git a/pogen4selenium-api/pom.xml b/pogen4selenium-api/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>io.toolisticon.pogen4selenium</groupId>
         <artifactId>pogen4selenium</artifactId>
-        <version>0.9.1</version>
+        <version>0.10.0</version>
     </parent>
 
     <name>pogen4selenium-api</name>
diff --git a/pogen4selenium-api/src/main/java/io/toolisticon/pogen4selenium/api/CommonParentInterface.java b/pogen4selenium-api/src/main/java/io/toolisticon/pogen4selenium/api/CommonParentInterface.java
@@ -0,0 +1,49 @@
+package io.toolisticon.pogen4selenium.api;
+
+import java.lang.reflect.InvocationTargetException;
+
+import org.openqa.selenium.WebDriver;
+
+public interface CommonParentInterface {
+	
+	/**
+	 * Gets the seleium driver.
+	 * @return the selenium driver currently used
+	 */
+	WebDriver getDriver();
+	
+	/**
+	 * Allows the creation of page object instances while using the fluent interface
+	 * @param <T>
+	 * @param pageObjectInterfaceType
+	 * @return
+	 */
+	default <T extends PageObjectParent<T>> T getPageObjectInstance(Class<T> pageObjectInterfaceType) {
+		
+		return getPageObjectInstance(pageObjectInterfaceType, getDriver());
+		
+	}
+	
+	/**
+	 * Allows the creation of page object instances while using the fluent interface
+	 * @param <T>
+	 * @param pageObjectInterfaceType
+	 * @return
+	 */
+	@SuppressWarnings("unchecked")
+	public static <T extends PageObjectParent<T>> T getPageObjectInstance(Class<T> pageObjectInterfaceType, WebDriver driver) {
+		
+		try {
+			
+			Class<?> clazz = Class.forName(pageObjectInterfaceType.getPackageName() + "." + pageObjectInterfaceType.getSimpleName() + "Impl");
+			return (T) clazz.getConstructor(WebDriver.class).newInstance(driver);
+			
+		} catch (ClassCastException |ClassNotFoundException | NoSuchMethodException | SecurityException | InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
+			throw new IllegalArgumentException("Couldn't create instance for PageObject '" + pageObjectInterfaceType.getCanonicalName() + "'", e);
+		}
+		
+	}
+	
+	
+	
+}
diff --git a/pogen4selenium-api/src/main/java/io/toolisticon/pogen4selenium/api/PageObjectParent.java b/pogen4selenium-api/src/main/java/io/toolisticon/pogen4selenium/api/PageObjectParent.java
@@ -2,29 +2,21 @@
 
 import java.time.Duration;
 
-import org.openqa.selenium.WebDriver;
-
 import io.toolisticon.pogen4selenium.runtime.AssertionInterface;
 import io.toolisticon.pogen4selenium.runtime.ExecuteBlock;
 
 /**
  * The page object parent interface. Must be extended by all interfaces annotated with {@link PageObject}
  * @param <PAGEOBJECT> The page object type
  */
-public interface PageObjectParent<PAGEOBJECT extends PageObjectParent<PAGEOBJECT>> {
+public interface PageObjectParent<PAGEOBJECT extends PageObjectParent<PAGEOBJECT>> extends CommonParentInterface {
 
 	/**
 	 * Verifies all elements marked via {@link PageObjectElement} annotated fields according to the configuration in the annotation.
 	 * @return The next fluent interface
 	 */
 	PAGEOBJECT verify();
 
-	/**
-	 * Gets the seleium driver.
-	 * @return the selenium driver currently used
-	 */
-	WebDriver getDriver();
-
 	/**
 	 * Applies a fixed time pause.
 	 * @param duration the duration to pause
diff --git a/pogen4selenium-api/src/main/java/io/toolisticon/pogen4selenium/runtime/CommonPageObjectCreator.java b/pogen4selenium-api/src/main/java/io/toolisticon/pogen4selenium/runtime/CommonPageObjectCreator.java
@@ -0,0 +1,5 @@
+package io.toolisticon.pogen4selenium.runtime;
+
+public interface CommonPageObjectCreator {
+
+}
diff --git a/pogen4selenium-api/src/main/java/io/toolisticon/pogen4selenium/runtime/DataObjectParentImpl.java b/pogen4selenium-api/src/main/java/io/toolisticon/pogen4selenium/runtime/DataObjectParentImpl.java
@@ -14,9 +14,10 @@
 import org.openqa.selenium.support.ui.Wait;
 
 import io.toolisticon.pogen4selenium.api._By;
+import io.toolisticon.pogen4selenium.api.CommonParentInterface;
 import io.toolisticon.pogen4selenium.api.ExtractDataValue;
 
-public class DataObjectParentImpl implements CommonByLocators{
+public class DataObjectParentImpl implements CommonByLocators, CommonParentInterface{
 	
 	protected final WebDriver driver;
 	private final WebElement relativeParentWebElement;
@@ -26,6 +27,7 @@ protected DataObjectParentImpl(WebDriver driver, WebElement relativeParentWebEle
 		this.relativeParentWebElement = relativeParentWebElement;
 	}
 
+	@Override
 	public WebDriver getDriver() {
 		return this.driver;
 	}
diff --git a/pogen4selenium-api/src/main/java/io/toolisticon/pogen4selenium/runtime/PageObjectParentImpl.java b/pogen4selenium-api/src/main/java/io/toolisticon/pogen4selenium/runtime/PageObjectParentImpl.java
@@ -39,7 +39,7 @@ public WebDriver getDriver() {
 		return this.driver;
 	}
 
-	
+
 	@Override
 	public PAGEOBJECT pause(Duration duration) {
 		new Actions(driver).pause(duration).perform();
diff --git a/pogen4selenium-example/pom.xml b/pogen4selenium-example/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>io.toolisticon.pogen4selenium</groupId>
         <artifactId>pogen4selenium</artifactId>
-        <version>0.9.1</version>
+        <version>0.10.0</version>
     </parent>
 
     <name>pogen4selenium-example</name>
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>io.toolisticon.pogen4selenium</groupId>
             <artifactId>pogen4selenium-api</artifactId>
-            <version>0.9.1</version>
+            <version>0.10.0</version>
         </dependency>
         
         <dependency>
diff --git a/pogen4selenium-processor/.factorypath b/pogen4selenium-processor/.factorypath
@@ -1,9 +1,9 @@
 <factorypath>
     <factorypathentry kind="VARJAR" id="M2_REPO/io/toolisticon/spiap/spiap-processor/0.11.0/spiap-processor-0.11.0.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/io/toolisticon/spiap/spiap-api/0.11.0/spiap-api-0.11.0.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/io/toolisticon/aptk/aptk-annotationwrapper-processor/0.30.2/aptk-annotationwrapper-processor-0.30.2.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/io/toolisticon/aptk/aptk-annotationwrapper-api/0.30.2/aptk-annotationwrapper-api-0.30.2.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/io/toolisticon/aptk/aptk-compilermessages-processor/0.30.2/aptk-compilermessages-processor-0.30.2.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/io/toolisticon/aptk/aptk-compilermessages-api/0.30.2/aptk-compilermessages-api-0.30.2.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/io/toolisticon/aptk/aptk-annotationwrapper-processor/0.30.5/aptk-annotationwrapper-processor-0.30.5.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/io/toolisticon/aptk/aptk-annotationwrapper-api/0.30.5/aptk-annotationwrapper-api-0.30.5.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/io/toolisticon/aptk/aptk-compilermessages-processor/0.30.5/aptk-compilermessages-processor-0.30.5.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/io/toolisticon/aptk/aptk-compilermessages-api/0.30.5/aptk-compilermessages-api-0.30.5.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="PLUGIN" id="org.eclipse.jst.ws.annotations.core" enabled="false" runInBatchMode="false"/>
 </factorypath>
diff --git a/pogen4selenium-processor/dependency-reduced-pom.xml b/pogen4selenium-processor/dependency-reduced-pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>pogen4selenium</artifactId>
     <groupId>io.toolisticon.pogen4selenium</groupId>
-    <version>0.9.1-SNAPSHOT</version>
+    <version>0.9.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>pogen4selenium-processor</artifactId>
@@ -75,13 +75,13 @@
     <dependency>
       <groupId>io.toolisticon.aptk</groupId>
       <artifactId>aptk-annotationwrapper-api</artifactId>
-      <version>0.30.3</version>
+      <version>0.30.5</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>io.toolisticon.aptk</groupId>
       <artifactId>aptk-compilermessages-api</artifactId>
-      <version>0.30.3</version>
+      <version>0.30.5</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -117,7 +117,7 @@
     <dependency>
       <groupId>io.toolisticon.aptk</groupId>
       <artifactId>aptk-cute</artifactId>
-      <version>0.30.3</version>
+      <version>0.30.5</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/pogen4selenium-processor/pom.xml b/pogen4selenium-processor/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>io.toolisticon.pogen4selenium</groupId>
         <artifactId>pogen4selenium</artifactId>
-        <version>0.9.1</version>
+        <version>0.10.0</version>
     </parent>
 
     <name>pogen4selenium-processor</name>
diff --git a/pogen4selenium-processor/src/main/java/io/toolisticon/pogen4selenium/processor/common/MethodsToImplementHelper.java b/pogen4selenium-processor/src/main/java/io/toolisticon/pogen4selenium/processor/common/MethodsToImplementHelper.java
@@ -80,7 +80,7 @@ public Optional<ExtractDataValueWrapper> getExtractDataValue() {
 
 	
 	public String getNextImplClassName() {
-		return this.executableElementWrapper.getReturnType().getSimpleName() + "Impl";
+		return this.executableElementWrapper.getReturnType().getSimpleName();
 	}
 	
 	public long getBeforePause() {
diff --git a/pogen4selenium-processor/src/main/java/io/toolisticon/pogen4selenium/processor/common/actions/UniversalActionHandler.java b/pogen4selenium-processor/src/main/java/io/toolisticon/pogen4selenium/processor/common/actions/UniversalActionHandler.java
@@ -4,10 +4,12 @@
 import java.util.Set;
 
 import javax.lang.model.element.Element;
+import javax.lang.model.element.TypeElement;
 
 import io.toolisticon.aptk.tools.TypeMirrorWrapper;
 import io.toolisticon.aptk.tools.wrapper.AnnotationMirrorWrapper;
 import io.toolisticon.aptk.tools.wrapper.ElementWrapper;
+import io.toolisticon.aptk.tools.wrapper.TypeElementWrapper;
 import io.toolisticon.pogen4selenium.api.LocatorBy;
 import io.toolisticon.pogen4selenium.api.LocatorSideCondition;
 import io.toolisticon.pogen4selenium.api.LocatorValue;
@@ -32,7 +34,7 @@ public String generateCode(Element element) {
 		_By by = annotationMirrorWrapper.getAttributeWithDefaultByAnnotation(LocatorBy.class).getEnumValue(_By.class);
 		String annotationValue = annotationMirrorWrapper.getAttributeWithDefaultByAnnotation(LocatorValue.class).getStringValue();
 		
-		ActionWrapper actionWrapper = ActionWrapper.wrap(annotationMirrorWrapper.asElement().unwrap());
+		ActionWrapper actionWrapper = ActionWrapper.wrap(annotationMirrorWrapper.asElement());
 		
 		String attributeString = actionWrapper.getAttributeValuesString(annotationMirrorWrapper);
 				
@@ -49,7 +51,7 @@ public Set<String> getImports(Element element) {
 		AnnotationMirrorWrapper annotationMirrorWrapper = AnnotationMirrorWrapper.get(element, annotation).get();
 		TypeMirrorWrapper sideConditionTmw = annotationMirrorWrapper.getAttributeWithDefaultByAnnotation(LocatorSideCondition.class).getClassValue();
 		
-		ActionWrapper actionWrapper = ActionWrapper.wrap(annotationMirrorWrapper.asElement().unwrap());
+		ActionWrapper actionWrapper = ActionWrapper.wrap(annotationMirrorWrapper.asElement());
 		
 		
 		Set<String> imports =  new HashSet<>();
diff --git a/pogen4selenium-processor/src/main/java/io/toolisticon/pogen4selenium/processor/pageobject/PageObjectProcessor.java b/pogen4selenium-processor/src/main/java/io/toolisticon/pogen4selenium/processor/pageobject/PageObjectProcessor.java
@@ -23,6 +23,7 @@
 import io.toolisticon.aptk.tools.generators.SimpleJavaWriter;
 import io.toolisticon.aptk.tools.wrapper.ElementWrapper;
 import io.toolisticon.aptk.tools.wrapper.TypeElementWrapper;
+import io.toolisticon.pogen4selenium.api.CommonParentInterface;
 import io.toolisticon.pogen4selenium.api.PageObject;
 import io.toolisticon.pogen4selenium.api.PageObjectParent;
 import io.toolisticon.pogen4selenium.processor.common.MethodsToImplementHelper;
@@ -142,6 +143,11 @@ private void createClass(TypeElementWrapper wrappedTypeElement, PageObjectWrappe
         					e.getEnclosingElement().get()
         				).getQualifiedName().equals(PageObjectParent.class.getCanonicalName()))
     			)
+        		// filter out all CommonParentInterface methods
+        		.filter(e -> !(ElementWrapper.toTypeElement(
+        					e.getEnclosingElement().get()
+        				).getQualifiedName().equals(CommonParentInterface.class.getCanonicalName()))
+    			)
         		.map(MethodsToImplementHelper::new)
 	    		.collect(Collectors.toSet());
         
diff --git a/pogen4selenium-processor/src/main/resources/DataToExtract.tpl b/pogen4selenium-processor/src/main/resources/DataToExtract.tpl
@@ -45,7 +45,7 @@ public class ${ toImplementHelper.implementationClassName }  extends DataObjectP
 		${action.generateCode}
 !{/for}
 !{if method.returnsPageObject}	
-		return new ${method.getNextImplClassName}(getDriver()).pause(Duration.ofMillis(${method.afterPause}L));
+		return getPageObjectInstance(${method.getNextImplClassName}.class).pause(Duration.ofMillis(${method.afterPause}L));
 !{else}
 		return this;	
 !{/if}
diff --git a/pogen4selenium-processor/src/main/resources/PageObject.tpl b/pogen4selenium-processor/src/main/resources/PageObject.tpl
@@ -63,7 +63,7 @@ public class ${ toImplementHelper.implementationClassName } ${toImplementHelper.
 !{elseif method.getExtractData.isPresent}
 		return ${method.getExtractData.get.getFinalMethodCall}
 !{else}
-		return new ${method.getNextImplClassName}(getDriver()).pause(Duration.ofMillis(${method.afterPause}L));
+		return getPageObjectInstance(${method.getNextImplClassName}.class).pause(Duration.ofMillis(${method.afterPause}L));
 !{/if}
 	}
 !{/for}	
diff --git a/pom.xml b/pom.xml
@@ -3,11 +3,11 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>io.toolisticon.pogen4selenium</groupId>
 	<artifactId>pogen4selenium</artifactId>
-	<version>0.9.1</version>
+	<version>0.10.0</version>
 	<packaging>pom</packaging>
 	<name>pogen4selenium</name>
 	<description>Please refer to https://github.com/toolisticon/pogen4selenium</description>
-	<url>https://github.com/holisticon/pogen4selenium</url>
+	<url>https://github.com/toolisticon/pogen4selenium</url>
 	<organization>
 		<name/>
 		<url/>
@@ -51,7 +51,7 @@
 		<!-- project dependency versions -->
 		<cute.version>1.8.2</cute.version>
 		<spiap.version>0.11.0</spiap.version>
-		<aptk.version>0.30.3</aptk.version>
+		<aptk.version>0.30.5</aptk.version>
 		<selenium.version>4.27.0</selenium.version>
 		
 		<!-- versions of test dependencies -->
@@ -85,7 +85,7 @@
 		<maven-site-plugin.version>3.12.1</maven-site-plugin.version>
 		<maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
 		<maven-versions-plugin.version>2.16.2</maven-versions-plugin.version>
-		
+		 
 		<gitflow-maven-plugin.version>1.20.0</gitflow-maven-plugin.version>
         <sonatype-centralPublishingPlugin.version>0.8.0</sonatype-centralPublishingPlugin.version>
 	</properties>

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +package io.toolisticon.pogen4selenium.runtime;
++
 +public interface CommonPageObjectCreator {
++
 +}
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public WebDriver getDriver() {`
`39`	`39`	`return this.driver;`
`40`	`40`	`}`
`41`	`41`
`42`		`-`
	`42`	`+`
`43`	`43`	`@Override`
`44`	`44`	`public PAGEOBJECT pause(Duration duration) {`
`45`	`45`	`new Actions(driver).pause(duration).perform();`