You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by cs...@apache.org on 2017/09/26 09:00:04 UTC
[3/4] aries-jax-rs-whiteboard git commit: Allow application addresses
without initial slash
Allow application addresses without initial slash
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/69d5e2d2
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/69d5e2d2
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/69d5e2d2
Branch: refs/heads/master
Commit: 69d5e2d2e2fe7b2f1ce589d231fd5a8dd8ba3dba
Parents: 0068fdd
Author: Carlos Sierra <cs...@apache.org>
Authored: Tue Sep 26 10:57:05 2017 +0200
Committer: Carlos Sierra <cs...@apache.org>
Committed: Tue Sep 26 10:57:05 2017 +0200
----------------------------------------------------------------------
jax-rs.itests/src/main/java/test/JaxrsTest.java | 19 +++++++++++++++++++
.../jax/rs/whiteboard/internal/Whiteboard.java | 4 ++++
2 files changed, 23 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/69d5e2d2/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 f722fa3..0e25089 100644
--- a/jax-rs.itests/src/main/java/test/JaxrsTest.java
+++ b/jax-rs.itests/src/main/java/test/JaxrsTest.java
@@ -103,6 +103,25 @@ public class JaxrsTest extends TestHelper {
}
@Test
+ public void testApplicationWithoutStartingSlash()
+ throws InterruptedException {
+
+ assertEquals(0, getRuntimeDTO().applicationDTOs.length);
+
+ registerApplication(
+ new TestApplication(), JAX_RS_APPLICATION_BASE, "test-application");
+
+ assertEquals(1, getRuntimeDTO().applicationDTOs.length);
+
+ WebTarget webTarget = createDefaultTarget().path("/test-application");
+
+ Response response = webTarget.request().get();
+
+ assertEquals("Hello application",
+ response.readEntity(String.class));
+ }
+
+ @Test
public void testApplicationChangeCount() throws Exception {
Long changeCount = (Long)_runtimeServiceReference.getProperty(
"service.changecount");
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/69d5e2d2/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 279d2ae..441070d 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
@@ -728,6 +728,10 @@ public class Whiteboard {
HTTP_WHITEBOARD_CONTEXT_NAME,
HTTP_WHITEBOARD_DEFAULT_CONTEXT_NAME));
+ if (!address.startsWith("/")) {
+ address = "/" + address;
+ }
+
if (address.endsWith("/")) {
address = address.substring(0, address.length() - 1);
}