added possibility to add route interceptor to SseThingsRoute

Signed-off-by: Thomas Jaeckle <thomas.jaeckle@bosch-si.com>
eclipse-ditto · Aug 13, 2018 · 88a9e35 · 88a9e35
1 parent a7f0021
commit 88a9e35
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/...ndpoints/src/main/java/org/eclipse/ditto/services/gateway/endpoints/routes/RootRoute.java b/...ndpoints/src/main/java/org/eclipse/ditto/services/gateway/endpoints/routes/RootRoute.java
@@ -360,7 +360,7 @@ private Route buildApiSubRoutes(final RequestContext ctx, final DittoHeaders dit
                 // /api/{apiVersion}/policies
                 policiesRoute.buildPoliciesRoute(ctx, dittoHeaders),
                 // /api/{apiVersion}/things SSE support
-                sseThingsRoute.buildThingsSseRoute(ctx, dittoHeaders),
+                sseThingsRoute.buildThingsSseRoute(ctx, dittoHeaders, Function.identity()),
                 // /api/{apiVersion}/things
                 thingsRoute.buildThingsRoute(ctx, dittoHeaders),
                 // /api/{apiVersion}/search/things

diff --git a/...src/main/java/org/eclipse/ditto/services/gateway/endpoints/routes/sse/SseThingsRoute.java b/...src/main/java/org/eclipse/ditto/services/gateway/endpoints/routes/sse/SseThingsRoute.java
@@ -28,6 +28,7 @@
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 import java.util.function.BiFunction;
+import java.util.function.Function;
 import java.util.stream.StreamSupport;
 
 import org.eclipse.ditto.json.JsonField;
@@ -121,20 +122,23 @@ public SseThingsRoute(final ActorRef proxyActor, final ActorSystem actorSystem,
      * @return {@code /things} SSE route.
      */
     @SuppressWarnings("squid:S1172") // allow unused ctx-Param in order to have a consistent route-"interface"
-    public Route buildThingsSseRoute(final RequestContext ctx, final DittoHeaders dittoHeaders) {
+    public Route buildThingsSseRoute(final RequestContext ctx, final DittoHeaders dittoHeaders,
+            final Function<Route, Route> inner) {
         return rawPathPrefix(mergeDoubleSlashes().concat(PATH_THINGS), () ->
                 pathEndOrSingleSlash(() ->
                         get(() ->
                                 headerValuePF(AcceptHeaderExtractor.INSTANCE, accept ->
-                                        parameterOptional(ThingsParameter.FIELDS.toString(), fieldsString ->
+                                        inner.apply(parameterOptional(ThingsParameter.FIELDS.toString(), fieldsString ->
                                                 parameterOptional(ThingsParameter.IDS.toString(),
                                                         idsString -> // "ids" is optional for SSE
                                                                 createSseRoute(dittoHeaders,
                                                                         calculateSelectedFields(fieldsString).orElse(
                                                                                 null),
-                                                                        idsString.map(ids -> ids.split(",")))
-                                                )
+                                                                        idsString.map(ids -> ids.split(","))
+                                                                )
+                                                ))
                                         )
+
                                 )
                         )
                 )