From 2a2a1a7c90784d7df938d8ee3c8f9d8aac8837a1 Mon Sep 17 00:00:00 2001 From: Krishna Nanda <59322@hexaware.com> Date: Wed, 22 Sep 2021 17:14:28 +0530 Subject: [PATCH] testmem --- .../.mvn/wrapper/MavenWrapperDownloader.class | Bin 5516 -> 5438 bytes UB_UserServiceProxy/bin/pom.xml | 6 +++ .../urbanbazaar/ServletInitializer.class | Bin 1492 -> 1448 bytes .../UbUserServiceProxyApplication.class | Bin 1265 -> 1228 bytes .../controller/MemberUserController.class | Bin 3189 -> 4928 bytes .../controller/UserController.class | Bin 5300 -> 7130 bytes .../urbanbazaar/model/MemberUser.class | Bin 2911 -> 2944 bytes .../com/example/urbanbazaar/model/User.class | Bin 5038 -> 4944 bytes .../example/urbanbazaar/model/UserLogin.class | Bin 1675 -> 1656 bytes .../repository/MemberUserRepository.class | Bin 1157 -> 1263 bytes .../repository/UserRepository.class | Bin 1121 -> 1080 bytes .../src/main/resources/application.properties | 6 +-- .../controller/UserControllerTest.class | Bin 0 -> 6046 bytes .../controller/MemberUserController.java | 5 ++ .../repository/MemberUserRepository.java | 4 ++ .../src/main/resources/application.properties | 2 +- .../controller/MemberControllerTest.java | 47 ++++++++++++++++++ .../controller/UserControllerTest.java | 1 + 18 files changed, 67 insertions(+), 4 deletions(-) create mode 100644 UB_UserServiceProxy/bin/src/test/java/com/example/urbanbazaar/controller/UserControllerTest.class create mode 100644 UB_UserServiceProxy/src/test/java/com/example/urbanbazaar/controller/MemberControllerTest.java diff --git a/UB_UserServiceProxy/bin/.mvn/wrapper/MavenWrapperDownloader.class b/UB_UserServiceProxy/bin/.mvn/wrapper/MavenWrapperDownloader.class index 3075e872e2766607fd6a6acab8bbeca291e234f9..860ca6866fbc8ff73d048a50160b44b3af98ff58 100644 GIT binary patch delta 158 zcmeCt-lrvS>ff$?3=9k=4BG4rOpFZ5lLdK{HyZm3Or9fPF09DN!0B3%oLW$lnV-kO zpv=fDH93&SV{$&f@@78H^-PncM0B~;85vmIGILVd88jyciA-f=ocuz>P?dv0mO+kz zi9sG{I12+Kg8~CDkfp`I3>0Hv;M&c=7b&DP*;7s*Q delta 236 zcmdm|)uSzN>ff$?3=9k=4EpR0OpFZ5lLdK{HyZm3NU$Upr57_Y2>7O!WaOs=Bo-y+ zrk11@6;EyuuoPBiWZ-nINKP#%$;{8=U{GabmYN*M<1sm(UwJbh=Xxe7pnPdjPH;(4 zW?niY19wVlaY<%gB1rY*XTrMN+Kdb=Zkai$>I?=Gx7`7b&DNnM+hw4Wx;ai9roWsRJ<+g9ez? PWY7cB96$|9Ky5kz{TeNy diff --git a/UB_UserServiceProxy/bin/pom.xml b/UB_UserServiceProxy/bin/pom.xml index 391d8d6..05708ba 100644 --- a/UB_UserServiceProxy/bin/pom.xml +++ b/UB_UserServiceProxy/bin/pom.xml @@ -42,6 +42,12 @@ spring-boot-starter-test test + + junit + junit + 4.12 + test + diff --git a/UB_UserServiceProxy/bin/src/main/java/com/example/urbanbazaar/ServletInitializer.class b/UB_UserServiceProxy/bin/src/main/java/com/example/urbanbazaar/ServletInitializer.class index d8a86f88125579f686136d06bd44bb1635220c75..fe1424ea30ef19aecb1008b649484826a36f53f3 100644 GIT binary patch delta 81 zcmcb@y@H$T)W2Q(7#J8#7!)^hMX^k7WwB?GWn_?;oX9M}#?Bzm$RIQMCZo(`Ce{>2 grpf87?$XQ*l0fxL3{nizK$?L;0f^avd>IBg01Vd+*Z=?k delta 124 zcmZ3%eTAFr)W2Q(7#J8#7?d}1MX|_pCl(asWF{w;Waj5FG6?vlmSp6o1SA$E=BAdU z78OrUVsT`VXJn9=oX9M}#?GL~$RIQMCZo*chb$?K%#+<%-PNRkrm-?INCGKl25BJ4 V#2~{U3#1tslz^BG$d_YK0043W8V>*f diff --git a/UB_UserServiceProxy/bin/src/main/java/com/example/urbanbazaar/UbUserServiceProxyApplication.class b/UB_UserServiceProxy/bin/src/main/java/com/example/urbanbazaar/UbUserServiceProxyApplication.class index 93755c07ec8109b3f5cababe386c5404fd27cafc..8bda0a7daeac36d15ddfaa4e4910c7af46aec179 100644 GIT binary patch delta 67 zcmey!d4`kg)W2Q(7#J8#800o`^)pZ2%$&t2Gg*$MoRM+zG!{d7W(IMfEE9tSgCvk< RV_;;E0@AWT%mQRf0{~T~3*P_$ delta 103 zcmX@Z`H_?B)W2Q(7#J8#7!)>g^)pMbBo?I?GcpMHrj}&nrvxMxCFZ7b)QVh~SnvH>xK?X?612GGbEeim=Qxq`( diff --git a/UB_UserServiceProxy/bin/src/main/java/com/example/urbanbazaar/controller/MemberUserController.class b/UB_UserServiceProxy/bin/src/main/java/com/example/urbanbazaar/controller/MemberUserController.class index 2d186bf8bbd34bf135609b45d95a1bca8aa84235..0f5a23594a3c43d583cd6f07f08c7649a2194c04 100644 GIT binary patch delta 828 zcmaix%TE(g6vn?Z({^4(t0*Bp0$S`tiq=>o()gl~*kme2BZ&(ngS~+04QK~ z)7(|GUvgegwk_Hs`BF*t;)zxAn!Z2hxhrl%zR^e8Ka}T++|jc#VlK*D^t)!vh`I=b z%tuq5nrc+n<))FA`|6^6rOnH)5le2Xnf8A4C%x7ybV1(Nzf2{3;doD1D`IU~c#nMH z5sqfcS-W2-5{}qaCs2s@S63y@QNC4vozcF0}XcxX5YGolKf=Ok|qtSOp1JH z738ipG%$iuC^*NDrr^9hW)0Gq9F3e{5X!cNEJ0h z6(v69_(~lqG)Uf!-(#P+G$Tf#^sWOT5zM9tyTeY)lU`qhLI(6`oM=Ua2`9Pixb%?l zZG>63<%QjIPxidFFX}Paq-^p>k4|G69Xc}0Rnt8cL3lhIgmUQnLe_QILD1Y@5bCgt zU^GR)E#w&+I_x9ZWa>6eOb0dkHXEqYTPjDFmW^{{rP2#I{#XPd%RpF$6;L40y#lL* zRvHV`u}aPwltBA`Ux!7W>&WY6ZsJ@uP+0&lo*{9O+Ms)@=;Zj$xeh~x3ZDvWfzFJw OSY;k?#dx;O`raRbTT9;n diff --git a/UB_UserServiceProxy/bin/src/main/java/com/example/urbanbazaar/controller/UserController.class b/UB_UserServiceProxy/bin/src/main/java/com/example/urbanbazaar/controller/UserController.class index 5e4e78351f835a5f5405fbf0d9c7314da38b5ecf..f444e34391b56718c9f22ebb72e40f2804cae32a 100644 GIT binary patch delta 924 zcmZva!B5k06vyAMD=S;KwQeCIi6TsK!_hGvBF-R)h{_K{P!n!6*vuNzE^UW$k$5IC zftMH$9!xx#5KT0gm`G4h9^imyFUG$>67TBk1`1(^*I)a7zt8XczTfm+`dfE+{r88D z0FZ~##qd`lGKrt%(%b@%jH{Q>5L%@s}PWb%MxyY6+zESeTI6WFIJs0Z4m3B#E+ zr;SQat&2o&I=bcR)1GNt`pixj7Xn*2s*d5ZqTy7q8AoF2C3OQ^#SY}^{K_x!g%}8p zl`*HJ@s*N6RZcFc95;g*d=h%DHKzD2*Ki7HK5n=r+j5OT%QL;X0)x=+C( z)noWQ)`orI8{$zWEckX%Qs)4`U5J zA?$aUl{H*HkerY5T>+CV$*x3AW2wGpZ@{)Z$DWy?5J-w|r%vw*-;;Pjf{P49--iU3 z7{vAlCc$Oe^$kmKg)Z{nxLq_GEeWpCY5#lNDA}&*+0L8<9C^H-N%%NE96v;Vi2zM- zm{y4agCqDO(a_NR9@I~jtpq)T)CXw6w~0hIgBEBdqzWcMrky+lDks9L5Sff0ufb-0 zHqPJ#q=@||mad4k*8uX{Kn6PY16mEB#|N4ibV81%sZMw5zf#rK=^9|~wo(_I*{xIs s&ei~ie4r};=PLOWK%zAcBAlnSm+AslAJqs|jI!&80T_fKxC+C60g40DrT_o{ delta 818 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 literal 5038 zcmeI0-*X!^5XV=p8{6mna6=1$LaGKRcA<6&p+H(v+LCl!oWit;XW)Su*{8%x&v!RE zIVAm0_)B152HyFj7*?__b|xC*dw}Uf9xjSjtFJz{TJ0(M>+j$G0Dv`U6(C38b|Slt zJ`-W%fE}_%H|jU|5$neRZwzFIg&p>iG1=%xJ`WnZ36}-P6Q~&HfQ9>wZ#xIPs|d^t za8URJNRvQGcR0!h1QuH(=jTd_aQ`lWS?v(BB>5?lIA>0G_k>JT$okw42Q2Lt^>A0H zW2>AfrqHXP%`Zi4t#L03(OTA4=KGQ-iB+<_Rdn3vY8S^f=!I$xQLjE5gi7>zGdvWD z=mh*h7)Gcsq7bL&TTLHvE3L;oL{-K8HVXzEP5DO{k^;O*U}5xrn^H!y2v-TjyCDKZ z!6El41~nFek)*MVaE*SlPQ6kShnQZCb~rupRuN@X9mm`&onCaZvjfiwz4J(#;25wBAu@` zYwaR@K;Zi1uwYa$*xOw7BL6!kF&7kX%nlhI(CrIvBGES&%gLgb3&&&#^+AnbRlTswLoBf zp~)cT58qI4FUX~8iS;bHWGQ-*2YJFPG! z!uh68w^iqHdL`rZpPnFdqs7ae_dFWNF5eRRURTn$UGuddP;3p0FW$}yEmLCkJyzei z3-ILBrGA(`c)!^eNrE@_9lVYva2;?7{M(@nIk*Tj_*)JNP&94Hww`Uvww<-@oNecA zyI|XjZ7-R230GKz*HHH|s(RR7!S;20-oR%KS0~#3J1l*__|`A*_Mh0x0mYv)W@HH& z0cM9@umbO5kHCBIK6<4JIkXKGZa5T{9ST*PagpFFYq1*K#Gk3y2oRY!0odIXnAx7Zi3^;cj3KqvRII9_O)*WI5 zKFNTy;ZU$RWrMSp0q3DZjKHTEaJC!@7H8Jr+{u9R#34rDvkW*-9SRm_&ft8W0q2=R zjKCKeaM}(9i!*O<)-&Mz;1DBlHv`U(4h4&|U~ukb!09-|2z;3VXV0NvaViF9BLmKX zLyW-v3^<`f!QxypILq+WSWVUGJuLAL990?r3xVUOKN4E(R@szzT~~E6(-lM?TP>y& oRA+_W3jO}+qK}-Pf@v4M0AHh44mMA|c3aqgjL$dt diff --git a/UB_UserServiceProxy/bin/src/main/java/com/example/urbanbazaar/model/UserLogin.class b/UB_UserServiceProxy/bin/src/main/java/com/example/urbanbazaar/model/UserLogin.class index 7194a7431912c14da5907df0662737e9adde90c2..cc2c9e9ac44ae3719c014515718d77ecfce94a5b 100644 GIT binary patch delta 241 zcmeC?{lUX^>ff$?3=9k=49Xk1o-j^kWb$W`VPrCzcuRS5Ia7ynNJgqcW^O@#QHerU zVp(E^LULkWUVe!}QmR5xYH@x}S!&8;1xB^W_n6ft-)B|@>X{hi8I*uD3s9W`03yCHA^-pY delta 237 zcmeyt)6L6u>ff$?3=9k=3@RJBo-hjdrj}&nrvxMxCFZ7XX@7MffCuhO#m; zumUMY2Fb|@tlE=3S;bhT;EK9gMbw~**ujbf8KfDQ7`VWWVP;?k(p`~6P+(97(kwuAiU5dgCd~i< diff --git a/UB_UserServiceProxy/bin/src/main/java/com/example/urbanbazaar/repository/MemberUserRepository.class b/UB_UserServiceProxy/bin/src/main/java/com/example/urbanbazaar/repository/MemberUserRepository.class index bcc9d2de7c7591585fcbb2e30a22d27516758ee8..d28516b7915e7b124d5a60866618132608c12d72 100644 GIT binary patch delta 210 zcmZqWe9y^s>ff$?3=9k=4C)iPCNVJ?Zk)%%IJup18*5-`YEk86M<)5nwoDIfq=QQH zN-}d(J@d*ki!+mQQXTX1@=Fp+GV}9_85!7pz^bho8Cc5_b4pVg8MyO+a%HIyL(G}$ zwB>=SJo8FY(^HGs859{Ac)bb|gHj9fi!)2|iz?X}lo=UVd@_qm*cntOKVU926$3ho sje(It97wY;NC8PE25ANnFfGF%3#1ts)PR_Wft5jyL4iSuL4|=C0BTS&=Kufz delta 165 zcmaFQ*~-av>ff$?3=9k=45|~kCNVL-+BlDgaq?Nl$&*`{9!Rm37N-_@rZ6%H_@lA4}c#Lghk$iVAWkQkI&kYAixl3!HG&Y;N1 zz~YlxT*A(vJlT__&_o<)5i28u7?5INkN}cQ43Z2YU|Nbn8b~uRr~ok!11p0JgB*hb IgAxNX0O7kN;Q#;t diff --git a/UB_UserServiceProxy/bin/src/main/java/com/example/urbanbazaar/repository/UserRepository.class b/UB_UserServiceProxy/bin/src/main/java/com/example/urbanbazaar/repository/UserRepository.class index cce83b0b417bcbde62d9237077fa039fd7101adc..56e39d3d3f5c26c713997704091b262c3937ccf1 100644 GIT binary patch delta 115 zcmaFJv4ex_)W2Q(7#J8#7?d`0y=R&%&RnA{#mKs62#lv4ES`3m@n7ofUSDS%>g+T;p1`~rQgBX|=XOIBW3=E1u%)`LSAju%j KAj`naAP)eoJQckF delta 155 zcmdnN@sNY-)W2Q(7#J8#7*sZLy=Ri)C@oGc%1g{mWn>WWO)bgDPYFmY0&+`Ii;5?I zXR6bdVPs(U%qvMvPc33+kYi-v^(sgVN-fAQ&Me6|24WrtRt9MXSq6CqW(Gw7eTX3A diff --git a/UB_UserServiceProxy/bin/src/main/resources/application.properties b/UB_UserServiceProxy/bin/src/main/resources/application.properties index 83b07d7..51194ab 100644 --- a/UB_UserServiceProxy/bin/src/main/resources/application.properties +++ b/UB_UserServiceProxy/bin/src/main/resources/application.properties @@ -1,10 +1,10 @@ -server.port=8001 +server.port=8500 -spring.datasource.url=jdbc:mysql://10.3.117.7:3306/grocery_db?createDatabaseIfNotExist=true +spring.datasource.url=jdbc:mysql://10.3.117.22:3306/grocery_db?createDatabaseIfNotExist=true spring.datasource.username=testuser spring.datasource.password=Password123 -server.servlet.context-path=/user +server.servlet.context-path=/users spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5Dialect spring.jpa.hibernate.ddl-auto=update diff --git a/UB_UserServiceProxy/bin/src/test/java/com/example/urbanbazaar/controller/UserControllerTest.class b/UB_UserServiceProxy/bin/src/test/java/com/example/urbanbazaar/controller/UserControllerTest.class new file mode 100644 index 0000000000000000000000000000000000000000..84a845c7b4b437fcb413489d12c6a45bf2e07f31 GIT binary patch literal 6046 zcmeHL?Qa`37=N6;B)N8L>0Sy9m{(qwN{|dFUnl~#RVx);wrOcL@zJ?+6L)v#o9)Ze z{bNWV!6&}(Mx6rT zKrxiw^Lp1KP*c^C^M(J?ZlztPofk?q**psY>t;xz=k&ifb8k zxli$+u?YI8G*%Lq3H7(sDIaw>^|==?T!6;Rd(PUNZXk6vV@q{}E!81gHmEPTrnplY zGUIiqK_K3XkrAUn$nC1-cGd0=r;mkAcO=4CDnq4eQ;%78&=#k!&oU#K@#V_GfFhVH zQmBN_gz4mbqefCj&1uY?awAqEYX8_oCEVHznASKg;%dySOxLkF7VSi(N_bwbM;B_g ztl4RB)fFCptYq(W#CD8XF5Tp=l*SsXF~kR=SLdc9{YT0ldytf}fvU-sz7V*}lwfFJ zobn;sRpALkbrM@}8EK;u&qzg6n_1bULenJj`LT%5ZXDwm?6V}meGjRtw4UHeQYy+K zYiLs75hACY+1v{^mfqpOo{pi*wbx_j>~cH-A44?RHZ!W-LWB?te z8{!qOAWV)xUXC(e#r}8fJkc_G%uJ`!FxFhYF-wOxJ42dGfTzc&nJV-{;%Qly>0QhW z>FrSk2d=}7Wmtln1a4K_VQ!Wh#BH0qt+*KRJWRqCS4TElBCzI4j|ES&=qVeVHywd# z;J!PBycHA31uaCTQ1`b#k zfnst#c*lg=web*g;bTHxOu&U%^rS2crW8G)%x59|gY5#gOR$Xp*YIr%XAo?iU*Y;sYpXxQ+VA*Q zfLr))X8=C8@!!%T6|BR%{jv9Oq%gpJAIHw4-N`}Q$VK}Q(dOVIM488R?hbJ8<>GGS z;NH*0{p5{sKh42?kc)f&U*rCegF6QmJZ}Lu`{#GC_c^{-@!7(sgdDmH58$i60WSW? Ai~s-t literal 0 HcmV?d00001 diff --git a/UB_UserServiceProxy/src/main/java/com/example/urbanbazaar/controller/MemberUserController.java b/UB_UserServiceProxy/src/main/java/com/example/urbanbazaar/controller/MemberUserController.java index 8a7841c..31bedd1 100644 --- a/UB_UserServiceProxy/src/main/java/com/example/urbanbazaar/controller/MemberUserController.java +++ b/UB_UserServiceProxy/src/main/java/com/example/urbanbazaar/controller/MemberUserController.java @@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import com.example.urbanbazaar.model.MemberUser; +import com.example.urbanbazaar.model.User; import com.example.urbanbazaar.repository.MemberUserRepository; //@CrossOrigin(origins = "http://localhost:4405") @CrossOrigin(origins = "http://localhost:63871") @@ -41,6 +42,10 @@ public class MemberUserController { public List showMembersByUser(@PathVariable int userId) { return repo.findByuserid(userId); } + @GetMapping("/findMemberByName/{name}") + public MemberUser findMemberByName(@PathVariable String name) { + return repo.findBymembername(name); + } @DeleteMapping("/deleteMember/{memberid}") public void deleteMemberById(@PathVariable int memberid ) { repo.deleteById(memberid); diff --git a/UB_UserServiceProxy/src/main/java/com/example/urbanbazaar/repository/MemberUserRepository.java b/UB_UserServiceProxy/src/main/java/com/example/urbanbazaar/repository/MemberUserRepository.java index 66cc203..e8815c7 100644 --- a/UB_UserServiceProxy/src/main/java/com/example/urbanbazaar/repository/MemberUserRepository.java +++ b/UB_UserServiceProxy/src/main/java/com/example/urbanbazaar/repository/MemberUserRepository.java @@ -6,8 +6,12 @@ import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import com.example.urbanbazaar.model.MemberUser; +import com.example.urbanbazaar.model.User; public interface MemberUserRepository extends JpaRepository { @Query(value="select * from members where members.UserId = ?1",nativeQuery=true) public List findByuserid(int userId); + + + public MemberUser findBymembername(String name); } diff --git a/UB_UserServiceProxy/src/main/resources/application.properties b/UB_UserServiceProxy/src/main/resources/application.properties index 51194ab..6b54763 100644 --- a/UB_UserServiceProxy/src/main/resources/application.properties +++ b/UB_UserServiceProxy/src/main/resources/application.properties @@ -1,6 +1,6 @@ server.port=8500 -spring.datasource.url=jdbc:mysql://10.3.117.22:3306/grocery_db?createDatabaseIfNotExist=true +spring.datasource.url=jdbc:mysql://10.3.117.21:3306/grocery_db?createDatabaseIfNotExist=true spring.datasource.username=testuser spring.datasource.password=Password123 diff --git a/UB_UserServiceProxy/src/test/java/com/example/urbanbazaar/controller/MemberControllerTest.java b/UB_UserServiceProxy/src/test/java/com/example/urbanbazaar/controller/MemberControllerTest.java new file mode 100644 index 0000000..3adf033 --- /dev/null +++ b/UB_UserServiceProxy/src/test/java/com/example/urbanbazaar/controller/MemberControllerTest.java @@ -0,0 +1,47 @@ +package com.example.urbanbazaar.controller; + +import static org.hamcrest.collection.IsCollectionWithSize.hasSize; +import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; + +import org.junit.Before; +import org.junit.FixMethodOrder; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.MethodSorters; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.http.MediaType; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.web.servlet.MockMvc; +import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; +import org.springframework.test.web.servlet.setup.MockMvcBuilders; +import org.springframework.web.context.WebApplicationContext; + +import com.example.urbanbazaar.UbUserServiceProxyApplication; + +@RunWith(SpringJUnit4ClassRunner.class) +@ContextConfiguration(classes = UbUserServiceProxyApplication.class) +@SpringBootTest +@FixMethodOrder(MethodSorters.NAME_ASCENDING) +public class MemberControllerTest { + private MockMvc mockMvc; + + @Autowired + private WebApplicationContext wac; + + @Before + public void setUp() { + this.mockMvc = MockMvcBuilders.webAppContextSetup(wac).build(); + } + + @Test + public void shouldFetchAllMembers() throws Exception { + this.mockMvc.perform(MockMvcRequestBuilders.get("/users/showAllMembers") + .accept(MediaType.APPLICATION_JSON)) + .andDo(print()) + .andExpect(jsonPath("$", hasSize(4))) + .andReturn(); + } +} diff --git a/UB_UserServiceProxy/src/test/java/com/example/urbanbazaar/controller/UserControllerTest.java b/UB_UserServiceProxy/src/test/java/com/example/urbanbazaar/controller/UserControllerTest.java index 267055b..31d69b3 100644 --- a/UB_UserServiceProxy/src/test/java/com/example/urbanbazaar/controller/UserControllerTest.java +++ b/UB_UserServiceProxy/src/test/java/com/example/urbanbazaar/controller/UserControllerTest.java @@ -1,6 +1,7 @@ package com.example.urbanbazaar.controller; import static org.hamcrest.collection.IsCollectionWithSize.hasSize; + import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;