From 13dd0642ab48bbfa5939f844a229a7e7c359bdf4 Mon Sep 17 00:00:00 2001 From: Szakalakamaka Date: Wed, 9 Sep 2020 11:07:06 +0200 Subject: [PATCH] attach missing files --- .../shelved.patch | 114 ++++++++++++++++++ .../klaus/mappers/MockedMessageMapper.java | 13 ++ .../release11/klaus/model/MockedMessage.java | 53 ++++++++ .../klaus/model/MockedMessageDto.java | 24 ++++ 4 files changed, 204 insertions(+) create mode 100644 .idea/shelf/Uncommitted_changes_before_Update_at_09_09_2020_11_06_[Default_Changelist]/shelved.patch create mode 100644 src/main/java/com/release11/klaus/mappers/MockedMessageMapper.java create mode 100644 src/main/java/com/release11/klaus/model/MockedMessage.java create mode 100644 src/main/java/com/release11/klaus/model/MockedMessageDto.java diff --git a/.idea/shelf/Uncommitted_changes_before_Update_at_09_09_2020_11_06_[Default_Changelist]/shelved.patch b/.idea/shelf/Uncommitted_changes_before_Update_at_09_09_2020_11_06_[Default_Changelist]/shelved.patch new file mode 100644 index 0000000..2973e3c --- /dev/null +++ b/.idea/shelf/Uncommitted_changes_before_Update_at_09_09_2020_11_06_[Default_Changelist]/shelved.patch @@ -0,0 +1,114 @@ +Index: src/main/java/com/release11/klaus/mappers/MockedMessageMapper.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/main/java/com/release11/klaus/mappers/MockedMessageMapper.java (date 1599560197073) ++++ src/main/java/com/release11/klaus/mappers/MockedMessageMapper.java (date 1599560197073) +@@ -0,0 +1,13 @@ ++package com.release11.klaus.mappers; ++ ++import com.release11.klaus.model.MockedMessage; ++import com.release11.klaus.model.MockedMessageDto; ++import org.mapstruct.*; ++ ++@Mapper ++public interface MockedMessageMapper { ++ @Mapping( target = "compositePrimaryKey", expression = "java(mockedMessageDto.getClientUUID() + \"_\"" + ++ " + mockedMessageDto.getMockedResponseId())") ++ MockedMessage mockedMessageDtoToMockedMessage(MockedMessageDto mockedMessageDto); ++ MockedMessageDto mockedMessageToMockedMessageDto(MockedMessage mockedMessage); ++} +Index: src/main/java/com/release11/klaus/model/MockedMessage.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/main/java/com/release11/klaus/model/MockedMessage.java (date 1599557591277) ++++ src/main/java/com/release11/klaus/model/MockedMessage.java (date 1599557591277) +@@ -0,0 +1,53 @@ ++package com.release11.klaus.model; ++ ++import com.release11.klaus.model.constraints.HttpCode; ++import lombok.*; ++import org.springframework.data.annotation.Id; ++import org.springframework.data.redis.core.RedisHash; ++import org.springframework.data.redis.core.index.Indexed; ++ ++import javax.validation.constraints.Positive; ++import java.io.Serializable; ++import java.util.Map; ++import java.util.UUID; ++ ++@Data ++@ToString ++@RedisHash("mockedMessage") ++@NoArgsConstructor ++@AllArgsConstructor ++public class MockedMessage implements Serializable { ++ @Id ++ private String compositePrimaryKey; ++ @Indexed ++ private UUID clientUUID; ++ @Positive ++ private int mockedResponseId; ++ private String mediaType; ++ private String messageBody; ++ private Map httpHeaders; ++ @HttpCode ++ private Integer httpStatus; ++ ++ public MockedMessage(MockedMessage mockedMessage) { ++ this.compositePrimaryKey = mockedMessage.getClientUUID().toString() + "_" + mockedMessage.getMockedResponseId(); ++ this.clientUUID = mockedMessage.getClientUUID(); ++ this.mockedResponseId = mockedMessage.getMockedResponseId(); ++ this.mediaType = mockedMessage.getMediaType(); ++ this.messageBody = mockedMessage.getMessageBody(); ++ this.httpHeaders = mockedMessage.getHttpHeaders(); ++ this.httpStatus = mockedMessage.getHttpStatus(); ++ } ++ public MockedMessage(UUID clientUUID, int mockedResponseId, String mediaType, ++ String messageBody, Map httpHeaders, Integer httpStatus) { ++ this.compositePrimaryKey = clientUUID.toString() + "_" + mockedResponseId; ++ this.clientUUID = clientUUID; ++ this.mockedResponseId = mockedResponseId; ++ this.mediaType = mediaType; ++ this.messageBody = messageBody; ++ this.httpHeaders = httpHeaders; ++ this.httpStatus = httpStatus; ++ } ++} ++ ++ +Index: src/main/java/com/release11/klaus/model/MockedMessageDto.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/main/java/com/release11/klaus/model/MockedMessageDto.java (date 1599553108395) ++++ src/main/java/com/release11/klaus/model/MockedMessageDto.java (date 1599553108395) +@@ -0,0 +1,24 @@ ++package com.release11.klaus.model; ++ ++import com.release11.klaus.model.constraints.HttpCode; ++import lombok.*; ++ ++import javax.validation.constraints.Positive; ++import java.util.Map; ++import java.util.UUID; ++ ++@Data ++@Builder ++@ToString ++@NoArgsConstructor ++@AllArgsConstructor ++public class MockedMessageDto { ++ private UUID clientUUID; ++ @Positive ++ private int mockedResponseId; ++ private String mediaType; ++ private String messageBody; ++ private Map httpHeaders; ++ @HttpCode ++ private Integer httpStatus; ++} diff --git a/src/main/java/com/release11/klaus/mappers/MockedMessageMapper.java b/src/main/java/com/release11/klaus/mappers/MockedMessageMapper.java new file mode 100644 index 0000000..7fd42d3 --- /dev/null +++ b/src/main/java/com/release11/klaus/mappers/MockedMessageMapper.java @@ -0,0 +1,13 @@ +package com.release11.klaus.mappers; + +import com.release11.klaus.model.MockedMessage; +import com.release11.klaus.model.MockedMessageDto; +import org.mapstruct.*; + +@Mapper +public interface MockedMessageMapper { + @Mapping( target = "compositePrimaryKey", expression = "java(mockedMessageDto.getClientUUID() + \"_\"" + + " + mockedMessageDto.getMockedResponseId())") + MockedMessage mockedMessageDtoToMockedMessage(MockedMessageDto mockedMessageDto); + MockedMessageDto mockedMessageToMockedMessageDto(MockedMessage mockedMessage); +} diff --git a/src/main/java/com/release11/klaus/model/MockedMessage.java b/src/main/java/com/release11/klaus/model/MockedMessage.java new file mode 100644 index 0000000..1ea2250 --- /dev/null +++ b/src/main/java/com/release11/klaus/model/MockedMessage.java @@ -0,0 +1,53 @@ +package com.release11.klaus.model; + +import com.release11.klaus.model.constraints.HttpCode; +import lombok.*; +import org.springframework.data.annotation.Id; +import org.springframework.data.redis.core.RedisHash; +import org.springframework.data.redis.core.index.Indexed; + +import javax.validation.constraints.Positive; +import java.io.Serializable; +import java.util.Map; +import java.util.UUID; + +@Data +@ToString +@RedisHash("mockedMessage") +@NoArgsConstructor +@AllArgsConstructor +public class MockedMessage implements Serializable { + @Id + private String compositePrimaryKey; + @Indexed + private UUID clientUUID; + @Positive + private int mockedResponseId; + private String mediaType; + private String messageBody; + private Map httpHeaders; + @HttpCode + private Integer httpStatus; + + public MockedMessage(MockedMessage mockedMessage) { + this.compositePrimaryKey = mockedMessage.getClientUUID().toString() + "_" + mockedMessage.getMockedResponseId(); + this.clientUUID = mockedMessage.getClientUUID(); + this.mockedResponseId = mockedMessage.getMockedResponseId(); + this.mediaType = mockedMessage.getMediaType(); + this.messageBody = mockedMessage.getMessageBody(); + this.httpHeaders = mockedMessage.getHttpHeaders(); + this.httpStatus = mockedMessage.getHttpStatus(); + } + public MockedMessage(UUID clientUUID, int mockedResponseId, String mediaType, + String messageBody, Map httpHeaders, Integer httpStatus) { + this.compositePrimaryKey = clientUUID.toString() + "_" + mockedResponseId; + this.clientUUID = clientUUID; + this.mockedResponseId = mockedResponseId; + this.mediaType = mediaType; + this.messageBody = messageBody; + this.httpHeaders = httpHeaders; + this.httpStatus = httpStatus; + } +} + + diff --git a/src/main/java/com/release11/klaus/model/MockedMessageDto.java b/src/main/java/com/release11/klaus/model/MockedMessageDto.java new file mode 100644 index 0000000..c47d7cf --- /dev/null +++ b/src/main/java/com/release11/klaus/model/MockedMessageDto.java @@ -0,0 +1,24 @@ +package com.release11.klaus.model; + +import com.release11.klaus.model.constraints.HttpCode; +import lombok.*; + +import javax.validation.constraints.Positive; +import java.util.Map; +import java.util.UUID; + +@Data +@Builder +@ToString +@NoArgsConstructor +@AllArgsConstructor +public class MockedMessageDto { + private UUID clientUUID; + @Positive + private int mockedResponseId; + private String mediaType; + private String messageBody; + private Map httpHeaders; + @HttpCode + private Integer httpStatus; +}