Merge branch 'master' into guava3

Author: Kirill Peshin

src/main/java/com/github/tomakehurst/wiremock/admin/AdminRoutes.java

@@ -111,6 +111,8 @@ private void initDefaultRoutes(Router router) {
  router.add(GET, "/docs", new GetDocIndexTask());
 
  router.add(GET, "/certs/wiremock-ca.crt", new GetCaCertTask());
+
+ router.add(GET, "/health", new HealthCheckTask());
  }
 
  protected void initAdditionalRoutes(Router routeBuilder) {

src/main/java/com/github/tomakehurst/wiremock/admin/model/HealthCheckResult.java

@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2023 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.model;
+
+import java.lang.management.ManagementFactory;
+import java.time.Instant;
+
+public class HealthCheckResult {
+ private final String status;
+ private final String message;
+ private final long uptimeInSeconds;
+ private final Instant timestamp;
+
+ public HealthCheckResult(String status, String message) {
+ this.status = status;
+ this.message = message;
+ this.timestamp = Instant.now();
+ this.uptimeInSeconds = ManagementFactory.getRuntimeMXBean().getUptime() / 1000;
+ }
+
+ public String getStatus() {
+ return status;
+ }
+
+ public String getMessage() {
+ return message;
+ }
+
+ public Instant getTimestamp() {
+ return timestamp;
+ }
+
+ public long getUptimeInSeconds() {
+ return uptimeInSeconds;
+ }
+}

src/main/java/com/github/tomakehurst/wiremock/admin/tasks/HealthCheckTask.java

@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2023 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.tasks;
+
+import static com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder.responseDefinition;
+import static java.net.HttpURLConnection.HTTP_OK;
+
+import com.github.tomakehurst.wiremock.admin.AdminTask;
+import com.github.tomakehurst.wiremock.admin.model.HealthCheckResult;
+import com.github.tomakehurst.wiremock.common.Json;
+import com.github.tomakehurst.wiremock.common.url.PathParams;
+import com.github.tomakehurst.wiremock.core.Admin;
+import com.github.tomakehurst.wiremock.http.ResponseDefinition;
+import com.github.tomakehurst.wiremock.stubbing.ServeEvent;
+
+public class HealthCheckTask implements AdminTask {
+ @Override
+ public ResponseDefinition execute(Admin admin, ServeEvent serveEvent, PathParams pathParams) {
+
+ return responseDefinition()
+ .withStatus(HTTP_OK)
+ .withStatusMessage("Wiremock is ok")
+ .withBody(
+ Json.write(
+ new HealthCheckResult(
+ HealthCheckStatus.HEALTHY.name().toLowerCase(), "Wiremock is ok")))
+ .withHeader("Content-Type", "application/json")
+ .build();
+ }
+
+ protected enum HealthCheckStatus {
+ HEALTHY,
+ UNHEALTHY
+ }
+}

src/main/java/com/github/tomakehurst/wiremock/core/Admin.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2022 Thomas Akehurst
+ * Copyright (C) 2011-2023 Thomas Akehurst
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/com/github/tomakehurst/wiremock/recording/Recorder.java

@@ -27,7 +27,6 @@
 import com.github.tomakehurst.wiremock.store.RecorderStateStore;
 import com.github.tomakehurst.wiremock.stubbing.ServeEvent;
 import com.github.tomakehurst.wiremock.stubbing.StubMapping;
-import com.google.common.collect.Lists;
 import java.util.List;
 import java.util.UUID;
 import java.util.function.Predicate;
@@ -109,7 +108,7 @@ private static Predicate<ServeEvent> withId(final UUID id) {
  public SnapshotRecordResult takeSnapshot(List<ServeEvent> serveEvents, RecordSpec recordSpec) {
  final List<StubMapping> stubMappings =
  serveEventsToStubMappings(
- Lists.reverse(serveEvents),
+ serveEvents,
  recordSpec.getFilters(),
  new SnapshotStubMappingGenerator(
  recordSpec.getCaptureHeaders(), recordSpec.getRequestBodyPatternFactory()),

src/main/java/com/github/tomakehurst/wiremock/store/InMemoryRequestJournalStore.java

@@ -16,33 +16,30 @@
 package com.github.tomakehurst.wiremock.store;
 
 import com.github.tomakehurst.wiremock.stubbing.ServeEvent;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Queue;
-import java.util.UUID;
+import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.ConcurrentLinkedDeque;
 import java.util.stream.Stream;
 
 public class InMemoryRequestJournalStore implements RequestJournalStore {
 
- private final Queue<UUID> queue = new ConcurrentLinkedQueue<>();
+ private final Deque<UUID> deque = new ConcurrentLinkedDeque<>();
  private final Map<UUID, ServeEvent> serveEvents = new ConcurrentHashMap<>();
 
  @Override
  public void add(ServeEvent event) {
  serveEvents.put(event.getId(), event);
- queue.add(event.getId());
+ deque.addFirst(event.getId());
  }
 
  @Override
  public Stream<ServeEvent> getAll() {
- return queue.stream().map(serveEvents::get);
+ return deque.stream().map(serveEvents::get);
  }
 
  @Override
  public void removeLast() {
- final UUID id = queue.poll();
+ final UUID id = deque.pollLast();
  if (id != null) {
  serveEvents.remove(id);
  }
@@ -60,20 +57,20 @@ public Optional<ServeEvent> get(UUID id) {
 
  @Override
  public void put(UUID id, ServeEvent event) {
- if (queue.contains(id)) {
+ if (deque.contains(id)) {
  serveEvents.put(id, event);
  }
  }
 
  @Override
  public void remove(UUID id) {
- queue.stream().filter(eventId -> eventId.equals(id)).forEach(queue::remove);
+ deque.stream().filter(eventId -> eventId.equals(id)).forEach(deque::remove);
  serveEvents.remove(id);
  }
 
  @Override
  public void clear() {
- queue.clear();
+ deque.clear();
  serveEvents.clear();
  }
 }

src/main/java/com/github/tomakehurst/wiremock/verification/AbstractRequestJournal.java

@@ -26,7 +26,6 @@
 import com.github.tomakehurst.wiremock.store.RequestJournalStore;
 import com.github.tomakehurst.wiremock.stubbing.ServeEvent;
 import com.github.tomakehurst.wiremock.stubbing.StubMapping;
-import com.google.common.collect.ImmutableList;
 import java.util.*;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
@@ -59,7 +58,10 @@ public int countRequestsMatching(RequestPattern requestPattern) {
 
  @Override
  public List<LoggedRequest> getRequestsMatching(RequestPattern requestPattern) {
- return getRequests().filter(thatMatch(requestPattern, customMatchers)).collect(toList());
+ List<LoggedRequest> loggedRequests =
+ getRequests().filter(thatMatch(requestPattern, customMatchers)).collect(toList());
+ Collections.reverse(loggedRequests);
+ return loggedRequests;
  }
 
  @Override
@@ -101,7 +103,7 @@ private List<ServeEvent> removeServeEvents(Predicate<ServeEvent> predicate) {
 
  @Override
  public List<ServeEvent> getAllServeEvents() {
- return ImmutableList.copyOf(store.getAll().collect(toList())).reverse();
+ return store.getAll().collect(toList());
  }
 
  @Override

src/test/java/com/github/tomakehurst/wiremock/ProxyAcceptanceTest.java

@@ -16,8 +16,6 @@
 package com.github.tomakehurst.wiremock;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.*;
-import static com.github.tomakehurst.wiremock.client.WireMock.any;
-import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
 import static com.github.tomakehurst.wiremock.common.ContentTypes.CONTENT_ENCODING;
 import static com.github.tomakehurst.wiremock.common.ParameterUtils.getLast;
 import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;

src/test/java/com/github/tomakehurst/wiremock/RecordApiAcceptanceTest.java

@@ -78,7 +78,7 @@ public void proxyServerShutdown() {
  + " \"mappings\": [ \n"
  + " { \n"
  + " \"request\" : { \n"
- + " \"url\" : \"/foo/bar\",  \n"
+ + " \"url\" : \"/foo/bar/baz\", \n"
  + " \"method\" : \"GET\" \n"
  + " }, \n"
  + " \"response\" : { \n"
@@ -87,13 +87,13 @@ public void proxyServerShutdown() {
  + " }, \n"
  + " { \n"
  + " \"request\" : { \n"
- + " \"url\" : \"/foo/bar/baz\", \n"
+ + " \"url\" : \"/foo/bar\",  \n"
  + " \"method\" : \"GET\" \n"
  + " }, \n"
  + " \"response\" : { \n"
  + " \"status\" : 200 \n"
  + " } \n"
- + " }, \n"
+ + " }  \n"
  + " ] \n"
  + "} ";
 
@@ -128,22 +128,22 @@ public void returnsRequestsWithDefaultOptions() throws Exception {
  + " \"mappings\": [ \n"
  + " { \n"
  + " \"request\" : { \n"
- + " \"url\" : \"/foo/bar\",  \n"
+ + " \"url\" : \"/foo/bar/baz\", \n"
  + " \"method\" : \"GET\" \n"
  + " }, \n"
  + " \"response\" : { \n"
  + " \"status\" : 200 \n"
  + " } \n"
- + " }, \n"
+ + " },  \n"
  + " { \n"
  + " \"request\" : { \n"
- + " \"url\" : \"/foo/bar/baz\", \n"
+ + " \"url\" : \"/foo/bar\",  \n"
  + " \"method\" : \"GET\" \n"
  + " }, \n"
  + " \"response\" : { \n"
  + " \"status\" : 200 \n"
  + " } \n"
- + " }  \n"
+ + " } \n"
  + " ] \n"
  + "} ";
 
@@ -368,7 +368,7 @@ public void returnsStubMappingsWithScenariosForRepeatedRequests() {
  + " \"mappings\": [ \n"
  + " { \n"
  + " \"request\" : { \n"
- + " \"url\" : \"/?transformed=global\",  \n"
+ + " \"url\" : \"/foo?transformed=global\", \n"
  + " \"method\" : \"GET\" \n"
  + " }, \n"
  + " \"response\" : { \n"
@@ -377,13 +377,13 @@ public void returnsStubMappingsWithScenariosForRepeatedRequests() {
  + " }, \n"
  + " { \n"
  + " \"request\" : { \n"
- + " \"url\" : \"/foo?transformed=global\", \n"
+ + " \"url\" : \"/?transformed=global\",  \n"
  + " \"method\" : \"GET\" \n"
  + " }, \n"
  + " \"response\" : { \n"
  + " \"status\" : 200 \n"
  + " } \n"
- + " }, \n"
+ + " } \n"
  + " ] \n"
  + "} ";
 
@@ -419,7 +419,7 @@ public void returnsTransformedStubMappingWithGlobalTransformer() {
  + " \"mappings\": [ \n"
  + " { \n"
  + " \"request\" : { \n"
- + " \"url\" : \"/?transformed=nonglobal\",  \n"
+ + " \"url\" : \"/foo?transformed=nonglobal\", \n"
  + " \"method\" : \"GET\", \n"
  + " \"headers\": { \n"
  + " \"Accept\": { \n"
@@ -430,10 +430,10 @@ public void returnsTransformedStubMappingWithGlobalTransformer() {
  + " \"response\" : { \n"
  + " \"status\" : 200 \n"
  + " } \n"
- + " }, \n"
+ + " },  \n"
  + " { \n"
  + " \"request\" : { \n"
- + " \"url\" : \"/foo?transformed=nonglobal\", \n"
+ + " \"url\" : \"/?transformed=nonglobal\",  \n"
  + " \"method\" : \"GET\", \n"
  + " \"headers\": { \n"
  + " \"Accept\": { \n"
@@ -444,7 +444,7 @@ public void returnsTransformedStubMappingWithGlobalTransformer() {
  + " \"response\" : { \n"
  + " \"status\" : 200 \n"
  + " } \n"
- + " }  \n"
+ + " } \n"
  + " ] \n"
  + "} ";
 

src/test/java/com/github/tomakehurst/wiremock/ServeEventLogAcceptanceTest.java

@@ -208,7 +208,7 @@ public void getsAllServeEventsThatMatchedStubId() {
  }
 
  private Matcher<LoggedRequest> withUrl(final String url) {
- return new TypeSafeMatcher<LoggedRequest>() {
+ return new TypeSafeMatcher<>() {
  @Override
  public boolean matchesSafely(LoggedRequest loggedRequest) {
  return loggedRequest.getUrl().equals(url);