Fix application shadowing default application
Project: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/repo Commit: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/commit/082b64a6 Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/082b64a6 Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/082b64a6 Branch: refs/heads/master Commit: 082b64a6fa22b2027ef2556dc2f8ca6fbfa22668 Parents: 27399b0 Author: Carlos Sierra <[email protected]> Authored: Fri Feb 16 17:24:08 2018 +0100 Committer: Carlos Sierra <[email protected]> Committed: Fri Feb 16 17:24:08 2018 +0100 ---------------------------------------------------------------------- jax-rs.itests/src/main/java/test/JaxrsTest.java | 22 ++++++++++++++++++++ .../jax/rs/whiteboard/internal/Whiteboard.java | 2 +- 2 files changed, 23 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/082b64a6/jax-rs.itests/src/main/java/test/JaxrsTest.java ---------------------------------------------------------------------- diff --git a/jax-rs.itests/src/main/java/test/JaxrsTest.java b/jax-rs.itests/src/main/java/test/JaxrsTest.java index 0dbd57a..f47a348 100644 --- a/jax-rs.itests/src/main/java/test/JaxrsTest.java +++ b/jax-rs.itests/src/main/java/test/JaxrsTest.java @@ -485,6 +485,28 @@ public class JaxrsTest extends TestHelper { } @Test + public void testApplicationShadowsDefault() { + assertEquals(0, getRuntimeDTO().applicationDTOs.length); + assertEquals(0, getRuntimeDTO().failedApplicationDTOs.length); + + registerAddon(new TestAddon()); + + assertEquals( + "Hello test", + createDefaultTarget().path("/test").request().get(String.class)); + + registerApplication( + new TestApplication(), JAX_RS_APPLICATION_BASE, "/"); + + assertEquals(1, getRuntimeDTO().applicationDTOs.length); + assertEquals(1, getRuntimeDTO().failedApplicationDTOs.length); + + assertEquals( + "Hello application", + createDefaultTarget().request().get(String.class)); + } + + @Test public void testApplicationReplaceDefault() { assertEquals(0, getRuntimeDTO().applicationDTOs.length); assertEquals(0, getRuntimeDTO().failedApplicationDTOs.length); http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/082b64a6/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/Whiteboard.java ---------------------------------------------------------------------- diff --git a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/Whiteboard.java b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/Whiteboard.java index de7ca7d..b74faa0 100644 --- a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/Whiteboard.java +++ b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/Whiteboard.java @@ -753,7 +753,7 @@ public class Whiteboard { String contextName; - if (JAX_RS_DEFAULT_APPLICATION.equals(applicationName)) { + if ("".equals(address)) { contextName = HTTP_WHITEBOARD_DEFAULT_CONTEXT_NAME; } else {
