From 8dfee0a437741f584e3e248757d4da7282a59df7 Mon Sep 17 00:00:00 2001 From: Artur Konczak Date: Fri, 21 Jul 2017 15:34:39 +0100 Subject: [PATCH] DATAES-373 - bump elasticsearch version to 5.5.0 --- pom.xml | 4 ++-- .../core/DefaultResultMapperTests.java | 15 ++++++--------- ...ElasticsearchTemplateParentChildTests.java | 2 +- ...on-5.4.0.jar => lang-expression-5.5.0.jar} | Bin 47147 -> 47144 bytes ...6.5.0.jar => lucene-expressions-6.6.0.jar} | Bin 73454 -> 73454 bytes .../plugin-descriptor.properties | 4 ++-- ...groovy-5.4.0.jar => lang-groovy-5.5.0.jar} | Bin 18128 -> 18128 bytes .../lang-groovy/plugin-descriptor.properties | 4 ++-- 8 files changed, 13 insertions(+), 16 deletions(-) rename src/test/resources/test-home-dir/modules/lang-expression/{lang-expression-5.4.0.jar => lang-expression-5.5.0.jar} (89%) rename src/test/resources/test-home-dir/modules/lang-expression/{lucene-expressions-6.5.0.jar => lucene-expressions-6.6.0.jar} (86%) rename src/test/resources/test-home-dir/modules/lang-groovy/{lang-groovy-5.4.0.jar => lang-groovy-5.5.0.jar} (87%) diff --git a/pom.xml b/pom.xml index 79311d040..c92c74e24 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 3.2.1 2.6 - 5.4.0 + 5.5.0 2.0.0.BUILD-SNAPSHOT @@ -91,7 +91,7 @@ org.apache.logging.log4j log4j-core - 2.6.2 + 2.8.2 diff --git a/src/test/java/org/springframework/data/elasticsearch/core/DefaultResultMapperTests.java b/src/test/java/org/springframework/data/elasticsearch/core/DefaultResultMapperTests.java index 4a488f7b3..bec87ff85 100644 --- a/src/test/java/org/springframework/data/elasticsearch/core/DefaultResultMapperTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/DefaultResultMapperTests.java @@ -41,6 +41,8 @@ import org.springframework.data.elasticsearch.annotations.Document; import org.springframework.data.elasticsearch.core.aggregation.AggregatedPage; import org.springframework.data.elasticsearch.core.mapping.SimpleElasticsearchMappingContext; import org.springframework.data.elasticsearch.entities.Car; + +import static java.util.Arrays.asList; import static org.hamcrest.Matchers.*; import static org.junit.Assert.*; import static org.mockito.Mockito.*; @@ -72,12 +74,7 @@ public class DefaultResultMapperTests { when(searchHits.iterator()).thenReturn(new ArrayIterator(hits)); when(response.getHits()).thenReturn(searchHits); - Aggregation aggregationToReturn = createCarAggregation(); - Aggregations aggregations = mock(Aggregations.class); - Iterator iter = Collections.singletonList(aggregationToReturn).iterator(); - - when(aggregations.iterator()).thenReturn(iter).thenReturn(iter); - when(aggregations.get("engine")).thenReturn(aggregationToReturn); + Aggregations aggregations = new Aggregations(asList(createCarAggregation())); when(response.getAggregations()).thenReturn(aggregations); //When @@ -86,7 +83,7 @@ public class DefaultResultMapperTests { //Then page.hasFacets(); assertThat(page.hasAggregations(), is(true)); - assertThat(page.getAggregation("engine").getName(), is("Diesel")); + assertThat(page.getAggregation("Diesel").getName(), is("Diesel")); } @Test @@ -185,8 +182,8 @@ public class DefaultResultMapperTests { private Map createCarFields(String name, String model) { Map result = new HashMap<>(); - result.put("name", new SearchHitField("name", Arrays.asList(name))); - result.put("model", new SearchHitField("model", Arrays.asList(model))); + result.put("name", new SearchHitField("name", asList(name))); + result.put("model", new SearchHitField("model", asList(model))); return result; } diff --git a/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplateParentChildTests.java b/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplateParentChildTests.java index bdabe5a0e..fe2e0bdfe 100644 --- a/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplateParentChildTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplateParentChildTests.java @@ -16,7 +16,7 @@ package org.springframework.data.elasticsearch.core; import static org.elasticsearch.common.xcontent.XContentFactory.*; -import static org.elasticsearch.index.query.QueryBuilders.*; +import static org.elasticsearch.join.query.JoinQueryBuilders.hasChildQuery; import static org.hamcrest.Matchers.*; import static org.junit.Assert.*; diff --git a/src/test/resources/test-home-dir/modules/lang-expression/lang-expression-5.4.0.jar b/src/test/resources/test-home-dir/modules/lang-expression/lang-expression-5.5.0.jar similarity index 89% rename from src/test/resources/test-home-dir/modules/lang-expression/lang-expression-5.4.0.jar rename to src/test/resources/test-home-dir/modules/lang-expression/lang-expression-5.5.0.jar index ade3e7cd7f4e68103f1ab677dd841a7e81378f85..fcf0687021e5424bed6f70ba6b7cedb9ea215fec 100644 GIT binary patch delta 2151 zcmZWp2~ZPP7+y9&AaaBx5XR*SwM0iSARr~-3W8R^1CM$Q6xt$opu`}^sVVWOA`$ed zC|Z>kYaqm65>8Jl)@rHPT3bbm)>=h5rxYuUY5VpqMOJqv`(EDv{onUr`!qwidI+~& z63Z}WVVIQ_R@&0N*VfA#E-{Za?MCI^5P@QG8sW#jGH9t_N=5xreN}zXp8Of|n2#$S zY+Y!5p0~Q9kG1J!v?6k>U((w);Pp1sIv~W4*+mxz%u=-8KFIK|Tq&x$lIF>JY|uOu$Lg}@ExUHb;*UV>i^TV0GFQmG z(nfnPmdOg71&0$&@sHwz;tL*Stg#W#PD|8^`htI(wSRrxg`UzU#@t)%uh~hR!waor zFPAT!dZRvc=%izyP87T}jTk`bx70FHec=9mDj&JARX;k~P9Am7k6+dm1L}z?1 zT6}ADe|EaZts}kezdQdjSSo)qQr21Kn0GTlSv}O?JjCs&xUCCs8z$o7<~VG?p1)A8 zN_yF-Hcu#*hg(VWf_cYxC*ccXy{>wWHmN$ZBIXF}lKXPP-fC5dRe#M3fA+LI>Ii$Z zPxPumds@0dznOqRt`4{et#k1?4A?PHh)c=Upxu1K9BrOiTQbn5Dt~;lC%XhEeGFTa z2~4yJQN1$-VeYR}QeHBl#1fhEW*g0rDgP4*5mqj8a>Nib7F>8IUQQ+=fYpLLeZN8&Unq=*i z#Hr*!3q-iwX1XZf0k)ZZ9Yol;z;Wf{teE!+}sVE)Rj~IpL6)%kaK9iy{#F} zV@!-bXj2Egntfna9Zaf#&}xGJs~LvLGE-qEUU`r?aqBEGt__;Ggv+Di>*+$WD=ttM}0Gx81@1t;ZMtUdjN89U1L9Uax7#oO7FZ|7!OO7 zWr1OlG^Z#auM>h@Vz&u_peQfy42boD*a#YSBn%03CG$XHJr4zXy^g>OrQ?ALQIc7V z1N>%K{%`xkWiY?kBboF?iwyoo#CL~d8>)+dKs9nmWL=3?%|3In8o%t#$2)yX`Rb-0{?2LEWX&V zj57jj`xUHDEKQG@JFe#fd>g5`?*7ShmJBi%LuM%roKk?8@8RnBq-iF&I~8i z#S%G?!}ib=SK|VUYJgK3L1SmCpu-}>T2&ZnJO$(B!%9TbKt*LJgmal_B+-<0z>jYy zK*#PZ0{9rXsLjeR`|Q#o$0nFFz0JoCAn@)Qp$EJsW1c23QVXESLHOfN600goJ+!Zh cKj{V~FWE|X18@(63yscz-(+X0SCbz90m<6_5C8xG delta 1919 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 delta 5364 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 diff --git a/src/test/resources/test-home-dir/modules/lang-expression/plugin-descriptor.properties b/src/test/resources/test-home-dir/modules/lang-expression/plugin-descriptor.properties index 6be681775..cc647f1ea 100644 --- a/src/test/resources/test-home-dir/modules/lang-expression/plugin-descriptor.properties +++ b/src/test/resources/test-home-dir/modules/lang-expression/plugin-descriptor.properties @@ -22,7 +22,7 @@ description=Lucene expressions integration for Elasticsearch # # 'version': plugin's version -version=5.4.0 +version=5.5.0 # # 'name': the plugin name name=lang-expression @@ -37,7 +37,7 @@ classname=org.elasticsearch.script.expression.ExpressionPlugin java.version=1.8 # # 'elasticsearch.version': version of elasticsearch compiled against -elasticsearch.version=5.4.0 +elasticsearch.version=5.5.0 ### optional elements for plugins: # # 'has.native.controller': whether or not the plugin has a native controller diff --git a/src/test/resources/test-home-dir/modules/lang-groovy/lang-groovy-5.4.0.jar b/src/test/resources/test-home-dir/modules/lang-groovy/lang-groovy-5.5.0.jar similarity index 87% rename from src/test/resources/test-home-dir/modules/lang-groovy/lang-groovy-5.4.0.jar rename to src/test/resources/test-home-dir/modules/lang-groovy/lang-groovy-5.5.0.jar index 85c7fd596c98168bd93844cddd1c590a909f9b66..b8ffc756205c45a093502e41c5166119f81f876b 100644 GIT binary patch delta 909 zcmcc6%Xp!ekvG7bnT3mifrEo#!mfK0dDS?8l$X%|jfW>%E7kkvKUNUg6aA^);Z^E) z2F5uSntMZh!&kp;FY?&3s%j-ifHY@wtKzMHzwNgBzIvC%uV6UK-1xoiyQSODr+NI? z-r39>r{IWbv+8e(?un!)e_vIlTRooa!|-^n?>P>UB0FQu@vj0X}{4dU>wzj_Dh2x^S~JO3l`LxTVrRQUOd7jueTS6->My1r)FS4-1bnV#Zv=E<+!E}&D-&lEYI zheg79+R^hGrWW%Kg)OoAWFFo4Zq51nW!AS&-k8ynzb^my*R}ul?^`?l?}av%3!6)t zX9~UFWK{Pka`La&?iKIrlQ#9SwXMIujGbYj|C*$VsmH6&ODwCLUwf*@AYhiTUDJ!( zYF>|iQ_Fg7TjgD`Z|`MH=6@4Pqp zuERoZSZV&gR`D{zr!3S*h9;9@;_uMEfJ3obnJpp>_Jlj-XfLJSP5 zMhp!03<$8Laq?t&7eBDpDrae?88Tq4q4iP=%>bpd#x+lsBICR^)E1=!3y>-n$qevW0;6|;S3(zgij3uU~2-^Si_op)`}j!vGc%1#~FcV z8~X#btS`q*`t(}q&&qnWP2ad?-QQEr&(vbKx#yvk-}`w_XB?~DqG)tzT8o&Gx+k;Z!aWuS1|{CfALSi3uVZ=70#+HVd=8>=2h$2h zu!xR2KNqtJ(6m>EQ~0@IsRJl5+0JkwFC&u(Gd#Ua?shbRCz#2{9j!nHOlEO{xX#Q8 z?5fFSPA*{ay-wa>`htt}WHo24$s3$SCTqG1D}bEW`ibk-2_^=H2^M0)-qWTe$Fmg|dM{X)<6{YgsrZpLT`_+q+6LEmi~zPj@u} ztKTh9G#VN*F!;KLIO=-( zx#|0OI=lJ>yXuuxlmvJq!UAN%%UI_0YM{<(KrD=6!UYE;6a4%`fM!4pU}XcTsV5o5faRGkPV=4du diff --git a/src/test/resources/test-home-dir/modules/lang-groovy/plugin-descriptor.properties b/src/test/resources/test-home-dir/modules/lang-groovy/plugin-descriptor.properties index c3a5a276f..48bfc72db 100644 --- a/src/test/resources/test-home-dir/modules/lang-groovy/plugin-descriptor.properties +++ b/src/test/resources/test-home-dir/modules/lang-groovy/plugin-descriptor.properties @@ -22,7 +22,7 @@ description=Groovy scripting integration for Elasticsearch # # 'version': plugin's version -version=5.4.0 +version=5.5.0 # # 'name': the plugin name name=lang-groovy @@ -37,7 +37,7 @@ classname=org.elasticsearch.script.groovy.GroovyPlugin java.version=1.8 # # 'elasticsearch.version': version of elasticsearch compiled against -elasticsearch.version=5.4.0 +elasticsearch.version=5.5.0 ### optional elements for plugins: # # 'has.native.controller': whether or not the plugin has a native controller