Refactor constructors to use PageObject context instead of Injector

akash-manna-sky · akash-manna-sky · commit cb90118ec2e1 · 2025-05-20T11:29:57.000+05:30
diff --git a/src/main/java/org/jenkinsci/test/acceptance/plugins/dashboard_view/DashboardView.java b/src/main/java/org/jenkinsci/test/acceptance/plugins/dashboard_view/DashboardView.java
@@ -1,6 +1,5 @@
 package org.jenkinsci.test.acceptance.plugins.dashboard_view;
 
-import com.google.inject.Injector;
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import java.net.URL;
 import java.util.ArrayList;
@@ -16,6 +15,7 @@
 import org.jenkinsci.test.acceptance.plugins.dashboard_view.read.ProjectStatusStdJobList;
 import org.jenkinsci.test.acceptance.po.Control;
 import org.jenkinsci.test.acceptance.po.Describable;
+import org.jenkinsci.test.acceptance.po.PageObject;
 import org.jenkinsci.test.acceptance.po.View;
 import org.openqa.selenium.By;
 import org.openqa.selenium.NoSuchElementException;
@@ -68,8 +68,8 @@ public class DashboardView extends View {
      * @param injector Injector to use.
      * @param url      URL of view.
      */
-    public DashboardView(Injector injector, URL url) {
-        super(injector, url);
+    public DashboardView(PageObject context, URL url) {
+        super(context, url);
     }
 
     /**
diff --git a/src/main/java/org/jenkinsci/test/acceptance/plugins/gitlab_plugin/GitLabOrganizationFolder.java b/src/main/java/org/jenkinsci/test/acceptance/plugins/gitlab_plugin/GitLabOrganizationFolder.java
@@ -1,15 +1,15 @@
 package org.jenkinsci.test.acceptance.plugins.gitlab_plugin;
 
-import com.google.inject.Injector;
 import java.net.URL;
 import java.time.Duration;
 import org.jenkinsci.test.acceptance.po.Describable;
 import org.jenkinsci.test.acceptance.po.Folder;
+import org.jenkinsci.test.acceptance.po.PageObject;
 
 @Describable("jenkins.branch.OrganizationFolder")
 public class GitLabOrganizationFolder extends Folder {
-    public GitLabOrganizationFolder(Injector injector, URL url, String name) {
-        super(injector, url, name);
+    public GitLabOrganizationFolder(PageObject context, URL url, String name) {
+        super(context, url, name);
     }
 
     public void create(String owner) {
diff --git a/src/main/java/org/jenkinsci/test/acceptance/plugins/maven/MavenModule.java b/src/main/java/org/jenkinsci/test/acceptance/plugins/maven/MavenModule.java
@@ -28,7 +28,7 @@
 public class MavenModule extends Job {
 
     public MavenModule(MavenModuleSet job, String name) {
-        super(job.injector, job.url("./%s/", name), name);
+        super(job, job.url("./%s/", name), name);
     }
 
     @Override
diff --git a/src/main/java/org/jenkinsci/test/acceptance/plugins/maven/MavenModuleSet.java b/src/main/java/org/jenkinsci/test/acceptance/plugins/maven/MavenModuleSet.java
@@ -23,7 +23,6 @@
  */
 package org.jenkinsci.test.acceptance.plugins.maven;
 
-import com.google.inject.Injector;
 import java.net.URL;
 import java.util.Objects;
 import java.util.function.Consumer;
@@ -33,6 +32,7 @@
 import org.jenkinsci.test.acceptance.po.Describable;
 import org.jenkinsci.test.acceptance.po.Jenkins;
 import org.jenkinsci.test.acceptance.po.Job;
+import org.jenkinsci.test.acceptance.po.PageObject;
 import org.jenkinsci.test.acceptance.po.PostBuildStep;
 import org.jenkinsci.test.acceptance.po.ShellBuildStep;
 import org.openqa.selenium.WebElement;
@@ -44,8 +44,8 @@ public class MavenModuleSet extends Job {
 
     private Control advancedButton = control("/advanced-button[1]");
 
-    public MavenModuleSet(Injector injector, URL url, String name) {
-        super(injector, url, name);
+    public MavenModuleSet(PageObject context, URL url, String name) {
+        super(context, url, name);
     }
 
     public MavenModuleSet options(String options) {
diff --git a/src/main/java/org/jenkinsci/test/acceptance/plugins/nested_view/NestedView.java b/src/main/java/org/jenkinsci/test/acceptance/plugins/nested_view/NestedView.java
@@ -1,8 +1,8 @@
 package org.jenkinsci.test.acceptance.plugins.nested_view;
 
-import com.google.inject.Injector;
 import java.net.URL;
 import org.jenkinsci.test.acceptance.po.Describable;
+import org.jenkinsci.test.acceptance.po.PageObject;
 import org.jenkinsci.test.acceptance.po.View;
 import org.jenkinsci.test.acceptance.po.ViewsMixIn;
 
@@ -13,8 +13,8 @@
 public class NestedView extends View {
     public final ViewsMixIn views = new ViewsMixIn(this);
 
-    public NestedView(Injector injector, URL url) {
-        super(injector, url);
+    public NestedView(PageObject context, URL url) {
+        super(context, url);
     }
 
     public void setDefaultView(String name) {
diff --git a/src/main/java/org/jenkinsci/test/acceptance/po/Build.java b/src/main/java/org/jenkinsci/test/acceptance/po/Build.java
@@ -38,17 +38,17 @@ public enum Result {
     private boolean success;
 
     public Build(Job job, int buildNumber) {
-        super(job.injector, job.url("%d/", buildNumber));
+        super(job, job.url("%d/", buildNumber));
         this.job = job;
     }
 
     public Build(Job job, String permalink) {
-        super(job.injector, job.url(permalink + "/"));
+        super(job, job.url(permalink + "/"));
         this.job = job;
     }
 
     public Build(Job job, URL url) {
-        super(job.injector, url);
+        super(job, url);
         this.job = job;
     }
 
diff --git a/src/main/java/org/jenkinsci/test/acceptance/po/Folder.java b/src/main/java/org/jenkinsci/test/acceptance/po/Folder.java
@@ -45,6 +45,11 @@ public class Folder extends TopLevelItem implements Container {
     private final By viewTab = by.css(".tabBar .tab a");
     private final By activeViewTab = by.css(".tabBar .tab.active a");
 
+    /**
+     * @deprecated Use {@link #ConfigurablePageObject(PageObject, URL)} instead to properly maintain context hierarchy.
+     *             This constructor will be removed in a future version.
+     */
+    @Deprecated
     public Folder(final Injector injector, final URL url, final String name) {
         super(injector, url, name);
 
diff --git a/src/main/java/org/jenkinsci/test/acceptance/po/FreeStyleJob.java b/src/main/java/org/jenkinsci/test/acceptance/po/FreeStyleJob.java
@@ -1,14 +1,13 @@
 package org.jenkinsci.test.acceptance.po;
 
-import com.google.inject.Injector;
 import java.net.URL;
 
 /**
  * @author Kohsuke Kawaguchi
  */
 @Describable("hudson.model.FreeStyleProject")
 public class FreeStyleJob extends Job {
-    public FreeStyleJob(Injector injector, URL url, String name) {
-        super(injector, url, name);
+    public FreeStyleJob(PageObject context, URL url, String name) {
+        super(context, url, name);
     }
 }
diff --git a/src/main/java/org/jenkinsci/test/acceptance/po/FreeStyleMultiBranchJob.java b/src/main/java/org/jenkinsci/test/acceptance/po/FreeStyleMultiBranchJob.java
@@ -1,6 +1,5 @@
 package org.jenkinsci.test.acceptance.po;
 
-import com.google.inject.Injector;
 import java.net.URL;
 import org.openqa.selenium.WebElement;
 
@@ -11,8 +10,8 @@
  */
 @Describable("com.github.mjdetullio.jenkins.plugins.multibranch.FreeStyleMultiBranchProject")
 public class FreeStyleMultiBranchJob extends Job {
-    public FreeStyleMultiBranchJob(Injector injector, URL url, String name) {
-        super(injector, url, name);
+    public FreeStyleMultiBranchJob(PageObject context, URL url, String name) {
+        super(context, url, name);
     }
 
     @Override
diff --git a/src/main/java/org/jenkinsci/test/acceptance/po/Jenkins.java b/src/main/java/org/jenkinsci/test/acceptance/po/Jenkins.java
@@ -2,7 +2,6 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.inject.Injector;
 import hudson.util.VersionNumber;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -53,8 +52,8 @@ public class Jenkins extends Node implements Container {
     public final ViewsMixIn views;
     public final SlavesMixIn slaves;
 
-    private Jenkins(Injector injector, URL url) {
-        super(injector, url);
+    private Jenkins(PageObject context, URL url) {
+        super(context, url);
         waitForStarted();
         jobs = new JobsMixIn(this);
         views = new ViewsMixIn(this);
@@ -66,8 +65,8 @@ public Jenkins getJenkins() {
         return this;
     }
 
-    public Jenkins(Injector injector, JenkinsController controller) {
-        this(injector, startAndGetUrl(controller));
+    public Jenkins(PageObject context, JenkinsController controller) {
+        this(context, startAndGetUrl(controller));
         this.controller = controller;
     }
 
diff --git a/src/main/java/org/jenkinsci/test/acceptance/po/Job.java b/src/main/java/org/jenkinsci/test/acceptance/po/Job.java
@@ -64,6 +64,11 @@ public List<Parameter> getParameters() {
     private final Control hasSlaveAffinity = control("/hasSlaveAffinity");
     private final Control assignedLabel = control("/hasSlaveAffinity/assignedLabelString", "/label");
 
+    /**
+     * @deprecated Use {@link #ConfigurablePageObject(PageObject, URL)} instead to properly maintain context hierarchy.
+     *             This constructor will be removed in a future version.
+     */
+    @Deprecated
     public Job(Injector injector, URL url, String name) {
         super(injector, url, name);
     }
diff --git a/src/main/java/org/jenkinsci/test/acceptance/po/ListView.java b/src/main/java/org/jenkinsci/test/acceptance/po/ListView.java
@@ -1,6 +1,5 @@
 package org.jenkinsci.test.acceptance.po;
 
-import com.google.inject.Injector;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
@@ -31,8 +30,8 @@ public static <T extends ListViewColumn> T createWithColumn(final Container owne
 
     private List<ListViewColumn> columns = new ArrayList<>();
 
-    public ListView(Injector injector, URL url) {
-        super(injector, url);
+    public ListView(PageObject context, URL url) {
+        super(context, url);
     }
 
     /**
diff --git a/src/main/java/org/jenkinsci/test/acceptance/po/MatrixConfiguration.java b/src/main/java/org/jenkinsci/test/acceptance/po/MatrixConfiguration.java
@@ -1,6 +1,5 @@
 package org.jenkinsci.test.acceptance.po;
 
-import com.google.inject.Injector;
 import java.net.URL;
 
 /**
@@ -9,7 +8,7 @@
  * @author Kohsuke Kawaguchi
  */
 public class MatrixConfiguration extends Job {
-    public MatrixConfiguration(Injector injector, URL url, String name) {
-        super(injector, url, name);
+    public MatrixConfiguration(PageObject context, URL url, String name) {
+        super(context, url, name);
     }
 }
diff --git a/src/main/java/org/jenkinsci/test/acceptance/po/MatrixProject.java b/src/main/java/org/jenkinsci/test/acceptance/po/MatrixProject.java
@@ -1,7 +1,6 @@
 package org.jenkinsci.test.acceptance.po;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import com.google.inject.Injector;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
@@ -21,8 +20,8 @@ public class MatrixProject extends Job {
     public final Control hasCombinationFilter = control("/hasCombinationFilter");
     public final Control combinationFilter = control("/hasCombinationFilter/combinationFilter");
 
-    public MatrixProject(Injector injector, URL url, String name) {
-        super(injector, url, name);
+    public MatrixProject(PageObject context, URL url, String name) {
+        super(context, url, name);
     }
 
     public void addUserAxis(String name, String value) {
@@ -57,7 +56,7 @@ public List<MatrixConfiguration> getConfigurations() {
     }
 
     public MatrixConfiguration getConfiguration(String name) {
-        return new MatrixConfiguration(injector, url(name + '/'), name);
+        return new MatrixConfiguration(this, url(name + '/'), name);
     }
 
     public void setTouchStoneBuild(String filter, String result) {
diff --git a/src/main/java/org/jenkinsci/test/acceptance/po/Node.java b/src/main/java/org/jenkinsci/test/acceptance/po/Node.java
@@ -23,7 +23,6 @@
  */
 package org.jenkinsci.test.acceptance.po;
 
-import com.google.inject.Injector;
 import java.net.URL;
 import org.openqa.selenium.NoSuchElementException;
 
@@ -37,7 +36,7 @@ protected Node(Jenkins j, URL url) {
         super(j, url);
     }
 
-    protected Node(Injector i, URL url) {
+    protected Node(PageObject i, URL url) {
         super(i, url);
     }
 
diff --git a/src/main/java/org/jenkinsci/test/acceptance/po/PageObject.java b/src/main/java/org/jenkinsci/test/acceptance/po/PageObject.java
@@ -62,36 +62,6 @@ protected PageObject(PageObject context, URL url) {
         this.context = context;
     }
 
-    /**
-     * Helper constructor for migrating from injector-based initialization.
-     * Creates a page object using Jenkins as context.
-     *
-     * @param injector The injector to use
-     * @param url The URL of the page
-     * @param jenkins The Jenkins instance to use as context
-     */
-    protected PageObject(Injector injector, URL url, Jenkins jenkins) {
-        this(injector, url);
-        this.context = jenkins;
-    }
-
-    /**
-     * Factory method to help migrate from injector-based initialization.
-     * This should be used in place of direct constructor calls when a proper context is available.
-     *
-     * @param injector The injector
-     * @param url The URL of the page
-     * @return A PageObject with Jenkins as context
-     */
-    public static <T extends PageObject> T create(Class<T> type, Injector injector, URL url) {
-        Jenkins jenkins = injector.getInstance(Jenkins.class);
-        try {
-            return type.getConstructor(PageObject.class, URL.class).newInstance(jenkins, url);
-        } catch (ReflectiveOperationException e) {
-            throw new RuntimeException("Failed to create page object using context-based constructor", e);
-        }
-    }
-
     public static String createRandomName() {
         return RND.next();
     }
diff --git a/src/main/java/org/jenkinsci/test/acceptance/po/PluginManager.java b/src/main/java/org/jenkinsci/test/acceptance/po/PluginManager.java
@@ -64,7 +64,7 @@ public class PluginManager extends ContainerPageObject {
     public MockUpdateCenter mockUpdateCenter;
 
     public PluginManager(Jenkins jenkins) {
-        super(jenkins.injector, jenkins.url("pluginManager/"));
+        super(jenkins, jenkins.url("pluginManager/"));
         this.jenkins = jenkins;
         mockUpdateCenter.ensureRunning(jenkins);
     }
diff --git a/src/main/java/org/jenkinsci/test/acceptance/po/TopLevelItem.java b/src/main/java/org/jenkinsci/test/acceptance/po/TopLevelItem.java
@@ -22,6 +22,11 @@ public List<Parameter> getParameters() {
 
     private List<Parameter> parameters = new ArrayList<>();
 
+    /**
+     * @deprecated Use {@link #ConfigurablePageObject(PageObject, URL)} instead to properly maintain context hierarchy.
+     *             This constructor will be removed in a future version.
+     */
+    // @Deprecated
     public TopLevelItem(Injector injector, URL url, String name) {
         super(injector, url);
         this.name = name;
diff --git a/src/main/java/org/jenkinsci/test/acceptance/po/View.java b/src/main/java/org/jenkinsci/test/acceptance/po/View.java
@@ -1,7 +1,6 @@
 package org.jenkinsci.test.acceptance.po;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import com.google.inject.Injector;
 import java.net.URL;
 import org.hamcrest.Description;
 import org.jenkinsci.test.acceptance.Matcher;
@@ -23,8 +22,8 @@ public abstract class View extends ContainerPageObject {
 
     public final JobsMixIn jobs;
 
-    public View(Injector injector, URL url) {
-        super(injector, url);
+    public View(PageObject context, URL url) {
+        super(context, url);
         jobs = new JobsMixIn(this);
     }
 
diff --git a/src/main/java/org/jenkinsci/test/acceptance/po/WorkflowJob.java b/src/main/java/org/jenkinsci/test/acceptance/po/WorkflowJob.java
@@ -24,7 +24,6 @@
 
 package org.jenkinsci.test.acceptance.po;
 
-import com.google.inject.Injector;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import java.net.URL;
 import java.time.Duration;
@@ -37,8 +36,8 @@
 @Describable("org.jenkinsci.plugins.workflow.job.WorkflowJob")
 public class WorkflowJob extends Job {
 
-    public WorkflowJob(Injector injector, URL url, String name) {
-        super(injector, url, name);
+    public WorkflowJob(PageObject context, URL url, String name) {
+        super(context, url, name);
     }
 
     public final Control script = new Control(this, "/definition/script") {
diff --git a/src/main/java/org/jenkinsci/test/acceptance/po/WorkflowMultiBranchJob.java b/src/main/java/org/jenkinsci/test/acceptance/po/WorkflowMultiBranchJob.java

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`public class MavenModule extends Job {`
`29`	`29`
`30`	`30`	`public MavenModule(MavenModuleSet job, String name) {`
`31`		`- super(job.injector, job.url("./%s/", name), name);`
	`31`	`+ super(job, job.url("./%s/", name), name);`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -38,17 +38,17 @@ public enum Result {`
`38`	`38`	`private boolean success;`
`39`	`39`
`40`	`40`	`public Build(Job job, int buildNumber) {`
`41`		`- super(job.injector, job.url("%d/", buildNumber));`
	`41`	`+ super(job, job.url("%d/", buildNumber));`
`42`	`42`	`this.job = job;`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`public Build(Job job, String permalink) {`
`46`		`- super(job.injector, job.url(permalink + "/"));`
	`46`	`+ super(job, job.url(permalink + "/"));`
`47`	`47`	`this.job = job;`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`public Build(Job job, URL url) {`
`51`		`- super(job.injector, url);`
	`51`	`+ super(job, url);`
`52`	`52`	`this.job = job;`
`53`	`53`	`}`
`54`	`54`