Fix issues after rebase

resteasy · Jun 7, 2021 · a9ea97f · a9ea97f
1 parent 5b90fd1
commit a9ea97f
Show file tree

Hide file tree

Showing 13 changed files with 88 additions and 145 deletions.
diff --git a/...ackson2/src/main/java/org/jboss/resteasy/plugins/providers/jackson/PatchMethodFilter.java b/...ackson2/src/main/java/org/jboss/resteasy/plugins/providers/jackson/PatchMethodFilter.java
@@ -4,19 +4,12 @@
 import java.io.IOException;
 
 import jakarta.annotation.Priority;
-import jakarta.ws.rs.BadRequestException;
-import jakarta.ws.rs.NotFoundException;
-import jakarta.ws.rs.ProcessingException;
-import jakarta.ws.rs.WebApplicationException;
 import jakarta.ws.rs.container.ContainerRequestContext;
-import jakarta.ws.rs.container.ContainerRequestFilter;
-import jakarta.ws.rs.core.Context;
-import jakarta.ws.rs.core.HttpHeaders;
+
 import jakarta.ws.rs.core.MediaType;
 import jakarta.ws.rs.ext.ContextResolver;
-import jakarta.ws.rs.ext.MessageBodyWriter;
 import jakarta.ws.rs.ext.Provider;
-import jakarta.ws.rs.ext.Providers;
+
 
 
 import org.jboss.resteasy.core.ResteasyContext;

diff --git a/...-ee7/src/main/java/org/jboss/resteasy/plugins/providers/jsonp/JsonpPatchMethodFilter.java b/...-ee7/src/main/java/org/jboss/resteasy/plugins/providers/jsonp/JsonpPatchMethodFilter.java
@@ -5,30 +5,31 @@
 import java.io.IOException;
 import java.nio.charset.Charset;
 
-import javax.annotation.Priority;
-import javax.json.Json;
-import javax.json.JsonArray;
-import javax.json.JsonException;
-import javax.json.JsonMergePatch;
-import javax.json.JsonObject;
-import javax.json.JsonPatch;
-import javax.json.JsonReader;
-import javax.json.JsonReaderFactory;
-import javax.json.JsonValue;
-import javax.json.JsonWriter;
-import javax.json.JsonWriterFactory;
-import javax.ws.rs.BadRequestException;
-import javax.ws.rs.ProcessingException;
-import javax.ws.rs.container.ContainerRequestContext;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.ext.Provider;
+import jakarta.annotation.Priority;
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonException;
+import jakarta.json.JsonMergePatch;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonPatch;
+import jakarta.json.JsonReader;
+import jakarta.json.JsonReaderFactory;
+import jakarta.json.JsonValue;
+import jakarta.json.JsonWriter;
+import jakarta.json.JsonWriterFactory;
 
 import org.jboss.resteasy.core.ResteasyContext;
 import org.jboss.resteasy.plugins.providers.AbstractPatchMethodFilter;
 import org.jboss.resteasy.spi.Failure;
 import org.jboss.resteasy.spi.HttpRequest;
 import org.jboss.resteasy.spi.HttpResponseCodes;
 
+import jakarta.ws.rs.BadRequestException;
+import jakarta.ws.rs.ProcessingException;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.ext.Provider;
+
 @Provider
 @Priority(Integer.MAX_VALUE - 1)
 public class JsonpPatchMethodFilter extends AbstractPatchMethodFilter {

diff --git a/resteasy-core/pom.xml b/resteasy-core/pom.xml
@@ -108,11 +108,11 @@
 
         <!-- Test dependencies -->
         <dependency>
-<<<<<<< HEAD
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>
-=======
+        </dependency>
+        <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
             <scope>provided</scope>

diff --git a/resteasy-core/src/main/java/org/jboss/resteasy/core/ContextParameterInjector.java b/resteasy-core/src/main/java/org/jboss/resteasy/core/ContextParameterInjector.java
@@ -1,5 +1,20 @@
 package org.jboss.resteasy.core;
 
+import java.io.OutputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.lang.reflect.Type;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.CompletionStage;
+
 import org.jboss.resteasy.plugins.providers.sse.SseImpl;
 import org.jboss.resteasy.plugins.server.servlet.ResteasyContextParameters;
 import org.jboss.resteasy.resteasy_jaxrs.i18n.Messages;
@@ -11,31 +26,12 @@
 import org.jboss.resteasy.spi.ValueInjector;
 import org.jboss.resteasy.spi.util.Types;
 
-import java.io.OutputStream;
-
-import jakarta.servlet.ServletOutputStream;
-import jakarta.servlet.WriteListener;
-
 import jakarta.ws.rs.container.ResourceInfo;
 import jakarta.ws.rs.core.Application;
 import jakarta.ws.rs.ext.Providers;
 import jakarta.ws.rs.sse.Sse;
 import jakarta.ws.rs.sse.SseEventSink;
 
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-import java.lang.reflect.Type;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.CompletionStage;
-
 /**
  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
  * @version $Revision: 1 $

diff --git a/resteasy-core/src/main/java/org/jboss/resteasy/core/ContextServletOutputStream.java b/resteasy-core/src/main/java/org/jboss/resteasy/core/ContextServletOutputStream.java
@@ -3,8 +3,8 @@
 import java.io.IOException;
 import java.io.OutputStream;
 
-import javax.servlet.ServletOutputStream;
-import javax.servlet.WriteListener;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.WriteListener;
 
 class ContextServletOutputStream extends ServletOutputStream
 {

diff --git a/...sy-core/src/main/java/org/jboss/resteasy/plugins/providers/AbstractPatchMethodFilter.java b/...sy-core/src/main/java/org/jboss/resteasy/plugins/providers/AbstractPatchMethodFilter.java
@@ -8,18 +8,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.ws.rs.BadRequestException;
-import javax.ws.rs.NotFoundException;
-import javax.ws.rs.ProcessingException;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.container.ContainerRequestContext;
-import javax.ws.rs.container.ContainerRequestFilter;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.ext.MessageBodyWriter;
-import javax.ws.rs.ext.Providers;
-
 import org.jboss.resteasy.core.ResourceMethodInvoker;
 import org.jboss.resteasy.core.ResteasyContext;
 import org.jboss.resteasy.plugins.server.servlet.ResteasyContextParameters;
@@ -33,6 +21,18 @@
 import org.jboss.resteasy.spi.ResourceInvoker;
 import org.jboss.resteasy.spi.ResteasyConfiguration;
 
+import jakarta.ws.rs.BadRequestException;
+import jakarta.ws.rs.NotFoundException;
+import jakarta.ws.rs.ProcessingException;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.container.ContainerRequestFilter;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.ext.MessageBodyWriter;
+import jakarta.ws.rs.ext.Providers;
+
 public abstract class AbstractPatchMethodFilter implements ContainerRequestFilter {
     //TODO:these should go to jaxrs spec apis
     public static final String APPLICATION_JSON_MERGE_PATCH_JSON = "application/merge-patch+json";

diff --git a/resteasy-dependencies-bom/pom.xml b/resteasy-dependencies-bom/pom.xml
@@ -15,14 +15,11 @@
     <name>RESTEasy dependencies BOM</name>
     <description>RESTEasy dependencies BOM</description>
     <properties>
+        <dep.arquillian-bom.version>1.4.1.Final</dep.arquillian-bom.version>
         <version.com.fasterxml.classmate>1.5.1</version.com.fasterxml.classmate>
         <version.com.fasterxml.jackson>2.11.4-$$jakarta9$$</version.com.fasterxml.jackson>
         <version.com.google.guava>30.1-jre</version.com.google.guava>
-<<<<<<< HEAD
-        <version.com.google.inject.guice>5.0.1</version.com.google.inject.guice>
-=======
-        <version.com.google.inject.guice>4.2.2-$$jakarta9$$</version.com.google.inject.guice>
->>>>>>> be8e04e1f5 (ee9 updates.  Compilable code; Large percentage of tests run)
+        <version.com.google.inject.guice>5.0.1-$$jakarta9$$</version.com.google.inject.guice>
         <version.com.io7m.xom>1.2.10</version.com.io7m.xom>
         <version.jakarta.mail>2.0.1</version.jakarta.mail>
         <version.org.glassfish.jaxb>3.0.0-M4</version.org.glassfish.jaxb>
@@ -89,11 +86,9 @@
         <version.org.infinispan>11.0.3.Final</version.org.infinispan>
         <version.org.jacoco>0.8.3</version.org.jacoco>
         <version.org.javassist>3.23.2-GA</version.org.javassist>
-<<<<<<< HEAD
-=======
+
         <version.org.jboss.arquillian.container.arquillian-weld-embedded>2.0.0.Final</version.org.jboss.arquillian.container.arquillian-weld-embedded>
         <version.arquillian-testenricher-cdi>1.4.1.Final-$$jakarta9$$</version.arquillian-testenricher-cdi>
->>>>>>> dd4432a40b (resolved issue with @Inject)
         <version.org.jboss.logging.jboss-logging>3.4.1.Final</version.org.jboss.logging.jboss-logging>
         <version.org.jboss.logging.jboss-logging-annotations>2.2.1.Final</version.org.jboss.logging.jboss-logging-annotations>
         <version.org.jboss.marshalling.jboss-marshalling-osgi>2.0.5.Final</version.org.jboss.marshalling.jboss-marshalling-osgi>
@@ -167,16 +162,6 @@
             <url>https://repository.jboss.org/nexus/service/local/staging/deploy/maven2/</url>
         </repository>
     </distributionManagement>
-    <repositories>
-        <!-- rls this local repo should be removed once the new
-            version of bouncycastle is available on a public maven repo
-            some time in June 2021.
-        -->
-        <repository>
-            <id>local-repo</id>
-            <url>file://${basedir}/xtmp-bouncycastle</url>
-        </repository>
-    </repositories>
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -805,6 +790,11 @@
                 org/bouncycastle/bcmail/main AND the module.xml file
                 must be updated to reference this JAR file
             -->
+            <dependency>
+                <groupId>org.bouncycastle</groupId>
+                <artifactId>bcmail-jdk15on</artifactId>
+                <version>${version.org.bouncycastle}</version>
+            </dependency>
             <dependency>
                 <groupId>org.bouncycastle</groupId>
                 <artifactId>bcjmail-jdk15on</artifactId>

diff --git a/security/resteasy-crypto/pom.xml b/security/resteasy-crypto/pom.xml
@@ -34,7 +34,7 @@
         </dependency>
         <dependency>
            <groupId>org.bouncycastle</groupId>
-           <artifactId>bcmail-jdk15on</artifactId>
+           <artifactId>bcjmail-jdk15on</artifactId>
         </dependency>
         <dependency>
             <groupId>com.sun.mail</groupId>

diff --git a/testsuite/integration-tests-spring/pom.xml b/testsuite/integration-tests-spring/pom.xml
@@ -16,13 +16,8 @@
     <name>RESTEasy Main testsuite: Spring integration tests</name>
 
     <properties>
-<<<<<<< HEAD
         <version.org.springframework>5.3.7</version.org.springframework>
-        <version.org.springframework.jakarta9>5.3.7-$$jakarta9$$</version.org.springframework.jakarta9>
-=======
-        <version.org.springframework.ee9>5.2.0.RELEASE-$$jakarta9$$</version.org.springframework.ee9>
-        <version.org.springframework>5.2.0.RELEASE</version.org.springframework>
->>>>>>> f28a224310 (Fix spring integration tests)
+        <version.org.springframework.ee9>5.3.7-$$jakarta9$$</version.org.springframework.ee9>
         <version.org.aspectj>1.7.3</version.org.aspectj>
         <version.aopalliance>1.0</version.aopalliance>
     </properties>

diff --git a/...egration-tests/src/test/java/org/jboss/resteasy/test/resource/patch/StudentPatchTest.java b/...egration-tests/src/test/java/org/jboss/resteasy/test/resource/patch/StudentPatchTest.java
@@ -3,16 +3,6 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import jakarta.json.Json;
-import jakarta.json.JsonObject;
-import jakarta.ws.rs.HttpMethod;
-import jakarta.ws.rs.client.Client;
-import jakarta.ws.rs.client.ClientBuilder;
-import jakarta.ws.rs.client.Entity;
-import jakarta.ws.rs.client.WebTarget;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.Response;
-
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.container.test.api.OperateOnDeployment;
 import org.jboss.arquillian.container.test.api.RunAsClient;
@@ -30,6 +20,16 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
+import jakarta.ws.rs.HttpMethod;
+import jakarta.ws.rs.client.Client;
+import jakarta.ws.rs.client.ClientBuilder;
+import jakarta.ws.rs.client.Entity;
+import jakarta.ws.rs.client.WebTarget;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+
 @RunWith(Arquillian.class)
 @RunAsClient
 public class StudentPatchTest {
@@ -116,7 +116,7 @@ public void testPatchDisabled() throws Exception {
       Assert.assertNull("Gender is not null", s.getGender());
 
       WebTarget patchTarget = client.target(PortProviderUtil.generateURL("/students/1", DISABLED_PATCH_DEPLOYMENT));
-      javax.json.JsonArray patchRequest = Json.createArrayBuilder()
+      jakarta.json.JsonArray patchRequest = Json.createArrayBuilder()
               .add(Json.createObjectBuilder().add("op", "copy").add("from", "/firstName").add("path", "/lastName").build())
               .add(Json.createObjectBuilder().add("op", "replace").add("path", "/firstName").add("value", "John").build())
               .build();
@@ -141,7 +141,7 @@ private void testPatch(String deployment) throws Exception {
 
       //patch a student, after patch we can get a male student named John Taylor and school is null.
       WebTarget patchTarget = client.target(generateURL("/students/1", deployment));
-      javax.json.JsonArray patchRequest = Json.createArrayBuilder()
+      jakarta.json.JsonArray patchRequest = Json.createArrayBuilder()
               .add(Json.createObjectBuilder().add("op", "copy").add("from", "/firstName").add("path", "/lastName").build())
               .add(Json.createObjectBuilder().add("op", "replace").add("path", "/firstName").add("value", "John").build())
               .add(Json.createObjectBuilder().add("op", "remove").add("path", "/school").build())
@@ -180,30 +180,4 @@ private void testMergePatch(String deployment) throws Exception {
       Assert.assertEquals("Expected gender is null", null, patchedStudent.getGender());
       client.close();
    }
-
-   @Test
-   @OperateOnDeployment(DISABLED_PATCH_DEPLOYMENT)
-   public void testPatchDisabled() throws Exception {
-      ResteasyClient client = ((ResteasyClientBuilder)ClientBuilder.newBuilder()).connectionPoolSize(10).build();
-
-      WebTarget base = client.target(PortProviderUtil.generateURL("/students", DISABLED_PATCH_DEPLOYMENT));
-      //add a student, first name is Taylor and school is school1, other fields is null.
-      Student newStudent = new Student().setId(1L).setFirstName("Taylor").setSchool("school1");
-      Response response = base.request().post(Entity.<Student>entity(newStudent, MediaType.APPLICATION_JSON_TYPE));
-      Student s = response.readEntity(Student.class);
-      Assert.assertNotNull("Add student failed", s);
-      Assert.assertEquals("Taylor", s.getFirstName());
-      Assert.assertNull("Last name is not null", s.getLastName());
-      Assert.assertEquals("school1", s.getSchool());
-      Assert.assertNull("Gender is not null", s.getGender());
-
-      WebTarget patchTarget = client.target(PortProviderUtil.generateURL("/students/1", DISABLED_PATCH_DEPLOYMENT));
-      jakarta.json.JsonArray patchRequest = Json.createArrayBuilder()
-            .add(Json.createObjectBuilder().add("op", "copy").add("from", "/firstName").add("path", "/lastName").build())
-            .add(Json.createObjectBuilder().add("op", "replace").add("path", "/firstName").add("value", "John").build())
-            .build();
-      Response res = patchTarget.request().build(HttpMethod.PATCH, Entity.entity(patchRequest, MediaType.APPLICATION_JSON_PATCH_JSON)).invoke();
-      Assert.assertEquals("Http 400 is expected", 400, res.getStatus());
-      client.close();
-   }
 }
diff --git a/...tion-tests/src/test/java/org/jboss/resteasy/test/security/CustomForbiddenMessageTest.java b/...tion-tests/src/test/java/org/jboss/resteasy/test/security/CustomForbiddenMessageTest.java
@@ -1,5 +1,7 @@
 package org.jboss.resteasy.test.security;
 
+import java.util.Hashtable;
+
 import org.apache.http.auth.AuthScope;
 import org.apache.http.auth.UsernamePasswordCredentials;
 import org.apache.http.client.CredentialsProvider;
@@ -13,12 +15,11 @@
 import org.jboss.resteasy.category.ExpectedFailingOnWildFly18;
 import org.jboss.resteasy.client.jaxrs.ResteasyClient;
 import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder;
-import jakarta.ws.rs.client.ClientBuilder;
 import org.jboss.resteasy.client.jaxrs.engines.ApacheHttpClientEngine;
 import org.jboss.resteasy.setup.AbstractUsersRolesSecurityDomainSetup;
+import org.jboss.resteasy.spi.HttpResponseCodes;
 import org.jboss.resteasy.test.security.resource.BasicAuthBaseResource;
 import org.jboss.resteasy.test.security.resource.CustomForbiddenMessageExceptionMapper;
-import org.jboss.resteasy.spi.HttpResponseCodes;
 import org.jboss.resteasy.utils.PortProviderUtil;
 import org.jboss.resteasy.utils.TestUtil;
 import org.jboss.shrinkwrap.api.Archive;
@@ -30,12 +31,8 @@
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 
+import jakarta.ws.rs.client.ClientBuilder;
 import jakarta.ws.rs.core.Response;
-import java.io.File;
-import java.net.URISyntaxException;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Hashtable;
 
 /**
  * @tpSubChapter Security