From 58b08878bdc5ed9e85e2225e504a8fe404afa4a6 Mon Sep 17 00:00:00 2001
From: modzeleg <g.modzelewski@protonmail.com>
Date: Wed, 24 Mar 2021 11:46:57 +0100
Subject: [PATCH] T235 Removed KlausController class

---
 .../klaus/controller/KlausController.java     |  65 ------------------
 .../klaus/controller/MockController.java      |  31 ++++++++-
 .../klaus/controller/KlausController.class    | Bin 4343 -> 0 bytes
 .../klaus/controller/MockController.class     | Bin 7200 -> 10024 bytes
 4 files changed, 29 insertions(+), 67 deletions(-)
 delete mode 100644 src/main/java/com/release11/klaus/controller/KlausController.java
 delete mode 100644 target/classes/com/release11/klaus/controller/KlausController.class

diff --git a/src/main/java/com/release11/klaus/controller/KlausController.java b/src/main/java/com/release11/klaus/controller/KlausController.java
deleted file mode 100644
index cd35fb9..0000000
--- a/src/main/java/com/release11/klaus/controller/KlausController.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.release11.klaus.controller;
-
-
-import com.release11.klaus.model.MockedMessageDto;
-import com.release11.klaus.service.KlausService;
-import com.release11.klaus.utilis.BusinessKey;
-import com.release11.klaus.utilis.TrackingClient;
-import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.RequestEntity;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.UUID;
-
-
-/**
- * This controller is responsible for returning the data of given mocked message. The content is made of usual
- * http parameters like: body, status, headers etc.
- * Basicly the api is responsible for what a client is looking for - a mocked server response.
- * Important note: {@link TrackingClient} use is to create logs - the history.
- * @author Gabriel Modzelewski
- * @author Rafał Żukowicz
- */
-@RestController
-@Slf4j
-@RequestMapping(path = ("/klaus/v1"))
-@AllArgsConstructor
-public class KlausController {
-
-    private final KlausService klausService;
-
-//    TODO: Move to MockController
-    /**
-     * It's one of the most important features - the bread and butter of the Mocked Service. It's link that allows
-     * to receive mocked response from the server and use it to mock!
-     * @param requestEntity Logs the data of request
-     * @param clientUUID the key-uuid of given set of messages
-     * @param mockedResponseId unique id of given message
-     * @return
-     */
-    @RequestMapping(value = "/get/{clientUUID}/{mockedResponseId}")
-    public ResponseEntity getMockedResponse(RequestEntity<String> requestEntity,
-                                            @PathVariable UUID clientUUID,
-                                            @PathVariable int mockedResponseId) {
-        TrackingClient.setBusinessKeys(Map.of(BusinessKey.INTERFACE_NAME, "getMockedResponse - request",
-                BusinessKey.CLIENT_UUID, String.valueOf(clientUUID),
-                BusinessKey.MESSAGE_ID, String.valueOf(mockedResponseId)));
-        log.info(requestEntity.toString().replaceAll("\"", "\\\\\"").substring(1));
-        TrackingClient.setBusinessKeys(Map.of(BusinessKey.INTERFACE_NAME, "getMockedResponse - response",
-                BusinessKey.CLIENT_UUID, String.valueOf(clientUUID),
-                BusinessKey.MESSAGE_ID, String.valueOf(mockedResponseId)));
-        MockedMessageDto mockedMessageDto = klausService.getMockedResponse(clientUUID, mockedResponseId);
-        HttpHeaders httpHeaders = new HttpHeaders();
-        if (mockedMessageDto.getHttpHeaders() != null) mockedMessageDto.getHttpHeaders().forEach(httpHeaders::set);
-        return new ResponseEntity<>(mockedMessageDto.getMessageBody(), httpHeaders,
-                Objects.requireNonNull(HttpStatus.valueOf(mockedMessageDto.getHttpStatus())));
-    }
-
-}
diff --git a/src/main/java/com/release11/klaus/controller/MockController.java b/src/main/java/com/release11/klaus/controller/MockController.java
index 1378fc4..d5f7123 100644
--- a/src/main/java/com/release11/klaus/controller/MockController.java
+++ b/src/main/java/com/release11/klaus/controller/MockController.java
@@ -3,11 +3,12 @@ package com.release11.klaus.controller;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.release11.klaus.model.MockedMessageDto;
 import com.release11.klaus.service.KlausService;
+import com.release11.klaus.utilis.BusinessKey;
+import com.release11.klaus.utilis.TrackingClient;
 import lombok.AllArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
+import org.springframework.http.*;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
@@ -154,5 +155,31 @@ public class MockController {
         return ++highestId;
     }
 
+    /**
+     * It's one of the most important features - the bread and butter of the Mocked Service. It's link that allows
+     * to receive mocked response from the server and use it to mock!
+     * @param requestEntity Logs the data of request
+     * @param clientUUID the key-uuid of given set of messages
+     * @param mockedResponseId unique id of given message
+     * @return
+     */
+    @GetMapping(value = "/klaus/v1/get/{clientUUID}/{mockedResponseId}")
+    public ResponseEntity getMockedResponse(RequestEntity<String> requestEntity,
+                                            @PathVariable UUID clientUUID,
+                                            @PathVariable int mockedResponseId) {
+        TrackingClient.setBusinessKeys(Map.of(BusinessKey.INTERFACE_NAME, "getMockedResponse - request",
+                BusinessKey.CLIENT_UUID, String.valueOf(clientUUID),
+                BusinessKey.MESSAGE_ID, String.valueOf(mockedResponseId)));
+        log.info(requestEntity.toString().replaceAll("\"", "\\\\\"").substring(1));
+        TrackingClient.setBusinessKeys(Map.of(BusinessKey.INTERFACE_NAME, "getMockedResponse - response",
+                BusinessKey.CLIENT_UUID, String.valueOf(clientUUID),
+                BusinessKey.MESSAGE_ID, String.valueOf(mockedResponseId)));
+        MockedMessageDto mockedMessageDto = klausService.getMockedResponse(clientUUID, mockedResponseId);
+        HttpHeaders httpHeaders = new HttpHeaders();
+        if (mockedMessageDto.getHttpHeaders() != null) mockedMessageDto.getHttpHeaders().forEach(httpHeaders::set);
+        return new ResponseEntity<>(mockedMessageDto.getMessageBody(), httpHeaders,
+                Objects.requireNonNull(HttpStatus.valueOf(mockedMessageDto.getHttpStatus())));
+    }
+
 
 }
diff --git a/target/classes/com/release11/klaus/controller/KlausController.class b/target/classes/com/release11/klaus/controller/KlausController.class
deleted file mode 100644
index 5ea19364e6b68a5a2f8e851b192ea9e3c5a4f106..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4343
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

diff --git a/target/classes/com/release11/klaus/controller/MockController.class b/target/classes/com/release11/klaus/controller/MockController.class
index dc54a4173d408dc32e120a31f23de6824dde87c3..7859840bab96ffee5ec314adacdc3d02bea89874 100644
GIT binary patch
delta 3608
zcma)7c~n&A7607_!@%%>aad#&Wf2iXJFya?j#>m!Q9vVzYop`vz>#4FXR)!COrkMu
zmg+fq|Flg#ZPR~pY@5U#lhd?m+O$p6Hr+SdG~M@o%cAY?dv6%V$jK?^Fz<WccfWgo
z_jiByzK<?@tk?a*^{1Wzuv{K;LK7@9rL@w#s+XNzd9~18fY0GMCqA#^3wU18U~b7R
zYe*(S;ZWSyo{WbgMm)aBI3g(S>h15`x^7KJ=ic5mJ)MF^b8~Ka>Sj}aKE5QFJ!~X;
zqQMbkaH|m?i$>x`&ElGvaVTlT6DsBlI=-R;7It)Zb@uk}-L|c3tqY6sRUJWmjX)Z^
z4+ahgeBnT3*tdEAK_i&(H)U=0C1Rn-uz!>C^^%TnC||Cg&c41i>pS<_uD+#QeOpl8
z*fq_~LL9<(b$k!s7iiHT!MOQo-hA_7o+s<y>s9&rdIDp97k-EzIdN6TkMR>hlOigd
z&b~hu2#yd=M>u3e5`vPrk;o!1F7Tw&$+&A8C_puSs^b;>Opp_f4%4VR8XNY-!$U0x
zecjRFVI#(<zrb-PeyJ++tY>zs#b0M65lS4%$FBuamyh4_{+>N`ioM_K_yhh(CSt}|
zI1n_}gu{YmjpnJ+dUMq6Oj&HEsZ;iU*6|lbQ9(SpKW;Hvh`-_QPW(g1KcNfUZ$>1@
z4Mm2c`S`b>YWf=6<u1g0ysG0h3<zeV4c${}aN-R?J#+G=HY5^b8;ro95sSO<I&xj8
z#D5uEgsS7staG|*OxH5Qq)T!n*C`HN^2A94OE%W2EgQ05tb`Ye8NJa+Z&Fc`tuFI3
zd9!DF04dPLC53{#Krm>Gv5e~*&9jbKBU$k$C1|-HN=AZ-P&DFe4|P!B$x+ses*)mI
zils#09E!#|1Hl7=y6oytcdco_DKi8M$j5?C<}anXl;MP(e-B$QFl@9(2al+u3SDO6
z(}JQjHGPRdA{lpyS7te7HZ?C*f_aMBVujp3X1g|;PdKWYr?&hqam!pC4yhLGpQhcI
ze0ix&b26L=4FtkTLv?~8r98_|(|}8A!4lM&HF}vY^)lZn4Z19lMzc-tJ%3)`;nW5d
zmsNU}e*NZ09R5<~k)8^+s?}VfVO_Q%WjJb$k~9-*6H(O<gi(@R8^Ovq$5?58th7SA
z^QPEpzf8q%5iItNgagUA@9+{I8TB0vT1~9x(YWuZ9d~ksbq$Ww-Wq&nqgHO-R`y8B
z-5!l5*gJu-9wTueIv6j>lXtn~PC4R~ck6Og-oyG&jj~YWaCF4*bq7ZG4+eN6Fcb(T
zqA?EG!qM!v7qbhJzGMg35Qq$hjd*=`G&+(T6F-}KPU;4W{v%_CKWkS0|A)5kx4xS_
zOVge^iUZ+rUnpVt-Ex<b@uPVS-hmQ_+|7oTdvrM_$2p`p6?te)BS+JKTaKGAl{KZD
z@;<@*n;4odS*JW8nETeI>|dK1)S{ZY1T@T2Q<f_a>M)PbLe7>ZS;((pGt8Ruh5Mw1
zyLpf;P87)^%QBb0^O27R6k`G0sFTIqsX-3+^5t#f17{6A+#*Z30!roWvXoQgR<7wu
zTKN>YO_s62n$0ui%Ttp<?zl0?QaWrwDQ?AF_^co;aB#0emdgr)FGZpFWhDbwr^9J<
zU2BK4R;y$+L$z_O$r=lQhpTqR@8JI0-H^C+O6@uta6pQz=gB+x;t*NIhsXx$vQQqc
z*rQ2{`AS7u%3`68Fo1THp#xs5MLjzC(O3sR*7LUu8?iA1cm@HUl#K)obZ5YI%O(Ym
zx0j|*>(MCP(t{l7rKQd@duKCu+PI_17N$UW<>?$+?Hn}b5SQCUWnq0BwsOC3m-J7j
zvWW*G+tP%epV?~X;DM^-04d$hD(;{bc4jaG4H={jX`~M7#?Hgd5?DxiN0$MXAUA{A
zKAXaPBkkKQ$O{zjHeiePty8qySa--yi}q8MjW*U|atI6&>o7HXAPZ+@24`g&C-^DY
zMQ$}(ms*H(c&A8q%O2uvqaRJ)d4m}4u!$t7y%vi_8aD_^{mxEfE6{}4WEXc`*g)FY
zBIfPh>OM;kHoiC`CQyW=g->+^P$K(Sd-YdhArRWQEZJ&Sedu=|{qClL^4n$kea<^%
z=iN$gz+F^Zin-j)M!1JMJBB4V&bGK0t8juUypNiDKe}-eTX728aLkHdVJU7P9X}tv
z5|I5&X;NMGPLMlk$rA?(=%SB;Yc?O7waISGGUQ%EfjDvY4b(bOxlUfC!PG4H0ONcR
zRrnBE@kl1~D$JBYt2qI`r4}`BmW#nEOkuFkHj{uh2G?Y05=%E<C56{ySP6mae$I|O
zZk|4eXFXp$hc7Rhz>DYb^*Iyx<^;Yofgha1%gvYYbI-3lzqy3p<zB*{uHdg4l>NV^
zvtM`ta~I9Ig8$@TMefshedlFdTjB8X;`Qg@RnOFQuVd$gXxpC>w)+*)H9Rfuojekc
zS6NE=B|I}Bm9+V+crVMGCy6lE8fToO*Dy}HoE-Futko#t?-?@u3AWoOS<W+T{!if+
zJdWjf0&RGb!{l));4Ia34tsGvg>hWK1GtC}<ATNPYMX<M=1<E330YJ2bY{k!#>3<|
zhfdbZLDiddwHhCn5i&Vhd-BMeVOFAzpfnk^`k|Qb>7l}2h)7C}loF-lOgnI?)KZiq
z2lzP2|A*BvT}PF2xmJy*MxATnWvN-%d=Ycc@=dci;P~fyR+c<nnN(cXCumZPd~qX|
zFJsmxL;0<>?oy$i>Is>59xp4mlI3<LnLoijj(9xC8E_v(`(C+U9)wp8abJ^|m8FZT
VIIkx7pX5F#tsJJJ$0a5A{tv!f0eAoa

delta 1482
zcmY+ES!`5Q7{`C-&a^XgJJU{QN*NYAOk1I0ktopEC?;-%E!9AZM2(>uXwne365pf>
z`sDI*9~7T_^ie{L#s?A$xUdVd2`cX5S`bB`qW^Qw?R1#Qz4yD{Ip_cV|KD=o>V5Op
z{N8Kt?*w{GONziSH+rgAik>XAY`^_XLs!TM$rQT``N95Y`sZ)#e|%v6eUA>Ve{568
z9zIO*QI?PSB)Z((Tg*^qUzYtGFeElUF<>a{SX3BHnR!uvwl&&3?d@pfhFLSIXy1rJ
z228b^Wff?rL(dSyK@Mr<a5T_1XC0^HtjFA+BFCq0V^a4{(%eWRGsz3=h&(e$$d~3Q
zp9!K_0LM5k3yPfJq@JJa5)!BNG@RiJ>J;QcThH)#kVmc$a*N;===eg~xXA@ss3U1w
z`I4^`phyE}`C5U?akxOxl{lQWzTsPi`d;3E9~^;#tRMCMll<o%!VK{<m0#pY8F_w{
z@tv+ZqobDPZ~X39?khj+S>{RR>c?zF7K|}B#horG?P7)O7VcsScPl;jFpqn=jV1ao
zWjV{L{F}x1RsIkUSXt$|l2ONXiWK|RPP#bH1?~P*JG1l|!CKcvxxA#moTN#yq|;tf
zAW1{~jTM!(qAuzB=Rq!yD;w2<;YytUt24TXYYN*ZxocF^2h<sBtDI4xeG#qYnbs-4
zo@rhc@l2<R=T%iC8FN<Cy0r<)*H>Z8QJ!VX;0e1bToS>!3ZCn~Tys@8QR(tr8<hfB
zFXsmJz(5VpQk7>Z<_RVKQ*Hz8E;_~uoyjRPMm$|2O;Fn#CgE6#lu5cQ<^nk^Dcz^V
z+%kdS5wIPZrAnC{m~HLl)h?Hw-_wdXq_NrL_}Kx0CR3-{+h3DoV6-Q6T^u;gnLry9
zNI#3a%;7e4Z1B3fg$B>6+crzfu;$`9_1W{>%oY~0mBqZE4t!BP_p*BH6;?@apVsYw
zwh9W?#PQSgntGE`B;Q>|nAVe)$LHSiAR~y?B7Qg;?N||TDq7rGs%@9o1o}GD*+w^S
zRAo+QvdOr?L?d8Z!wz7N36=7RfPU?w)_f5f#*2PlF6G5!t$5jY=xMo!v)|=|*>i^9
zp>4Zf1D9(1ML|P1Au+7BK<GYd<AU^(Cv9@>BV=(a?x;i-%I~pz2YW55sX=WeVG8ou
ZkK#*|Op%OfWRgOgCf6~cth~-N!~Y*!_)q`<