From cdf0c5c15b7a016024828f12cbe286f61f88f9c3 Mon Sep 17 00:00:00 2001
From: Artem Bilan <abilan@pivotal.io>
Date: Mon, 15 Apr 2019 14:15:46 -0400
Subject: [PATCH] Upgrade to Gradle 5.3.1, Kotlin-1.3.30

* Fix new Sonar smell in the `CacheRequestHandlerAdvice`
---
 build.gradle                                  |   2 +-
 gradle/wrapper/gradle-wrapper.jar             | Bin 55190 -> 55616 bytes
 gradle/wrapper/gradle-wrapper.properties      |   2 +-
 gradlew                                       |  18 +++-
 gradlew.bat                                   |  18 +++-
 .../advice/CacheRequestHandlerAdvice.java     |  88 +++++++++---------
 6 files changed, 80 insertions(+), 48 deletions(-)

diff --git a/build.gradle b/build.gradle
index 86432bb6a9..624898b870 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-	ext.kotlinVersion = '1.3.21'
+	ext.kotlinVersion = '1.3.30'
 	repositories {
 		maven { url 'https://repo.spring.io/plugins-release' }
 	}
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 87b738cbd051603d91cc39de6cb000dd98fe6b02..5c2d1cf016b3885f6930543d57b744ea8c220a1a 100644
GIT binary patch
delta 3320
zcmai0c|2768`iN!wwN(!Oxeo5?`tVU3{m#%jC~noTx!q_nHtNnR`zAgWC@krB#b55
znJk4YA);()+(!K-w|npJuix)IpYu7-^SqzuJ>T~|?;j_-ma(;-@!<_I_B>B@4FVej
z11CRtM@$8afpkN^v*te{ycR9yTldxXJbmio?@}x{9}zaw&=aQt(a^ZXN9S3i8a+Z%
zGc@&(5}jplZjJKk2wNlTp(mbeKL5J9Gjo==yT{-eVKj?*rT1%bQ@%#Xce~~1f{19^
zoD75QEoSzDVh@!9qG4yl`;9=Ysp?rRX=(8$VDRz=R+oA3>jLxjW-H!-2biNSYuy)U
z7-B-qC5l;>qjMTg!DbWPY}h7qxi6xp)_T)_O2+*&NDg?v;RyY@5XtWHx%(ImQ_3E%
zA%$s3xrxE0Fk>DhG!pG)4}I!pWJl~QtV_3Jl2W4PuWWssMq^UpGatK+4CING9pB#5
z_NDc)aonVrZuXsr5!RcE#?aXFZQjt2VMd)-p00K$EheT?H!m_D2Mdqq;0moaO=C&y
zg<U9!uBeuQjEL!XxV}P?LM2tSrEI>JnvzgUn!wkx^{r049pU#gsIMhl`<y=TDSzGM
zkEpL#BR}&VK8O53_)_t-0Pee5S8b1WyU|L)+N$K$e<^$Jno8h|x9Zt_vOAMqb3Vq2
ziy+@yk8-t(3BhaE#yQp#Jv?Ov8#In&-aNK@gzDIT-R!}wj*PCFi1}RiFRR`2iI+xh
zuWs)D0R^{Zhf&;J*1!eP3bi3sx0U^{(v{og+?;~8Hc2XavjbOG>%{MDNl;}JRbneC
zSTB=5f;o9=2Rt24_lt&%%f<WWi20}o;W{~MY`Gmy!q#)sGa!dLl`Wph8PBAMOq&VP
z>~m{Ts)zu8H9j`INrgMp>l-|k%Kj%U`OXL1J2e+CJHJxreHLD_#o*Ze<mg$Yq&0zs
zWs#Be(Za^mwNY!MhY{%ku5a+2_qtX_kXTs2@vL=KzDEtB!CV~Yy_bJ85}B7pyIN$A
zTpvrW2m)!iW-2!XZQ9sact@y4i@jxF_QU>uXE4uGDQAJS_PpEGt7hmd7psmLEBL^h
zD#JbHiklZEXkk9(6uF$ErsUu^jg7c~1oRS&CuTq*Xg_cOvGw~FZ&1#p(6|jz9lJnP
zSIJ)sX_W2$PSksX&}*_ejz+t*X)xK|JcakaMRGd%c*R)cQcT|?sM^#{fdjh5_I$iK
zBX_d;wz+cf>b}r!i3yo6eaua)d`|Mi_|Q3mAz5Qn?#~xgE9In<;TwYN^~mtaYy#WU
z*ffWtxwlk&!e@UfqQ$bn23RDFV3o-H_WM}44yQpYw;JuRf$at#XX-qmuVnKqg-Bo#
zJjZE39)!{i$qJh?oJzVzWFDlSW;{Wf`Z)33Y$Fh^+qasrsEJsfy9yhyTFe?Lej&3n
zEAS(D8WCt(ew(SGD<k$r4*59Ks$Onmy={3Qvg}1}Xw4aHM<LTAnr;c!^wR)zVG-H>
z-J#7@l?KI*ZbS)AVQ23qV&{c=$@zUp0@6=kZp+5by+gnAWdB||7e=!yJ|WTpG0OC7
zKlKWFv6#(>nrEq@d1i-#L9SVxTDNb1DaY%2$=@)`k&3s8wz$M*;THa&!2Isj%6CQS
zY>A4HtmWY3@9e@F)mCHJQzBz~Lt(w<zn27>cJE{!CAr=wxn4|5n(jslTy)~IF?tNK
zD^2#hTM0d6MDg>`9;s5*(4W1V8y}F8OT6Xap{`=h1XVKO3zrBh=;JnIs*RB>@7t5T
zwV=G^T)L=(9P7tS={6`tEBBBm^u~_!-#m75G*h}y_Jj7|STtiY_LDR5UUHI@awWmB
zDn6q9{2M-EHaTm53ln%ENJ$HpLwRcL>7^hUrM=}<y&0Gn{r3KRtD&CT#NN8cuKhE~
zpc1nu-A4lR&s`ok>&`qmWTgtr{Ul*Lqcd_9S0xZ1s>F2dVd(s)3&$`gxFAu6jXYIS
ze#M~w@=X@lm)sFI4EEiqKh7JxN=<BaVUDbliLT+#v^0tH(6k-eIqTxLAk|(ySrFhN
zF`gcdTfST|!F&gi))_<s1tB?h4cZk;9Z?k{9cXLEMhtv9*KTRa{ExaF`DO_jugUUW
zoopY$vtd_eU{#R4@uXAGD++yo_5_vN`F9bK)sYs2Vf9{B>_?+}D=iHCc&S2<^VPZ6
zYKXZgvi(Yne9}k6o=ezgquABVB77}x$nKXh`@LjH&lQPqm_;MTL><DvefUUjkhanD
zWE&S9)UwWls3GOSmocRa!h$UYAByIj-`=tD(?hcMzg&*`Hkp`s!)tcf@&m`zI%3A)
zeO<Q<T19u)3~Mok&+=O8=~{!UldRR<G$UUOl_?$B&SMjnEVuT1+t<=^-#n{qzQxAc
zbp^JYUx#>4RGO|E#_7AS4@43rz=ij?gcMZalnd-JK4ILhL)Ee(3G<xoc;H0pJ&_+d
zOdBG}hp!sC!B93<ozYP<&I_?oGtG(HdePf{8{79Zu#x!ZWvZKY8;#9j0ygqmvfngq
zH9L5A!zs=z@K!#m(=C0tI7|Z<Q+WyMXJ=x?@1PC5Lvk%XGrl;i!BIX5+wq<?;MvJ?
zHTHIOC?XLCVMD(u=iWW@MYG8`gJ8N9f02Sl6*cMF%YPkXzII2@JfudT?Y56ZWtyW>
zN}g99HmhxoBjHR<pWiO)ey@q59db#{PX1UM%}1?L9q)0*^&uLP;5l1y+E+j$)x+I&
z$l$h9Vx2Dp$M#74#-Cvgjbg2J1uk5pLoAm(rF`54mprw`+?ciNGG>~y@b>-7{f+`p
zIZ<^8%d;w<x{U9mZp*tJsVRCLHl6kn0dLPoV%LoKbhXW+Y(;N~(e4_u<s?T4cxP^(
zh=7ZYBgBsy8C<!Z>CA#xfwSc6$DNVPjAX6FCkb|MQ|6hFyz9UhoLF0^xUd#*^2Ofn
zOJgmwDyb1=Z8T)ArRy|VQOM+BrhZ>W_ELJ6u(d^JTu|j%*6g8JKZ-ewoj)sXJCdS=
zHOo?HscL;Z`H18}%WnE1&o42KZ+=fg(*VN>t>kRkcd{mP9NF6;MnzH&m2WsD)sX~h
zbhv|Ux$w2avQwoI`IKiGMLrL;Z>R}Y_0K*L=63V<f_(gz&9$)m05S}pNNel*rs%}W
zcrP}muBo=F4#nh@7}kARyK+$^5c*UA+e3P-etQ?kh2{iN!s^3L!W`JV(zm=UtTdAQ
zE2c_!Vas9Nf+9t7)2%m=R)a_uht-*vt*=Ah`Q4wZ!s`sq!ykVxyNuctzuxajYI<O~
z<SG{%1FeeT$YTG*9w`MOy)r?K&FY`xj$^(PPvUqojavzRueI{B$cChsAivV3Uf*o>
z)ut+5tM74Glzb?92<ph9l;lAz=}&Pegxct(te>kbu5@3M#1Hi7K3$c)?<RerhVY|d
zTNbO$M)AfSInKbqAPmN!j2RaJhBP4sDLO}?-Ms?6<)YB;p`qSrxlnhsdysbo9R<^$
z;q<qJ(B%j}?{G%CqhT6l;=;B+VNe34Tlqk_F3rD6$w>TL$}`aKf0hC3`r!>Xy3!f{
z`}Y#@$`|mG1JlKzVE!vD04aX}x#hV*+AC>bQ|%XJ1<&;=0?uX!RM?CIB=+!tgkB-w
zu*HF--^U4#nG1mXz0v^0@|UCs1lt}!1zTaTwoe+k?sPym`pyB-F25ivXx)#1|1%|e
zJ7V<v?<k9>pujkk#Lu%U{v6xiQ5LW2`~QXrR`ja@*L=b0ejT977v%C)0WAik0gV7U
z6a-7##p#p>>>3a{^Z}e3Z~?A|foBFU12bqaEE*0vqdCCVLFq%{;F%$Dkb6i8;Qo!C
z&;zkU(!i5zbSMd)zQzg8(kU^HPQ^flVIzR)<^jwbwget09YD?zV*rx+mx@0IN{#S<
zsB|8Ve>>sJI7sHE!@=(((ttqL0ks%C4M^r5!0H?rJ;MV|jtT)1cMl{|9xo_Okp@Ka
ze^CzbCPf?IDFWLlE`V1FDDpZ0C@7~VMZt%!6%SFtxz{!Tb1UfBDEg~49x!4|2#_L!
zX=6UXeh28<q4RSf$NpI}`U!t-?%z=sKLomri-QgQLKZ*Q?(Zmz7w!J%Q~d8Gw7S5|
R^3$e5zsN`FCc2S<;XjD90!#n^

delta 2991
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
Pbkbqm3=F=5f2aQeBaWHL

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 44e7c4d1d7..ea13fdfd19 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.3.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index af6708ff22..b0d6d0ab5d 100755
--- a/gradlew
+++ b/gradlew
@@ -1,5 +1,21 @@
 #!/usr/bin/env sh
 
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m"'
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
diff --git a/gradlew.bat b/gradlew.bat
index 6d57edc706..9991c50326 100755
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      http://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m"
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/CacheRequestHandlerAdvice.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/CacheRequestHandlerAdvice.java
index 577f48352f..c23c25e559 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/CacheRequestHandlerAdvice.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/CacheRequestHandlerAdvice.java
@@ -174,59 +174,59 @@ public class CacheRequestHandlerAdvice extends AbstractRequestHandlerAdvice
 
 	@Override
 	protected void onInit() {
-		List<CacheOperation> cacheOperations;
+		List<CacheOperation> cacheOperationsToUse;
 		if (!ObjectUtils.isEmpty(this.cacheNames)) {
-			cacheOperations = this.cacheOperations.stream()
-					.filter((operation) -> ObjectUtils.isEmpty(operation.getCacheNames()))
-					.map((operation) -> {
-						CacheOperation.Builder builder;
-						if (operation instanceof CacheableOperation) {
-							CacheableOperation cacheableOperation = (CacheableOperation) operation;
-							CacheableOperation.Builder cacheableBuilder = new CacheableOperation.Builder();
-							cacheableBuilder.setSync(cacheableOperation.isSync());
-							String unless = cacheableOperation.getUnless();
-							if (unless != null) {
-								cacheableBuilder.setUnless(unless);
-							}
-							builder = cacheableBuilder;
-						}
-						else if (operation instanceof CacheEvictOperation) {
-							CacheEvictOperation.Builder cacheEvictBuilder = new CacheEvictOperation.Builder();
-							CacheEvictOperation cacheEvictOperation = (CacheEvictOperation) operation;
-							cacheEvictBuilder.setBeforeInvocation(cacheEvictOperation.isBeforeInvocation());
-							cacheEvictBuilder.setCacheWide(cacheEvictOperation.isCacheWide());
-							builder = cacheEvictBuilder;
-						}
-						else {
-							CachePutOperation cachePutOperation = (CachePutOperation) operation;
-							CachePutOperation.Builder cachePutBuilder = new CachePutOperation.Builder();
-							String unless = cachePutOperation.getUnless();
-							if (unless != null) {
-								cachePutBuilder.setUnless(unless);
-							}
-							builder = cachePutBuilder;
-						}
-
-						builder.setName(operation.getName());
-						builder.setCacheManager(operation.getCacheManager());
-						builder.setCacheNames(this.cacheNames);
-						builder.setCacheResolver(operation.getCacheResolver());
-						builder.setCondition(operation.getCondition());
-						builder.setKey(operation.getKey());
-						builder.setKeyGenerator(operation.getKeyGenerator());
-						return builder.build();
-					})
-					.collect(Collectors.toList());
+			cacheOperationsToUse =
+					this.cacheOperations.stream()
+							.filter((operation) -> ObjectUtils.isEmpty(operation.getCacheNames()))
+							.map((operation) -> {
+								CacheOperation.Builder builder;
+								if (operation instanceof CacheableOperation) {
+									CacheableOperation cacheableOperation = (CacheableOperation) operation;
+									CacheableOperation.Builder cacheableBuilder = new CacheableOperation.Builder();
+									cacheableBuilder.setSync(cacheableOperation.isSync());
+									String unless = cacheableOperation.getUnless();
+									if (unless != null) {
+										cacheableBuilder.setUnless(unless);
+									}
+									builder = cacheableBuilder;
+								}
+								else if (operation instanceof CacheEvictOperation) {
+									CacheEvictOperation.Builder cacheEvictBuilder = new CacheEvictOperation.Builder();
+									CacheEvictOperation cacheEvictOperation = (CacheEvictOperation) operation;
+									cacheEvictBuilder.setBeforeInvocation(cacheEvictOperation.isBeforeInvocation());
+									cacheEvictBuilder.setCacheWide(cacheEvictOperation.isCacheWide());
+									builder = cacheEvictBuilder;
+								}
+								else {
+									CachePutOperation cachePutOperation = (CachePutOperation) operation;
+									CachePutOperation.Builder cachePutBuilder = new CachePutOperation.Builder();
+									String unless = cachePutOperation.getUnless();
+									if (unless != null) {
+										cachePutBuilder.setUnless(unless);
+									}
+									builder = cachePutBuilder;
+								}
+								builder.setName(operation.getName());
+								builder.setCacheManager(operation.getCacheManager());
+								builder.setCacheNames(this.cacheNames);
+								builder.setCacheResolver(operation.getCacheResolver());
+								builder.setCondition(operation.getCondition());
+								builder.setKey(operation.getKey());
+								builder.setKeyGenerator(operation.getKeyGenerator());
+								return builder.build();
+							})
+							.collect(Collectors.toList());
 		}
 		else {
-			cacheOperations = this.cacheOperations;
+			cacheOperationsToUse = this.cacheOperations;
 		}
 
 		this.delegate.setBeanFactory(getBeanFactory());
 		EvaluationContext evaluationContext = ExpressionUtils.createStandardEvaluationContext(getBeanFactory());
 		this.delegate.setKeyGenerator((target, method, params) ->
 				this.keyExpression.getValue(evaluationContext, params[0])); // NOSONAR
-		this.delegate.setCacheOperationSources((method, targetClass) -> cacheOperations);
+		this.delegate.setCacheOperationSources((method, targetClass) -> cacheOperationsToUse);
 		this.delegate.afterPropertiesSet();
 
 	}