Repository: tomee Updated Branches: refs/heads/master 3a73f9445 -> d2376e186
JOHNZON-88 ensuring method and fields are mapped by johnzon by default Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/6fdfa982 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/6fdfa982 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/6fdfa982 Branch: refs/heads/master Commit: 6fdfa98202680be6d574bbf84c87e9d1c2493bb1 Parents: 3a73f94 Author: Romain manni-Bucau <[email protected]> Authored: Sat Jul 2 18:46:51 2016 +0200 Committer: Romain manni-Bucau <[email protected]> Committed: Sat Jul 2 18:46:51 2016 +0200 ---------------------------------------------------------------------- .../server/cxf/rs/JohnzonMappingTest.java | 104 +++++++++++++++++++ 1 file changed, 104 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/6fdfa982/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JohnzonMappingTest.java ---------------------------------------------------------------------- diff --git a/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JohnzonMappingTest.java b/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JohnzonMappingTest.java new file mode 100644 index 0000000..f33f2bd --- /dev/null +++ b/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JohnzonMappingTest.java @@ -0,0 +1,104 @@ +/* + * 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.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.validation.Valid; +import javax.validation.constraints.NotNull; +import javax.ws.rs.Consumes; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.client.ClientBuilder; +import javax.ws.rs.client.Entity; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; +import java.net.URL; + +import static org.junit.Assert.assertEquals; + +@EnableServices("jaxrs") +@Classes(/*cdi = false, */innerClassesAsBean = true) +@RunWith(ApplicationComposer.class) +@ContainerProperties(@ContainerProperties.Property(name = "openejb.cxf.rs.bval.log.level", value = "INFO")) +public class JohnzonMappingTest { + @RandomPort("http") + private URL base; + + @Test + public void passing() { + final Payload payload = new Payload(); + payload.setName("ok"); + assertEquals( + "ok", + ClientBuilder.newClient().target(base.toExternalForm()).path("openejb/test").request(MediaType.APPLICATION_JSON_TYPE) + .post(Entity.entity(payload, MediaType.APPLICATION_JSON_TYPE), Payload.class) + .getName()); + } + + @Test + public void inFailing() { + final Payload payload = new Payload(); + assertEquals( + Response.Status.BAD_REQUEST.getStatusCode(), // thanks to the mapper + ClientBuilder.newClient().target(base.toExternalForm()).path("openejb/test").request(MediaType.APPLICATION_JSON_TYPE) + .post(Entity.entity(payload, MediaType.APPLICATION_JSON_TYPE)).getStatus()); + } + + @Test + public void outFailing() { + final Payload payload = new Payload(); + payload.setName("empty"); + assertEquals( + Response.Status.BAD_REQUEST.getStatusCode(), // thanks to the mapper + ClientBuilder.newClient().target(base.toExternalForm()).path("openejb/test").request(MediaType.APPLICATION_JSON_TYPE) + .post(Entity.entity(payload, MediaType.APPLICATION_JSON_TYPE)).getStatus()); + } + + @Path("test") + public static class ValidateMe { + @POST + @Valid + @Consumes(MediaType.APPLICATION_JSON) + @Produces(MediaType.APPLICATION_JSON) + public Payload get(@Valid final Payload in) { + final Payload payload = new Payload(); + payload.setName("empty".equals(in.name) ? null : in.name); + return payload; + } + } + + public static class Payload { + @NotNull + private String name; + + public String getName() { + return name; + } + + public void setName(final String name) { + this.name = name; + } + } +}
