Fixed #1684 - Expose remove stub mapping by ID (#1986)

Patrolfr · web-flow · commit a137ab15acd7 · 2022-10-25T14:07:00.000+01:00
* Fixed #1684 - Expose RemoveStubMappingTask through HttpAdminClient * Fixed #1684 - Fix OldRemoveStubMappingTaskTest test name * Fixed #1684 - Add (Old)RemoveStubMappingTask acceptance tests * Fixed #1684 - Remove (Old)RemoveStubMappingTask unit tests
diff --git a/src/main/java/com/github/tomakehurst/wiremock/WireMockServer.java b/src/main/java/com/github/tomakehurst/wiremock/WireMockServer.java
@@ -278,6 +278,11 @@ public void removeStubMapping(StubMapping stubMapping) {
     wireMockApp.removeStubMapping(stubMapping);
   }
 
+  @Override
+  public void removeStubMapping(UUID id) {
+    wireMockApp.removeStubMapping(id);
+  }
+
   @Override
   public void verify(RequestPatternBuilder requestPatternBuilder) {
     client.verifyThat(requestPatternBuilder);
diff --git a/src/main/java/com/github/tomakehurst/wiremock/client/HttpAdminClient.java b/src/main/java/com/github/tomakehurst/wiremock/client/HttpAdminClient.java
@@ -160,6 +160,14 @@ public void removeStubMapping(StubMapping stubbMapping) {
     postJsonAssertOkAndReturnBody(urlFor(OldRemoveStubMappingTask.class), Json.write(stubbMapping));
   }
 
+  @Override
+  public void removeStubMapping(UUID id) {
+    executeRequest(
+        adminRoutes.requestSpecForTask(RemoveStubMappingTask.class),
+        PathParams.single("id", id),
+        Void.class);
+  }
+
   @Override
   public ListStubMappingsResult listAllStubMappings() {
     return executeRequest(
diff --git a/src/main/java/com/github/tomakehurst/wiremock/core/Admin.java b/src/main/java/com/github/tomakehurst/wiremock/core/Admin.java
@@ -36,6 +36,8 @@ public interface Admin {
 
   void removeStubMapping(StubMapping stubbMapping);
 
+  void removeStubMapping(UUID id);
+
   ListStubMappingsResult listAllStubMappings();
 
   SingleStubMappingResult getStubMapping(UUID id);
diff --git a/src/main/java/com/github/tomakehurst/wiremock/core/WireMockApp.java b/src/main/java/com/github/tomakehurst/wiremock/core/WireMockApp.java
@@ -262,6 +262,14 @@ public void removeStubMapping(StubMapping stubMapping) {
     stubMappings.removeMapping(stubMapping);
   }
 
+  @Override
+  public void removeStubMapping(UUID id) {
+    final Optional<StubMapping> maybeStub = stubMappings.get(id);
+    if (maybeStub.isPresent()) {
+      removeStubMapping(maybeStub.get());
+    }
+  }
+
   @Override
   public void editStubMapping(StubMapping stubMapping) {
     stubMappings.editMapping(stubMapping);
diff --git a/src/main/java/com/github/tomakehurst/wiremock/junit/DslWrapper.java b/src/main/java/com/github/tomakehurst/wiremock/junit/DslWrapper.java
@@ -55,6 +55,11 @@ public void removeStubMapping(StubMapping stubbMapping) {
     admin.removeStubMapping(stubbMapping);
   }
 
+  @Override
+  public void removeStubMapping(UUID id) {
+    admin.removeStubMapping(id);
+  }
+
   @Override
   public ListStubMappingsResult listAllStubMappings() {
     return admin.listAllStubMappings();
diff --git a/src/test/java/com/github/tomakehurst/wiremock/StubbingAcceptanceTest.java b/src/test/java/com/github/tomakehurst/wiremock/StubbingAcceptanceTest.java
@@ -1004,6 +1004,29 @@ public void jsonResponseWithObjectValue() {
     assertThat(response.content(), containsString("\"Json From Object\""));
   }
 
+  @Test
+  public void removesASingleStubMapping() {
+    final UUID id = UUID.randomUUID();
+    stubFor(get("/stub-to-remove").withId(id).willReturn(aResponse()));
+
+    assertThat(testClient.get("/stub-to-remove").statusCode(), is(200));
+
+    StubMapping stub = wireMockServer.getSingleStubMapping(id);
+    wireMockServer.removeStubMapping(stub);
+    assertThat(testClient.get("/stub-to-remove").statusCode(), is(404));
+  }
+
+  @Test
+  public void removesASingleStubMappingById() {
+    final UUID id = UUID.randomUUID();
+    stubFor(get("/stub-to-remove-by-id").withId(id).willReturn(aResponse()));
+
+    assertThat(testClient.get("/stub-to-remove-by-id").statusCode(), is(200));
+
+    wireMockServer.removeStubMapping(id);
+    assertThat(testClient.get("/stub-to-remove-by-id").statusCode(), is(404));
+  }
+
   private int getStatusCodeUsingJavaUrlConnection(String url) throws IOException {
     HttpURLConnection connection = (HttpURLConnection) new URL(url).openConnection();
     connection.setRequestMethod("GET");
diff --git a/src/test/java/com/github/tomakehurst/wiremock/admin/RemoveStubMappingTaskTest.java b/src/test/java/com/github/tomakehurst/wiremock/admin/RemoveStubMappingTaskTest.java
