diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 2795a49..7991329 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -20,9 +20,9 @@ - - + + diff --git a/src/main/java/com/release11/klaus/controller/MockController.java b/src/main/java/com/release11/klaus/controller/MockController.java index 68d20e0..b2c0fef 100644 --- a/src/main/java/com/release11/klaus/controller/MockController.java +++ b/src/main/java/com/release11/klaus/controller/MockController.java @@ -12,10 +12,7 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; import java.time.LocalDateTime; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.UUID; +import java.util.*; @Slf4j @Controller @@ -67,6 +64,7 @@ public class MockController { klausService.setMockedResponse(buildDefaultMessage(clientUUID)); messages = klausService.getAllMockedResponses(clientUUID); } + Collections.sort(messages); return messages; } diff --git a/src/main/java/com/release11/klaus/model/MockedMessageDto.java b/src/main/java/com/release11/klaus/model/MockedMessageDto.java index 317e23c..b37bcca 100644 --- a/src/main/java/com/release11/klaus/model/MockedMessageDto.java +++ b/src/main/java/com/release11/klaus/model/MockedMessageDto.java @@ -19,7 +19,7 @@ import java.util.UUID; @ToString @NoArgsConstructor @AllArgsConstructor -public class MockedMessageDto implements Serializable { +public class MockedMessageDto implements Serializable, Comparable { private UUID clientUUID; @NotNull @Positive @@ -37,4 +37,9 @@ public class MockedMessageDto implements Serializable { this.clientUUID = clientUUID; this.httpHeaders = httpHeaders; } + + @Override + public int compareTo(MockedMessageDto message) { + return this.mockedResponseId > message.getMockedResponseId() ? 1 : -1; + } }