refactor: minor refinements to the MockWebServer

Signed-off-by: Marc Nuri <[email protected]>
fabric8io · Sep 25, 2023 · 0e54a28 · 0e54a28
1 parent 007abfa
commit 0e54a28
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 66 deletions.
diff --git a/junit/mockwebserver/src/main/java/io/fabric8/mockwebserver/dsl/Function.java b/junit/mockwebserver/src/main/java/io/fabric8/mockwebserver/dsl/Function.java
diff --git a/...server/src/main/java/io/fabric8/mockwebserver/internal/InlineWebSocketSessionBuilder.java b/...server/src/main/java/io/fabric8/mockwebserver/internal/InlineWebSocketSessionBuilder.java
@@ -18,11 +18,9 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import io.fabric8.mockwebserver.Context;
 import io.fabric8.mockwebserver.MockServerException;
 import io.fabric8.mockwebserver.dsl.Emitable;
 import io.fabric8.mockwebserver.dsl.EventDoneable;
-import io.fabric8.mockwebserver.dsl.Function;
 import io.fabric8.mockwebserver.dsl.TimesOrOnceable;
 import io.fabric8.mockwebserver.dsl.WebSocketSessionBuilder;
 
@@ -31,17 +29,16 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Queue;
+import java.util.function.Function;
 
 public class InlineWebSocketSessionBuilder<T> implements WebSocketSessionBuilder<T>, EventDoneable<T> {
 
   private static final ObjectMapper MAPPER = new ObjectMapper();
 
-  private final Context context;
   private final Function<WebSocketSession, T> function;
   private WebSocketSession session;
 
-  public InlineWebSocketSessionBuilder(Context context, Function<WebSocketSession, T> function) {
-    this.context = context;
+  public InlineWebSocketSessionBuilder(Function<WebSocketSession, T> function) {
     this.function = function;
   }
 

diff --git a/...kwebserver/src/main/java/io/fabric8/mockwebserver/internal/MockServerExpectationImpl.java b/...kwebserver/src/main/java/io/fabric8/mockwebserver/internal/MockServerExpectationImpl.java
@@ -22,7 +22,6 @@
 import io.fabric8.mockwebserver.ServerRequest;
 import io.fabric8.mockwebserver.ServerResponse;
 import io.fabric8.mockwebserver.dsl.DelayPathable;
-import io.fabric8.mockwebserver.dsl.Function;
 import io.fabric8.mockwebserver.dsl.HttpMethod;
 import io.fabric8.mockwebserver.dsl.MockServerExpectation;
 import io.fabric8.mockwebserver.dsl.Pathable;
@@ -43,6 +42,7 @@
 import java.util.Queue;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -193,15 +193,15 @@ public Pathable<ReturnOrWebsocketable<TimesOnceableOrHttpHeaderable<Void>>> dela
 
   @Override
   public WebSocketSessionBuilder<TimesOnceableOrHttpHeaderable<Void>> andUpgradeToWebSocket() {
-    return new InlineWebSocketSessionBuilder<>(context, new WebSocketSessionConverter(this));
+    return new InlineWebSocketSessionBuilder<>(new WebSocketSessionConverter(this));
   }
 
   /**
    * {@inheritDoc}
    */
   @Override
   public WebSocketSessionBuilder<TimesOnceableOrHttpHeaderable<Void>> andUpgradeToWebSocket(ScheduledExecutorService executor) {
-    return new InlineWebSocketSessionBuilder<>(context, new WebSocketSessionConverter(this));
+    return new InlineWebSocketSessionBuilder<>(new WebSocketSessionConverter(this));
   }
 
   @Override

diff --git a/junit/mockwebserver/src/main/java/io/fabric8/mockwebserver/utils/Closeables.java b/junit/mockwebserver/src/main/java/io/fabric8/mockwebserver/utils/Closeables.java