From 3d687e0845c2d2e4b42fe99cb7d5592e2259ee56 Mon Sep 17 00:00:00 2001 From: Igor Date: Tue, 16 Nov 2021 11:07:00 +0100 Subject: [PATCH] changed project structure --- Camel/.idea/.gitignore | 3 - Camel/.idea/compiler.xml | 13 -- Camel/.idea/jarRepositories.xml | 20 --- Camel/.idea/misc.xml | 14 -- Camel/.idea/runConfigurations.xml | 10 -- Camel/.idea/uiDesigner.xml | 124 ------------------ Camel/.idea/vcs.xml | 6 - .../target/classes/com/release11/Main$1.class | Bin 1425 -> 0 bytes Camel/target/classes/com/release11/Main.class | Bin 2531 -> 0 bytes Camel/pom.xml => pom.xml | 0 {Camel/sql_script => sql_script}/sql.ddl | 0 {Camel/sql_script => sql_script}/sql.dml | 0 .../main/java/com/release11/DAO.java | 0 .../main/java/com/release11/Main.java | 24 +++- .../main/java/com/release11/Material.java | 0 .../java/com/release11/MyAggregation.java | 11 ++ .../main/java/com/release11/MyBuilder.java | 0 .../main/java/com/release11/Package.java | 0 .../src => src}/main/resources/material.xml | 0 .../src => src}/main/resources/material.xsd | 0 {Camel/src => src}/main/resources/test.xml | 0 .../classes/com/release11/DAO.class | Bin target/classes/com/release11/Main$1.class | Bin 0 -> 1717 bytes target/classes/com/release11/Main.class | Bin 0 -> 2728 bytes .../com/release11/Material$enumType.class | Bin .../classes/com/release11/Material.class | Bin .../classes/com/release11/MyAggregation.class | Bin 0 -> 570 bytes .../com/release11/MyBuilder$enumType.class | Bin .../classes/com/release11/MyBuilder.class | Bin .../classes/com/release11/Package.class | Bin {Camel/target => target}/classes/material.xml | 0 {Camel/target => target}/classes/material.xsd | 0 {Camel/target => target}/classes/test.xml | 0 33 files changed, 29 insertions(+), 196 deletions(-) delete mode 100644 Camel/.idea/.gitignore delete mode 100644 Camel/.idea/compiler.xml delete mode 100644 Camel/.idea/jarRepositories.xml delete mode 100644 Camel/.idea/misc.xml delete mode 100644 Camel/.idea/runConfigurations.xml delete mode 100644 Camel/.idea/uiDesigner.xml delete mode 100644 Camel/.idea/vcs.xml delete mode 100644 Camel/target/classes/com/release11/Main$1.class delete mode 100644 Camel/target/classes/com/release11/Main.class rename Camel/pom.xml => pom.xml (100%) rename {Camel/sql_script => sql_script}/sql.ddl (100%) rename {Camel/sql_script => sql_script}/sql.dml (100%) rename {Camel/src => src}/main/java/com/release11/DAO.java (100%) rename {Camel/src => src}/main/java/com/release11/Main.java (71%) rename {Camel/src => src}/main/java/com/release11/Material.java (100%) create mode 100644 src/main/java/com/release11/MyAggregation.java rename {Camel/src => src}/main/java/com/release11/MyBuilder.java (100%) rename {Camel/src => src}/main/java/com/release11/Package.java (100%) rename {Camel/src => src}/main/resources/material.xml (100%) rename {Camel/src => src}/main/resources/material.xsd (100%) rename {Camel/src => src}/main/resources/test.xml (100%) rename {Camel/target => target}/classes/com/release11/DAO.class (100%) create mode 100644 target/classes/com/release11/Main$1.class create mode 100644 target/classes/com/release11/Main.class rename {Camel/target => target}/classes/com/release11/Material$enumType.class (100%) rename {Camel/target => target}/classes/com/release11/Material.class (100%) create mode 100644 target/classes/com/release11/MyAggregation.class rename {Camel/target => target}/classes/com/release11/MyBuilder$enumType.class (100%) rename {Camel/target => target}/classes/com/release11/MyBuilder.class (100%) rename {Camel/target => target}/classes/com/release11/Package.class (100%) rename {Camel/target => target}/classes/material.xml (100%) rename {Camel/target => target}/classes/material.xsd (100%) rename {Camel/target => target}/classes/test.xml (100%) diff --git a/Camel/.idea/.gitignore b/Camel/.idea/.gitignore deleted file mode 100644 index 26d3352..0000000 --- a/Camel/.idea/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml diff --git a/Camel/.idea/compiler.xml b/Camel/.idea/compiler.xml deleted file mode 100644 index 6ceb844..0000000 --- a/Camel/.idea/compiler.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Camel/.idea/jarRepositories.xml b/Camel/.idea/jarRepositories.xml deleted file mode 100644 index 712ab9d..0000000 --- a/Camel/.idea/jarRepositories.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/Camel/.idea/misc.xml b/Camel/.idea/misc.xml deleted file mode 100644 index 06e8b35..0000000 --- a/Camel/.idea/misc.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/Camel/.idea/runConfigurations.xml b/Camel/.idea/runConfigurations.xml deleted file mode 100644 index 797acea..0000000 --- a/Camel/.idea/runConfigurations.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/Camel/.idea/uiDesigner.xml b/Camel/.idea/uiDesigner.xml deleted file mode 100644 index e96534f..0000000 --- a/Camel/.idea/uiDesigner.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Camel/.idea/vcs.xml b/Camel/.idea/vcs.xml deleted file mode 100644 index 6c0b863..0000000 --- a/Camel/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/Camel/target/classes/com/release11/Main$1.class b/Camel/target/classes/com/release11/Main$1.class deleted file mode 100644 index 022fbec2fe64849b4f44f435c6c3cf8c459d028c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1425 zcmb7ESyK~15dJ0{yDW=fxI7URFbTqn;+1d+gsUomB^EsRG}#PcakB$^MEqG+X{_?W z;@KZ%*|Sjy8mc5!*_rO?{kp$zy7$M=Z{GpTVyy!Sv}kBG(S~-0K3i5SU$}w?Vrt6T z;Ep#k#h_KWJ5u73p|@~8BEPVeGoYhGgJGf*Cc~)o%N9T6_P(%eUJoF>w`1hSoh_Rv2bdg#%vYmdm}e zwH^A7SI(si|D>zP5+#k3<;9*#;z%#2qmQBUpj5Q8fsA}x7#P5yhHECS;|9an|KTts zLek;YWlDMNOIrki^c%`i^lq8BjUl2}l%R%<6j}LuHtmrp^uIsd|UT-K&#|T4L47$NX;XB+lFop*jQYO;KT&&bzNQ#%> z9>bePt+t8>bj7(#Tx2u#G(2q9Xmv(stT(9>bWAb~ayxXYqH>fyibN!`l~ZQp7}P;6 zKIzJGcHR|L;m)pau5673`|`t@;MBLlZ0JWKb}Z6G#g>jI3_};7zUKCOUKR`ksV3u+ z-XUd{s4|A`g5!zJs8SUETV8a@lPpM^yE~j@C;PXvHQaXsLi-D>KAky+4qJMAPC4=k zz*s)E#i8o>K*KBz?AgSeo>0_wJOV3@%GsfSCRH3&wCvfg3}~`8M7S?Y8WyRj^E0o) zP2{mmJSwzTJl{3BP~xd?iXdE*0rjW3?s>vra(NJl0K?S&I(>pzPmlWY&@Ms$PE3R0 zDeb1oRvsfW{sk=a722mb<{3TPDF)P%&*^E#djl`mN3y! mL;iOSIXZ8p%ro?yqkRJNcoq8==#7=wvw&4v4T@46>GuoCw|Nx+ diff --git a/Camel/target/classes/com/release11/Main.class b/Camel/target/classes/com/release11/Main.class deleted file mode 100644 index 9494064cfa4a4d59773d60a6684c4858d570acd2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2531 zcmaJ@TUQfT6#fn*ObBDes7SnE1k@nH5V4BEUbq%)0t!frwzVfS$1rg+6J{m|y;*zL zUf%lDx31N<_MtBzWv%{z{;00*lMo0bcCs=v=j_Ybdw=_UXa4#3ufGAjhM&S{K%;_y ziXfU8T627rYZkY&+H58#bf2N=rfHl0>kN(Yo<#*AhI6`;*YfM$ilyl}EoWqOEiFgm z+~@O7(bYv53K~ObVTem{vZS2Uw8TJvVj$6v%#D>zI` zdcwaumtr^`PwfRX@4Kd*9qw5S;Rr*(bsS$B9aV8m8Y$Aq6K)7?3_)(>O(;H-oxm@B?Y}IE=zDbtMn}=do`zxa?jMs_d_#Vbh+=i49)t^ zP$=kU=&Q2fx^J$E{E9YGdP(0QOPhMcbnHozIqrH00}SoHUZ}x(Xkch4j6PhE(I1v? zS5>@P0Y>6BLwU;i_7H{`LY2kBNMcyQO_jQpny|Mjo>J>*)Qknk7PhbD@}71p?~PR^ z7*5gD?r@~&J0tod+j(pWBP$qEWz^P6hBdhi_te(+CAcRN32l62HjD|mpQjm)?U$vwX?G{Wn8Mo< z0@_?{@zj15GAG9}kr@@UxJ}JKQO-F19?ITiD=+k&3YU0-^; zt6~xF(1N-vxG!$Ij#1QwyCA5`Y0PjwUZ>Uv)rLb@qPiKTOD&fyIS=7JL&y9?YGQ05 zb}2SFH=B;-$)js>E0&s0PcOt0EqEUvD0raaLvZ4*nxYqHXuaM`1z z-F+M+Hl^!gYZw9#6=YQ`!`#QG3(J%}aYfLxgeVYo#BWI|d&F>}((B2Uq9}@FB?Vc# zyb4=ZGvN77K>^uC_JbyICGnVJP$3VeOk2zp^BJlx&sa1QNjW;V7CDuK#ygV%f7v8N zj~&2Yx*8^5`I5`F`28xz+9h9-b2m%YN9%~GOG-Zf_i&&kf;p}W$~;oL0+rw0VP0a! z+AUb0q{*j3#3ebB;cTr{_2wg8+BXN7i$SZlsvz=msv|Fr26w0q2dXG{5hda8c6V2` z<1%L*>^U+BPps*pAi302@QmEmp7pHMp`!z>5UxUz=>^~B-!bizQ~z~(z}7P+vr;A+r;@~ z;05B_=v#_tn@A*s(V)~HEI+PA1Ci^|;0xT?!W)g)#soQeE7=qcY-4IE+O&yVTSzw` z8rZ@eR(dQjB$cQVc{g%z3-2}37eVF)44TNX(paim40}o5LmLHuf>LNl3w=I nPOE;6Z|GCzTk;ejAK#J9b9!&U_xNFFZVErrTbQI%^rY)Q-YJ^T diff --git a/Camel/pom.xml b/pom.xml similarity index 100% rename from Camel/pom.xml rename to pom.xml diff --git a/Camel/sql_script/sql.ddl b/sql_script/sql.ddl similarity index 100% rename from Camel/sql_script/sql.ddl rename to sql_script/sql.ddl diff --git a/Camel/sql_script/sql.dml b/sql_script/sql.dml similarity index 100% rename from Camel/sql_script/sql.dml rename to sql_script/sql.dml diff --git a/Camel/src/main/java/com/release11/DAO.java b/src/main/java/com/release11/DAO.java similarity index 100% rename from Camel/src/main/java/com/release11/DAO.java rename to src/main/java/com/release11/DAO.java diff --git a/Camel/src/main/java/com/release11/Main.java b/src/main/java/com/release11/Main.java similarity index 71% rename from Camel/src/main/java/com/release11/Main.java rename to src/main/java/com/release11/Main.java index 8ed56d2..af9b711 100644 --- a/Camel/src/main/java/com/release11/Main.java +++ b/src/main/java/com/release11/Main.java @@ -2,6 +2,7 @@ package com.release11; import com.mysql.cj.jdbc.MysqlDataSource; import org.apache.activemq.ActiveMQConnectionFactory; +import org.apache.camel.AggregationStrategy; import org.apache.camel.CamelContext; import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; @@ -34,22 +35,33 @@ public class Main { connectionFactory.setPassword("admin"); context.addComponent("activemq", JmsComponent.jmsComponentAutoAcknowledge(connectionFactory)); + + AggregationStrategy aggregationStrategy = new MyAggregation(); + + DAO dao = new DAO(); context.addRoutes(new RouteBuilder() { @Override public void configure() throws Exception { - from("direct:start").to("jdbc:source").split(body()).bean(dao,"splitMaterial").to("activemq:queue:material").to("log:?level=INFO&showHeaders=true&showBody=true"); - from("activemq:queue:material").to("activemq:queue:materialPackage").to("log:?level=INFO&showHeaders=true&showBody=true"); - //from("activemq:queue:material").bean(dao,"hello").to("log:?level=INFO&showHeaders=true&showBody=true"); - //from("direct:test").to("jdbc:source").split(body()).bean(dao, "test").to("activemq:queue:type=test").to("log:?level=INFO&showHeaders=true&showBody=true"); + from("direct:start").to("jdbc:source") + .split(body()) + .bean(dao,"splitMaterial") + .to("activemq:queue:material") + .to("log:?level=INFO&showHeaders=true&showBody=true"); + + from("activemq:queue:material") + .enrich("jdbc:source",aggregationStrategy) + .to("activemq:queue:materialPackage") + .to("log:?level=INFO&showHeaders=true&showBody=true"); } }); context.start(); ProducerTemplate template = context.createProducerTemplate(); template.sendBody("direct:start", "SELECT * FROM material LIMIT 1"); - Thread.sleep(10000); - template.sendBody("activemq:queue:material",null); + + Thread.sleep(1000); + template.setDefaultEndpointUri("activemq:queue:material"); context.stop(); } diff --git a/Camel/src/main/java/com/release11/Material.java b/src/main/java/com/release11/Material.java similarity index 100% rename from Camel/src/main/java/com/release11/Material.java rename to src/main/java/com/release11/Material.java diff --git a/src/main/java/com/release11/MyAggregation.java b/src/main/java/com/release11/MyAggregation.java new file mode 100644 index 0000000..afc04d9 --- /dev/null +++ b/src/main/java/com/release11/MyAggregation.java @@ -0,0 +1,11 @@ +package com.release11; + +import org.apache.camel.AggregationStrategy; +import org.apache.camel.Exchange; + +public class MyAggregation implements AggregationStrategy { + @Override + public Exchange aggregate(Exchange oldExchange, Exchange newExchange) { + return oldExchange; + } +} diff --git a/Camel/src/main/java/com/release11/MyBuilder.java b/src/main/java/com/release11/MyBuilder.java similarity index 100% rename from Camel/src/main/java/com/release11/MyBuilder.java rename to src/main/java/com/release11/MyBuilder.java diff --git a/Camel/src/main/java/com/release11/Package.java b/src/main/java/com/release11/Package.java similarity index 100% rename from Camel/src/main/java/com/release11/Package.java rename to src/main/java/com/release11/Package.java diff --git a/Camel/src/main/resources/material.xml b/src/main/resources/material.xml similarity index 100% rename from Camel/src/main/resources/material.xml rename to src/main/resources/material.xml diff --git a/Camel/src/main/resources/material.xsd b/src/main/resources/material.xsd similarity index 100% rename from Camel/src/main/resources/material.xsd rename to src/main/resources/material.xsd diff --git a/Camel/src/main/resources/test.xml b/src/main/resources/test.xml similarity index 100% rename from Camel/src/main/resources/test.xml rename to src/main/resources/test.xml diff --git a/Camel/target/classes/com/release11/DAO.class b/target/classes/com/release11/DAO.class similarity index 100% rename from Camel/target/classes/com/release11/DAO.class rename to target/classes/com/release11/DAO.class diff --git a/target/classes/com/release11/Main$1.class b/target/classes/com/release11/Main$1.class new file mode 100644 index 0000000000000000000000000000000000000000..02c6665f7e1aeae28ff313d9a8823aec9e7e78ae GIT binary patch literal 1717 zcmb7ETT|0O6#kZ5N{xaQMeweOB_N@Sw-!{cf|k+|2OoUerb`-3v#?1}|BU~^8Lcxu zI6nKM9M7gGXv>UtrrDg6bIyL>xqbif;5Q^h|m7U$LrI!4MwFVYNy+LF7j5-yKC8Eiy~N5Xx_Fj|z#wfPQr zYQlDSUHJA~t6d=t6UPmlFwuv8hU+a(mDuyELfOw{9Etg+z|b?}1zz-!p))(SnL>ua zta?f~Q9g{giqZsez{F{sVd&aYvd%D*EpGEYZu>lNZG!0qZegqyV_jAWX>!@3*wU8} zt3nEA8IEmND^5O?v2sKj!#HQ)yon3ANMu`Jw~fQl5m8bf{|}V1l8y*NsSd%>^e&sY zf~!QYBCC|{v1}VMzjC+9{rFezDC5HzF>xKE4Bg?5??ntxvaOj|db^|OVokqI=qA4n z?S2SY3R#BZNzgUw1Lbi)4GZH2CQRJKE0X3Vc);-daIV%X+f?Ghe-yG^_6$t5 zYqTb#1J)(#gcNR3k8>yT_C$R*zZ;8Krq zZbyH=UbFz6v@f-W{(YDMqiqa4Ah}a(tnp7^*2E_m)@L01kQhFsXAchD7@4{%rs_(_6JJ&!3|Lyl10B54{0+`$6w;u-E?ox1t}Yk42* i0%7YSgp2fCruPm!!AhcAC9hJVStVc4Ewm%)q~A}w2h#-r literal 0 HcmV?d00001 diff --git a/target/classes/com/release11/Main.class b/target/classes/com/release11/Main.class new file mode 100644 index 0000000000000000000000000000000000000000..0f05702a129b8845ebc4144e5e69c6bf247e7202 GIT binary patch literal 2728 zcmaJ@TUQfT6#kARObFAeQIU8-ZfXEwNVSRyt>s#g1Qd{#YPE-%W0*LZ2{RLgUhTd1 zet+&$pSo68UqH%Q{Q>Y*@_9IeYJK-}gCx|NG}(0A9e)VeCVlf`E!3 z>KP7X`2((5+|Fpzi&>%j4E2MiZTc@V)Wy2y6@(btbSJ0fR=s6Q)3aLESk$$&T#a&{ z&pHKH7hx!<3!#xACdr8+b3)VN{eAKNcwanD|CbZz&-Y){be?f6; z@Ndqf7>>kJI|j}Au4!kIUGpIvWC*y9<4d7KDh^8_MGASs4WWr4$c>z7OLDV{s3bQM z`8xN!hmLC~IL>g^aWfjvbA3sajL^J7KJU1`Hf!ecmY5M4)AQZcFpf!ITBKQ9&K*Om ziZ-;96^o{AFbveNv%>Nbixej-HcGK2R}^$IbX8d*4bVo#JzlW<5gDKn$M(ev`P+dr zGF4|8+GD9IIWKQ&WxEMIj4pI5=uvS_CbzwU-*Pe+vf42BOr5arnVEvieaB^J(6^RC zK_5eJg$&ny^MS}MYeU74^bL}i9lgSF#Z=VMxKSiV=)5oUF35GLH-@ zH;iq|7~-`Gs2ZZ|S+R1)$v-kkbA=_iC*pDH!l6vY6&Ws562_S9>qgBR4ArC<-W+Ql94hfH&o1EmI{kJo^cAk z@EAI3)NYA3Tre#|xLdL}Rm{uE4SGIzeTnv}iUqvJ(4@P9v|M)`qo50SPEg0tn&EV; zM&9!YZ@Q+8uBXD6 z@eX*tlUMM7A+kI9vOb7B;usX_{VCHHQ-$0j#h)))v=d1=I=ALI1&!8Qn*o2xq?{k# zQ%4diNm#ieWK--`#eCcz^+e}xhNKVGAX6O`G5_}{A{D_b*TsEl-A=T(G*E)5Uy5^{ z=5Tdc*FF*mQ=u^_Co;pSYN^UrCtm8mJ#&<CT9|?CFD*P!92(-Y&No!X_uPGGkw#8tWsjGMAF8f3ov zBp;o{Q^NDpLKY6CR-K^exWzM4cyz25=t?4g`#`BfJv|@NN~1TUcd&aM?2jUOg`ScO zx;3oQQ!O#zO}s^`2E2`T2!w>$V*+ZRz4c8f3+re|MZ)Qxb8Aq0A_vwG>4_X!!_iF~ zBif0n-pI*_(zAwBo9I~RUB~G};0a=z=v|0t>xd_U(V*l%UwU1P1|pZD!6&%9fh%>` z#2A6RoT%T#Rr4=Ln0InMQ%l2-@x5Ey2*$q z$k0Y^15SyP&g30;@8Br8(TosXY8vTcasbECgcJ045}jzF8P;0k`F#{V6|Sfi6mhVgbORCpKf(JDl=7CfTRHsUwD zj}IuMo%jJC;v>|Nu1AFT2?C_e#i#g;0-Z$~kMTLB#=|JSAYBUSYR6ajn$W%>%mAT% ZOVZ!d_dde2{c>b7A271h}8)W>w%}^5aW~ff55&Y}q>RAqG zJk`!fH8XMy6%+LrRcIO6+E_jPXv-Zlu~J>@bjUw@J9dl5K76_d4ME3oOgAB{P{fHD zapCX{>@`hS30>OZGGTQlzzS*<(Jiq?=*;KD9&zsI#UUvd&Qj{!n`P%tr>J8+t(L