Skip to content

Migrate from EE 8 to EE 9 #225

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

Merged
merged 1 commit into from
Mar 3, 2025
Merged

Migrate from EE 8 to EE 9 #225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>4.86</version>
<version>5.7</version>
<relativePath />
</parent>
<artifactId>sse-gateway</artifactId>
Expand All @@ -15,8 +15,8 @@
<revision>1.28</revision>
<changelist>-SNAPSHOT</changelist>
<!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
<jenkins.baseline>2.387</jenkins.baseline>
<jenkins.version>${jenkins.baseline}.3</jenkins.version>
<jenkins.baseline>2.479</jenkins.baseline>
<jenkins.version>${jenkins.baseline}.1</jenkins.version>
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
<node.version>8.17.0</node.version>
<npm.version>6.13.4</npm.version>
Expand Down Expand Up @@ -61,7 +61,7 @@
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-${jenkins.baseline}.x</artifactId>
<version>2543.vfb_1a_5fb_9496d</version>
<version>3893.v213a_42768d35</version>
<scope>import</scope>
<type>pom</type>
</dependency>
Expand Down
28 changes: 14 additions & 14 deletions src/main/java/org/jenkinsci/plugins/ssegateway/Endpoint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,21 +36,21 @@
import org.kohsuke.accmod.restrictions.DoNotUse;
import org.kohsuke.accmod.restrictions.NoExternalUse;
import org.kohsuke.stapler.HttpResponse;
import org.kohsuke.stapler.StaplerRequest;
import org.kohsuke.stapler.StaplerResponse;
import org.kohsuke.stapler.StaplerRequest2;
import org.kohsuke.stapler.StaplerResponse2;
import org.kohsuke.stapler.interceptor.RequirePOST;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import jakarta.servlet.Filter;
import jakarta.servlet.FilterChain;
import jakarta.servlet.FilterConfig;
import jakarta.servlet.ServletException;
import jakarta.servlet.ServletRequest;
import jakarta.servlet.ServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpSession;
import java.io.File;
import java.io.IOException;
import java.net.URLDecoder;
Expand Down Expand Up @@ -134,7 +134,7 @@ public String getUrlName() {
}

@Restricted(DoNotUse.class) // Web only
public HttpResponse doConnect(StaplerRequest request, StaplerResponse response) throws IOException {
public HttpResponse doConnect(StaplerRequest2 request, StaplerResponse2 response) throws IOException {
String clientId = request.getParameter("clientId");

if (clientId == null) {
Expand Down Expand Up @@ -166,7 +166,7 @@ public HttpResponse doConnect(StaplerRequest request, StaplerResponse response)

@RequirePOST
@Restricted(DoNotUse.class) // Web only
public HttpResponse doConfigure(StaplerRequest request, StaplerResponse response) throws IOException {
public HttpResponse doConfigure(StaplerRequest2 request, StaplerResponse2 response) throws IOException {
SubscriptionConfigQueue.SubscriptionConfig subscriptionConfig = SubscriptionConfigQueue.SubscriptionConfig.fromRequest(request);
if(LOGGER.isDebugEnabled()){
LOGGER.debug("Processing configuration request. batchId={}", subscriptionConfig.getBatchId());
Expand All @@ -193,7 +193,7 @@ public HttpResponse doConfigure(StaplerRequest request, StaplerResponse response
}

@Restricted(DoNotUse.class) // Web only
public HttpResponse doPing(StaplerRequest request) throws IOException {
public HttpResponse doPing(StaplerRequest2 request) throws IOException {
String dispatcherId = request.getParameter("dispatcherId");

if (dispatcherId != null) {
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/jenkinsci/plugins/ssegateway/SubscriptionConfigQueue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@
import org.jenkinsci.plugins.ssegateway.sse.EventDispatcherFactory;
import org.kohsuke.accmod.Restricted;
import org.kohsuke.accmod.restrictions.NoExternalUse;
import org.kohsuke.stapler.StaplerRequest;
import org.kohsuke.stapler.StaplerRequest2;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.servlet.http.HttpSession;
import jakarta.servlet.http.HttpSession;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
Expand Down Expand Up @@ -170,7 +170,7 @@ String getDispatcherId() {
return dispatcherId;
}

static SubscriptionConfig fromRequest(StaplerRequest request) throws IOException {
static SubscriptionConfig fromRequest(StaplerRequest2 request) throws IOException {
JSONObject payload = Util.readJSONPayload(request);
SubscriptionConfig config = new SubscriptionConfig();

Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/jenkinsci/plugins/ssegateway/Util.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
import org.apache.commons.io.IOUtils;
import org.kohsuke.accmod.Restricted;
import org.kohsuke.accmod.restrictions.NoExternalUse;
import org.kohsuke.stapler.StaplerRequest;
import org.kohsuke.stapler.StaplerRequest2;

import javax.servlet.http.HttpSession;
import jakarta.servlet.http.HttpSession;
import java.io.File;
import java.io.IOException;
import java.io.InputStreamReader;
Expand All @@ -48,7 +48,7 @@ public class Util {
private Util() {
}

public static JSONObject readJSONPayload(StaplerRequest request) throws IOException {
public static JSONObject readJSONPayload(StaplerRequest2 request) throws IOException {
String characterEncoding = request.getCharacterEncoding();

if (characterEncoding == null) {
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/org/jenkinsci/plugins/ssegateway/sse/AsynchEventDispatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.servlet.AsyncContext;
import javax.servlet.AsyncEvent;
import javax.servlet.AsyncListener;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.AsyncContext;
import jakarta.servlet.AsyncEvent;
import jakarta.servlet.AsyncListener;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/org/jenkinsci/plugins/ssegateway/sse/EventDispatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSessionEvent;
import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpSessionEvent;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.Serializable;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/jenkinsci/plugins/ssegateway/sse/EventDispatcherFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@

import edu.umd.cs.findbugs.annotations.CheckForNull;
import edu.umd.cs.findbugs.annotations.NonNull;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpSession;
import java.util.HashMap;
import java.util.Map;

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/jenkinsci/plugins/ssegateway/sse/SynchEventDispatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;

/**
* Synchronous event dispatcher.
Expand Down
18 changes: 9 additions & 9 deletions src/test/java/org/jenkinsci/plugins/ssegateway/EndpointUnitTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.kohsuke.stapler.StaplerRequest;
import org.kohsuke.stapler.StaplerResponse;
import org.kohsuke.stapler.StaplerRequest2;
import org.kohsuke.stapler.StaplerResponse2;
import org.mockito.Mockito;

import javax.servlet.ServletException;
import javax.servlet.http.HttpSession;
import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpSession;
import java.io.IOException;
import java.util.Map;

Expand All @@ -25,13 +25,13 @@
public class EndpointUnitTest {

private EventDispatcher eventDispatcher;
private StaplerResponse response;
private StaplerResponse2 response;

@Before
public void setup() {
SubscriptionConfigQueue.start();
eventDispatcher = new MockEventDispatcher();
response = Mockito.mock(StaplerResponse.class);
response = Mockito.mock(StaplerResponse2.class);
}

@After
Expand All @@ -51,7 +51,7 @@ public void test_configure_empty_config() throws IOException, ServletException {
Endpoint endpoint = new Endpoint() {
@Override protected void init() {}
};
StaplerRequest request = newRequest("/sample-config-01.json");
StaplerRequest2 request = newRequest("/sample-config-01.json");

endpoint.doConfigure(request, response);

Expand Down Expand Up @@ -99,8 +99,8 @@ public void test_configure_subscribe_unsubscribeAll() throws IOException, Servle
waitForCountToShrink(subscribers, 0);
}

private StaplerRequest newRequest(String config) throws IOException {
StaplerRequest request = Mockito.mock(StaplerRequest.class);
private StaplerRequest2 newRequest(String config) throws IOException {
StaplerRequest2 request = Mockito.mock(StaplerRequest2.class);
HttpSession session = Mockito.mock(HttpSession.class);
Map dispatchers = Mockito.mock(Map.class);

Expand Down
6 changes: 3 additions & 3 deletions src/test/java/org/jenkinsci/plugins/ssegateway/MockEventDispatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
import org.jenkinsci.plugins.ssegateway.sse.EventDispatcher;
import org.mockito.Mockito;

import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;

/**
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/org/jenkinsci/plugins/ssegateway/MockServletInputStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
*/
package org.jenkinsci.plugins.ssegateway;

import javax.servlet.ReadListener;
import javax.servlet.ServletInputStream;
import jakarta.servlet.ReadListener;
import jakarta.servlet.ServletInputStream;
import java.io.IOException;
import java.io.InputStream;

Expand Down
Loading