Skip to content

Commit 626acf5

Browse files
authored
Migrate from EE 8 to EE 9 (#103)
1 parent dc24510 commit 626acf5

File tree

5 files changed

+13
-13
lines changed

5 files changed

+13
-13
lines changed

src/main/java/org/jenkinsci/plugin/gitea/GiteaBrowser.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
import org.apache.commons.lang.StringUtils;
3939
import org.jenkinsci.plugin.gitea.servers.GiteaServers;
4040
import org.kohsuke.stapler.DataBoundConstructor;
41-
import org.kohsuke.stapler.StaplerRequest;
41+
import org.kohsuke.stapler.StaplerRequest2;
4242

4343
/**
4444
* A {@link GitRepositoryBrowser} for Gitea.
@@ -143,7 +143,7 @@ public String getDisplayName() {
143143
* {@inheritDoc}
144144
*/
145145
@Override
146-
public GiteaBrowser newInstance(StaplerRequest req, JSONObject jsonObject) throws FormException {
146+
public GiteaBrowser newInstance(StaplerRequest2 req, JSONObject jsonObject) throws FormException {
147147
return req.bindJSON(GiteaBrowser.class, jsonObject);
148148
}
149149
}

src/main/java/org/jenkinsci/plugin/gitea/GiteaLink.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public String getIconFileName() {
8787
Icon icon = IconSet.icons.getIconByClassSpec(iconClassName + " icon-md");
8888
if (icon != null) {
8989
JellyContext ctx = new JellyContext();
90-
ctx.setVariable("resURL", Stapler.getCurrentRequest().getContextPath() + Jenkins.RESOURCE_PATH);
90+
ctx.setVariable("resURL", Stapler.getCurrentRequest2().getContextPath() + Jenkins.RESOURCE_PATH);
9191
return icon.getQualifiedUrl(ctx);
9292
}
9393
}

src/main/java/org/jenkinsci/plugin/gitea/GiteaWebhookAction.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,17 @@
2828
import hudson.model.UnprotectedRootAction;
2929
import hudson.security.csrf.CrumbExclusion;
3030
import hudson.util.HttpResponses;
31+
import jakarta.servlet.FilterChain;
32+
import jakarta.servlet.ServletException;
33+
import jakarta.servlet.http.HttpServletRequest;
34+
import jakarta.servlet.http.HttpServletResponse;
3135
import java.io.IOException;
3236
import java.util.logging.Level;
3337
import java.util.logging.Logger;
34-
import javax.servlet.FilterChain;
35-
import javax.servlet.ServletException;
36-
import javax.servlet.http.HttpServletRequest;
37-
import javax.servlet.http.HttpServletResponse;
3838
import jenkins.scm.api.SCMEvent;
3939
import org.apache.commons.lang.StringUtils;
4040
import org.kohsuke.stapler.HttpResponse;
41-
import org.kohsuke.stapler.StaplerRequest;
41+
import org.kohsuke.stapler.StaplerRequest2;
4242

4343
@Extension
4444
public class GiteaWebhookAction extends CrumbExclusion implements UnprotectedRootAction {
@@ -70,7 +70,7 @@ public boolean process(HttpServletRequest req, HttpServletResponse resp, FilterC
7070
return false;
7171
}
7272

73-
public HttpResponse doPost(StaplerRequest request) throws IOException {
73+
public HttpResponse doPost(StaplerRequest2 request) throws IOException {
7474
String origin = SCMEvent.originOf(request);
7575
if (!request.getMethod().equals("POST")) {
7676
LOGGER.log(Level.FINE, "Received {0} request (expecting POST) from {1}",

src/main/java/org/jenkinsci/plugin/gitea/servers/GiteaServers.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
import jenkins.model.Jenkins;
4444
import net.sf.json.JSONObject;
4545
import org.apache.commons.lang.StringUtils;
46-
import org.kohsuke.stapler.StaplerRequest;
46+
import org.kohsuke.stapler.StaplerRequest2;
4747

4848
/**
4949
* Represents the global configuration of Gitea servers.
@@ -214,7 +214,7 @@ public ListBoxModel getServerItems() {
214214
* {@inheritDoc}
215215
*/
216216
@Override
217-
public boolean configure(StaplerRequest req, JSONObject json) throws FormException {
217+
public boolean configure(StaplerRequest2 req, JSONObject json) throws FormException {
218218
req.bindJSON(this, json);
219219
return true;
220220
}

src/main/java/org/jenkinsci/plugin/gitea/tasks/GiteaAssetPublisher.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
import org.jenkinsci.plugin.gitea.client.api.GiteaConnection;
7272
import org.kohsuke.stapler.DataBoundConstructor;
7373
import org.kohsuke.stapler.DataBoundSetter;
74-
import org.kohsuke.stapler.StaplerRequest;
74+
import org.kohsuke.stapler.StaplerRequest2;
7575

7676
public class GiteaAssetPublisher implements SimpleBuildStep, Describable<GiteaAssetPublisher> {
7777

@@ -311,7 +311,7 @@ public boolean isApplicable(Class<? extends AbstractProject> jobType) {
311311
}
312312

313313
@Override
314-
public GiteaAssetPublisher newInstance(@NonNull StaplerRequest req, JSONObject formData) throws FormException {
314+
public GiteaAssetPublisher newInstance(@NonNull StaplerRequest2 req, JSONObject formData) throws FormException {
315315
return req.bindJSON(GiteaAssetPublisher.class, formData);
316316
}
317317

0 commit comments

Comments
 (0)