Enable tests after jakartified media

Signed-off-by: Jan Supol <jan.supol@oracle.com>
eclipse-ee4j · Oct 6, 2020 · 767311d · 767311d
1 parent 0ee426b
commit 767311d
Show file tree

Hide file tree

Showing 78 changed files with 463 additions and 773 deletions.
diff --git a/bom/pom.xml b/bom/pom.xml
@@ -188,21 +188,16 @@
                 <artifactId>jersey-proxy-client</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.glassfish.jersey.ext</groupId>
-                <artifactId>jersey-servlet-portability</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.glassfish.jersey.ext</groupId>
-                <artifactId>jersey-spring4</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.glassfish.jersey.ext</groupId>
-                <artifactId>jersey-spring5</artifactId>
-                <version>${project.version}</version>
-            </dependency>
+<!--            <dependency>-->
+<!--                <groupId>org.glassfish.jersey.ext</groupId>-->
+<!--                <artifactId>jersey-spring4</artifactId>-->
+<!--                <version>${project.version}</version>-->
+<!--            </dependency>-->
+<!--            <dependency>-->
+<!--                <groupId>org.glassfish.jersey.ext</groupId>-->
+<!--                <artifactId>jersey-spring5</artifactId>-->
+<!--                <version>${project.version}</version>-->
+<!--            </dependency>-->
             <dependency>
                 <groupId>org.glassfish.jersey.ext</groupId>
                 <artifactId>jersey-declarative-linking</artifactId>
@@ -258,21 +253,21 @@
                 <artifactId>jersey-rx-client-rxjava2</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.glassfish.jersey.ext.microprofile</groupId>
-                <artifactId>jersey-mp-rest-client</artifactId>
-                <version>${project.version}</version>
-            </dependency>
+<!--            <dependency>-->
+<!--                <groupId>org.glassfish.jersey.ext.microprofile</groupId>-->
+<!--                <artifactId>jersey-mp-rest-client</artifactId>-->
+<!--                <version>${project.version}</version>-->
+<!--            </dependency>-->
             <dependency>
                 <groupId>org.glassfish.jersey.media</groupId>
                 <artifactId>jersey-media-jaxb</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.glassfish.jersey.media</groupId>
-                <artifactId>jersey-media-json-jackson</artifactId>
-                <version>${project.version}</version>
-            </dependency>
+<!--            <dependency>-->
+<!--                <groupId>org.glassfish.jersey.media</groupId>-->
+<!--                <artifactId>jersey-media-json-jackson</artifactId>-->
+<!--                <version>${project.version}</version>-->
+<!--            </dependency>-->
             <dependency>
                 <groupId>org.glassfish.jersey.media</groupId>
                 <artifactId>jersey-media-json-jettison</artifactId>

diff --git a/connectors/jetty-connector/pom.xml b/connectors/jetty-connector/pom.xml
@@ -48,12 +48,12 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.glassfish.jersey.media</groupId>
-            <artifactId>jersey-media-json-jackson</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.glassfish.jersey.media</groupId>-->
+<!--            <artifactId>jersey-media-json-jackson</artifactId>-->
+<!--            <version>${project.version}</version>-->
+<!--            <scope>test</scope>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>org.glassfish.jersey.test-framework.providers</groupId>
             <artifactId>jersey-test-framework-provider-jetty</artifactId>

diff --git a/...ectors/jetty-connector/src/test/java/org/glassfish/jersey/jetty/connector/EntityTest.java b/...ectors/jetty-connector/src/test/java/org/glassfish/jersey/jetty/connector/EntityTest.java
@@ -32,7 +32,7 @@
 
 import org.glassfish.jersey.client.ClientConfig;
 import org.glassfish.jersey.logging.LoggingFeature;
-import org.glassfish.jersey.jackson.JacksonFeature;
+// import org.glassfish.jersey.jackson.JacksonFeature;
 import org.glassfish.jersey.server.ResourceConfig;
 import org.glassfish.jersey.test.JerseyTest;
 
@@ -103,15 +103,15 @@ public String toString() {
 
     @Override
     protected Application configure() {
-        ResourceConfig config = new ResourceConfig(EntityResource.class, JacksonFeature.class);
+        ResourceConfig config = new ResourceConfig(EntityResource.class/*, JacksonFeature.class*/);
         config.register(new LoggingFeature(LOGGER, LoggingFeature.Verbosity.PAYLOAD_ANY));
         return config;
     }
 
     @Override
     protected void configureClient(ClientConfig config) {
-        config.connectorProvider(new JettyConnectorProvider())
-                .register(JacksonFeature.class);
+        config.connectorProvider(new JettyConnectorProvider());
+                //.register(/*JacksonFeature.class*/);
     }
 
     @Test

diff --git a/core-server/pom.xml b/core-server/pom.xml
@@ -198,6 +198,12 @@
             <artifactId>jakarta.xml.bind-api</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-osgi</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
@@ -231,48 +237,6 @@
     </dependencies>
 
     <profiles>
-        <profile>
-            <id>jdk11+</id>
-            <activation>
-                <jdk>[11,)</jdk>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>jakarta.xml.bind</groupId>
-                    <artifactId>jakarta.xml.bind-api</artifactId>
-                </dependency>
-                <dependency>
-                    <groupId>com.sun.xml.bind</groupId>
-                    <artifactId>jaxb-osgi</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>jdk8</id>
-            <activation>
-                <jdk>1.8</jdk>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <!-- TODO remove after jakartification -->
-                        <configuration>
-                            <excludes> <!--JDK 8 -->
-                                <exclude>org/glassfish/jersey/server/filter/FilterSetMethodTest.java</exclude>
-                                <exclude>org/glassfish/jersey/server/internal/inject/FormParamTest.java</exclude>
-                                <exclude>org/glassfish/jersey/server/model/OptionsSubResourceMethodTest.java</exclude>
-                                <exclude>org/glassfish/jersey/server/model/OptionsTest.java</exclude>
-                                <exclude>org/glassfish/jersey/server/wadl/generators/resourcedoc/WadlGeneratorResourceDocSupportTest.java</exclude>
-                                <exclude>org/glassfish/jersey/server/ExtendedResourceContextTest.java</exclude>
-                            </excludes>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
         <profile>
             <id>securityOff</id>
             <properties>

diff --git a/examples/declarative-linking/pom.xml b/examples/declarative-linking/pom.xml
@@ -54,6 +54,11 @@
             <artifactId>jakarta.el</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-osgi</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.glassfish.jersey.media</groupId>
             <artifactId>jersey-media-moxy</artifactId>
@@ -82,31 +87,10 @@
                     <mainClass>org.glassfish.jersey.examples.linking.App</mainClass>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <excludes>
-                        <exclude>org/glassfish/jersey/examples/linking/LinkWebAppTest.java</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 
     <profiles>
-        <profile>
-            <id>jdk11+</id>
-            <activation>
-                <jdk>[11,)</jdk>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>com.sun.xml.bind</groupId>
-                    <artifactId>jaxb-osgi</artifactId>
-                </dependency>
-            </dependencies>
-        </profile>
         <profile>
             <id>pre-release</id>
             <build>

diff --git a/examples/entity-filtering-security/pom.xml b/examples/entity-filtering-security/pom.xml
@@ -49,8 +49,12 @@
         </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.media</groupId>
-            <artifactId>jersey-media-json-jackson</artifactId>
+            <artifactId>jersey-media-json-processing</artifactId>
         </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.glassfish.jersey.media</groupId>-->
+<!--            <artifactId>jersey-media-json-jackson</artifactId>-->
+<!--        </dependency>-->
 
         <dependency>
             <groupId>org.glassfish.jersey.test-framework.providers</groupId>
@@ -70,16 +74,6 @@
                     <mainClass>org.glassfish.jersey.examples.entityfiltering.security.App</mainClass>
                 </configuration>
             </plugin>
-            <!-- TODO remove after jakartification is done -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <excludes>
-                        <exclude>**/**/*.java</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 

diff --git a/...lassfish/jersey/examples/entityfiltering/security/SecurityEntityFilteringApplication.java b/...lassfish/jersey/examples/entityfiltering/security/SecurityEntityFilteringApplication.java
@@ -12,7 +12,7 @@
 
 import jakarta.ws.rs.ApplicationPath;
 
-import org.glassfish.jersey.jackson.JacksonFeature;
+// import org.glassfish.jersey.jackson.JacksonFeature;
 import org.glassfish.jersey.message.filtering.SecurityEntityFilteringFeature;
 import org.glassfish.jersey.moxy.json.MoxyJsonConfig;
 import org.glassfish.jersey.server.ResourceConfig;

diff --git a/...t/java/org/glassfish/jersey/examples/entityfiltering/security/RestrictedResourceTest.java b/...t/java/org/glassfish/jersey/examples/entityfiltering/security/RestrictedResourceTest.java
@@ -17,7 +17,7 @@
 
 import org.glassfish.jersey.examples.entityfiltering.security.domain.RestrictedEntity;
 import org.glassfish.jersey.examples.entityfiltering.security.domain.RestrictedSubEntity;
-import org.glassfish.jersey.jackson.JacksonFeature;
+// import org.glassfish.jersey.jackson.JacksonFeature;
 import org.glassfish.jersey.message.filtering.SecurityEntityFilteringFeature;
 import org.glassfish.jersey.moxy.json.MoxyJsonFeature;
 import org.glassfish.jersey.server.ResourceConfig;
@@ -42,7 +42,7 @@ public class RestrictedResourceTest extends JerseyTest {
 
     @Parameterized.Parameters(name = "Provider: {0}")
     public static Iterable<Class[]> providers() {
-        return Arrays.asList(new Class[][]{{MoxyJsonFeature.class}, {JacksonFeature.class}});
+        return Arrays.asList(new Class[][]{{MoxyJsonFeature.class}/*, {JacksonFeature.class}*/});
     }
 
     public RestrictedResourceTest(final Class<Feature> filteringProvider) {

diff --git a/...java/org/glassfish/jersey/examples/entityfiltering/security/UnrestrictedResourceTest.java b/...java/org/glassfish/jersey/examples/entityfiltering/security/UnrestrictedResourceTest.java
@@ -16,7 +16,7 @@
 
 import org.glassfish.jersey.examples.entityfiltering.security.domain.RestrictedEntity;
 import org.glassfish.jersey.examples.entityfiltering.security.domain.RestrictedSubEntity;
-import org.glassfish.jersey.jackson.JacksonFeature;
+// import org.glassfish.jersey.jackson.JacksonFeature;
 import org.glassfish.jersey.message.filtering.SecurityEntityFilteringFeature;
 import org.glassfish.jersey.moxy.json.MoxyJsonFeature;
 import org.glassfish.jersey.server.ResourceConfig;
@@ -40,7 +40,7 @@ public class UnrestrictedResourceTest extends JerseyTest {
 
     @Parameterized.Parameters(name = "Provider: {0}")
     public static Iterable<Class[]> providers() {
-        return Arrays.asList(new Class[][]{{MoxyJsonFeature.class}, {JacksonFeature.class}});
+        return Arrays.asList(new Class[][]{{MoxyJsonFeature.class}/*, {JacksonFeature.class}*/});
     }
 
     public UnrestrictedResourceTest(final Class<Feature> filteringProvider) {

diff --git a/examples/entity-filtering-selectable/pom.xml b/examples/entity-filtering-selectable/pom.xml
@@ -49,8 +49,12 @@
         </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.media</groupId>
-            <artifactId>jersey-media-json-jackson</artifactId>
+            <artifactId>jersey-media-json-processing</artifactId>
         </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.glassfish.jersey.media</groupId>-->
+<!--            <artifactId>jersey-media-json-jackson</artifactId>-->
+<!--        </dependency>-->
 
         <dependency>
             <groupId>org.glassfish.jersey.test-framework.providers</groupId>
@@ -70,16 +74,6 @@
                     <mainClass>org.glassfish.jersey.examples.entityfiltering.selectable.App</mainClass>
                 </configuration>
             </plugin>
-            <!-- TODO remove after jakartification is done -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <excludes>
-                        <exclude>org/glassfish/jersey/examples/entityfiltering/selectable/PersonResourceTest.java</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 

diff --git a/...fish/jersey/examples/entityfiltering/selectable/SelectableEntityFilteringApplication.java b/...fish/jersey/examples/entityfiltering/selectable/SelectableEntityFilteringApplication.java
@@ -12,7 +12,7 @@
 
 import jakarta.ws.rs.ApplicationPath;
 
-import org.glassfish.jersey.jackson.JacksonFeature;
+// import org.glassfish.jersey.jackson.JacksonFeature;
 import org.glassfish.jersey.message.filtering.SelectableEntityFilteringFeature;
 import org.glassfish.jersey.moxy.json.MoxyJsonConfig;
 import org.glassfish.jersey.server.ResourceConfig;

diff --git a/...est/java/org/glassfish/jersey/examples/entityfiltering/selectable/PersonResourceTest.java b/...est/java/org/glassfish/jersey/examples/entityfiltering/selectable/PersonResourceTest.java
@@ -21,7 +21,7 @@
 import org.glassfish.jersey.examples.entityfiltering.selectable.domain.Person;
 import org.glassfish.jersey.examples.entityfiltering.selectable.domain.PhoneNumber;
 import org.glassfish.jersey.examples.entityfiltering.selectable.resource.PersonResource;
-import org.glassfish.jersey.jackson.JacksonFeature;
+// import org.glassfish.jersey.jackson.JacksonFeature;
 import org.glassfish.jersey.message.filtering.SelectableEntityFilteringFeature;
 import org.glassfish.jersey.moxy.json.MoxyJsonFeature;
 import org.glassfish.jersey.server.ResourceConfig;
@@ -46,7 +46,7 @@ public class PersonResourceTest extends JerseyTest {
 
     @Parameterized.Parameters(name = "Provider: {0}")
     public static Iterable<Class[]> providers() {
-        return Arrays.asList(new Class[][]{{MoxyJsonFeature.class}, {JacksonFeature.class}});
+        return Arrays.asList(new Class[][]{{MoxyJsonFeature.class} /*, {JacksonFeature.class} */});
     }
 
     private final Class<Feature> filteringProvider;
@@ -94,12 +94,12 @@ public void testNoFilter() throws Exception {
         assertThat(phoneNumbers, notNullValue());
 
         // TODO: enable for MOXy as well when JERSEY-2751 gets fixed.
-        if (JacksonFeature.class.isAssignableFrom(filteringProvider)) {
-            phoneNumber = phoneNumbers.get("HOME");
-            assertThat(phoneNumber, notNullValue());
-            assertThat(phoneNumber.getAreaCode(), notNullValue());
-            assertThat(phoneNumber.getNumber(), notNullValue());
-        }
+//        if (JacksonFeature.class.isAssignableFrom(filteringProvider)) {
+//            phoneNumber = phoneNumbers.get("HOME");
+//            assertThat(phoneNumber, notNullValue());
+//            assertThat(phoneNumber.getAreaCode(), notNullValue());
+//            assertThat(phoneNumber.getNumber(), notNullValue());
+//        }
     }
 
     @Test