Repository: tomee Updated Branches: refs/heads/master f78d33274 -> 8ec2e6538
test to show how to use back jettison Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/8ec2e653 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/8ec2e653 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/8ec2e653 Branch: refs/heads/master Commit: 8ec2e65384bc97e5ba66339e9b26fdb20772699d Parents: f78d332 Author: Romain manni-Bucau <rmannibu...@gmail.com> Authored: Thu Sep 8 14:56:23 2016 +0200 Committer: Romain manni-Bucau <rmannibu...@gmail.com> Committed: Thu Sep 8 14:56:23 2016 +0200 ---------------------------------------------------------------------- server/openejb-cxf-rs/pom.xml | 6 ++ .../server/cxf/rs/JettisonCompatTest.java | 77 ++++++++++++++++++++ 2 files changed, 83 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/8ec2e653/server/openejb-cxf-rs/pom.xml ---------------------------------------------------------------------- diff --git a/server/openejb-cxf-rs/pom.xml b/server/openejb-cxf-rs/pom.xml index 66c1208..4b84dcd 100644 --- a/server/openejb-cxf-rs/pom.xml +++ b/server/openejb-cxf-rs/pom.xml @@ -127,5 +127,11 @@ <version>${johnzon.version}</version> </dependency> --> + <dependency> + <groupId>org.codehaus.jettison</groupId> + <artifactId>jettison</artifactId> + <version>1.3.4</version> + <scope>test</scope> + </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/tomee/blob/8ec2e653/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JettisonCompatTest.java ---------------------------------------------------------------------- diff --git a/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JettisonCompatTest.java b/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JettisonCompatTest.java new file mode 100644 index 0000000..0f7c5fe --- /dev/null +++ b/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JettisonCompatTest.java @@ -0,0 +1,77 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.openejb.server.cxf.rs; + +import org.apache.openejb.junit.ApplicationComposer; +import org.apache.openejb.loader.IO; +import org.apache.openejb.testing.Classes; +import org.apache.openejb.testing.ContainerProperties; +import org.apache.openejb.testing.EnableServices; +import org.apache.openejb.testing.RandomPort; +import org.junit.Test; +import org.junit.runner.RunWith; + +import javax.enterprise.context.ApplicationScoped; +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import javax.xml.bind.annotation.XmlRootElement; +import java.io.IOException; +import java.net.URL; + +import static org.junit.Assert.assertEquals; + +@EnableServices("jaxrs") +@Classes(cdi = true, innerClassesAsBean = true) +@RunWith(ApplicationComposer.class) +@ContainerProperties(@ContainerProperties.Property( + name = "cxf.jaxrs.providers", + value = "org.apache.cxf.jaxrs.provider.json.JSONProvider" +)) +public class JettisonCompatTest { + @RandomPort("http") + private URL root; + + @Test + public void run() throws IOException { + assertEquals("{\"jet\":{\"name\":\"test\"}}", IO.slurp(new URL(root.toExternalForm() + "openejb/jettison"))); + } + + @Path("jettison") + @ApplicationScoped + public static class JettisonEndpoint { + @GET + @Produces(MediaType.APPLICATION_JSON) + public Jet get() { + return new Jet(); + } + } + + @XmlRootElement + public static class Jet { + private String name = "test"; + + public String getName() { + return name; + } + + public void setName(final String name) { + this.name = name; + } + } +}
