Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[JENKINS-64746] public API hudson.model.UpdateCenter.HudsonUpgradeJob constructor signature change #5216

Merged
merged 6 commits into from
Feb 1, 2021
Merged

[JENKINS-64746] public API hudson.model.UpdateCenter.HudsonUpgradeJob constructor signature change #5216

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f08a336
[JENKINS-64746] restore a deprecated constructor with acegisecurity
escoem Jan 29, 2021
6db0fd1
[JENKINS-64746] restore deprecated constructors with acegisecurity
escoem Jan 29, 2021
5626cbd
[JENKINS-64746] avoid ambiguous reference
escoem Jan 29, 2021
e869e3c
[JENKINS-64746] javadoc
escoem Jan 29, 2021
a015546
still using null with cast
escoem Jan 29, 2021
5293a6f
[JENKINS-64746] missing import
escoem Jan 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 39 additions & 0 deletions core/src/main/java/hudson/model/UpdateCenter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2111,6 +2111,15 @@ public InstallationJob(Plugin plugin, UpdateSite site, Authentication auth) {
this(plugin,site,auth,false);
}

/**
* @deprecated use {@code InstallationJob(Plugin, UpdateSite, Authentication, boolean)}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
* @deprecated use {@code InstallationJob(Plugin, UpdateSite, Authentication, boolean)}
* @deprecated use {@link #InstallationJob(Plugin, UpdateSite, Authentication, boolean)}

* @see #InstallationJob(Plugin, UpdateSite, Authentication, boolean)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
* @see #InstallationJob(Plugin, UpdateSite, Authentication, boolean)

*/
@Deprecated
public InstallationJob(Plugin plugin, UpdateSite site, org.acegisecurity.Authentication auth, boolean dynamicLoad) {
this(plugin, site, auth.toSpring(), dynamicLoad);
}

public InstallationJob(Plugin plugin, UpdateSite site, Authentication auth, boolean dynamicLoad) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would also be polite to add @since 2.266 for the Spring overloads.

super(site, auth);
this.plugin = plugin;
Expand Down Expand Up @@ -2326,6 +2335,16 @@ public final class PluginDowngradeJob extends DownloadJob {

private final PluginManager pm = Jenkins.get().getPluginManager();

/**
* @deprecated use {@code PluginDowngradeJob(Plugin, UpdateSite, Authentication)}
* @see #PluginDowngradeJob(Plugin, UpdateSite, Authentication)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ditto

*/
@Deprecated
public PluginDowngradeJob(Plugin plugin, UpdateSite site, org.acegisecurity.Authentication auth) {
this(plugin, site, auth.toSpring());
}


public PluginDowngradeJob(Plugin plugin, UpdateSite site, Authentication auth) {
super(site, auth);
this.plugin = plugin;
Expand Down Expand Up @@ -2410,6 +2429,16 @@ public String toString() {
* Represents the state of the upgrade activity of Jenkins core.
*/
public final class HudsonUpgradeJob extends DownloadJob {

/**
* @deprecated use {@code HudsonUpgradeJob(UpdateSite site, Authentication auth)}
* @see #HudsonUpgradeJob(UpdateSite, Authentication)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ditto

*/
@Deprecated
jglick marked this conversation as resolved.
Show resolved Hide resolved
jglick marked this conversation as resolved.
Show resolved Hide resolved
public HudsonUpgradeJob(UpdateSite site, org.acegisecurity.Authentication auth) {
super(site, auth.toSpring());
}

public HudsonUpgradeJob(UpdateSite site, Authentication auth) {
super(site, auth);
}
Expand Down Expand Up @@ -2444,6 +2473,16 @@ protected void replace(File dst, File src) throws IOException {
}

public final class HudsonDowngradeJob extends DownloadJob {

/**
* @deprecated use {@code HudsonDowngradeJob(UpdateSite site, Authentication auth)}
* @see #HudsonDowngradeJob(UpdateSite, Authentication)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ditto

*/
@Deprecated
public HudsonDowngradeJob(UpdateSite site, org.acegisecurity.Authentication auth) {
super(site, auth.toSpring());
}

public HudsonDowngradeJob(UpdateSite site, Authentication auth) {
super(site, auth);
}
Expand Down
3 changes: 2 additions & 1 deletion test/src/test/java/jenkins/install/InstallUtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import java.util.Map;
import java.util.UUID;

import hudson.security.ACL;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
import hudson.security.ACL;

import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
Expand Down Expand Up @@ -180,7 +181,7 @@ else if("Installing".equals(statusType)) {
json.put("dependencies", new JSONArray());
Plugin p = new Plugin(getId(), json);

InstallationJob job = new InstallationJob(p, null, null, false);
InstallationJob job = new InstallationJob(p, null, ACL.SYSTEM2, false);
escoem marked this conversation as resolved.
Show resolved Hide resolved
job.status = status;
job.setCorrelationId(UUID.randomUUID()); // this indicates the plugin was 'directly selected'
updates.add(job);
Expand Down