From c4f0ee5888f768ee7d499c558cf4b1c7d74f0461 Mon Sep 17 00:00:00 2001 From: dhaneshpai Date: Mon, 18 Sep 2017 12:11:35 +0530 Subject: [PATCH 1/5] 1) Set REDIS password while configuring Host 2) Configure JEDIS client to use REDIS password if available ( i.e. not null) --- .../main/java/com/netflix/dyno/connectionpool/Host.java | 9 +++++++++ .../com/netflix/dyno/jedis/JedisConnectionFactory.java | 7 +++++++ 2 files changed, 16 insertions(+) diff --git a/dyno-core/src/main/java/com/netflix/dyno/connectionpool/Host.java b/dyno-core/src/main/java/com/netflix/dyno/connectionpool/Host.java index 04b9b885..0a1b4f5c 100644 --- a/dyno-core/src/main/java/com/netflix/dyno/connectionpool/Host.java +++ b/dyno-core/src/main/java/com/netflix/dyno/connectionpool/Host.java @@ -45,6 +45,7 @@ public class Host implements Comparable { private final String rack; private final String datacenter; private Status status = Status.Down; + private String password = null; public enum Status { Up, Down; @@ -93,6 +94,14 @@ public String getHostAddress() { return hostname; } + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + public String getHostName() { return hostname; } diff --git a/dyno-jedis/src/main/java/com/netflix/dyno/jedis/JedisConnectionFactory.java b/dyno-jedis/src/main/java/com/netflix/dyno/jedis/JedisConnectionFactory.java index 525902ff..12766f40 100644 --- a/dyno-jedis/src/main/java/com/netflix/dyno/jedis/JedisConnectionFactory.java +++ b/dyno-jedis/src/main/java/com/netflix/dyno/jedis/JedisConnectionFactory.java @@ -85,6 +85,13 @@ public JedisConnection(HostConnectionPool hostPool) { jedisClient = new Jedis(host.getHostAddress(), host.getPort(), hostPool.getConnectionTimeout(), hostPool.getSocketTimeout(), true, sslSocketFactory, new SSLParameters(), null); } + + String redisPassword = host.getPassword(); + if(null != jedisClient && null != redisPassword) { + if(!jedisClient.auth(redisPassword).equals("OK")) { + Logger.warn("Failed to set REDIS auth Password"); + } + } } @Override From 1f73cd14dc853bf78955bec87d278618a4ef3a8f Mon Sep 17 00:00:00 2001 From: dhaneshpai Date: Wed, 27 Dec 2017 11:50:41 +0530 Subject: [PATCH 2/5] Fix build issues. --- gradle/wrapper/gradle-wrapper.jar | Bin 54708 -> 54731 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 736fb7d3f94c051b359fc7ae7212d351bc094bdd..6b6ea3ab4ff4f69d55c5fd9c0a6ac70f47d41008 100644 GIT binary patch delta 2300 zcmY+Fc|26>AIE2obw~!;#@KU>5uvzZG?uc*AZ5u`S+a$Yq&t$Xh(V8avXqiEh@m2D zF*L?9cA~m&DO&L~k%g&ikUuUWjOh+9=R+V~iXafb0Nq@9klw!u2t;7WBwVtm(pJ;q z>&oo1$qLHN!?IJahQF*YNyN>0vg{OtDw1sq=RT#T4199@l+v(Hsd_~B&$m~XC^n&) zG(TJX?eq)cw{Oe8BDO!D#@+R^Wym=-_}$|1)O~VRwnd}d{d1#2CpNq*LgF~HXBr>Q zxN^jM?}5GAX#?{b%H=1o=aBPzP7B2QclOz*E!8GbY*c;NEJ;t?q}TVAxR{Xn^9cd;P`UG8-=j*{(Z)XRTh1?y zo>LL6{^*`j5MQ|mh-BPYzSJ@;`u&}SL*%#69icKyWzWJ2 zhwvN@Z}Giq+sJO*cAVj);A8s7!j|gS_SsCTWk8q5p;6%`-D^s}6g_efpM7rm09Q)N zvi_fMdfxf!!OMr^d_By9x_VLWdL`J~+XjSB+qQv@>Z))D&Rylz8okh_V|QfNy^&ZF zWrXg(Blu>EZ>?~%cRIPQ?RN!jK9l7KQ;@W2J;5Vdr#0BqJtfFHNBw|cgZ3`;6?TcG z*Tvd8zSij8mz1QdM-vTsXqBv?j$Jl2uJUgkYkKWJ&K~V8?)#oz+9-Emsk$P3QmQe7diZ2p4U3=a?y3tIDqL8|SQhs)FMdhK;0^887xpWEc>mZ)2z{*tEZFmhsgc_|U?Z1`Xi#@tF zb6&7?dXD(uX6qY2ZR1q`0=EGtOgY1@!FuShjPAFVDHgD4JH;oEnt3xq&>~SatjAA< zXzu>pV+^~z6rVe+8($faJL~YcDx0lf%r9GU!MUjiqKfWML_Ca%%BAsM zy)jG|&unceqr@ksxKL;%w+d5SV~kxo@%rluGvGsWhDlkFv?MvCzipOU5Vd>6p?o8aWfUUv#jbNA>$BhFpc?&cfZ^n%+)d zQzSBSb*R|9Cm{x_!AD*&@=g$ur%+yz#e(;WP;<%mo(4P(akkewBFuQaKF*YE?7Ykh zIA+&|5mzUKqE^Rip71$?mBl1lPR*|27wsfF9$rw=kEy>G6YC&0zJnJ*vJ((2AWOMO za&LGEKBMs-4*0~2 zfJUy}dInzPa7GS(SG_?D6m%AjE}c~aVZ&%}gB$TD!;wxh7W8u?F*XLmrNa@4y%)k~ z0^Lj^OkS}uNO^!9Itpp#azhP}HDnCo@?q(gzX|TaOWin6VJZxbsZ!i-c<5yjTvoJL zj9U*65lUf;9kGVu%fQ((9H5NgA+AbgL88bt(h5F|^$OKXvZRWd1Y3FW}smCjWu1AK_n(F!1{T delta 2205 zcmY+F3p7;w9>-_4I|mb)h!|!RVHzZ_2-y^39~* zy|3T(W7S)wh`kcfP2LklieR^tSRd=Z5}Fk}%3ZLsYu4t$N(rdPU4-Lr8# zRq15M+S}mm;8j5J6O6BSe%;XV>CT($a!sB+l_LqFKD$FA9g*GRbO)dCnMRi?kUh$r zWX{DV-`~BgPX8`aJ#~5MsG8L-tuV{nU-u;jTRnZ(EfaC>Q`PYitvHDl>DfO0rQ=CoCD$6?`+I1tz%Q0OOfw6PE8cOgzud7KBBA9 zrgYlTOseg$f8lt|f}XSatkmPioIlF%D9PwwHv2SN-P}}JeD2sBUwdvaM*iWZIesaS zKOjV0Fm$*(iLz70Un#(-G^2|NDsHY`MM@^A=SA71Nh`^B;PcTf%DSb=UG-NNy+NTDm28dU;B?k=hv_{J zr1YYk92mYCW!2zf?|1r4Cweu@!TvB2z3`HGVI7SR-p5{FvmqsixrL`yKi5nf**HbX zdrxh#nk;{UUJbcV&v0A3nIS!5 zGVF3HseP<^(?r00=5=&-=A%a*r<5l%SYeh&bfs|KE?QiAB|CT`GIDo}hn;aw2D^rR zZqj!pu{L%-s=A=3nOd93-VYV@Z=&p{j|*PK%Y~*bRDR#w z#>>GA8cPnI&wgWl-H_bzTaJwW`GV*FVtln`2ugh8uB>ID9d`Yrb=*}=YdP$aVy!p# z*q%Dy9i^$5Cxo%bCGZ@P{qzwmKcl`?S#RrWq zvjKcyw;%%+Bq z$CsxlI!Wtvw6-iq$%jUuo)D&Lt6gimS80XgroIww z-wf{7CSG!thY;>Al2VJJFP{{|%l9Vn36TA2fYzt`|1}*{^?4$TfvC?A*#-3a&5=T& zPEi7>{X|F&3AR!cfg2JF{J9t)=*J>`0CK<`vXq2_QE4dqNdLf%pkxpOzHGtB zh+F+Qgj@bsyIolcTzP;2Lgk+eW|ZLq8I`T#kO*a|!`QBl1vATfxA3^ZWNWY8AE z>BG`pUryYL2ubdQ(bZHEyc#ruR84=NEU@4Zp_7g<);r3;ZHqWqBnC8as1SBP9Ow`2 zhU~pync{^5%poGA?I%Vx5bUP_zK9W`h>-}~hKZ0I73fp70Be|ti~+;L)=()Gv{Q|N z^#~Cn92QFz5OjFE7%`xE1dHSX-bf%676VSl=>BD@{cWrK?{MIIZ!CBbO8|9TBE(1p z$Wl%4jcbTJ2X>7fhEz`g!%+h088w6CPQn>}Y%k<_8kSjOZqU*hSpIv=9#Xgf%R{`q zkYXMzBlFb2M;;N9x(K87LmNn`5SCGeTf_+l3_ip{3YTHaxmX4$jPHV089z`B+!@1w zOXFCGcU5eezz;Z={rv58%HZ16GCUk+mH!-4%f+DvD4W Date: Fri, 29 Dec 2017 11:13:51 +0530 Subject: [PATCH 3/5] Update build.gradle Continue if Javadoc build fails --- build.gradle | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index f4765f28..2a3766b9 100644 --- a/build.gradle +++ b/build.gradle @@ -35,7 +35,8 @@ subprojects { project.tasks.withType(Javadoc) { if (JavaVersion.current().isJava8Compatible()) { - options.addStringOption('Xdoclint:none', '-quiet') + //options.addStringOption('Xdoclint:none', '-quiet') + options.addBooleanOption('Xdoclint:none', true) } } From b93689d9646d2646f60ff2ae35ea2a8d66bad83c Mon Sep 17 00:00:00 2001 From: mgddp <31952146+mgddp@users.noreply.github.com> Date: Fri, 29 Dec 2017 11:37:02 +0530 Subject: [PATCH 4/5] Update build.gradle Disable JavaDoc for testing --- build.gradle | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 2a3766b9..a2b2ee64 100644 --- a/build.gradle +++ b/build.gradle @@ -33,12 +33,15 @@ subprojects { testCompile "io.netty:netty-all:4.1.14.Final" } - project.tasks.withType(Javadoc) { - if (JavaVersion.current().isJava8Compatible()) { - //options.addStringOption('Xdoclint:none', '-quiet') - options.addBooleanOption('Xdoclint:none', true) - } - } + //project.tasks.withType(Javadoc) { + // if (JavaVersion.current().isJava8Compatible()) { + // //options.addStringOption('Xdoclint:none', '-quiet') + // options.addBooleanOption('Xdoclint:none', true) + // failOnError=false + // } + //} + + tasks.withType(Javadoc).all { enabled = false } } project(':dyno-core') { From 82af2e6781e28f843dc0f85d2f29a7dce10a5f1c Mon Sep 17 00:00:00 2001 From: dhaneshpai Date: Thu, 31 May 2018 10:48:04 +0530 Subject: [PATCH 5/5] Merge changes for issue #222 and #221 --- build.gradle | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index a2b2ee64..2cc13805 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'nebula.netflixoss' version '3.6.4' + id 'nebula.netflixoss' version '5.0.0' } // Establish version and status @@ -16,6 +16,9 @@ subprojects { apply plugin: 'eclipse' apply plugin: 'nebula.compile-api' + sourceCompatibility = '1.8' + targetCompatibility = '1.8' + repositories { jcenter() }