fix issue-64708

akash-manna-sky · akash-manna-sky · commit e7dc1b897bab · 2025-11-03T00:16:55.000+05:30
diff --git a/src/main/java/org/jenkinsci/test/acceptance/plugins/gerrit_trigger/GerritTriggerJob.java b/src/main/java/org/jenkinsci/test/acceptance/plugins/gerrit_trigger/GerritTriggerJob.java
@@ -59,7 +59,7 @@ public class GerritTriggerJob extends PageObject {
             "/com-sonyericsson-hudson-plugins-gerrit-trigger-hudsontrigger-GerritTrigger/triggerOnEvents/commentAddedTriggerApprovalValue");
 
     public GerritTriggerJob(Jenkins jenkins, String jobName) {
-        super(jenkins.injector, jenkins.url("job/" + jobName + "/configure"));
+        super(jenkins, jenkins.url("job/" + jobName + "/configure"));
         this.jenkins = jenkins;
     }
 
diff --git a/src/main/java/org/jenkinsci/test/acceptance/plugins/gerrit_trigger/GerritTriggerNewServer.java b/src/main/java/org/jenkinsci/test/acceptance/plugins/gerrit_trigger/GerritTriggerNewServer.java
@@ -38,7 +38,7 @@ public class GerritTriggerNewServer extends PageObject {
     public final Control modeDefault = control("/mode[com.sonyericsson.hudson.plugins.gerrit.trigger.GerritServer]");
 
     public GerritTriggerNewServer(Jenkins jenkins) {
-        super(jenkins.injector, jenkins.url("gerrit-trigger/newServer"));
+        super(jenkins, jenkins.url("gerrit-trigger/newServer"));
         this.jenkins = jenkins;
     }
 
diff --git a/src/main/java/org/jenkinsci/test/acceptance/plugins/gerrit_trigger/GerritTriggerServer.java b/src/main/java/org/jenkinsci/test/acceptance/plugins/gerrit_trigger/GerritTriggerServer.java
@@ -59,7 +59,7 @@ public class GerritTriggerServer extends PageObject {
     private static final String serverUrl = "gerrit-trigger/server/";
 
     public GerritTriggerServer(Jenkins jenkins, String serverName) {
-        super(jenkins.injector, jenkins.url(serverUrl + serverName));
+        super(jenkins, jenkins.url(serverUrl + serverName));
         this.jenkins = jenkins;
     }
 
diff --git a/src/main/java/org/jenkinsci/test/acceptance/plugins/logparser/LogParserOutputPage.java b/src/main/java/org/jenkinsci/test/acceptance/plugins/logparser/LogParserOutputPage.java
@@ -41,7 +41,7 @@ public String getFrameName() {
      * @param po The page of the logparser.
      */
     public LogParserOutputPage(PageObject po) {
-        super(po.injector, po.url("parsed_console"));
+        super(po, po.url("parsed_console"));
     }
 
     /**
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/po/Action.java b/src/main/java/org/jenkinsci/test/acceptance/po/Action.java
@@ -37,7 +37,7 @@ public abstract class Action extends PageObject {
     private final String linkText;
 
     public Action(ContainerPageObject parent, String relative, String linkText) {
-        super(parent.injector, parent.url(relative + "/"));
+        super(parent, parent.url(relative + "/"));
         this.parent = parent;
         this.linkText = linkText;
     }
diff --git a/src/main/java/org/jenkinsci/test/acceptance/po/Artifact.java b/src/main/java/org/jenkinsci/test/acceptance/po/Artifact.java
@@ -19,7 +19,7 @@ public class Artifact extends PageObject {
     private final @NonNull String path;
 
     public Artifact(@NonNull Build build, @NonNull String path) {
-        super(build.injector, build.url("artifact/%s", path));
+        super(build, build.url("artifact/%s", path));
         this.build = build;
         this.path = path;
     }
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/BuildHistory.java b/src/main/java/org/jenkinsci/test/acceptance/po/BuildHistory.java
@@ -16,11 +16,11 @@ public class BuildHistory extends PageObject {
     private static final Pattern CONSOLE_LINK_PATTERN = Pattern.compile("/job/(.+?)/(\\d+)/console");
 
     public BuildHistory(Node parent) {
-        super(parent.injector, parent.url("builds"));
+        super(parent, parent.url("builds"));
     }
 
     public BuildHistory(View parent) {
-        super(parent.injector, parent.url("builds"));
+        super(parent, parent.url("builds"));
     }
 
     public Set<Build> getBuilds() {
diff --git a/src/main/java/org/jenkinsci/test/acceptance/po/JenkinsConfig.java b/src/main/java/org/jenkinsci/test/acceptance/po/JenkinsConfig.java
@@ -14,7 +14,7 @@ public class JenkinsConfig extends ConfigurablePageObject {
     public final Control quietPeriod = control("/jenkins-model-GlobalQuietPeriodConfiguration/quietPeriod");
 
     public JenkinsConfig(Jenkins jenkins) {
-        super(jenkins.injector, jenkins.url("configure"));
+        super(jenkins, jenkins.url("configure"));
         this.jenkins = jenkins;
     }
 
diff --git a/src/main/java/org/jenkinsci/test/acceptance/po/Logout.java b/src/main/java/org/jenkinsci/test/acceptance/po/Logout.java
@@ -6,6 +6,6 @@
  */
 public class Logout extends PageObject {
     public Logout(Jenkins jenkins) {
-        super(jenkins.injector, jenkins.url("logout"));
+        super(jenkins, jenkins.url("logout"));
     }
 }
diff --git a/src/main/java/org/jenkinsci/test/acceptance/po/PageObject.java b/src/main/java/org/jenkinsci/test/acceptance/po/PageObject.java
@@ -47,6 +47,11 @@ public abstract class PageObject extends CapybaraPortingLayerImpl {
 
     private static final RandomNameGenerator RND = new RandomNameGenerator();
 
+    /**
+     * @deprecated Use {@link #PageObject(PageObject, URL)} instead to preserve context.
+     *             This constructor should only be used for top-level objects like {@link Jenkins}.
+     */
+    @Deprecated
     public PageObject(Injector injector, URL url) {
         super(injector);
         this.url = url;
diff --git a/src/main/java/org/jenkinsci/test/acceptance/po/PluginManager.java b/src/main/java/org/jenkinsci/test/acceptance/po/PluginManager.java
@@ -63,7 +63,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/WizardCreateAdminUser.java b/src/main/java/org/jenkinsci/test/acceptance/po/WizardCreateAdminUser.java
@@ -49,7 +49,7 @@ public class WizardCreateAdminUser extends PageObject {
     JenkinsController controller;
 
     public WizardCreateAdminUser(Jenkins jenkins) {
-        super(jenkins.injector, jenkins.url(""));
+        super(jenkins, jenkins.url(""));
     }
 
     public WizardCreateAdminUser createAdminUser(String userName, String password, String fullName, String email) {
diff --git a/src/main/java/org/jenkinsci/test/acceptance/po/WizardCustomizeJenkins.java b/src/main/java/org/jenkinsci/test/acceptance/po/WizardCustomizeJenkins.java
@@ -42,7 +42,7 @@
 public class WizardCustomizeJenkins extends PageObject {
 
     public WizardCustomizeJenkins(Jenkins jenkins) {
-        super(jenkins.injector, jenkins.url(""));
+        super(jenkins, jenkins.url(""));
     }
 
     public WizardCustomizeJenkins doInstallSuggested() {
diff --git a/src/main/java/org/jenkinsci/test/acceptance/po/WizardLogin.java b/src/main/java/org/jenkinsci/test/acceptance/po/WizardLogin.java
@@ -47,7 +47,7 @@ public class WizardLogin extends PageObject {
     private Control cLogin = control("/Continue");
 
     public WizardLogin(Jenkins jenkins) {
-        super(jenkins.injector, jenkins.url(""));
+        super(jenkins, jenkins.url(""));
     }
 
     /**
diff --git a/src/main/java/org/jenkinsci/test/acceptance/utils/pluginTests/SecurityDisabler.java b/src/main/java/org/jenkinsci/test/acceptance/utils/pluginTests/SecurityDisabler.java
@@ -35,7 +35,7 @@ public class SecurityDisabler extends PageObject {
     public final Jenkins jenkins;
 
     public SecurityDisabler(Jenkins jenkins) {
-        super(jenkins.injector, jenkins.url("configureSecurity"));
+        super(jenkins, jenkins.url("configureSecurity"));
         this.jenkins = jenkins;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public class GerritTriggerJob extends PageObject {`
`59`	`59`	`"/com-sonyericsson-hudson-plugins-gerrit-trigger-hudsontrigger-GerritTrigger/triggerOnEvents/commentAddedTriggerApprovalValue");`
`60`	`60`
`61`	`61`	`public GerritTriggerJob(Jenkins jenkins, String jobName) {`
`62`		`- super(jenkins.injector, jenkins.url("job/" + jobName + "/configure"));`
	`62`	`+ super(jenkins, jenkins.url("job/" + jobName + "/configure"));`
`63`	`63`	`this.jenkins = jenkins;`
`64`	`64`	`}`
`65`	`65`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public class GerritTriggerNewServer extends PageObject {`
`38`	`38`	`public final Control modeDefault = control("/mode[com.sonyericsson.hudson.plugins.gerrit.trigger.GerritServer]");`
`39`	`39`
`40`	`40`	`public GerritTriggerNewServer(Jenkins jenkins) {`
`41`		`- super(jenkins.injector, jenkins.url("gerrit-trigger/newServer"));`
	`41`	`+ super(jenkins, jenkins.url("gerrit-trigger/newServer"));`
`42`	`42`	`this.jenkins = jenkins;`
`43`	`43`	`}`
`44`	`44`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public String getFrameName() {`
`41`	`41`	`* @param po The page of the logparser.`
`42`	`42`	`*/`
`43`	`43`	`public LogParserOutputPage(PageObject po) {`
`44`		`- super(po.injector, po.url("parsed_console"));`
	`44`	`+ super(po, po.url("parsed_console"));`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`/**`
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
`@@ -37,7 +37,7 @@ public abstract class Action extends PageObject {`
`37`	`37`	`private final String linkText;`
`38`	`38`
`39`	`39`	`public Action(ContainerPageObject parent, String relative, String linkText) {`
`40`		`- super(parent.injector, parent.url(relative + "/"));`
	`40`	`+ super(parent, parent.url(relative + "/"));`
`41`	`41`	`this.parent = parent;`
`42`	`42`	`this.linkText = linkText;`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public class Artifact extends PageObject {`
`19`	`19`	`private final @NonNull String path;`
`20`	`20`
`21`	`21`	`public Artifact(@NonNull Build build, @NonNull String path) {`
`22`		`- super(build.injector, build.url("artifact/%s", path));`
	`22`	`+ super(build, build.url("artifact/%s", path));`
`23`	`23`	`this.build = build;`
`24`	`24`	`this.path = path;`
`25`	`25`	`}`
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`
Original file line number	Diff line number	Diff line change
`@@ -16,11 +16,11 @@ public class BuildHistory extends PageObject {`
`16`	`16`	`private static final Pattern CONSOLE_LINK_PATTERN = Pattern.compile("/job/(.+?)/(\\d+)/console");`
`17`	`17`
`18`	`18`	`public BuildHistory(Node parent) {`
`19`		`- super(parent.injector, parent.url("builds"));`
	`19`	`+ super(parent, parent.url("builds"));`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`public BuildHistory(View parent) {`
`23`		`- super(parent.injector, parent.url("builds"));`
	`23`	`+ super(parent, parent.url("builds"));`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`public Set<Build> getBuilds() {`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ public class JenkinsConfig extends ConfigurablePageObject {`
`14`	`14`	`public final Control quietPeriod = control("/jenkins-model-GlobalQuietPeriodConfiguration/quietPeriod");`
`15`	`15`
`16`	`16`	`public JenkinsConfig(Jenkins jenkins) {`
`17`		`- super(jenkins.injector, jenkins.url("configure"));`
	`17`	`+ super(jenkins, jenkins.url("configure"));`
`18`	`18`	`this.jenkins = jenkins;`
`19`	`19`	`}`
`20`	`20`