From 517dd2a5866b8fe9c2c91e68bb8057c14a49020e Mon Sep 17 00:00:00 2001 From: modzeleg Date: Fri, 26 Mar 2021 17:35:43 +0100 Subject: [PATCH] TODO unchecked. Code removed. Constant LOG_PREFIX added. --- .../klaus/repository/EventRepositoryImpl.java | 6 ++---- .../release11/klaus/utilis/RedisAppender.java | 11 +++++------ .../repository/EventRepositoryImpl.class | Bin 8076 -> 7936 bytes .../klaus/utilis/RedisAppender.class | Bin 8092 -> 8152 bytes 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/release11/klaus/repository/EventRepositoryImpl.java b/src/main/java/com/release11/klaus/repository/EventRepositoryImpl.java index 752c655..b8bf849 100644 --- a/src/main/java/com/release11/klaus/repository/EventRepositoryImpl.java +++ b/src/main/java/com/release11/klaus/repository/EventRepositoryImpl.java @@ -5,8 +5,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.release11.klaus.model.Event; import com.release11.klaus.utilis.BusinessKey; import lombok.AllArgsConstructor; -import org.codehaus.jettison.json.JSONException; -import org.codehaus.jettison.json.JSONObject; import org.springframework.stereotype.Repository; import redis.clients.jedis.Jedis; import redis.clients.jedis.JedisPool; @@ -20,6 +18,8 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; +import static com.release11.klaus.utilis.RedisAppender.LOG_PREFIX; + /** * Builds Event list based on logs created via {@link com.release11.klaus.utilis.TrackingClient} and {@link com.release11.klaus.utilis.RedisAppender} * @author Rafał Żukowicz @@ -27,8 +27,6 @@ import java.util.stream.Collectors; @Repository @AllArgsConstructor public class EventRepositoryImpl implements EventRepository { - //TODO: create one constant for both Impl and well as RedisAppender - private final String LOG_PREFIX = "logstash_"; private final JedisPool jedisPool; private final ObjectMapper objectMapper; diff --git a/src/main/java/com/release11/klaus/utilis/RedisAppender.java b/src/main/java/com/release11/klaus/utilis/RedisAppender.java index df9cddf..d96d03b 100644 --- a/src/main/java/com/release11/klaus/utilis/RedisAppender.java +++ b/src/main/java/com/release11/klaus/utilis/RedisAppender.java @@ -18,17 +18,13 @@ import redis.clients.jedis.Protocol; /** * Class is used to insert logs directly to Redis. {@link com.release11.klaus.repository.EventRepositoryImpl} is using those logs. * @author Rafał Żukowicz + * @author Gabriel Modzelewski */ public class RedisAppender extends UnsynchronizedAppenderBase { JedisPool pool; - - // keep this for config compatibility for now JSONEventLayout jsonlayout; - Layout layout; - - // logger configurable options String host = "localhost"; int port = Protocol.DEFAULT_PORT; String key = null; @@ -36,6 +32,9 @@ public class RedisAppender extends UnsynchronizedAppenderBase { String password = null; int database = Protocol.DEFAULT_DATABASE; + public static final String LOG_PREFIX = "logstash_"; + + public RedisAppender() { jsonlayout = new JSONEventLayout(); } @@ -49,7 +48,7 @@ public class RedisAppender extends UnsynchronizedAppenderBase { Jedis client = pool.getResource(); try { String json = layout == null ? jsonlayout.doLayout(event) : layout.doLayout(event); - key = "logstash_" + LocalDate.now(); + key = LOG_PREFIX + LocalDate.now(); client.rpush(key, json); } catch (Exception e) { e.printStackTrace(); diff --git a/target/classes/com/release11/klaus/repository/EventRepositoryImpl.class b/target/classes/com/release11/klaus/repository/EventRepositoryImpl.class index b6e1910161dabe8d66e823d8650b02bd0b920d9f..ddc3cdac1b7570d415068c67c7ad05d9891118fe 100644 GIT binary patch delta 2500 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 diff --git a/target/classes/com/release11/klaus/utilis/RedisAppender.class b/target/classes/com/release11/klaus/utilis/RedisAppender.class index e70e42d92d986e416378ad574f493e78715dca97..67d7fa087a21ea7da4303e68f903e7aa242bb7e8 100644 GIT binary patch delta 3270 zcmbuBYitx%6vzK}yX`*u*xf#M+ue4zU|Y)8q*AJaHWZ|^sZl7z5J0ikqDXC8BB+U& ztceCcNaBYv@q>+;V1kLn&`2A_M!w(&HL>vpSP>N;_yRFnMlP`rA0XxHw(q1_w% z2JgSikB!cK2VDky5j0-sn|gf4M~wl8!{)NAX*Nzth7 z45z(mfuwdZ6w@X{K5ZggDuUW%czvP@$58@-6ZG%FNz}2Qj{^QqX-$!iu1`4LfPnt% zMKyw`K?F%ekz%hF3$Xx;_}79)oZ_q^t^}6iQ=De&#a?_syHnbDWF#YPT}N-gRq%5~ zJ?AY!D{jCtbYeMf#?@GhYp{XO8~MDIZ9m)XxE=#&)9tsCuAZJhqn$j?_TqDV!5(n0 z=~MR3;7fA&x%w-7P5>@-Ke<7mF%WN`AWxQ%9}*l*#J+=M@U z7=e29GyB)kj@uu|Em-*oyt$AKUCFX#NoR-hMm5KmfM#q}Pxfpmr@o5rzqluw4u zp#EkJVLNrZQDdgHnE=k|2V}yY<3cBA{ciYubMP}K? zpE~ctzr*0y9x1QVbz+42mU*HMx}px)Q8yEHiwo)n9ksy>^#vEyVH0&lMW2ppq{r<{ zjb6kEl0qMo;Z6#RN z*^}Z8A#VmLANKh0;Noe@%FsZ?T*ZwTVbGRF8+Ec$P6USdJB&i?WYXSeQ516IH~g;q zj#+Ap;j$hB=`#-^n$3~Re0GxE^KPikU{}|pyq+FY zFbk~67NA(gET##8zwoL9ROBFE%G-h2YUIJ=DwPE_gTw!VN{k_5hkAlg`&^*PP)-6< z@nt&HtQ9G3w6aXe#wQ&q{&o&cg`Gkp#ZxX6F*P(XNx=g$Len<)z$&w`$%f`>Cnzr0 zL!)J?Vv2~KA;O3YLR<|*Tu1O&flwuruuJASM}oX;STb`Zld#8SKcQZ5fvQpCQlmq8 z9VL^rhvk3;H9)0jB_r~kC6ly6y~H&KU7%{!NY(041vnr-b=quP&DlfD*-^zvz)FUI z@Cm=AJK>`dhucL2m;sL8SB%Mg8q(`{s_5VX!=tlaoo%HB@ zNsD+?GNunztE9(B`lbtMv2rj%UNBApD4~8FV>)Iheaj-{J@g+jW#lF#DIMkt9ivcq z&919=X=u^~KP19ANrY7VOs=XD5m9PhdTLU(*pu>o3qB|R4{6gQ%6PeyiwZLcJv3%r z=PeR9PcQY1ug-C%!3mt|=CDzhsrPv+%T(%V3S{WhGn08aBczb_q*SSwkDHT1*uep+Uq%C2a`2V_G?#tZ9~3WDN}7-m)Gj zWcit^z>AF4;STH-RWe{&Iu+lPD`I2H+-zQ&Ux71WS-2bMagm?{kEj;%_F>A3B>(F~ P1D}HIEfR}G6RQ3JP($KV delta 3169 zcmb7`TWnNC7{~w9Zuj1@+siJy>uxW!rM3@*wrWbMrApc~UMNI-5D8#Gu$t7%gNYH> z2PHmeVsg~@P!*#_646+t4GK{n)CYV(gO++j1TWB{0)mP_@jvHG&rVOyA@yO;nX@zV z&F}lqH{W~{UBg}BebXO&2%tkWjf6YH#slF~;-~jEM0$K>nXtG*WCJ1>MX#tfcFp@( z)EZl2IZWD;FW-d~8Le9s(us^Eqy8iZAOuNW+Z?@wpH_)F6yn z#8HO?79fjywi?*egjQUM366?#CeVhj@eSWTY{dZ-(bnnsa9-M4f-*iABgiogXlLsx zT#pX)u;*r6jazUHR`UBcey`zsfbUJ{#2~IU?YEPzfh&JYJH;IB!*}?eE#MxtrfeO; z59A1P_F??U^^dSW*9QLuqyxCAFMz(y0o=MgfTI`b8(-%*=w}Wp5u6LoU5z_vb=+85 zkutfZB0#t1V^FR43;zdx}rQ>jC(nj_S`3aYG1hq|3mt39Bmbf_s0s38UQaMk*a(pM|6*K#M;A&K>< z#+?l10fylQbYUal6*>>iahG1ToZxI{l)vJP@<+IJTimy95NGwh zJ4~bN9?_j5{-jl8b=de=}0C`-;hD-_m=FBMKPNkkA)YBeN6{sYEI(Zc))W5E> zR5@jN#)cYXlCyO=Z|Ooy1*n!$R5_uZ<(%g{ppv>$NfYXVrIhh#DxoFM7i5n>6{%e8K*GYT%j(hcv+s-zXRCNwHCvaQQA$K0J|X|79{eF~4~4A5+_VZa)Li8sb>ipt+PeY%3;75eK60MXaBD3)0cD*D@MVZWw#^J1A07LC&4f==3b#&gxU(BxhK4s~_#P_{s)meF|7B zmh;b#R9*ah?uKqzJ|t)vtTcVBGNY_B8oABDefW f2&U>fN;zMoXf{Ye)BM$lI(~)OS|A$4LZto!8}!it