Attempting to deal with @WebParam annotation

briandilley · May 24, 2023 · eb433ed · eb433ed
1 parent 05ce039
commit eb433ed
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/build.gradle b/build.gradle
@@ -99,6 +99,8 @@ dependencies {
     // update jakarta.servlet-api to version 6+ when JDK baseline is increased to 11+
     servletSupportImplementation 'jakarta.servlet:jakarta.servlet-api:5.0.0'
 
+    implementation group: 'jakarta.jws', name: 'jakarta.jws-api', version: '3.0.0'
+
     implementation "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}"
     implementation "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}"
     implementation "com.fasterxml.jackson.core:jackson-annotations:${jacksonVersion}"

diff --git a/src/test/java/com/googlecode/jsonrpc4j/server/JsonRpcServerAnnotateMethodVarArgsTest.java b/src/test/java/com/googlecode/jsonrpc4j/server/JsonRpcServerAnnotateMethodVarArgsTest.java
@@ -9,13 +9,13 @@
 import com.googlecode.jsonrpc4j.JsonRpcMethod;
 import com.googlecode.jsonrpc4j.JsonRpcParam;
 import com.googlecode.jsonrpc4j.VarArgsUtil;
+import jakarta.jws.WebParam;
 import org.easymock.EasyMockRunner;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import javax.jws.WebParam;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.HashMap;

diff --git a/src/test/java/com/googlecode/jsonrpc4j/server/JsonRpcServerTest.java b/src/test/java/com/googlecode/jsonrpc4j/server/JsonRpcServerTest.java
@@ -133,7 +133,7 @@ public void testGetMethod_base64Params() throws Exception {
 
 		request.addParameter("id", Integer.toString(123));
 		request.addParameter("method", "testMethod");
-		request.addParameter("params", Base64.getEncoder().encode("[\"Whir?inaki\"]".getBytes(StandardCharsets.UTF_8)));
+		request.addParameter("params", Base64.getEncoder().encodeToString("[\"Whir?inaki\"]".getBytes(StandardCharsets.UTF_8)));
 
 		jsonRpcServer.handle(request, response);