remove setLiveChannelName method from RootRouteHeadersStepBuilder;

Signed-off-by: Stefan Maute <stefan.maute@bosch.io>
eclipse-ditto · Sep 29, 2021 · f3f7741 · f3f7741
1 parent 00a38d5
commit f3f7741
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 16 deletions.
diff --git a/.../test/java/org/eclipse/ditto/concierge/service/enforcement/LiveSignalEnforcementTest.java b/.../test/java/org/eclipse/ditto/concierge/service/enforcement/LiveSignalEnforcementTest.java
@@ -73,6 +73,9 @@
 import akka.testkit.TestProbe;
 import akka.testkit.javadsl.TestKit;
 
+/**
+ * Tests {@link LiveSignalEnforcement} in context of an {@link EnforcerActor}.
+ */
 @SuppressWarnings({"squid:S3599", "squid:S1171"})
 public final class LiveSignalEnforcementTest {
 

diff --git a/...est/java/org/eclipse/ditto/concierge/service/enforcement/ThingCommandEnforcementTest.java b/...est/java/org/eclipse/ditto/concierge/service/enforcement/ThingCommandEnforcementTest.java
@@ -92,6 +92,9 @@
 import akka.testkit.javadsl.TestKit;
 import scala.concurrent.duration.Duration;
 
+/**
+ * Tests {@link ThingCommandEnforcement} in context of an {@link EnforcerActor}.
+ */
 @SuppressWarnings({"squid:S3599", "squid:S1171"})
 public final class ThingCommandEnforcementTest {
 

diff --git a/...ain/java/org/eclipse/ditto/gateway/service/endpoints/actors/AbstractHttpRequestActor.java b/...ain/java/org/eclipse/ditto/gateway/service/endpoints/actors/AbstractHttpRequestActor.java
@@ -257,10 +257,12 @@ private void handleWhoami(final Whoami command) {
     }
 
     /**
-     * Provide an adequate {@link org.eclipse.ditto.gateway.service.endpoints.routes.whoami.WhoamiResponse} as answer for an {@link org.eclipse.ditto.gateway.service.endpoints.routes.whoami.Whoami}.
+     * Provide an adequate {@link org.eclipse.ditto.gateway.service.endpoints.routes.whoami.WhoamiResponse} as answer
+     * for an {@link org.eclipse.ditto.gateway.service.endpoints.routes.whoami.Whoami}.
      *
      * @param request the request which should be answered.
-     * @return the correct {@link org.eclipse.ditto.gateway.service.endpoints.routes.whoami.WhoamiResponse} for the {@code request}.
+     * @return the correct {@link org.eclipse.ditto.gateway.service.endpoints.routes.whoami.WhoamiResponse} for
+     * the {@code request}.
      */
     // intentionally protected to allow overwriting this in extensions
     protected WhoamiResponse createWhoamiResponse(final Whoami request) {

diff --git a/.../java/org/eclipse/ditto/gateway/service/endpoints/routes/RootRouteHeadersStepBuilder.java b/.../java/org/eclipse/ditto/gateway/service/endpoints/routes/RootRouteHeadersStepBuilder.java
@@ -28,7 +28,6 @@
 import org.eclipse.ditto.base.model.headers.DittoHeadersSizeChecker;
 import org.eclipse.ditto.base.model.signals.commands.exceptions.GatewayDuplicateHeaderException;
 import org.eclipse.ditto.protocol.HeaderTranslator;
-import org.eclipse.ditto.protocol.TopicPath;
 
 import akka.http.javadsl.model.HttpHeader;
 import akka.http.javadsl.model.HttpMessage;
@@ -170,7 +169,6 @@ BuildStep withQueryParameters(final Map<String, String> queryParameters) {
             avoidConflictingHeaders(headersFromQueryParameters);
             dittoHeadersBuilder.putHeaders(filteredExternalHeaders);
             dittoHeadersBuilder.putHeaders(headersFromQueryParameters);
-            setLiveChannelName(queryParameters);
 
             return new BuildStep(dittoHeadersBuilder, requestContext);
         }
@@ -192,18 +190,6 @@ private GatewayDuplicateHeaderException getDuplicateHeaderException(final String
                     .build();
         }
 
-        /*
-         * If the "live" query param was set - no matter what the value was - use live channel.
-         */
-        private void setLiveChannelName(final Map<String, String> queryParameters) {
-            final String liveChannelName = TopicPath.Channel.LIVE.getName();
-            if (null != queryParameters.get(liveChannelName)) {
-                dittoHeadersBuilder.channel(liveChannelName);
-            } else {
-                dittoHeadersBuilder.channel(null);
-            }
-        }
-
     }
 
     /**