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:02 UTC
[1/4] aries-jax-rs-whiteboard git commit: Update to latest spec
Repository: aries-jax-rs-whiteboard
Updated Branches:
refs/heads/master e63d50e53 -> a4fff1afb
Update to latest spec
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/46522854
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/46522854
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/46522854
Branch: refs/heads/master
Commit: 465228541a619babcd0da148c08102e500a1feb1
Parents: e63d50e
Author: Carlos Sierra <cs...@apache.org>
Authored: Tue Sep 26 10:55:52 2017 +0200
Committer: Carlos Sierra <cs...@apache.org>
Committed: Tue Sep 26 10:55:52 2017 +0200
----------------------------------------------------------------------
.../jax/rs/whiteboard/internal/AriesJaxRSServiceRuntime.java | 6 ------
1 file changed, 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/46522854/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/AriesJaxRSServiceRuntime.java
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/AriesJaxRSServiceRuntime.java b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/AriesJaxRSServiceRuntime.java
index c44773f..9b8e583 100644
--- a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/AriesJaxRSServiceRuntime.java
+++ b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/AriesJaxRSServiceRuntime.java
@@ -26,7 +26,6 @@ import org.osgi.service.jaxrs.runtime.dto.ExtensionDTO;
import org.osgi.service.jaxrs.runtime.dto.FailedApplicationDTO;
import org.osgi.service.jaxrs.runtime.dto.FailedExtensionDTO;
import org.osgi.service.jaxrs.runtime.dto.FailedResourceDTO;
-import org.osgi.service.jaxrs.runtime.dto.RequestInfoDTO;
import org.osgi.service.jaxrs.runtime.dto.ResourceDTO;
import org.osgi.service.jaxrs.runtime.dto.RuntimeDTO;
import org.osgi.service.jaxrs.whiteboard.JaxRSWhiteboardConstants;
@@ -223,11 +222,6 @@ public class AriesJaxRSServiceRuntime implements JaxRSServiceRuntime {
return runtimeDTO;
}
- @Override
- public RequestInfoDTO calculateRequestInfoDTO(String path) {
- return null;
- }
-
public void removeApplicationEndpoint(
String applicationName, ServiceReference<?> endpointServiceReference) {
[2/4] aries-jax-rs-whiteboard git commit: Source cleaning
Posted by cs...@apache.org.
Source cleaning
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/0068fdd0
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/0068fdd0
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/0068fdd0
Branch: refs/heads/master
Commit: 0068fdd0f9d188826d1528590d2f0aa6654afa54
Parents: 4652285
Author: Carlos Sierra <cs...@apache.org>
Authored: Tue Sep 26 10:56:34 2017 +0200
Committer: Carlos Sierra <cs...@apache.org>
Committed: Tue Sep 26 10:56:34 2017 +0200
----------------------------------------------------------------------
.../jax/rs/whiteboard/internal/AriesJaxRSServiceRuntime.java | 4 ----
1 file changed, 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/0068fdd0/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/AriesJaxRSServiceRuntime.java
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/AriesJaxRSServiceRuntime.java b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/AriesJaxRSServiceRuntime.java
index 9b8e583..8643e0a 100644
--- a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/AriesJaxRSServiceRuntime.java
+++ b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/AriesJaxRSServiceRuntime.java
@@ -36,13 +36,9 @@ import javax.ws.rs.core.Application;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.TreeSet;
import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentSkipListSet;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.function.BiFunction;
import java.util.stream.Stream;
[3/4] aries-jax-rs-whiteboard git commit: Allow application addresses
without initial slash
Posted by cs...@apache.org.
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);
}
[4/4] aries-jax-rs-whiteboard git commit: Map should not be used like
this
Posted by cs...@apache.org.
Map should not be used like this
Currently map is being called both when services come in and when they
go away. This is an undesirable side effect of the current DSL
implementation but is going to likely change in the future.
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/a4fff1af
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/a4fff1af
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/a4fff1af
Branch: refs/heads/master
Commit: a4fff1afbb081ca0b2a29222d3ce8b92c5238194
Parents: 69d5e2d
Author: Carlos Sierra <cs...@apache.org>
Authored: Tue Sep 26 10:57:46 2017 +0200
Committer: Carlos Sierra <cs...@apache.org>
Committed: Tue Sep 26 10:57:46 2017 +0200
----------------------------------------------------------------------
.../apache/aries/jax/rs/whiteboard/internal/Whiteboard.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/a4fff1af/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 441070d..48af331 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
@@ -668,7 +668,11 @@ public class Whiteboard {
private static <T> OSGi<T> countChanges(
OSGi<T> program, ChangeCounter counter) {
- return program.map(t -> {counter.inc(); return t;});
+ return program.flatMap(t -> {
+ counter.inc();
+
+ return onClose(counter::inc).then(just(t));
+ });
}
private static CXFNonSpringServlet createCXFServlet(Bus bus) {