Fixed wiremock#1684 - Expose RemoveStubMappingTask through HttpAdminC…

…lient

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);

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(

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);

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);

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();

src/test/java/com/github/tomakehurst/wiremock/admin/OldRemoveStubMappingTaskTest.java

@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2013-2022 Thomas Akehurst
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.github.tomakehurst.wiremock.admin;
+
+import static com.github.tomakehurst.wiremock.stubbing.StubMapping.buildJsonStringFor;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import com.github.tomakehurst.wiremock.admin.model.PathParams;
+import com.github.tomakehurst.wiremock.admin.tasks.OldRemoveStubMappingTask;
+import com.github.tomakehurst.wiremock.core.Admin;
+import com.github.tomakehurst.wiremock.http.Request;
+import com.github.tomakehurst.wiremock.http.ResponseDefinition;
+import com.github.tomakehurst.wiremock.stubbing.StubMapping;
+import java.net.HttpURLConnection;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+public class OldRemoveStubMappingTaskTest {
+
+  private static final StubMapping MOCK_MAPPING = new StubMapping(null, new ResponseDefinition());
+
+  private Admin mockAdmin = Mockito.mock(Admin.class);
+  private Request mockRequest = Mockito.mock(Request.class);
+
+  private OldRemoveStubMappingTask removeStubMappingTask = new OldRemoveStubMappingTask();
+
+  @Test
+  public void delegatesSavingMappingsToAdmin() {
+    when(mockRequest.getBodyAsString()).thenReturn(buildJsonStringFor(MOCK_MAPPING));
+
+    removeStubMappingTask.execute(mockAdmin, mockRequest, PathParams.empty());
+
+    verify(mockAdmin).removeStubMapping(any(StubMapping.class));
+  }
+
+  @Test
+  public void returnsOKResponse() {
+    when(mockRequest.getBodyAsString()).thenReturn(buildJsonStringFor(MOCK_MAPPING));
+
+    ResponseDefinition response =
+        removeStubMappingTask.execute(mockAdmin, mockRequest, PathParams.empty());
+
+    assertThat(response.getStatus(), is(HttpURLConnection.HTTP_OK));
+    verify(mockAdmin).removeStubMapping(any(StubMapping.class));
+  }
+}

src/test/java/com/github/tomakehurst/wiremock/admin/RemoveStubMappingTaskTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2021 Thomas Akehurst
+ * Copyright (C) 2013-2022 Thomas Akehurst
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,49 +15,65 @@
  */
 package com.github.tomakehurst.wiremock.admin;
 
-import static com.github.tomakehurst.wiremock.stubbing.StubMapping.buildJsonStringFor;
+import static com.google.common.base.Optional.absent;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
-import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import com.github.tomakehurst.wiremock.admin.model.PathParams;
-import com.github.tomakehurst.wiremock.admin.tasks.OldRemoveStubMappingTask;
+import com.github.tomakehurst.wiremock.admin.model.SingleStubMappingResult;
+import com.github.tomakehurst.wiremock.admin.tasks.RemoveStubMappingTask;
 import com.github.tomakehurst.wiremock.core.Admin;
-import com.github.tomakehurst.wiremock.http.Request;
 import com.github.tomakehurst.wiremock.http.ResponseDefinition;
 import com.github.tomakehurst.wiremock.stubbing.StubMapping;
 import java.net.HttpURLConnection;
+import java.util.UUID;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
 public class RemoveStubMappingTaskTest {
 
   private static final StubMapping MOCK_MAPPING = new StubMapping(null, new ResponseDefinition());
+  private static final String TEST_UUID_STRING = "7ef8ddb5-b00f-4991-949f-824cd1e2d072";
+  private static final UUID TEST_UUID = UUID.fromString(TEST_UUID_STRING);
 
-  private Admin mockAdmin = Mockito.mock(Admin.class);
-  private Request mockRequest = Mockito.mock(Request.class);
+  private final Admin mockAdmin = Mockito.mock(Admin.class);
+  private final PathParams mockPathParams = Mockito.mock(PathParams.class);
 
-  private OldRemoveStubMappingTask removeStubMappingTask = new OldRemoveStubMappingTask();
+  private final RemoveStubMappingTask removeStubMappingTask = new RemoveStubMappingTask();
 
   @Test
-  public void delegatesSavingMappingsToAdmin() {
-    when(mockRequest.getBodyAsString()).thenReturn(buildJsonStringFor(MOCK_MAPPING));
+  public void delegatesDeletingMappingToAdmin() {
+    when(mockPathParams.get("id")).thenReturn(TEST_UUID_STRING);
+    when(mockAdmin.getStubMapping(TEST_UUID)).thenReturn(new SingleStubMappingResult(MOCK_MAPPING));
 
-    removeStubMappingTask.execute(mockAdmin, mockRequest, PathParams.empty());
+    removeStubMappingTask.execute(mockAdmin, null, mockPathParams);
 
-    verify(mockAdmin).removeStubMapping(any(StubMapping.class));
+    verify(mockAdmin).removeStubMapping(MOCK_MAPPING);
   }
 
   @Test
   public void returnsOKResponse() {
-    when(mockRequest.getBodyAsString()).thenReturn(buildJsonStringFor(MOCK_MAPPING));
+    when(mockPathParams.get("id")).thenReturn(TEST_UUID_STRING);
+    when(mockAdmin.getStubMapping(TEST_UUID)).thenReturn(new SingleStubMappingResult(MOCK_MAPPING));
 
-    ResponseDefinition response =
-        removeStubMappingTask.execute(mockAdmin, mockRequest, PathParams.empty());
+    ResponseDefinition response = removeStubMappingTask.execute(mockAdmin, null, mockPathParams);
 
     assertThat(response.getStatus(), is(HttpURLConnection.HTTP_OK));
-    verify(mockAdmin).removeStubMapping(any(StubMapping.class));
+    verify(mockAdmin).removeStubMapping(MOCK_MAPPING);
+  }
+
+  @Test
+  public void returnsNOT_FOUNDResponse() {
+    when(mockPathParams.get("id")).thenReturn(TEST_UUID_STRING);
+    when(mockAdmin.getStubMapping(TEST_UUID))
+        .thenReturn(SingleStubMappingResult.fromOptional(absent()));
+
+    ResponseDefinition response = removeStubMappingTask.execute(mockAdmin, null, mockPathParams);
+
+    assertThat(response.getStatus(), is(HttpURLConnection.HTTP_NOT_FOUND));
+    verify(mockAdmin, never()).removeStubMapping(TEST_UUID);
   }
 }