From 399d22b28f4a5db89786a638469424f32d7598b5 Mon Sep 17 00:00:00 2001 From: Tina_Azure <-> Date: Thu, 9 Mar 2023 19:05:33 +0100 Subject: [PATCH] Modification to use the HandlerCollection + slight cleanup --- .../classes/java/main/cavecomm/Database.class | Bin 5398 -> 4717 bytes .../main/cavecomm/HandlerCollection.class | Bin 0 -> 3108 bytes .../java/main/cavecomm/MainVerticle.class | Bin 4309 -> 4475 bytes src/main/java/cavecomm/Database.java | 39 +++++++----------- src/main/java/cavecomm/MainVerticle.java | 16 +++---- 5 files changed, 19 insertions(+), 36 deletions(-) create mode 100644 build/classes/java/main/cavecomm/HandlerCollection.class diff --git a/build/classes/java/main/cavecomm/Database.class b/build/classes/java/main/cavecomm/Database.class index b308574dce99284fdedb73e5d0174a2b6381038b..fda5961e242a7a8d1c70b406923e4f7ed536aae9 100644 GIT binary patch delta 1747 zcmZuy>2p(66#w1irAc017rNR7=#pxirs={cGju8~Z6TGewsdqxEU)Raw5CZ(Ub=wV zf{KV6cop{*wJL&^Vr_~jD7fH?Yemt&zz=-%gUh)uvC|K&u0Ngf z`F|EZ08ooRW@Mi^v#q4Xr;cjA;P7xoqpGWYYFMjj<~tk(vxm)7tVYJI=(S>-0u_A> zIZMu7HPG+ZLJdK`U-RjM!2p9CjOZf~{f4ggHiq>jyj98Nd(4HkJp!a(fhG{*PTua; z78y1SDAl*k#2X3ht!PjD&)WotRWGg%E=j(8hHu_Aq3Ma2JK!a1W){ zwXp6B`Xj@EDhGCBuY&uqkHJ2m>0NqgFfhQ6B^0iRi8ZM(VZVY0u#fMu=g6YghZH=F zNBC;H({T`wTEP`OhR1oEy@;Q&WeumojQtGh?OVD#wsiM4)_2!;-`vsE8|xEmW=L!Z z2Ew`;(0f#WL^IQPa0P$SGGSv^u(h?fH3^%EU$)Qlqq3K+<*F^6%Z_~3%w3LhcT#LP zV#eJQBN{`7Umfo2SDo6p=8NcBXG9B4II9@yO2qi<_$H-@pH!OpB}XkEQaZVmSe0~I z#usnD^kz_+0|DAN zzZwo}VJm*+Q^_vr62mHfAu)@eOU~YEMK+$mlhnPZL^JR-y`Ne3ewN?D8_2S z%Exsmz{}+6B@|#S4&xQNg(Pw?Lwc2}F&WZpn5IP$*4Igr4CxJ$EQa(ZNeQ5)9KlUS zF&9(HjAAkkhifRHgo-IeI+d4AAR=+50iCmyIEVDp6wL_bErCKlIz@_Pd9FFQT_;dc z7R4G9Tr1rRXaJ(9HDQMACJ5@WY_$||J?xEGPl`I??KRT5Vn9pj^5W?T97l1?C?*eY z6Js;U9>IsYdTK>+nShoJ`(~t}#XyU7C_Rp55?>RBe`2cBAf9A&tDW|#gC@|qEG8`$ zlVTEU7N>cT&;?CT?h!gc%@UMif4OvtX%v;a=dpDfHgWr?AGZnO=4Hg|iOB{yC#f@~ z*obm$T1MQnMBHPL6p)@J;vO8wEPtD=OSL;Wip9LtJMBMvA!Ef2r`^T zxYZp+grTiGiV0yUE}x9zE@9fePCAaw*;4A=QQT|70`3O^c1{1gIE^f_5X6IwGzS)N z$gup+NisNHO$!6sR6E?%br1bl61yri(dK)x2Dji^Y@;m}t0ZRYq2+oH^N=RVy_&v{ zqectWCElvRkx?Nq7Ch#4lDq`#6i9y~#|rxB?)(cbQyNizpY$f2g7`@)q!b^L?h|~5 dFXGadBz;3I`q4Ol#xLY2!_IIKzu|Xe{|5+{UZ?;7 delta 2384 zcmaKt33L-x6o&toCYfY1(3%!7Elb6MZAy)86|`6@7O;ha2a2M&F-^yknkH#7h2mCs z+_!PxS8!KEiv{<6-}imrQE|upe=o6$=fKH1@7;NG-+$lz?tPhcW#@+VC;nV>4}g07 zu~Lub70oJdiJFV8XtJv-GS#%rHZx;6GyG#$U7dHNCp8g4Xj6E1ho(6-itaN!mMw_>GJuN6DGR#B_NhgAk{hnF1^jVCi! zqiSi{A^iqcVqS;yJo8g)$vnym}N}Vo$Rq?R6+11u=mRY@4 zw8ysQ^jPVoWz_-=<<3n1R?esXF=0(&=6zv7|5rQtLS2~#zT=G1oY`Pm$V zKe2@AZ}N;k&MOvcJ+*uXY&)*B<7XN{p=4Zks~+@t0^HY8Z(<{#G9DB}oJ zqejhPRH``ugR=$!4+c1{aV8CI>RZdTFm#T?;l>E~5ke5fd@A8@BuX&~<1m^UV=$3V zchR$nD!?S%4fzKtEvYS(buaE?o5;2M@c`>Btp{nzlTE@yv^>gsn3fmJ_7Uu@4&%+Q zREHU^9L96QHatu@icrBLO;mx0E9v6Fz{Qk&fV%}%9+fJT=3k@=TN3Wagz)W%R1Tol zh46$mXap0lcVQ*nT#%V(gYC><^$fPtE*OReCf}-}m1cDYqm|^MfnXlP@RQumeGg`BJY^J7O{O+M)Jwbj-u< z{6aRN3(ZJjCci5!I0>_HD)zt?n1gFDS8kC@zsPw%W Rf5gx9)A{@he#P$y{SCrKKED6} diff --git a/build/classes/java/main/cavecomm/HandlerCollection.class b/build/classes/java/main/cavecomm/HandlerCollection.class new file mode 100644 index 0000000000000000000000000000000000000000..d2f1223a9896fedec16f8ed7c529da35c698cb07 GIT binary patch literal 3108 zcmc&$SyvQC6#hzp7mQ zd>xw!Ruf8F*def|((+Oi__3>eTna;(Ye5I^k zx`*^RwyG9LE+P7hV}Y;viJUP;nZS>fz~CkqQ(9+Y6MQ68$OK@_^P=%4oD{J0I($7m zo6D#soEF$8Ga1iyq;?r5122BSNy#u$`uvUA@iVP>9%n3^wK0mgz@c^D@<3|XVuoe1 zdP2#hVpylj8A<4nNaAH26~AocsD|o1tFxhsH{&IYTX@;V1g=yRUm_Q2m8MDtMWC~QgtS~IFiq1+rWw&DykcV# zQvwZ+%$i8;tf;5iR2Zzv1y2#sHC(sws*M?gsiRbL>oNi@i%L(aD3Xh+o!w#9#tqC- zXId^RhLqu(cXf)hNK0Qw0*9+YE$J?D)PmP=)50wqxAFQDm9L zJ9NdQW-O)CUS$HA3VF+hG}xXg#Or#fG)p#T!4cT)$Q9)T>2z#D`bkfPV}a+fyD=SE zwqyD5Zku#{HJwc_sBqSB#=@Tr9O=!;&^7PHkM%m`68fIW+A5jCEsPtp^J?PSw7|uI zQpefYC*!51>V+5|WC#Q^d{;@bqHWPyPmLuuORhGXg3C7n7Gg=VT9XjiB5A5j-zI-4 z5|Yv0lA;=ZvkO-8$7WFE@N{W&1r+*wuEtXQ0+Gy=7B~7;Yv0pV8l_tkS~|;9GE;P} zIpHq)($uHG%2OiuZ!MNE)F93TyqG@|vs06NNd(!@QRA*j%C1crJYout-Q#i)=tze$ zGo^GYNJiTl@nH)-!p9aqF{S*eK!2$=U4JE5RyU6j4QfD^~Dzq$> zP<)z86?j9chmE&6vkO94M2c_CaIr)QDiA|d*vN0Wp*2_nKj020TLpea+tknKxcLyB z)5q4(B`{jwUB8CiMrNOx?KeVwqYcB|4QuEZcz}WV`+xm@bPdPYxlXj7TEla77=D0r zYj|M`=I>+YPk52quNv9uM@WFA2Da0^Hg?kv-fMQ?EIN5ab@6!G#U9?x z2D_VX_uwA(=7F6e7iS4?86IaHnCA5^O=vwBhmU~Z2n`wBMh^(I+93nS| y$=?z3H%R`5$lp=&cZ^U*{y+Ze@NS;T_wYW)CI;jK{y)PPd~4zCOMH!Q(fv2+8%civ literal 0 HcmV?d00001 diff --git a/build/classes/java/main/cavecomm/MainVerticle.class b/build/classes/java/main/cavecomm/MainVerticle.class index 56bc8812cb8f01f984af6ff9bda8f7127f405b74..029a67610596a7ed51ae323c439de5dfdb699a38 100644 GIT binary patch delta 1522 zcmaKsX;hR|7{`BiW|;TootFW}6-_ik#X$}rC~i=grY35ZiI$ZEj2aFM!3=H{YPOeY zw_HloY_YvmQU}wbY%^O;+xLC>(5KGnRGyx9B<*xMeR=M){_p=j_qq4z>Az=NhmN-& z0Lu7zhqcBPG$~S~7A%O>M`nbZV*wO{eE2D`8OCr$N>el*3oCl(>J_d`e*hOFY;qZ? z$jsGQuHOF9j4>#)Dd$W@*R>s8b-+E+U%^;|vu(yPUeQ-~@%Ge>?ipqU6Kp0jNgs9( z%5XEnM7?M*Yf=n-IHlCrM6*H6CQgg? zd*}ETv&3Mj%`&dkac`+PkE?B3S+3i>`Q2A4JPo1xu#Z(-YjB;-_1vI;^_H8fxXC7m zoAnqY&ws1Jh&L>3h%Ra{xJ}26>;bEBo7}E2YeFsInrMB!#cJ-bxs!DYcVj%J7@w<` ztG;@&*;D^w1d2BZNT{~9Dcsy_a+etOqJ`#%O*Scf6T^{6w0~8!DN^fW9{1R6VXGcy z4p-ZB#LVh-zs&es)8pZ$C5lqL%`8!q^f7ab+NoPo2dZMdId!fYs*k6x zSI_Eo))}fuw_6qI{z$04x;B*491AtYatiftR;m9Li&r^h@S4qGUf)&j^QZ-HD!S)Z z)`eO^1(8t0{DNuKb>W)W=)p77y}WH<@{Y|5bY!qs97i3;F`MV;5bJ%%`oLySGWL;U zeQdLfwhY=N{F%k)d|~jVbJt(#P4+?cjSi(1dA?T+&>d-6R!(I!x-i~o@S{GEHq7Uh zsZGI=+x79Z9>ovIfIAif{IEznsi*J=kBX&uOrkEfi~fmZxMf|YC-_TR1BD5)T?}bw zC?p8FsLD%FtZ1k7Z%42VBf%(zM9y;2C3|mzb6k>fu9GoYN_GgI3x`7xOQbD(q|=XH z6muFAWLRb~oN7i;$0%ZqVJQ_3&sO@MAk#_Iq?s-}E`<9rhbMSaV4o5|k9c-uSWd%4 zbB-}iBF=FGJDDC#P~|Yb7fc9~R{%lj_-M`Hp!EvaO*TF#AhLLQMsk3h~8 zJbC{K7CPbzC7FvV#dnor%8`=rlDYaLd%-K331(!aguNF1SKKTE=AoK z%Leud;XaI(?mZ)2C?T7b;&ZcKGSYGVNs++;gH;u>NYi8jJ5N|4U@l2Y4F>Mb^X%rn z)>F;0l99f0b6Lradz{EjUV@Ye=jVlj59S{sr`=KsEpX delta 1393 zcmYk6XK++i6vuz}?QY)V?R5!Dz#s!5Awbvw64C%+2@nJn0w@r%fa_*OB*|iur3jh? zE5w3cQL$lf*aApcP;8)p1rSlOV*BJc<9A2L^EMgr%W3zVbN{E@`&YrKeD~--`wjq; z`K{C4V!1&=lxW6LYW7+qw4z*7M1^8Nkr`~A7aY$7n~9nWm}Ihj^FmRk*i>nzGEFha zOz{men|(D-lxockE;MI+Bl=pD2bs-9HWzE=FjtXd{`BRTG5)IHJm%Xh&|Jc$W}Uxu zSd>MY#ndX?SiB__tDm22YEk%#M$Qi7V~OT+t}rM3Wx=ahYO_ppH8GPNm>7yvXOqxe z%W_4YIqKw@HG#^|3a+?aGqgl&3 zvni|6iL+j_ft$?XtkJox3V&m)ArYjVjW)MvZsj&bf79;vH$&}VPCIvK3c1tFw~IrY z6?Up|Wn*$pqs?7rlU-2QfzRPyg%gjhPQ;T94K5wrr@0>^C9X(Y=TXgLJZ@$?6>7U_a|Y)= zrFoiX6gsgs5l^)w7NinQ>l784D~>q%=67eidfjyN8Xg#@C@3;fU!FPDYjU7OI#pym zkMVAkdduu^hpMsWm^;iww_bs|4A{-^wxty&4qK4 z$(1RY)h~*{p2>tm{T2pL1jrKltnBXj!ja%nY6(-FNojaableUq-b`;4F6Vihz4nlKBPd zYuT>XF_FAltL4NiE4-7MNScKn+RI=MSDpnD$|RpI(be*rr~j`3VRo_$B%@5EC*w)+ z^Gn9XlCJd{C1qXbkwzs+Tjq%IM#bDw;hWR6S!^Se5pTBydLX>1CbFN7C0*PdzGw6v zwuB!j_UMD*hlQniq^Cc=%sjgLGm0F>Fi?h8CLNkWxqK59@+(v_kJ45aF(HFD(v3+l zbP2W`Y28-#3gUtC^K1}!mV_73DmI^V0D5EnO^MBZoA#-~q(s@mo)W9X$r2|g5`IDe zK6$oPZpJC~ST+n?WwxfK)u^#F8f6__5 U { - if (ar.succeeded()) { - RowSet result = ar.result(); - //test output - JsonArray jsonArray = new JsonArray(); - for (Row r : result) { - JsonObject jsonRow = new JsonObject(); - jsonRow.put("testcolumn1", r.getJson("testcolumn1")); - jsonRow.put("column2", r.getJson("column2")); - jsonArray.add(jsonRow); - } - //sets the header to json - rc.response().putHeader("Content-Type", "application/json; charset=UTF8") - .end(jsonArray.encode()); - - } else { - System.out.println("Failure: " + ar.cause().getMessage()); + switch (outputDataType) { + case OUTPUT_DATATYPE_JSON -> HandlerCollection.outputJSON(ar, rc); + case OUTPUT_DATATYPE_HTML -> HandlerCollection.outputHTML(ar, rc); } + closeClient(); }); } diff --git a/src/main/java/cavecomm/MainVerticle.java b/src/main/java/cavecomm/MainVerticle.java index 2a1446b..cfc796b 100644 --- a/src/main/java/cavecomm/MainVerticle.java +++ b/src/main/java/cavecomm/MainVerticle.java @@ -1,18 +1,9 @@ package cavecomm; import io.vertx.core.AbstractVerticle; -import io.vertx.core.AsyncResult; -import io.vertx.core.Handler; import io.vertx.core.MultiMap; import io.vertx.core.json.JsonObject; import io.vertx.ext.web.Router; -import io.vertx.ext.web.RoutingContext; -import io.vertx.pgclient.PgConnectOptions; -import io.vertx.pgclient.PgPool; -import io.vertx.sqlclient.PoolOptions; -import io.vertx.sqlclient.Row; -import io.vertx.sqlclient.RowSet; -import io.vertx.sqlclient.SqlClient; public class MainVerticle extends AbstractVerticle { @Override @@ -29,10 +20,13 @@ public class MainVerticle extends AbstractVerticle { "testuser", "123"); - //db.executeQuery("SELECT * FROM testtable"); router.get("/jsonTest").handler(rc -> { - db.executeQuery("SELECT * FROM testtable", rc); + db.executeQuery("SELECT * FROM testtable", rc, Database.OUTPUT_DATATYPE_JSON); + } + ); + router.get("/htmlTest").handler(rc -> { + db.executeQuery("SELECT * FROM testtable", rc, Database.OUTPUT_DATATYPE_HTML); } );