From 480aeb7eb700b9b926ddb24adf063a5543ea39f7 Mon Sep 17 00:00:00 2001 From: Jason Tedor Date: Thu, 4 Jan 2018 16:36:13 -0500 Subject: [PATCH 01/74] Introduce Gradle wrapper We have agreed to introduce the Gradle wrapper to simplify workflows for developers, and managing infrastructure (e.g., CI, release builds, etc.) as well as consideration for the fact that other projects in our stack use Gradle and do not necessarily want to be tied to our Gradle version. Relates #28065 --- .gitignore | 5 - CONTRIBUTING.md | 5 +- build.gradle | 27 ++++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 54727 bytes gradle/wrapper/gradle-wrapper.properties | 6 + gradlew | 172 +++++++++++++++++++++++ gradlew.bat | 84 +++++++++++ 7 files changed, 291 insertions(+), 8 deletions(-) create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat diff --git a/.gitignore b/.gitignore index 5d7dbbefdc8b8..41a151f160cfa 100644 --- a/.gitignore +++ b/.gitignore @@ -20,11 +20,6 @@ nbactions.xml .gradle/ build/ -# gradle wrapper -/gradle/ -gradlew -gradlew.bat - # maven stuff (to be removed when trunk becomes 4.x) *-execution-hints.log target/ diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 801d6596736e4..c211ae374f4a9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -92,9 +92,8 @@ Contributing to the Elasticsearch codebase **Repository:** [https://github.com/elastic/elasticsearch](https://github.com/elastic/elasticsearch) -Make sure you have [Gradle](http://gradle.org) installed, as -Elasticsearch uses it as its build system. Gradle must be at least -version 4.3 in order to build successfully. +Elasticsearch uses the Gradle wrapper for its build. You can execute Gradle +using the wrapper via the `gradlew` script in the root of the repository. We support development in the Eclipse and IntelliJ IDEs. For Eclipse, the minimum version that we support is [Eclipse Oxygen][eclipse] (version 4.7). For diff --git a/build.gradle b/build.gradle index 949ada13fd9dc..56506d8c125f1 100644 --- a/build.gradle +++ b/build.gradle @@ -25,7 +25,13 @@ import org.elasticsearch.gradle.VersionCollection import org.elasticsearch.gradle.VersionProperties import org.gradle.plugins.ide.eclipse.model.SourceFolder +import org.gradle.api.tasks.wrapper.Wrapper +import org.gradle.api.tasks.wrapper.Wrapper.DistributionType +import org.gradle.util.GradleVersion +import org.gradle.util.DistributionLocator + import java.nio.file.Path +import java.security.MessageDigest // common maven publishing configuration subprojects { @@ -402,6 +408,27 @@ task run(type: Run) { impliesSubProjects = true } +task wrapper(type: Wrapper) + +gradle.projectsEvaluated { + + allprojects { + tasks.withType(Wrapper) { Wrapper wrapper -> + wrapper.distributionType = DistributionType.ALL + + wrapper.doLast { + final DistributionLocator locator = new DistributionLocator() + final GradleVersion version = GradleVersion.version(wrapper.gradleVersion) + final URI distributionUri = locator.getDistributionFor(version, wrapper.distributionType.name().toLowerCase(Locale.ENGLISH)) + final URI sha256Uri = new URI(distributionUri.toString() + ".sha256") + final String sha256Sum = new String(sha256Uri.toURL().bytes) + wrapper.getPropertiesFile() << "distributionSha256Sum=${sha256Sum}\n" + } + } + } + +} + /* Remove assemble on all qa projects because we don't need to publish * artifacts for them. */ gradle.projectsEvaluated { diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..27768f1bbac3ce2d055b20d521f12da78d331e8e GIT binary patch literal 54727 zcmagFV|ZrKvM!pAZQHhO+qP}9lTNj?q^^Y^VFp)SH8qbSJ)2BQ2girNE| z%tC(^)c?v~^Z#E_K}1nTQbJ9gQ9<%vVRAxVj)8FwL5_iTdUB>&m3fhE=kRWl;g`&m z!W5kh{WsV%fO*%je&j+Lv4xxK~zsEYQls$Q-p&dwID|A)!7uWtJF-=Tm1{V@#x*+kUI$=%KUuf2ka zjiZ{oiL1MXE2EjciJM!jrjFNwCh`~hL>iemrqwqnX?T*MX;U>>8yRcZb{Oy+VKZos zLiFKYPw=LcaaQt8tj=eoo3-@bG_342HQ%?jpgAE?KCLEHC+DmjxAfJ%Og^$dpC8Xw zAcp-)tfJm}BPNq_+6m4gBgBm3+CvmL>4|$2N$^Bz7W(}fz1?U-u;nE`+9`KCLuqg} zwNstNM!J4Uw|78&Y9~9>MLf56to!@qGkJw5Thx%zkzj%Ek9Nn1QA@8NBXbwyWC>9H z#EPwjMNYPigE>*Ofz)HfTF&%PFj$U6mCe-AFw$U%-L?~-+nSXHHKkdgC5KJRTF}`G zE_HNdrE}S0zf4j{r_f-V2imSqW?}3w-4=f@o@-q+cZgaAbZ((hn))@|eWWhcT2pLpTpL!;_5*vM=sRL8 zqU##{U#lJKuyqW^X$ETU5ETeEVzhU|1m1750#f}38_5N9)B_2|v@1hUu=Kt7-@dhA zq_`OMgW01n`%1dB*}C)qxC8q;?zPeF_r;>}%JYmlER_1CUbKa07+=TV45~symC*g8 zW-8(gag#cAOuM0B1xG8eTp5HGVLE}+gYTmK=`XVVV*U!>H`~j4+ROIQ+NkN$LY>h4 zqpwdeE_@AX@PL};e5vTn`Ro(EjHVf$;^oiA%@IBQq>R7_D>m2D4OwwEepkg}R_k*M zM-o;+P27087eb+%*+6vWFCo9UEGw>t&WI17Pe7QVuoAoGHdJ(TEQNlJOqnjZ8adCb zI`}op16D@v7UOEo%8E-~m?c8FL1utPYlg@m$q@q7%mQ4?OK1h%ODjTjFvqd!C z-PI?8qX8{a@6d&Lb_X+hKxCImb*3GFemm?W_du5_&EqRq!+H?5#xiX#w$eLti-?E$;Dhu`{R(o>LzM4CjO>ICf z&DMfES#FW7npnbcuqREgjPQM#gs6h>`av_oEWwOJZ2i2|D|0~pYd#WazE2Bbsa}X@ zu;(9fi~%!VcjK6)?_wMAW-YXJAR{QHxrD5g(ou9mR6LPSA4BRG1QSZT6A?kelP_g- zH(JQjLc!`H4N=oLw=f3{+WmPA*s8QEeEUf6Vg}@!xwnsnR0bl~^2GSa5vb!Yl&4!> zWb|KQUsC$lT=3A|7vM9+d;mq=@L%uWKwXiO9}a~gP4s_4Yohc!fKEgV7WbVo>2ITbE*i`a|V!^p@~^<={#?Gz57 zyPWeM2@p>D*FW#W5Q`1`#5NW62XduP1XNO(bhg&cX`-LYZa|m-**bu|>}S;3)eP8_ zpNTnTfm8 ze+7wDH3KJ95p)5tlwk`S7mbD`SqHnYD*6`;gpp8VdHDz%RR_~I_Ar>5)vE-Pgu7^Y z|9Px+>pi3!DV%E%4N;ii0U3VBd2ZJNUY1YC^-e+{DYq+l@cGtmu(H#Oh%ibUBOd?C z{y5jW3v=0eV0r@qMLgv1JjZC|cZ9l9Q)k1lLgm))UR@#FrJd>w^`+iy$c9F@ic-|q zVHe@S2UAnc5VY_U4253QJxm&Ip!XKP8WNcnx9^cQ;KH6PlW8%pSihSH2(@{2m_o+m zr((MvBja2ctg0d0&U5XTD;5?d?h%JcRJp{_1BQW1xu&BrA3(a4Fh9hon-ly$pyeHq zG&;6q?m%NJ36K1Sq_=fdP(4f{Hop;_G_(i?sPzvB zDM}>*(uOsY0I1j^{$yn3#U(;B*g4cy$-1DTOkh3P!LQ;lJlP%jY8}Nya=h8$XD~%Y zbV&HJ%eCD9nui-0cw!+n`V~p6VCRqh5fRX z8`GbdZ@73r7~myQLBW%db;+BI?c-a>Y)m-FW~M=1^|<21_Sh9RT3iGbO{o-hpN%d6 z7%++#WekoBOP^d0$$|5npPe>u3PLvX_gjH2x(?{&z{jJ2tAOWTznPxv-pAv<*V7r$ z6&glt>7CAClWz6FEi3bToz-soY^{ScrjwVPV51=>n->c(NJngMj6TyHty`bfkF1hc zkJS%A@cL~QV0-aK4>Id!9dh7>0IV;1J9(myDO+gv76L3NLMUm9XyPauvNu$S<)-|F zZS}(kK_WnB)Cl`U?jsdYfAV4nrgzIF@+%1U8$poW&h^c6>kCx3;||fS1_7JvQT~CV zQ8Js+!p)3oW>Df(-}uqC`Tcd%E7GdJ0p}kYj5j8NKMp(KUs9u7?jQ94C)}0rba($~ zqyBx$(1ae^HEDG`Zc@-rXk1cqc7v0wibOR4qpgRDt#>-*8N3P;uKV0CgJE2SP>#8h z=+;i_CGlv+B^+$5a}SicVaSeaNn29K`C&=}`=#Nj&WJP9Xhz4mVa<+yP6hkrq1vo= z1rX4qg8dc4pmEvq%NAkpMK>mf2g?tg_1k2%v}<3`$6~Wlq@ItJ*PhHPoEh1Yi>v57 z4k0JMO)*=S`tKvR5gb-(VTEo>5Y>DZJZzgR+j6{Y`kd|jCVrg!>2hVjz({kZR z`dLlKhoqT!aI8=S+fVp(5*Dn6RrbpyO~0+?fy;bm$0jmTN|t5i6rxqr4=O}dY+ROd zo9Et|x}!u*xi~>-y>!M^+f&jc;IAsGiM_^}+4|pHRn{LThFFpD{bZ|TA*wcGm}XV^ zr*C6~@^5X-*R%FrHIgo-hJTBcyQ|3QEj+cSqp#>&t`ZzB?cXM6S(lRQw$I2?m5=wd z78ki`R?%;o%VUhXH?Z#(uwAn9$m`npJ=cA+lHGk@T7qq_M6Zoy1Lm9E0UUysN)I_x zW__OAqvku^>`J&CB=ie@yNWsaFmem}#L3T(x?a`oZ+$;3O-icj2(5z72Hnj=9Z0w% z<2#q-R=>hig*(t0^v)eGq2DHC%GymE-_j1WwBVGoU=GORGjtaqr0BNigOCqyt;O(S zKG+DoBsZU~okF<7ahjS}bzwXxbAxFfQAk&O@>LsZMsZ`?N?|CDWM(vOm%B3CBPC3o z%2t@%H$fwur}SSnckUm0-k)mOtht`?nwsDz=2#v=RBPGg39i#%odKq{K^;bTD!6A9 zskz$}t)sU^=a#jLZP@I=bPo?f-L}wpMs{Tc!m7-bi!Ldqj3EA~V;4(dltJmTXqH0r z%HAWKGutEc9vOo3P6Q;JdC^YTnby->VZ6&X8f{obffZ??1(cm&L2h7q)*w**+sE6dG*;(H|_Q!WxU{g)CeoT z(KY&bv!Usc|m+Fqfmk;h&RNF|LWuNZ!+DdX*L=s-=_iH=@i` z?Z+Okq^cFO4}_n|G*!)Wl_i%qiMBaH8(WuXtgI7EO=M>=i_+;MDjf3aY~6S9w0K zUuDO7O5Ta6+k40~xh~)D{=L&?Y0?c$s9cw*Ufe18)zzk%#ZY>Tr^|e%8KPb0ht`b( zuP@8#Ox@nQIqz9}AbW0RzE`Cf>39bOWz5N3qzS}ocxI=o$W|(nD~@EhW13Rj5nAp; zu2obEJa=kGC*#3=MkdkWy_%RKcN=?g$7!AZ8vBYKr$ePY(8aIQ&yRPlQ=mudv#q$q z4%WzAx=B{i)UdLFx4os?rZp6poShD7Vc&mSD@RdBJ=_m^&OlkEE1DFU@csgKcBifJ zz4N7+XEJhYzzO=86 z#%eBQZ$Nsf2+X0XPHUNmg#(sNt^NW1Y0|M(${e<0kW6f2q5M!2YE|hSEQ*X-%qo(V zHaFwyGZ0on=I{=fhe<=zo{=Og-_(to3?cvL4m6PymtNsdDINsBh8m>a%!5o3s(en) z=1I z6O+YNertC|OFNqd6P=$gMyvmfa`w~p9*gKDESFqNBy(~Zw3TFDYh}$iudn)9HxPBi zdokK@o~nu?%imcURr5Y~?6oo_JBe}t|pU5qjai|#JDyG=i^V~7+a{dEnO<(y>ahND#_X_fcEBNiZ)uc&%1HVtx8Ts z*H_Btvx^IhkfOB#{szN*n6;y05A>3eARDXslaE>tnLa>+`V&cgho?ED+&vv5KJszf zG4@G;7i;4_bVvZ>!mli3j7~tPgybF5|J6=Lt`u$D%X0l}#iY9nOXH@(%FFJLtzb%p zzHfABnSs;v-9(&nzbZytLiqqDIWzn>JQDk#JULcE5CyPq_m#4QV!}3421haQ+LcfO*>r;rg6K|r#5Sh|y@h1ao%Cl)t*u`4 zMTP!deC?aL7uTxm5^nUv#q2vS-5QbBKP|drbDXS%erB>fYM84Kpk^au99-BQBZR z7CDynflrIAi&ahza+kUryju5LR_}-Z27g)jqOc(!Lx9y)e z{cYc&_r947s9pteaa4}dc|!$$N9+M38sUr7h(%@Ehq`4HJtTpA>B8CLNO__@%(F5d z`SmX5jbux6i#qc}xOhumzbAELh*Mfr2SW99=WNOZRZgoCU4A2|4i|ZVFQt6qEhH#B zK_9G;&h*LO6tB`5dXRSBF0hq0tk{2q__aCKXYkP#9n^)@cq}`&Lo)1KM{W+>5mSed zKp~=}$p7>~nK@va`vN{mYzWN1(tE=u2BZhga5(VtPKk(*TvE&zmn5vSbjo zZLVobTl%;t@6;4SsZ>5+U-XEGUZGG;+~|V(pE&qqrp_f~{_1h@5ZrNETqe{bt9ioZ z#Qn~gWCH!t#Ha^n&fT2?{`}D@s4?9kXj;E;lWV9Zw8_4yM0Qg-6YSsKgvQ*fF{#Pq z{=(nyV>#*`RloBVCs;Lp*R1PBIQOY=EK4CQa*BD0MsYcg=opP?8;xYQDSAJBeJpw5 zPBc_Ft9?;<0?pBhCmOtWU*pN*;CkjJ_}qVic`}V@$TwFi15!mF1*m2wVX+>5p%(+R zQ~JUW*zWkalde{90@2v+oVlkxOZFihE&ZJ){c?hX3L2@R7jk*xjYtHi=}qb+4B(XJ z$gYcNudR~4Kz_WRq8eS((>ALWCO)&R-MXE+YxDn9V#X{_H@j616<|P(8h(7z?q*r+ zmpqR#7+g$cT@e&(%_|ipI&A%9+47%30TLY(yuf&*knx1wNx|%*H^;YB%ftt%5>QM= z^i;*6_KTSRzQm%qz*>cK&EISvF^ovbS4|R%)zKhTH_2K>jP3mBGn5{95&G9^a#4|K zv+!>fIsR8z{^x4)FIr*cYT@Q4Z{y}};rLHL+atCgHbfX*;+k&37DIgENn&=k(*lKD zG;uL-KAdLn*JQ?@r6Q!0V$xXP=J2i~;_+i3|F;_En;oAMG|I-RX#FwnmU&G}w`7R{ z788CrR-g1DW4h_`&$Z`ctN~{A)Hv_-Bl!%+pfif8wN32rMD zJDs$eVWBYQx1&2sCdB0!vU5~uf)=vy*{}t{2VBpcz<+~h0wb7F3?V^44*&83Z2#F` z32!rd4>uc63rQP$3lTH3zb-47IGR}f)8kZ4JvX#toIpXH`L%NnPDE~$QI1)0)|HS4 zVcITo$$oWWwCN@E-5h>N?Hua!N9CYb6f8vTFd>h3q5Jg-lCI6y%vu{Z_Uf z$MU{{^o~;nD_@m2|E{J)q;|BK7rx%`m``+OqZAqAVj-Dy+pD4-S3xK?($>wn5bi90CFAQ+ACd;&m6DQB8_o zjAq^=eUYc1o{#+p+ zn;K<)Pn*4u742P!;H^E3^Qu%2dM{2slouc$AN_3V^M7H_KY3H)#n7qd5_p~Za7zAj|s9{l)RdbV9e||_67`#Tu*c<8!I=zb@ z(MSvQ9;Wrkq6d)!9afh+G`!f$Ip!F<4ADdc*OY-y7BZMsau%y?EN6*hW4mOF%Q~bw z2==Z3^~?q<1GTeS>xGN-?CHZ7a#M4kDL zQxQr~1ZMzCSKFK5+32C%+C1kE#(2L=15AR!er7GKbp?Xd1qkkGipx5Q~FI-6zt< z*PTpeVI)Ngnnyaz5noIIgNZtb4bQdKG{Bs~&tf)?nM$a;7>r36djllw%hQxeCXeW^ z(i6@TEIuxD<2ulwLTt|&gZP%Ei+l!(%p5Yij6U(H#HMkqM8U$@OKB|5@vUiuY^d6X zW}fP3;Kps6051OEO(|JzmVU6SX(8q>*yf*x5QoxDK={PH^F?!VCzES_Qs>()_y|jg6LJlJWp;L zKM*g5DK7>W_*uv}{0WUB0>MHZ#oJZmO!b3MjEc}VhsLD~;E-qNNd?x7Q6~v zR=0$u>Zc2Xr}>x_5$-s#l!oz6I>W?lw;m9Ae{Tf9eMX;TI-Wf_mZ6sVrMnY#F}cDd z%CV*}fDsXUF7Vbw>PuDaGhu631+3|{xp<@Kl|%WxU+vuLlcrklMC!Aq+7n~I3cmQ! z`e3cA!XUEGdEPSu``&lZEKD1IKO(-VGvcnSc153m(i!8ohi`)N2n>U_BemYJ`uY>8B*Epj!oXRLV}XK}>D*^DHQ7?NY*&LJ9VSo`Ogi9J zGa;clWI8vIQqkngv2>xKd91K>?0`Sw;E&TMg&6dcd20|FcTsnUT7Yn{oI5V4@Ow~m zz#k~8TM!A9L7T!|colrC0P2WKZW7PNj_X4MfESbt<-soq*0LzShZ}fyUx!(xIIDwx zRHt^_GAWe0-Vm~bDZ(}XG%E+`XhKpPlMBo*5q_z$BGxYef8O!ToS8aT8pmjbPq)nV z%x*PF5ZuSHRJqJ!`5<4xC*xb2vC?7u1iljB_*iUGl6+yPyjn?F?GOF2_KW&gOkJ?w z3e^qc-te;zez`H$rsUCE0<@7PKGW?7sT1SPYWId|FJ8H`uEdNu4YJjre`8F*D}6Wh z|FQ`xf7yiphHIAkU&OYCn}w^ilY@o4larl?^M7&8YI;hzBIsX|i3UrLsx{QDKwCX< zy;a>yjfJ6!sz`NcVi+a!Fqk^VE^{6G53L?@Tif|j!3QZ0fk9QeUq8CWI;OmO-Hs+F zuZ4sHLA3{}LR2Qlyo+{d@?;`tpp6YB^BMoJt?&MHFY!JQwoa0nTSD+#Ku^4b{5SZVFwU9<~APYbaLO zu~Z)nS#dxI-5lmS-Bnw!(u15by(80LlC@|ynj{TzW)XcspC*}z0~8VRZq>#Z49G`I zgl|C#H&=}n-ajxfo{=pxPV(L*7g}gHET9b*s=cGV7VFa<;Htgjk>KyW@S!|z`lR1( zGSYkEl&@-bZ*d2WQ~hw3NpP=YNHF^XC{TMG$Gn+{b6pZn+5=<()>C!N^jncl0w6BJ zdHdnmSEGK5BlMeZD!v4t5m7ct7{k~$1Ie3GLFoHjAH*b?++s<|=yTF+^I&jT#zuMx z)MLhU+;LFk8bse|_{j+d*a=&cm2}M?*arjBPnfPgLwv)86D$6L zLJ0wPul7IenMvVAK$z^q5<^!)7aI|<&GGEbOr=E;UmGOIa}yO~EIr5xWU_(ol$&fa zR5E(2vB?S3EvJglTXdU#@qfDbCYs#82Yo^aZN6`{Ex#M)easBTe_J8utXu(fY1j|R z9o(sQbj$bKU{IjyhosYahY{63>}$9_+hWxB3j}VQkJ@2$D@vpeRSldU?&7I;qd2MF zSYmJ>zA(@N_iK}m*AMPIJG#Y&1KR)6`LJ83qg~`Do3v^B0>fU&wUx(qefuTgzFED{sJ65!iw{F2}1fQ3= ziFIP{kezQxmlx-!yo+sC4PEtG#K=5VM9YIN0z9~c4XTX?*4e@m;hFM!zVo>A`#566 z>f&3g94lJ{r)QJ5m7Xe3SLau_lOpL;A($wsjHR`;xTXgIiZ#o&vt~ zGR6KdU$FFbLfZCC3AEu$b`tj!9XgOGLSV=QPIYW zjI!hSP#?8pn0@ezuenOzoka8!8~jXTbiJ6+ZuItsWW03uzASFyn*zV2kIgPFR$Yzm zE<$cZlF>R8?Nr2_i?KiripBc+TGgJvG@vRTY2o?(_Di}D30!k&CT`>+7ry2!!iC*X z<@=U0_C#16=PN7bB39w+zPwDOHX}h20Ap);dx}kjXX0-QkRk=cr};GYsjSvyLZa-t zzHONWddi*)RDUH@RTAsGB_#&O+QJaaL+H<<9LLSE+nB@eGF1fALwjVOl8X_sdOYme z0lk!X=S(@25=TZHR7LlPp}fY~yNeThMIjD}pd9+q=j<_inh0$>mIzWVY+Z9p<{D^#0Xk+b_@eNSiR8;KzSZ#7lUsk~NGMcB8C2c=m2l5paHPq`q{S(kdA7Z1a zyfk2Y;w?^t`?@yC5Pz9&pzo}Hc#}mLgDmhKV|PJ3lKOY(Km@Fi2AV~CuET*YfUi}u zfInZnqDX(<#vaS<^fszuR=l)AbqG{}9{rnyx?PbZz3Pyu!eSJK`uwkJU!ORQXy4x83r!PNgOyD33}}L=>xX_93l6njNTuqL8J{l%*3FVn3MG4&Fv*`lBXZ z?=;kn6HTT^#SrPX-N)4EZiIZI!0ByXTWy;;J-Tht{jq1mjh`DSy7yGjHxIaY%*sTx zuy9#9CqE#qi>1misx=KRWm=qx4rk|}vd+LMY3M`ow8)}m$3Ggv&)Ri*ON+}<^P%T5 z_7JPVPfdM=Pv-oH<tecoE}(0O7|YZc*d8`Uv_M*3Rzv7$yZnJE6N_W=AQ3_BgU_TjA_T?a)U1csCmJ&YqMp-lJe`y6>N zt++Bi;ZMOD%%1c&-Q;bKsYg!SmS^#J@8UFY|G3!rtyaTFb!5@e(@l?1t(87ln8rG? z--$1)YC~vWnXiW3GXm`FNSyzu!m$qT=Eldf$sMl#PEfGmzQs^oUd=GIQfj(X=}dw+ zT*oa0*oS%@cLgvB&PKIQ=Ok?>x#c#dC#sQifgMwtAG^l3D9nIg(Zqi;D%807TtUUCL3_;kjyte#cAg?S%e4S2W>9^A(uy8Ss0Tc++ZTjJw1 z&Em2g!3lo@LlDyri(P^I8BPpn$RE7n*q9Q-c^>rfOMM6Pd5671I=ZBjAvpj8oIi$! zl0exNl(>NIiQpX~FRS9UgK|0l#s@#)p4?^?XAz}Gjb1?4Qe4?j&cL$C8u}n)?A@YC zfmbSM`Hl5pQFwv$CQBF=_$Sq zxsV?BHI5bGZTk?B6B&KLdIN-40S426X3j_|ceLla*M3}3gx3(_7MVY1++4mzhH#7# zD>2gTHy*%i$~}mqc#gK83288SKp@y3wz1L_e8fF$Rb}ex+`(h)j}%~Ld^3DUZkgez zOUNy^%>>HHE|-y$V@B}-M|_{h!vXpk01xaD%{l{oQ|~+^>rR*rv9iQen5t?{BHg|% zR`;S|KtUb!X<22RTBA4AAUM6#M?=w5VY-hEV)b`!y1^mPNEoy2K)a>OyA?Q~Q*&(O zRzQI~y_W=IPi?-OJX*&&8dvY0zWM2%yXdFI!D-n@6FsG)pEYdJbuA`g4yy;qrgR?G z8Mj7gv1oiWq)+_$GqqQ$(ZM@#|0j7})=#$S&hZwdoijFI4aCFLVI3tMH5fLreZ;KD zqA`)0l~D2tuIBYOy+LGw&hJ5OyE+@cnZ0L5+;yo2pIMdt@4$r^5Y!x7nHs{@>|W(MzJjATyWGNwZ^4j+EPU0RpAl-oTM@u{lx*i0^yyWPfHt6QwPvYpk9xFMWfBFt!+Gu6TlAmr zeQ#PX71vzN*_-xh&__N`IXv6`>CgV#eA_%e@7wjgkj8jlKzO~Ic6g$cT`^W{R{606 zCDP~+NVZ6DMO$jhL~#+!g*$T!XW63#(ngDn#Qwy71yj^gazS{e;3jGRM0HedGD@pt z?(ln3pCUA(ekqAvvnKy0G@?-|-dh=eS%4Civ&c}s%wF@0K5Bltaq^2Os1n6Z3%?-Q zAlC4goQ&vK6TpgtzkHVt*1!tBYt-`|5HLV1V7*#45Vb+GACuU+QB&hZ=N_flPy0TY zR^HIrdskB#<$aU;HY(K{a3(OQa$0<9qH(oa)lg@Uf>M5g2W0U5 zk!JSlhrw8quBx9A>RJ6}=;W&wt@2E$7J=9SVHsdC?K(L(KACb#z)@C$xXD8^!7|uv zZh$6fkq)aoD}^79VqdJ!Nz-8$IrU(_-&^cHBI;4 z^$B+1aPe|LG)C55LjP;jab{dTf$0~xbXS9!!QdcmDYLbL^jvxu2y*qnx2%jbL%rB z{aP85qBJe#(&O~Prk%IJARcdEypZ)vah%ZZ%;Zk{eW(U)Bx7VlzgOi8)x z`rh4l`@l_Ada7z&yUK>ZF;i6YLGwI*Sg#Fk#Qr0Jg&VLax(nNN$u-XJ5=MsP3|(lEdIOJ7|(x3iY;ea)5#BW*mDV%^=8qOeYO&gIdJVuLLN3cFaN=xZtFB=b zH{l)PZl_j^u+qx@89}gAQW7ofb+k)QwX=aegihossZq*+@PlCpb$rpp>Cbk9UJO<~ zDjlXQ_Ig#W0zdD3&*ei(FwlN#3b%FSR%&M^ywF@Fr>d~do@-kIS$e%wkIVfJ|Ohh=zc zF&Rnic^|>@R%v?@jO}a9;nY3Qrg_!xC=ZWUcYiA5R+|2nsM*$+c$TOs6pm!}Z}dfM zGeBhMGWw3$6KZXav^>YNA=r6Es>p<6HRYcZY)z{>yasbC81A*G-le8~QoV;rtKnkx z;+os8BvEe?0A6W*a#dOudsv3aWs?d% z0oNngyVMjavLjtjiG`!007#?62ClTqqU$@kIY`=x^$2e>iqIy1>o|@Tw@)P)B8_1$r#6>DB_5 zmaOaoE~^9TolgDgooKFuEFB#klSF%9-~d2~_|kQ0Y{Ek=HH5yq9s zDq#1S551c`kSiWPZbweN^A4kWiP#Qg6er1}HcKv{fxb1*BULboD0fwfaNM_<55>qM zETZ8TJDO4V)=aPp_eQjX%||Ud<>wkIzvDlpNjqW>I}W!-j7M^TNe5JIFh#-}zAV!$ICOju8Kx)N z0vLtzDdy*rQN!7r>Xz7rLw8J-(GzQlYYVH$WK#F`i_i^qVlzTNAh>gBWKV@XC$T-` z3|kj#iCquDhiO7NKum07i|<-NuVsX}Q}mIP$jBJDMfUiaWR3c|F_kWBMw0_Sr|6h4 zk`_r5=0&rCR^*tOy$A8K;@|NqwncjZ>Y-75vlpxq%Cl3EgH`}^^~=u zoll6xxY@a>0f%Ddpi;=cY}fyG!K2N-dEyXXmUP5u){4VnyS^T4?pjN@Ot4zjL(Puw z_U#wMH2Z#8Pts{olG5Dy0tZj;N@;fHheu>YKYQU=4Bk|wcD9MbA`3O4bj$hNRHwzb zSLcG0SLV%zywdbuwl(^E_!@&)TdXge4O{MRWk2RKOt@!8E{$BU-AH(@4{gxs=YAz9LIob|Hzto0}9cWoz6Tp2x0&xi#$ zHh$dwO&UCR1Ob2w00-2eG7d4=cN(Y>0R#$q8?||q@iTi+7-w-xR%uMr&StFIthC<# zvK(aPduwuNB}oJUV8+Zl)%cnfsHI%4`;x6XW^UF^e4s3Z@S<&EV8?56Wya;HNs0E> z`$0dgRdiUz9RO9Au3RmYq>K#G=X%*_dUbSJHP`lSfBaN8t-~@F>)BL1RT*9I851A3 z<-+Gb#_QRX>~av#Ni<#zLswtu-c6{jGHR>wflhKLzC4P@b%8&~u)fosoNjk4r#GvC zlU#UU9&0Hv;d%g72Wq?Ym<&&vtA3AB##L}=ZjiTR4hh7J)e>ei} zt*u+>h%MwN`%3}b4wYpV=QwbY!jwfIj#{me)TDOG`?tI!%l=AwL2G@9I~}?_dA5g6 zCKgK(;6Q0&P&K21Tx~k=o6jwV{dI_G+Ba*Zts|Tl6q1zeC?iYJTb{hel*x>^wb|2RkHkU$!+S4OU4ZOKPZjV>9OVsqNnv5jK8TRAE$A&^yRwK zj-MJ3Pl?)KA~fq#*K~W0l4$0=8GRx^9+?w z!QT8*-)w|S^B0)ZeY5gZPI2G(QtQf?DjuK(s^$rMA!C%P22vynZY4SuOE=wX2f8$R z)A}mzJi4WJnZ`!bHG1=$lwaxm!GOnRbR15F$nRC-M*H<*VfF|pQw(;tbSfp({>9^5 zw_M1-SJ9eGF~m(0dvp*P8uaA0Yw+EkP-SWqu zqal$hK8SmM7#Mrs0@OD+%_J%H*bMyZiWAZdsIBj#lkZ!l2c&IpLu(5^T0Ge5PHzR} zn;TXs$+IQ_&;O~u=Jz+XE0wbOy`=6>m9JVG} zJ~Kp1e5m?K3x@@>!D)piw^eMIHjD4RebtR`|IlckplP1;r21wTi8v((KqNqn%2CB< zifaQc&T}*M&0i|LW^LgdjIaX|o~I$`owHolRqeH_CFrqCUCleN130&vH}dK|^kC>) z-r2P~mApHotL4dRX$25lIcRh_*kJaxi^%ZN5-GAAMOxfB!6flLPY-p&QzL9TE%ho( zRwftE3sy5<*^)qYzKkL|rE>n@hyr;xPqncY6QJ8125!MWr`UCWuC~A#G1AqF1@V$kv>@NBvN&2ygy*{QvxolkRRb%Ui zsmKROR%{*g*WjUUod@@cS^4eF^}yQ1>;WlGwOli z+Y$(8I`0(^d|w>{eaf!_BBM;NpCoeem2>J}82*!em=}}ymoXk>QEfJ>G(3LNA2-46 z5PGvjr)Xh9>aSe>vEzM*>xp{tJyZox1ZRl}QjcvX2TEgNc^(_-hir@Es>NySoa1g^ zFow_twnHdx(j?Q_3q51t3XI7YlJ4_q&(0#)&a+RUy{IcBq?)eaWo*=H2UUVIqtp&lW9JTJiP&u zw8+4vo~_IJXZIJb_U^&=GI1nSD%e;P!c{kZALNCm5c%%oF+I3DrA63_@4)(v4(t~JiddILp7jmoy+>cD~ivwoctFfEL zP*#2Rx?_&bCpX26MBgp^4G>@h`Hxc(lnqyj!*t>9sOBcXN(hTwEDpn^X{x!!gPX?1 z*uM$}cYRwHXuf+gYTB}gDTcw{TXSOUU$S?8BeP&sc!Lc{{pEv}x#ELX>6*ipI1#>8 zKes$bHjiJ1OygZge_ak^Hz#k;=od1wZ=o71ba7oClBMq>Uk6hVq|ePPt)@FM5bW$I z;d2Or@wBjbTyZj|;+iHp%Bo!Vy(X3YM-}lasMItEV_QrP-Kk_J4C>)L&I3Xxj=E?| zsAF(IfVQ4w+dRRnJ>)}o^3_012YYgFWE)5TT=l2657*L8_u1KC>Y-R{7w^S`WJ+^JzHuu=JXOHcf zJ+^Jzwr%U1_nvcc-h2LE-KwN2RY@h4{5nr}uU@^@j9Y!eW&RrlxrFJsJ2m$YA_9Zz zQ+{`F1*shE`k2SQa*%|AUxq<=OnLWoUSKBL5S3upsND`EUdf$ctj1W+2<}WUDMj>z za+Wj!+79Vd*#&dxJZUUqcbZTV?^AN-WmS0xbO0L%qI4R5O0}%qTI}x2PsGXxa+rLb zKYys3#s6LbHFE*r;Z_2}f(Ghf&o{3Ff_C17?ImPaYYE29AL74)xG#-HDL8_6uXQ>t z@~fAb>IUp>$h{RVr7A|gHq!P0z4v0 z%ym-k&xgT`bxc8aG@QQ8JLHDtxJ#^AQj{B6HlOY)QN92>Yp?g>2yw}HnKR%z&!o!J zHh!g$kLAqd5xI!0YD~JB*)GzDO&A~Y5SQG(28+=@^q6#)oYAgF8xLiZn4{u z5&5*9C3yVeXSj;Dd*$ZdBVF{))4ZSiWr%r`q0kQfF);z){9>8>7_v z0j1pk4DxiF?YXMc*cWsCy%F;TrjqkXhU0rL6{CQePQ|dt?c<)^jtTc;eqPq{Y37vQ z!Um_nse-}h<3}bh9~QAVU@sm6G5*B{E;eAXO*bbm2f{-DETrR2VCD~%MZ)6BxjBQ0hNIhUE&Yg(gRm~8P(Q=b~wdqYdM7si)_YiR7roGf0Fvq{BME4Ic9H@(QIS)r; z%RcWbmq29@fmvY`Le5<>X=+=Exzppaq}#Q6=>}!cE@wE4#h6Nd$Dli&6tT&@F5;8? zxVcN^_n7Sila;d>GChi{eNm?wEuFB^Jg3wz8cbdJlX+zB zx9CrZ>SJN9B9UZ=FaO7_+(%ux`FAwPwl0C=uSq^YAx1(}!Jd!k&;hv{BGcsbz4Hy8 zAAdqWS4PS)5XeAJrgARBmwnmusufhCE2!DD5`eM&8L@-YID)LY{6+QrK*fs>g~zsMYM+SqIjBEBGjS|TiGPw=;q2{+3&Y~hUR zA)7V)Ccmb?+-Gj^*u*)$M13UF-MGt%#L2)J^BEp-?hE#lXnUXw@yT1>+~J*_pC0gW za9XNlp?hV{PbRT{v1DIPw$-jfl-t6-wMX`B*2m~WkLt@)hd7+v$$(Ds_d594?3ENF zK7RrH>(r^xjjmPYFZCgiA3yN^J;EmS%k;na_(Ab+zh>o-hq{u7D68lPZKYC>G9iUk zgMZPJ1{*;j;6a#>zEvcoS4x`aB1e6N`vhSQ^y9q)z2`?BHNqgO)&0);mP%mHzN7T{ z{CtJkhL?>O+cp7Awx#l0D<+i>_$j0v$|mX@Rvmqz~Evt!KhIoe+PR!9mH1N%>`fQA5Llt(k|4nHQGyjXsyr~nu0F2n&uCPUxg*ZZ$m zQ>}c!rb((Wi^}jC+UF-8X)T@tC=UsFkS?S?mCad5Ee&ARka@As48zq;F||JfIa>AE zD7!lYbGl&^lcF7tL6BY_5Yss)E695VJ|Y?S(2L?GBOC&O-h2w55Twc8__vAW;4EU5 zL=v|Q2Fs)p2<%h0?O{n^T+(vpnactMdY#ZI>Mxvx*|G1zW?sR|49&n0#bt{HHvD?OS)3GC(lC9T5tr-GLsiz%t{7vpmeNX z?>_!LBrWhQe%Ay1_@M&y;|JTn4@o(FM>Bp02V-jkD`R_Nsb7ZrRzlyKGWO;MPLAfk z{z-RCRM3>f`ljSgnrtjMmf1Blu4>l1g<77i?rKW%BLWlD2chD5l1s%A$h5Ajqf zN%Y8F=kj*rDRVIf&lbabE~h%Y(KsxRb)otEXdftJAJ?k@hm)1QAIF~ZYQL8!eYR#E zj#0{{+d2-eNE{P&~wT|4Zo|4Pt5tChPcpb7%yvEZ6Xq+a^2`H6HEDB z_RbBjBA*$TEi$GcUy0GrRoGvMa4#80=bYHhp0uKxL~{37GWYI*0{14sPmyP^s6Rte z<;UlZ=iz=5@P|q{MWctLok&eMQAR z+xp}czZkndEqmwjRou9>qAi&dO8UZoHQ|xQdY5@Mp5FBJId%30Xbbxlxx*DHm{2(+ z*DVqmN6`m^k)XbGdb2^^Nk*ota^r=4R zub4A>hn&sH&D+Y}-NMOS-@^N0)XL^tJHw8L(?Olz^EKF8aSGX~?6-OjKp9=>_O;N6 zz1D_(@`J&EoUM_K_hVQ|*uZNE5s2m#S`^7pbyWh3a38B-5<^V7Z~!S`Oj^>3j>2>n zww4Nf8u>wqv*T)gWa{W)nm+BRrLf>T)U)vhi!qK>@H$L<@mrCkGr?Zl=z8sg{Yo{X zLu(uTU@=RH`P@v+zW37Zg;|g7(_KxPmGK#ck4gQ~guuX}u#4k0bq8#FnC*_0R}~5f z^+dg6F@EbG&cR3;A(1<#vj`mLl72cXpTbc*Es$B|x^g|1m&5ap05(k{or>iFs@6LG zFznY^LF)E;E>G7vTkH-!sWgy2JCyquiRc=g8fh2K__a6Ihd#@-N+r{^20IW)L#~>k z)A_|#dD!PLwk#;pMHUuG)~FKdrE2V$!`}xr`M+UEBq#mH-!dM+hN=4|eomOefvX>D z)kZuJc2-I68UNAdj}#e7C5ZX>3|KK!@)1KE4S*^P@30vrrSj5+i5iB0$#+%i1GAGK zpu!~mo^vl<*9RBTl@Uak>+E+VF~5VmFmZupsqV&$+X?o5K-?DrL`Yhg&eXjGTfm zFdm!`ShSDw&v}g?kKC>DHxuo-K}}Veo?FhWQmbq+KYyun$y1^@L{b@%wyLH>`lDRg z4AI3T(*IZ%nbNy;?E>TSEfG^HI8!$N-p{mb_HIm*K?qlYvjYt=+ zy_jY6Y2aU&NS7%z;J!(@L7397DKC~CrDw8agMQYI0M|7!HqtlJb7;Y}IlnO2fq5p; zSbl19z+M$cv^zRVh3>8C!a+`PB4=Yx&>Uczj%foWIQE&TA9G6&3We9FHm1_vRnc@? z-PB|0Q6g{q`gM=dMP}6TWRM#CK#zcdJ9 zM2z<%l(_D5GVGfbS*uX->S}0e*GIDvmpl{E5fH<%H-e>Ew=`fBVJkL5P*m&OWtk;q zqWPAHi-#P1BOpx6A^rGXi-XhNn(c2r#LVKQb99bacVvV2!wAFlS=lj5SMTC@kf`|w z$kkCPjCdt)wQ1&VjMs1b1P`kSY`neGjtrE^9VM92vaC~*X!=P$JONjDyu5-JiD$Y& zwg|tQ?(V&L!FVm}gmQaX&~cUta}j9*2w z%Joa|qlLj1;8O*`bId|C!Oppr!@4t=uor}l3W8v&8Ym%qqHK;KY)W?Z!IKd?Z>>X* zCxcHX?z3`xaz zp<1-@_+(Ib8|H z&d4wq+6};a?73nhxyD9v+3ZWYwf^2OaAiZ5O}mXN-T~O>va-Gf1=+m1&d9(H%We$; zvv*wPW)%9x-Nx2|NSL>Y`N{!S>S{~Y6wxp74$Zjm6>Rzft@v5#wH{@MEed9MX;k~Y zlKj&Ps`H8d6WpCXB<5NO>?L&wuqLChJ(PqtEtcaI;it#(+CB-~Zyrf&il$1(cPkX2 zn1@Y%wvKq4tBTzX7@b`mCRql>x%v#Ey}GQgK%d6TTqwK;uHt#M9_6axmlOEs+7fDK z_u(PI76S2}?m`|8>{X0YC~nn(KA0FX3=DM16g#uXg81dV`psbp*$qp$EPZS%J2pS% zDg!1R!W&xk9T)NKFOn=I5z@IEBb0zD{Iu4H#!N@9g9?tq3Gt#obh*dT-FS`?j;@FbPTT0$-HIITOie{iW#ms5aW(?% z(GDgt&4PwNO$Aypl6p#HViZ6U@Iswaf(+7-V29liae!YBuNu18rl$eFU?bK40Hrcmdi&e|a4b6!=r%ozk83IZ08a-1HDd z{d&pKQ;{K5Xv^KU262Eq^fK!$K$B;u5vw5|kj7K`DehX1Fy>l>K&6(ro3y_F2hEaa zeXvcToowI@@s*$Ga$682&ELtdaaqI4&HZz7cea;s;9hDUHOe7<)r&e|c3g=3a5*>? z9EwR=-DGe^%2Zg=*van|qK_%V60ownJKWb}bTy~JZIbT6%-K@ADY@YxfhIuRj=CXl zB{%~u%7)C`2srrYCnti$@~Vggob{RpN5xw1vd!R36RLFt($F+xU7C2)1oA3UtKta? z8yh~e>Sl5ZC@7X6%h(KewJUCktskCDDRS!EGU zAH#{m#+(a=SRK*|^@igpyN24<{2r{l)1a_lble9~w2fsnNjz^NbMw4mE6V3cq_ zO2kQskQT_n{+4q{ab<3bH3_X#)h0LN!9MmL1i};0I3s`)%d6jqpWR^tEkrASSinYH|A8`tWtb%rQYTsZ+3_y|EQjpPi}WmXp(&(l3WAI?8hE{FG$H(k^A z`_xQ+S4r2LtV9@J#|`CFtWxF>H%KXM>4P_=;*Bcux*KayBAN2u7&m5)m+lb11TPRK zHje@^%#A{C>FS&pcGOOE@?1#~Oz`cp4GADL`YE4?=+ZGPqB7yYZu}$GI z_$EiV;|)P&Ec8rO{e}ZNAkh%O1`(aw=IOt36XP}Z+B_EZRiOSs=gS`rgWgLgul2Jt zAYE*`NpQa6qK}z1CE!ieH5eDKS5WZdogjf(>ckf3g;7lw~2C8e|nNln8;D)ygtm*1IyCZM!^~`-O;EYX*u1+W;!j6OxAdXuJDeQ>`A$pFwzA4oh^Bbn-uC zdR!7$8$1DYiylREJnnS=wHFwN(GiLL1}a{@`+@(*cIH19-UNTyn3$V7+3WvzD;O1T zEsMktKlHVBv>3qS@0*uLctMbnv&{$rr%bO5jUwhLSZSL?bP&C+&3vP1PDpyEm;G^}_4YP3rTgRXnmj}@Wkio90y`4=(vEj%f{XR3#jSfn05igz z%V_%1n)mu#g|%8cM8De3%$osb2r{x_;-LsSX!AAvL=(EOxX6&hI$xZ*i2A96F#sqy zcT?%EJ408^$~gvoR`-0*3^68ebDnXnCV(XPn~*;7Tg~aIBFk9bFrmD(2HR&575;%d#j|Czya? zM(7N0f={X&X5`;Xa=U-Vqk;iogg4n9vUL+HIdpeL&ZbwP=m0)Lekg?Agdq<+U*yt) z>mqj&d$QjH>1AY}(`7o7PYuVM@pj)UoCDi+B(U)_L@MfMe4>uh#^Z>@S%E-=+b2-y zCFIdZ%Be(v%9})T^`U5?B%|-UQJ46L9-ggKC%|V!#GCHgX(8>BoJQZ+c)bFrIwWYN zWa3Xu*!J4alaOAEL2ZrN;;#CH58P4# zDn5$uP>^~BqyUc}FY&t^x;6*6B_DKT6hB7%t^iI<-dBo(Ux8uRfkaFhCN7RYNxW_r ztbmx$LgIHlw1TSt@i(3UT`QBebfa@1HBbA#%VmL6f{ zC}k+yOy&aa1t;38^#mQV?nCu@GtCg(xzbl}JYT=PGu_(CRSa_P?~a}}+f$#?_a??Q zJ8rYlbU~|ezF>E1;Bn#hCKyhyg}`M;!FMyDA!KhRH3eKP(SJehTrgw}avCvhV_-zs z(FD4Ts)aki5WmpiZcg-hJa2orx#Br&;SGYh@=S5!?JtD%x+WdL-Cf7hW$nEH)@2_p zi1t0BPvITyAnAL?9m(EYpTP4V4Vtd_PSrdg8K3u~E%!&XzY|PUQ2^^{M>^)G)}N%j{GHV#=f48i+g&3iE)X8jgE(LiX{sJ z^T$0nSd>KQRi?CPVKO5v`&3HvPgXVuzP@-swcQenSOYXgsSZ|23L3hQylbxR2EDa&JB2XEc6cK(#YHcbBHS=_x+Iub2 z(G9XYEGh-jd+e1hGs#mCvN_^!*7j}uYeFEkS1|hmyK(7C#-iJx5|m@*T{E`}RBBv_ zMr&-5pmcn&xVwx6##yz^tXWDOqVqs$&sE^EgUVRKF}fc}Yt&Em#(LQ)OQ6D3hzV>J zvgJjw>{xk+AtgoA)fJ;IoDO8g+CBiO1vU*Ixv8^7AViiWwFA6T>LFq=$MThUU~W@J zjh-7eJ?S&#D1g`+2}7zuYD$X5Q=m;&ra2lrV}Oo0SA_bY^e9M6G6~0mEIvej zS=rAIh@7?-gRpi{AlDxVg!{CH>|R1{#ne16rWfR){d3K}#HUD%kwtY=Ce?IU{k7 z(Cs2lQ(h5V6GON6^-G&!-@i$Oq~BuSy0(v?Nu@Q-pQ%&2^dmgYjrNAFeA`$n|5MA( zwK$>a9%G_{4nlnBj~NIThxnin>#v_S(Izm2cflwNlL{wRg=r;vFfz7+kUN}^oe@_x zy;q8BEn}zh*O=`pJqYa@J@WUIt|=2Z11bJ^+aU#HXA}!G4aF4A(O8g>_+Q@rX{E#p zrOXxELqBgI8Phw)@9QOg$+R-%Z-tn_^qm8FGwcQn8!yEKh2HWrv`ZL*NcTs4!ViU#lfD`aTgA<_*4II+`1w^|xt zWzz>SK4lQ(&G1tkO*Hl{I|H}CUkQgbodX;4-_u;y8&v4_q6A`ZG znB(l=Qk$HvGSL!jcpa0C0OYmG%TnbS1I!)+o{H?n3L68X!edkCcScTU_+k~zpsoiZ zM}>QVS0PQqpxXoB35Z?C-M9s251oQAMT+cqOR90Tl4o^77DkdRsj08aiV~sDpp!)c zuTJmGBs#AD;EisiIl&(RF*Bvn5h2>4CTTZTt>(&V_ZQ=`1CfSc*ae&<gclnrV(|U*Y2gXfgzGmUDE8o408lRjaehjc-09O)T$A&N4CPZnEgR*r+!?JCGQ28rs`nJn>9P4efHb|6=`1K5TPj5`TGhSI_KE&_U{@(inu}oE_W!TIO#`XXZSnE3o1Uk zKlw!Sf+}CP3)5VA1!~6i*-7w;E^B35AW;3H;{_xGi5&<*2#M2+>KIb3<>UZuez4t~ zKn>e%=fr#OxC%hZB`&-Q2)~*g!(_6J#4?{ zKQy-g1!Pc>k4{NQ(@-=@(@IEr!*i`>5msEeRf3(T&an<5*xVgdW8%hKOaelna4BrzCfHRf&B;dx5FrbWWCflCBE z)H0arWRt2r<}luboToO%xZL)L(PYey7c3S*f<0T?80udsK5I#{!2NSL>WP|u+h5;O zr+d6-3ydDQ<2WG^qnsk>jNPx1+}wyx$E(Iox3!aXx@O3>?1UqWB*ee+T+f^(ZxqZC zkFsK~I@|)iRY0ovn}3Z5ncn5Bj8~`nV6D3#-rH>*JnpoVCj!DMa(B~yoEp@Ig!gO-iE0z!lKgroH`ph`ps$x=A69^pi}HIuu%I8R zut9t#K>-T}O&Y}9@|+l>ciM<_Qi|>!VoQ6>MRzS(UQ1Fn`vd0_)+t+D42g6$fkZvS z;W5kW<#E&WDwX%^^8)V2RX)KEA`j|KSYU+M-9dDq@_J%*ut&ywLiVNP@OR6dO~e`L zWCd-Ar0Mx$0Iw@?O~4uo)|b+)nz4L179CpE@>v-gLWoNbUBIMWr;7d_d(0A0ZIPf9 zJX8Ls4C}#ypBaxl2-419J-=9~5k+y&F@j?GEp5Q|TTkpjXhlf^g;~DbEX=W|R=Uva zSE`6Kv$b@CN|c52jO6-xX)Ye3B6B?Sp7Ddwv00soW$+{&LYN6$f*^^!{JlM)X?mIt z>5O>HvG#&WeYl1}%H_>CWtzs=uH4M@Q@#BL@$k;Dc{R>-Bk~-f78e2#^V2xplZ9Ix zi$>*SoDCt7dCjsEKpzeq=8{o~Ak~VL$i^aNm{Va=WL92@J##>KH-l0^(dkU1LP?or zR9cBf5){QURXUG#7Q==SnUU`5(1l;8 zwK^S%9B4YM-+Vb6)CCXBD*5s*8J+z`qxLZI;F>w-Zy{R@jJgzro2W>aShSmpNHY8= z_Rj*}yii1+yzu3C`N2+b=|O<3@Z#ZOfn@z05tsMI$SXc+2nb3u29Q<|BNO3S9!;%|JZrez5JG%*}H`^8D23**M( ziCsFloTF>rC?+IsRAR zFdfWhQ{@kuJxF|TPp0NKE6eOX&XM+jm!ug?@i+4>OsIF*txBIBKi(#)Y0`ac;Ke;y z(8WEWa9B_m9d{Uk9H($!nYk;5-u+mj6mtzrLR(q=S5snE2_$lX)krwFxZTY!!YiQq zBg6Ho00OXC`d|!}N*qCxX9P>f=I(32PR-r|cx*emR%~z(?_Sr8;Tprpx0*Y~KcTlF zfUy4Y0_6BycGn_jGrV1c*|A_<5wDPi$O%z&#s;yq*8~Ry($CHiD~7!TL}~;=5ur1* zGRM7Yz07$ak#iw>fLARy2WvM6Cl0qjtY>bujY2otzn1(QlENGUCIRhic8OShng(b0 zsl>^$0!V6yttFspo}r}Jz_~f|8x_XxB-1;S7LaY)-bTCr70Ng!g1Hs_CT~c7=gfbT zFaO7p#BXovWc_W%@+|>sZ2R9(U1IEn1Q0!PknAgCenX>%HPvbFWxX=kQlfvTKV5Tm z;hQ7opV(9(2F6p%7Ru&p08esyaY+$ZRvB=^TZztQGg3O$CbJ(TW;1~$CgU~666C71%h(!VpI{%y(hZHghmY; zn}wj8v@;(Zv*z07E~WT&&OgGVNy=E94q#OtO6bdGU(*WN$PKj_q01Od zH;ysfI@&HKZ;)HEtGPGof9ZqO)q;#?_KlZ>!&utQIWO`2t)?Oa7K6t4zAC2QSLJ(^ z^6y2@|F|lDt6rkyr6v3L;JxM+2j{Cw$)*UIAVsRADa7QF0U;qan@(D-#93=M5bV;K;fe09HXFaKwxS`e3G(v;;8vV~OXcj4+d}FF?Ras2SBO5u$_IVY@yeW_jrU z38H06FIbmVIO(G2K8lxTNvCIqC|qr+JHshp>8#8g3_%uNQ$;ZdQ!qR3_8_|lwd=Cr zD$i6%IN;ckWoURsBWam&htS%pR0|xtm`twT?hlNeHgwN>l4+y@^T@VNb(bRZPwpiSX-g?Iq-zlbV-Rf+%O z_m%x0p`Q6IZu^%%T>|=8jW8l~{|+v`uOZSpDqw;fd7vgfG2d(f!F1koQFO5Z#>(OB z+s7@E>xt%=B%WDOpm^%ZeOSokz3hER{YP~9aIJB&6d6(`cNurv)}^<{KJVw}1M3gk zy*2VieTe}q`Fj0QAWixWKa6&YLiLws+&*lZep{qpBSUN7)RY`U9bpw=n()a}3W7qH zf`sH*e@}FT_2_Nw5+)+Ggi?Pl%Mnre0UVS@zy-=Am@+wqX=Z25t};_fd@@4I>M^`7y(;!ciS}Uxe_iKo(X-7_7b>yJi`2a$=iaYhF6!#LLc$lcx zJqkC5B&5P}Yc@UP{(#Gp@vuDV+E%92nG3)M$UG4O&D0_pn}jpq%%%znyFqeVa<*mg z)!Mt%_KG8^*pW05lYR}Yd8iipe0S5K^0T!2CjM<{AT^5 z5b6wB*i}C#znOKN@!b{WHZo_81W%O=RxRcY7#}(S*mBWxwZ@DV#qE04P;EMqHJ!n@ zG$7m$Ju84{e05wJj&vOsn(85DItgSd;Po`@@Hx|2BH9tvH6R_1qX*IcxkkQhKxHLk zGu`asmC865vX!G!cRNO-nd4uP+09rgw-rS;%czCnBjYR}n^~3UCNg56jWjX}zY1+NpH0iq$hC)NFQX@|X`386tIe4Y62| zES}1OXtFG}qO)hVw?5DIuI%Q@=jCjsVvkS2<*;H^n2&YoGTIB zT(5FK!slnjpG$#SlXUgD*N{Upp<8iqRTR-$g$w8~q%fl^S2MHU>Mq9CDl3nKwqTQm z*Ik&Ng&L>z6H}aY*AC=4sp^q+4X!<(z!A}?gR+FTv7D|E&$N5-evLqgZXQ*hb1XIQ z=b0vppdEam7kK)nZOuf(FGZ9T$tg@tv%Dc+$iho}L^8|5SDMe?GY~@3Tb*G_nQiaU<=X*k1-Q`9EqF$)JI>&0da z(CI(hSH|MSJKaFQ!eWYT!3BMZtcUaoc?Hz>G#0QQZru}S>D^0A5_e=)%VVc;IYBXs zLKRwuAT*q62Vvx#>@!-IY%ZQ8Itv zF2>8GEWIS?N6Qgeb10l4XhO^%LOJ>lG4hP#*x-W{rE#dQjgRny=`xZP(eHA+%t@

i| z%T)<(DrJc1>wW;MNR}y;M~6yB{yhXKDv>S?J88p`<;lWue;~<$7r+fd+b$ElDFfmp zuxZm|(^5f-+7N1B^6OoL|3gT(8asxym{_)bkETNKpcK>hX4TG+6 z%%ATBdi;I=+oa}i2fduW{kKf)e@gWPMe_e;ttb3t)}R69e9#(dDL5sE3@qG()bCtO zZ4M~@U`xa08-l2))oROg$BSpOdG_H7I1C>GE+`auY-Q89ZC#O4JuJN@p?zsNL1vD# z=0tQA_su*Nz)(Fq?cP{OATS9mtVt{`|A`VIu&{gNmWaR?>Y`CMk?0tWLvRu+Ag&#@ zSGbc$RPZGxe##EyX?hH@1sLfGitds98ubqIK%MIOH>5KJipH)3e%)+Bo4KB-@6rIiq34E3w+UMLjO zz3waN8u44BvF+stgcx&j4O;D5vq$G{7%VT_Nm1CcS{S%q>>IUYMG^v%XvPbj9o9%_ z*S`Uv&rEN3GW#Ob2X@@i4kROK1EBphCh0>lyvBwp<0-3Bq8ZWwvTz~1Gvc=e%X~!< zN$E-SG+<~Uv+BNYXtNZB@yj_78|=&zUrt zs*&!}_(xuqYV}GHI_nfgXQG|$;ZyarmyBN+?c+f6n7iAPhi5v}p>N;_YvPP$ReEky zS_v|krw;`>$YtkK%mZ!J-1?BCF_hyGSSN`eY=lEh^pPzl!gpZCh!CR>rFBB&!xz*w zl+-_a`xQ|3nd(&Q+3)q`GyD3AUkx_)55chWOmiKWUFzCJPa8I5yx8fMD$50S^X`%F zIlIORRDGQ>@G{j{W{%g4A18#CC~Hek3s!#%`7t?QGelEN{ynO;l%m;tf!@G4tYPI* z$cg|&v+WO>oS5yD0g#Gfb~J(IQH!o1dS56ZGIF4a``uIG5#_ukE<*Rv-X%UV19Si% zivf7Dj^tzQYf%koBwRF;us>Y8f8#;u!tu=J|5e6={V!96e}4k~$G`F)Wv9bG{*4uh z*0OWoOB`QKSZBweSmdEoQ2u;S3AuTp^zxqIBSJ`yVeRxTmN*NQ%r3$=M9CW$AMrK!d3xXg*jq*>D;s)2g?!blNfvB5)YH$=GJ;+jp#elS(A$ zIMoEE73+I-t}}@!YCnuKZr)vL(LCslbvKd%)0BxI@HsNpix~O^IP_G|dg#`u=Hymp z9B+Xei5-DKNSeR_>Z648Nfp$^V<8Ef7FT>g z8I-OZXD20opU9c3t?p<|cKF{cU+;HJAlFeRDtQVM-?{MgO9{?@(< z&Y&KierF=jZzB<||KIlYpP5L&*yNY}x2MRzO-0skinmYby2<`#^WR;)^Wa(Q#VdME1xl1d&mOMEX$a=!{7CMz&k*CXCmMs|R<-VEvz_8i`5+3NB?DrCJM$ z>UAoLQ5zXHW=+avmFgG*w5P!~wDje&?tQwVY=;{xS|%3h{G(}Yn0*-f%NFwzX-=Zl z$|H!Qsm2Yh6&kH6tWj|}WAHjNm+483e>9!irpcMT7|5}LbJbT$HL5Iu)9;8eE>1&b zFv;=w+Ct~tP=opB$d^lvkMLGn&22p=>Gq>H)auRRt1?H{fgZq^m6f9;O7%2b?RFW$!OG)Q@hbX;;ZONoi18F9TVCILaCBUSSngXiVwu2nXlXX?}O zQdmsO{uG!qE=WZkq1+*~nG_}+JVTm;?g@AwPsTMfPT%7Mp_CvrNZlztie-smo3?!d z*-1X_OJpqr>wvcxq~TSezM#v^M>Uc4?m5wMD>|zQ+w(_f@t_pw(4kbPPHu4L=3o^} zKKs^Qb{maasD7|GO?nkWo)QG5G(wp$X1|4 zo!BJjzG~@Ml?JM7Du9xqQ1>V9=bg6eCZ|q`N&~FR3f1n%9jNj0-qQ95+;dmIbVffF z;e8I|9A_j*KwkUYFkE)=j7`SD~wm9sUELqARwsO z(0j7k%9nXr@C!kjL37Md1Rb~5m>z@U`g_hvB$Buv3`GTII+ZX5wWI2CIP02=R zcw+Tdw`Q&iv3UnkYUdo4F55oTOgehBS;#(m$x}vC$B`MyNSZyvBM&V*PpyHF`KsT} zrYG#4SwH1Zhe&R;boerK1}IJuuzg)=ObKxNpqho7=^nDhc|4^*SmWOD{uP+qPi89Q z_|BV)-xCy(|H~O7sPAAbZsTBV<6!RiZBV56yVGo}|IvKd4QU6>I0@!LD7O?SbU9XFbnHQH&!R ztVoc7e)!ArOl}90$@B9kJl#$}v+aK0=s3Sf4h7e|=pqhS<>vDI()>U9lfP}mRfDaA zg<9+3!qp{4`TS^n;~Xg>jU19)tVlJYFcP zLPzheLJLu%QExXjl4!LQcAvrURslmz7&Q*lX!6$^gO6c0l)sRQ1*O@!UWB58(UbL% z7Ut`uTNyyret`3p)8Kpi2)Xe_Pz|rlh!-0%Vi%JM*%{O+kdV2?zZYxin1KG6h?Fn5 znT(gVTO;R7fUJ|q=Hp7O_jwWDRuv!0Xx*_R-UHb$tg;rI-gk+(KPC@4+#$OCKHW&! z2T`Y1nNTUCnFNUVRB#RDcF*ee4)h5O80HzwEH;f2(aNRdbmc>R8JGRn=;TE+`x^SL z=t903fZYF==#;eiHgEq&Rrimar|78fX#9`*ZbQw|75M3V{^f?z%@smS_OeHSTER>rl|72xv$3C)WQooN;oj~eh*cRvY4f%bWw>b!@= zJlU^Dw^uH&*RAXdZc`KIZ++P6Fy6PL^zU`J^-hPk$;*MSEFS!LEUJRXnzivmGjJ`MB^n0&@Z@357b^WgPz}nyCdSjlS+3xiScjp3 z@qsJJLAlmd=BLiG0uI<42xb>`=dp_jnh|98i)y`Q7d3-}OpKeRDX-oW&W>%Q={_NR zEmi#6r(@NxTteCi>7uB5H%k3==wXH9cFd~Dw&BfQNTBEh(+ca0KiyfJv?L3jlM=l` z8tf{V4=}?PdHU>5tOk7P4J>R%Nqd-~qFr9!0!^apL7y%S>@JIU=IgaT4?97mI_BtL znk2UcyzFj`MRJ>uA~@aMCauts!5`G@ZWmFcX0tIl3)aBu1tEHcUdvOG(C4iJo&Xs7 zHxbob;?1Q~I+fXH)^*l>d&~DVR~XtZV&_wAS^?Wm@A?+1*OeeFG2CK3?EuS`pVBTK z&qTEpsHauBtZ>Ri99?1#$2D~{wrtB>Fm|O#9Umo9lWPGR7RsuSkW^M&u+~$*vudwb5wg^nqzaxfEUL@YS$VY^4CqDkH7KBT+tpCD^*(@ zXY%E+7>Z+oCVzft2qqdEMUHr9ys#7g=O*Bx2?!3=50#3=1r8^R^;w*SdaZ?p%X#Gq zr8$f(fe$;Ly(b)w@}c3{t!;6ZD+&-inIz*Z&D?AB$%3`B}4_GhfUuQQKt+6}= z#Lt1U=FDJ3V9v$V;u58I&lnMYcwH{;qR^p1{b2c^)VT^Wt@pWT4RHmb{_6FWnNI{s zZ3K4S45-b>(7ph$%#bPmMIIWRhfm{13!@41^nxi(z6JVJ!IU-KsVL5&hN|O*1&Ygu zBB&N?YVOQrqT_=6;&|=&C5*svb?#PguF^p5R0tl?<&XX>QLdkME8}2{+0bqck-FOQ z+dD|uiJs52i(XSzt4cekBwdZNntkPwn*EFc1m$A4p8H)J2NQb0bT9v+7C3_Lsd_sc zG?b@Zu{FXLZEvZW8H_PPj}<+vI_fU)A=62pv|x|-Gs;p0LfD%NlWltAaMUPwYQvs_ zZ>LK_V96`SmL5W$?`-=w&TiN9LM$41O#}=cBaM=^wZ1VL>&1M$R*ty7B7q_CLGLnK zmSbEZNIvQFtBaG~C(ZS=@940JGHTR+^_YdiA&2Kw>hMKPp&i*yGujyvcd{RYZ9$om z!@#DeZ1n8edvrx3(GMS01Mf>OQ)PKeir8c!8^mYNXs1cJ6+2;<9DMRlg@Ehaj?Vi@ zi**mv4aF5+C6TQ|NlL{?U#XTN5buK8vQgsf z=h%8R410HG3KMAw3~pnuv-w6%Zj;qaLdpeGDW<^4}BssZrGfZwI(}w#gjGJ93LitkG+ej>PT)eR*WKj(d`z59g z)pp%V8#CsVPoJ<^@6_2YZ!Pe$CLA&GuDr(rWOJ-N4LN~TP$Jr?myz6(jm{91HALEH ze2vP@@34~d9i)=ra5=qV4CogE%Go?!>#8v#2dG!=p&?j0Ao21e$4{S{+d> z)u32&P^z!bWrE8#r|+MM-=@KLIwFGwL#q;L=asaGS9+n;h0f6v08$5>fsytkyQnq? z#B5kxU(lwv;Vm;z(i)Rs?b;7R& zF{b6y*keic#*rRz$c^2m&Q z!4XzUn4ypUVm>C_W^v*OHol3|?}{H{S(~Y0a~G~l^J`UcPtgcfp7s($_(qaav8_A> zmf-axX#{^9#b5{l%r$D4U@acMRSZFukrH{jfN6cJ%Hr%%zWZWM%z9N#*NBW2);oAO zqGM>kNgP)L_6UL^-tVSdM4=8j=nu?)VWinPn z4K#uDb;XQrM06O@aV7#5j{FYZS96d4B(pTO=#&$Tt243<&hS&1_=X=zW16xAYmDua z~4ZT}60~MTRnd=r&Tn66(T#_noy|pa&8b z8hxrF7z=ZBy*ZF1OiZBU_US5Eweo(K*vF(D7WLqAh4g;Z_zGsI7Ni78~TS5xz|9 z2eu|sz@tJTav1oD&ptLduLBA>V^1vW<#1__uvl#dfXGNb=e!v}qsR5O27~M+Nw5p6 z72;#tMz`kQ49A|TN6tXy=HZu*7<;Od`+R%|t#?=)H03UY7Y{6>OX$5sFjTQx@w(!% z)ojO8_kun9Yf3BoNBl`hD4H04f_Nu~>7%BvTtAZpty z>=OWQKoQ^#_^mnezfIp+*Us>7bL3K`BUvQC!mUoL@yMwXCDU^aTo0iU8H%Mp9}1Cy z7&d8|xx=gONFA-N>D%$_C$TfghfR1H;c#MJZ$Mm_Mx6R&lE_B-=;&~weV+5TB*R+47mj0LOs=BC`^<_EX4HrdfFmU1ZwulGRM!K%89-XN)>)7YZlizpRVHP*!!^qQOR;{NI zhj%+VY3>B$yOw;tf86cl;$6v8cGAc)vQqo*!pO6$R+vE)P#y6_b(|rXiPK77u_r5n zgt}ODqB4XfFyQTWxN$2*E%o~Cwla%26U;TVR1Fsl6WJy=Hy&of%8?}8LQRjtXe7Zi zopIp??rU_?E)_1WRqf^aZ5&u9YKu7xFxQr+wQxF@fJK^fx*^5A+TrkQhN=Z8&Ty~}qt2I;cv@o`Y6jHHvZf3^-zH_rOHsU+4Ya>jAd`r)+u{|(|BO2Xq<2-~8aTvkhI_Hux zO}jquyaN|M1S`9$%r2Aws|{w?*q@|vatQUY0-0N6*{tWE#os3Oct1*oz&V6nM)930 zMkwtKWEJQ}iwNr8jrCubg~TEy?-~FmUkWgJw%=J6{$cVjy%e97%mEI6bWhp233*QR z&8%VQU6K?7`%$XK;(;?7>+I@u@rm2czV-%0~$sgIQB%o;Wi6KmW&)z zy3@javfUhiH8=Aq9Z1rJiYS}|!|#E?+Z7U;QJ8u#M+Ou)@UrrG`vos1IIBdJQk~WOeW0-|FJefC@sM%< zAr5%lLG1Fk%5@B%0|s)GK8BVm%bQk-;O(LVmg+!b?1en#I-2kbnJ$hkU0(Dw>kqfd zyyR?!E8ob+?>lMW1f_UzGnM=E7xScGrq00TPDvWgr#6(o?nl|`nbfW`SF5k7$qKENCR1pF?&3JQxTU+#Jr->@wh``K{elj zmDG}aq%$7@tH$d7W#cAqQ^UtmmhOn^LrKT(&m%nUnTpZxLq;@PpX!X75OMP1Af zn-6umF%ZLFzyv1<+N=+KdYHfMk~R}9uyXXKR)!w7T{p^iRswv{wY03pRT?8G!W%`$Tu^r|a>Tp7}?O@t>CCCyX z)4|vtb|Ef4OE2Dr6bsFfm>*~o1iVm_2JSb>sbr#TdS^b zY*D~yvU8yh6sSgnIyKL>ls*r;i(|=eD-egBR&)UcF7F#0bu}*gGnFtXJ_X5ytDo^Z z_vBVfQM7Ji&qLZL2+Rrvtee~^(IaaEzL4A@w6M31nDOX?F=D#pGK38zA3A9d;{)`K z2~~I+LH!LFjIO*oZY6yDzQ!7OJo~^S?}&oj+(6VT>jCji6E68&Z1; z?uPYzZR-go>J;Y=SFVhUE6sm^HG>~C+_lghy^JEGe&b0hta}Ce*P&2s!ssv>FchW$ zj@dE&{!sXb+xFkWPzr!=KA_*H;A>-Rv}KD9Jbf0%pXdfZ%?xwSqY_*Mxv}3_;j%yG*%|#;n%-9h8(;CuGGa;f^P&XQ z0_`ajCli8lbqQc$4NZ$Csq<`9(zGUR-gmtYWWP>^X{h0Oiqe2{PM$T|U9_@K)NMBp zs@;kHqSxe9KS-}}$TOErVaY&jrY%HoFlV7sa#H8y{~UM1F6i`qf9dN+E6pZ(B82mi zx4`OKSS~|y_wB~cat>|?kRx^TwAJb)UTgNwBCcAcb9I_yR)bKsC3ye$?BQgu67wM5 z&kHQBr_Z^D-i4t`J^JSfmT#K7^aBOXp-sB-rWYlN98UQ%E19BVK%sRoz?^;10ujh; ztmZ#eKa1YKhmx`WaPO(rT)jQs=SDd!6&#_9&S{4p^(`ub8b(jM(8Q%gAA<@8X*oCj zWKmY=hBHk^sSj3~p&}&WAYt+}Hq(w`AEx*D4vWhz3zu;?g^%gOkO+rWb~4T$oZxX# z2N&0pA^L%RL+X&Ja!+8TwFh8P^>CAX5ze1>{3IDc^75V36v;$mMEv2V=tZ zwx%qFEqM#jRTzDU!9uF`X{*KU) z!x|MAdW6<`9lkyyE!?b?Idu{Xq;WE_=wP+6#hsRcs;w1cI*QFg1N83{%G_7XaK)c< z*=_on)X(=jzoNBHI?b8-i&5%`pQQN@+FuL4ZwL>W<3?zO;7KP?bJW^X!A1aywn=6g zvz~{2kIgw*#x+Q4p->;xI1jxJJ~_6WQaG$LOB5P1x?|qAp*SC5gXILSc6^CkguE&8 zRWiu~e$C7+An6UZtEV{o)m>1fUFrC7M`cOSwzgcRnQwdWsmGWK>3 zvM_$J75*}Rz`o)YT*o6XgqAJoN5~wEcXO^x77sha4{;?^)PZNojXm^>&!i@_*n6y< z*}J*pHX|3I9gI9Iq2D%8d8A)!vc;9?R#`+dGX~RX`g-99==;yUI@+Sh5tnlUst>o_ zUC+95@LMGk_0-9C@kuyC%{zk=wQxIAF<qw#>Mc6qyY)~G1!?uvF)2tUCj0VXw z-b%?W;{|mp4|C37aLfMf2IRXtA_;GRQrbs|QpXS{NK;Eh1%v^dC4z9I1|v@g+2fS5O39qtu~Dohn=)Uc`N*l>#u`14T^~`IKZ--0Gn@&zcYCM zZN2tcVfBab=#wl3GPHgBk|Hw_8#X=bzB?1T3~^FIq$Q*gyjv50S7WS({UXgB-|a>y zDen#VjTpw5l%5QOreF#`)1KvrP;q>S-Egh(wjN zi>x_+#THvZdajOfk`gDLJzVXu`?5RoJ6<=*WgYwnq)cv0xfCOZZvp;Gm2WePKSTx3 zCqCon7IU^j2*tx|Ec1t_L?H^TI)b(CIQX8a_GgwwZYkwYF8X(>y6-hv6z=XSY=K5s zXrH8oO0C}rMxv_9-WOLg0I?o8`bMaRr(7E7f9!MJJs)^kt>g{HnFI{ES`+2V+Q*x)8v3v%YaFl z1Q@_5E2a4tQVdOYjVLa0zRhXSCo>F-B1X4&FJK<~pxfZU>#YTm3%!pJn>$RZ967Nx z;!+qU_n|iFACcIQitEiOP2Bp9oPNQQ&YYHkn9mcwS!WY(h(WE z;2!O-X0@d^L$(euD=Wax8Q<@im6DbDKkS>eC=I>)F+boLAl7B%hj?=q5KKPs24X#v zFqkkmR|#1?ph{vY@lxUvb&uhJNo#9w)jTOy2iBJfFB)03{ zR*o01Q(8TaN46eM>P~>RY&8U6HlaA_Cj^R9=wmv!dOBi#O^1bTSwhTV?7nWM;r3t) zJs>y_H8zm~!|cCaoLx2yjUW1usH@jw8=kWMJu7zyDlSpONs`10O+{Lxd_#19?Hq>S z7!zjTv+)DynA#Gnoq3x10vJvYbdYM`diF4{TxCQ$eiY~wYl{dNk4H)+hk#p;@hnE? zkZe@Q0V+lD=gGWd-fziqwAx$9^);hf3Wt6=^KNF*;;-cncWTckJ?pmZXku*; z6Vg@4mDAU;GFMzk_xgA_HpzK8yLY^sBP26+)^dI~?zQq16PofR!amwDNY zDKH84l@J*n>WP&b?fV_&fUC#w-kMi4l~fGEc%5)}s)3Qnu$fBls{5~}Nxmb9XL&GJ zK2}pr&`P(y*9VWRuH^BrKE&-@xWV1R;f#zVO!k##dO~2l2MO>HWxMy~y+X;~l`clq z0Wt>iBB3>SlGLQQrIMEp&N8;8t>=`|Hjr4Kt8pVF>}RD>-KHq%ty@%B=u>C{`iZwulwCIpq-Ff{f`|#8yxn(# zY(mv}x$dv!jnRlo%KPGUwBVXpIrw{_39NBAd_apF?`FX9_!LG8l~B4q^Y5UGzE0H_ zzvm29>OBebXGo_BmHpm@{81m(O!Yy3bc0#R^&>Z;o`sPuPsziJQ&j=E)o8|uKtR2e z|0`(akJ0##Npz|jw2R_QjW*RedrZu0;wT_LZbJA0{b(RT?^8x$#aIw}h`=BhaoK2} z0qKN9Ao+rt`+!pxy^-zMSiylx*vc<}~y$}t~l;-6&k4z@BC zIFEED3qPuDVy8NoYH?y5&VKFEPMl@FGEGVDWz2#zT{u$augwBux79jM-#h z%EP_3m&pN&K6DE)T*|RX@5(l@diy(Me+bmAB9tHHI+p_P7h$;?D<|CaF8eKoj5Ezt zRQsCVa|iXoa~ACk+i=+-mrU83X7OND^Jd}v^ByQE$HuotsOJrsbNddJ^qRf)?wVxE z9CAi+_a^z`9PfG2cHIfeBUeN)-=~Njxa591V6lokrbK91=rb2Sk#b)mZ<{l7FO*e* z*mTsyZ@JtE@xB1YeE)5e^y?g0s=90T1?#QL7u6lR)Vfm?&gABqzL6}*hl#8&J*B)> zF#}HFe$w3rB@jWSCR+VrJtgQ<2}-GFI>bxppTN2-9it*-nap~LX{6^ z7qpC~2O~qd`-jlmJ;NQ$8B#0FE*DUWF>9HpXX#d}8l8?7w&R)UZ&j?AoRgHa&U6YW z&1%$|ij|XXO;EJ^nJM+Cno76^^c683TfRajE%oYX%!fIPRCaAAehEEHCtzAqHe^z* zXGF9tHVaLnAt)~5KrWFyv^1o*_&P|d37iIMM2`Gb32(`=hIqKA8>`|qOWHc!FmkPG zs(kTR#a3@*a(JwTD!(X7mTF$iZhF;p1{pz$qPR4)utW_ZRO(|bWEk*GsRT`u+=GNA z$0$@OR_GecM$TIGi5fu&c`Bk2Ba>7N*uj(T46YSie@q2lUF%w7VRs41a(_ueIzG3^ zfhh{9gm0fMuq}EfE#yPIq>}h;`pt1~AUohJfKrE?*)#^cyK%q8=g60OlU8-De`Jd7 zg!EzI63%|8l9W4-+0<5hPrcBVH5rj1?Yq4a+4CUM?q>L^jV9#pdZg)qLL4raJ zjOnM^%{Wmy5u)G0kw_F881()_zRqYa!xvcDi+s1d+Al~5R>mlZtHB2N7rWxsJt3qq z{kSMKK-Q&$C<9Rs%r(kj`dNkMO*63b^QM7~_|y6UoAS3UOID$bQLagtaY|8T^&lD9 zf&Kg`LOA>E{RXz4cIeDROtFD>X>Uq=W@mJdjgpcq1^P}?<7zUeB552J0;d=@>pvWi z_r+{-Ue}7hL8vVtw)D^5#Me|iLxc8#U+msaL>pA{t8S5a4!vq$ze!WUffsR&~bLFarpY7 zjIL%Rybo`AuYulxv$|wrnD>#|ZgB0ALpz%`FRod&PG$t{G30GzM)(OFM)hL8H$25% zp@QKfN-s_<3gW)PK2TTl2=BdzX^ktNa%t;G-#&nS!d?YR8H%9sv)+0g>=y#%$2Z0X zP|c%YZrMjwW7|Y8D42J--5A*hTkQmgY5m-$b87h@;%B|X1!O`ZrJoBK((~C6Y;^!U zV3*eKMX$F23h^^Hp@w06C$;d zc($gluhqy8`T8Xq!G7_^s+axf*hZS(2kYtEmbPRJJl(Ze8mDM8ibZ;UD3#J7_gw)) zqcB`_#EOHF*%Q+Tft+3Ibz@lGUOCex{c*X5xwTETA%*n5)oHV_e4FZHdX?WM z1`8e{cP`4{>|(>YJD^v8oAPMWfqcUppS!;1@hw~Ic5e^o9o=K|UPMo6gaAC`m2I<4 zM#&gwfsz{EhjAJ&zs7IInW%$2+MuN&L>Q6AQq%W^IpasKk%>rL4(%Tw>R~uQ-9Z|k#cR{XSvg*YwS+>2* z@N1mFQRWkkkL5&Jy~Q!QR&Hn!+ZUlVBnj0NBiWq0`d8PFOjJ&lOGzzxjTgXL*ske$>M_22xDw0D zQrJp(UyXX?FJTJG7f}@Y5t+{eOKdcnwE`$$BGDk(ggYg`zflctvBrgZma!HNk2;0$ z(nyADrB)QB*{a{RnR)t))Q{pcW;EbJDJ6(jF+^J1x$VOrGdn9DrXKB8BU zZ8y{AAz5bv51jYmJ)vbdyjN5M?a+W6PcW|z_UI^(QW)Lv=ebKW%h0Paj|^n6bGpKo zyYJh5<#Nr9-g0FTX_gi5Ga3actDmKxIR_w@i2x3cdCTKa_KL0*qgd54S{Trk*P+ok ztZAliu~CL6Ka4;mOzQRc$`_M3!Xts~cKXkT*(lYW%ZYyoY6}@xtM*F@?w8ukbrGc# zvpVU%5SeMidA5yGdGsryiFMiioa@uh#y~ zQ;NP6S{@N+LJ^*0zsGw4lbmv#4<3wM431R78Y4C#OMQ^5SuvITf#L+cVVostaJhwf z1N{tWQ&5~#J@5p$qBtAUAq|nf*C_f8eoNCXLGZj7{8T)Hv3Y8Cf!)yHr>TBi%uB_P zQkA_r%5WvC5G7h3!B2Wm5O-BacXTv(gYUug~F6Y6UaPZvK*BcZ(%r(6S*H`1rZw_B|IEcL6yWXNZ&iqo` z!fJ>>ZUj;KZSLV_yH&81rXvfwqCk;`Q);4-2l8FTrCT#aGZLb2P0 zMoSiL0##i~CGw-!qA8W50+W^ujRTUJc%`zi8WxY#(FG#tUQ>0rCs@%nxiH>4@YF2& zPZG&d6`%Liopk+-3Gga6OXKxr5^D^9u;u(HZhku0B@%9zUVYncs7eS9_h0kO^e zmg55$5B%qIu8M93iA!u}M)(Ogkh}HS_BIhK9I-gr?f3F{JmAUKWDKJ6Jn2!Ttlcf% zPmmuNd^qhH2r5i5UyENI->ZF+<+%2iRx-J=kj`Bsc4|X3GLhX-6L-I2_3LUb#P&3 zCm0f@MpS!rk1xFsuDadU^u6J01`g0!Qv5{t+C-41VPOqex)L9}*{(6HHMR+7qz4vA zTOBtMF=8*IV$JsNh*-__T`U~Q~Ydlt07dFR_g1XNFE620E0zLS!*Blsv+rIJ`L1`c*Rc9;xEw5nhYH<0#zX|9vs$2KCq=nul8|x)`GU-X$d6WaZ-xE znil`vk*9awjfX7yl-Q+?lRqiEv>ZCO$G&`9dBr+=sV{Oth5CG}q-)5v?j+QlPW#c= z<$;I8N2y(7Lj0`^lUSZmCv8Zu+-2fDlIp1tZeO{XK2ysY@O1(yTAbz_rW%7()yz+` z#oLlMi9Ve}OLT7)Vt`Gi8^d|35wO(Xh#wmx)xHB6U(|GIXrYh;bB*EZn9v63>ie(9 z2Iu=Zlj9Z2;mBqh!0)2I5?>})55x+{{ z&nr0YE={JEUkCJYb>00#^3J&Pt>zu>+{AT5_{zH01?{RN->REAYEP5VxA1iJroIqKG%QYIl&#HWL=D z;0r6FR)>e6cZHHn5=k5;mONf@ljl1?N*c3t^hW0{L_M24Ik~iSLm%&U;!QHawWj4% z+7pdh+$3(zw`erKRF!UjAp+-JB9S3LgnbaK#V=+BGRCLA6a&6OYvAaAW6sUESezKQX@x?`vG z3U|!;aMD!^j5f5(*G>e!6fl;$mr=g!#B75}KV)Xgqmz_`V#Hptygx0$t zlf+p^JlTNmdp*^ch;xnU9B09iZ*n%Tb3zm;n?7qF^CP}mfri1Rn_&iC<(n|MW5RzF zN|N*PvE%<1cp3(WUP{( z8j5>|ryJb!EY;?$dN@csnTqz@A#XQ&O8kuXIHAh`FT{9wnLk}xpg!^@oX^kc;w`f3 zF|VN29Fw9lI+yI3G5JMx5dm0;zu8tl_r+5Qu}5$TY8bYNR(<(LJ+!Rla4rqD1%Pu+ z$PHzI$K=|#&v;zB^r7DGs==`l^~e!D-QS6CVJxc!_gut;FX#%anyt}(7ieM3?}@aU z&Cd#F`~t`NnD0d>x`vBYLM*_^+lTN=SJl7#QwINzIRBx+_wW5)m9Jh{Dkx8)i~W~V%1fyCo3g`u0IGT4h0wh}h#P)O#4a*@Wd6a61GB&9OP19Edglj1y> zLVa?WAxZh-*lx~7v82Z;ZT zk(~jzzUd2PY)x3Jq$3%Rh&OQO@UcR-br)%VAF+vY=BZ@TOe*Wi^09oqO4U;f$X%%S zz_vMxAHFrQJK05Q*IkOcl?K;(;3mTV$mr{=OtzhY>ujw3TD3ZE z)Hq`?8thD&dXj%k_z+UgLa`D5kWiJKB5h3$^sR3JaN$XuEvDfJF;NmCUIDV(~H8IcY9>>4;@ z$#RI@7OYy1+Co?z?Onw}-UbGmVO{W)@(ayhK)V)XE<3#mAl z9^LL|pk-3`{XwJft1J9KVh85Q3e7TkTXuf0i{s;u)nOop`clRsy&JV^R5w=^@82TE zN+|)9jKVu}3Zb+7V(=UomCqs#RSF=Ei=7(Gq;}0XZE}j@p_0T)OH?BElmpZ!IikL1 zoB~rhI1DxVJk?Scd{*Z<>Sr~-m`I)lohfdZvdWLb$HiicGbd}Ras=hljgwqx?y6&N zX)!>}uO=zox;7T8sPflb3z7lGgQ&&8zH5LLp2=GL0A7Q_a=#nc5M8Du_h|5SuDU@2 zXmMJwLx4Lwu4sYu;)`as)bTay{v3oCC;#>F_Oq9NalKHDQF*@UEJ()GTz83D&9@r; zMw8PB(woOlQ_!F@R!A+fy?S-EwSX)gp!;NAn^UT0Yj|>Y|JR7eYR{ZjYWr3AsvTmd z@)#;8&3?{??kXMEryihu?eHW9$KTkPYFU(#A0YVR&X8EUMUM?16g$RF?IFQiY}r%x z3b&ZT(W08>Tr@tmfVC^^&{ajE46nudqCEJjjFBq%Ig9XSuf^Y>1c{dWQUG#$0Np;a zC>uVAc91dTuhre)h`BC@>Et8Nyc;RbR{6&ADJZo}E^#GI(z=)aNLrw&eHZ#(q?fk8 zK5vav8KpTWANc{dcw~!}fs7yp#WBh%O+KZo(YdBl5i=?8cuu zAw^`9-uWZ3uy5+YSXwQZ(D7K9B`g-KxiU#O`_#QnEk?5|*|^_4=#;wRM+W5aS~*Yp z{=1Q^xS=F@RXq1_Ka2BX5?*V}+M>{1XOM1u2n+b69GGVE-FY+za`Iut&G}7NS?YC{ zOnPlfc^fG__)`@#GB07VNK_nnNI%VhQ-ZRuyH9ucb3v>nKW+$!Z+XKA2D`kOz3B~( zo1>dRDV(t~8#EwR`Tg}`^$x+d92sOQ1N1h)q94uQ5=-yQRmgNIrQ}3LpQ>1-H-szi zSHp^dSrN7bx)H;OHD#q~i;73+-P=%K^Ac)Rmi1#g`P({ekG3fvH#?_}`ZILyydrmZ zV%oxaC|wmOjNuz`X54aP_;^nrs#Q^mMYrME><^<&Dv`}?oAT*yOKmsls<&c4)g0)bZ%8|Z7|pAbYkAqSyWk4JOlHY6ldu-&5t-F=n) zWxX1SuE-ol1MI`3S_4wQ*dq{-;xJHl*S~r8E;EMep!Z0p37Ia#~14g zCD(V2C|v1RrjIZr+D_UJC|Uji5hg;MO>DwD>iOqhU89S;iBcz_>@!PrP*ZAhVktu3ROj_P-pC?==U^*nc&dQQttradTBgw+ez!LG1 z3m07`$Gxm7fOsPsWq7H%8rjY$b^lHa7-dxeRHRRU9%xyJxf$fxYRynIR%<2E#Dkfk z;@El+Qe8TQGJi5Uordtn$%$)9+%5;QZwFZ&N3#2C=uL_7J?z-kTQ5teyUUo;V!TGi zia^caMGE;k&5NLJkjI@5yH*T5T?Dt(%dQc1?dK`?bT`LG8{{7I6nP+SZOYO@twTZ) z*@QwQ;Pz);f8D^1No_`H25jKs15Uh9|9u1ZZ{PJl4)p!;bq`n2_}2lK+B%ve!dy*c z0dllVn!ymX=C{Ql3z*i9djy^qWJ1`_!f;uPCJFS<7n$%Xq^Q54j zs_lBKDrciL1RM&{ZP>zAMIf(g=qh35yMLjI{{aovZXr~cp7zi>lu@H+yziF*YN7HE z5fx$EjJd>;orv0M0?hB{72jyo9KI97+Eoj_1mL|xpMi& zZc)|h?*?}5lg^pvjlXB?+rCt4n$S_!dS}VZqpP7vYieVyfccg_fi5Lp7+3a#Dtm6kOF-y->2w^m=f55Cn-6*poUC6vk5HF!lGq6vxkOA9Q3C4 zeP4q~dVgKe*ZF2D*g;291DJPFGd4J1ph#tl%aTdi64Wje`sP+<>&HZby_r?&8j`i>8tS{n&lLp4k46L@2UD$pwrJ#k4x|#RT;aIG|Lh=Us-xux^*qp8+^J>G+~OfU znLIG=m*q1+JL&8#ivU9?>t@DL8c*>~G}ehf&jljaC9HpzAnQHC{b6?bIOQqsBm7V3RRPK9-`7VZ1Gpc3BTK|j9t z7B2j2Z3hS5=jRvazCs09EZhO-TA=~wS~-957T8&v8R|Ryj;?QNw3J*YKXSkrD2T8- z-`lRN!*&o%B*#r6`7o+1V)Sbvt~dtEAeh&X&yp&nv=6VI$TyLT80LjHsgL(kI94y5 z@~ltj%7LybHTY4nTrIv;eiow$I>L5>_=u*F(#v+y;VZS>uQ;W`yNSD_pLR*+q;Hl;Vv%OSA`s6a0wS;} zgWi8E*lyvwoDJqACk*2DS@75MlAH;@f<(h9E1eH<_-=HdO(}Isr46a_e%C1One9VW5@%BPDZ!|g4GB#}Vh{rE& zSO^MK;R}*I4s;%B{;TXzBzMRm2F*|F7wY@AU^E^=Q}1^rfs@iihCc3^0VgGjP(c>l zI+GP%z6e%{0pd#h(Wei9(T(HpeflyL+n?4hFBCXaqlYBB_>lw0=8G+BYG=)6M3z_t zk%YSg&>~UM-qF3?^Gw2>iXuiLof2G;RPlwzYY##sGksGi(5;rjbUyYxlG4!Z)!h23 z{gp*LK72T#1#+gE{|K-JN`?r&*C03P7^K0%T_k_)P@j0lf-&xj^fE$-8>e0DyA%6R zP9aKFX4&qNlnU>5`E=;TYET?56LmNya9#X~7NjLH0t_&%;KkAZrzjEUL%PY$9oK_6;4B7I$Jt7<(}-N-5IZKQSB3~4Jsq?D;)ZxmHs2C_mf z+hUD`K@~HAM1XU|GO)Yf_NgHIY`&7TEHm+}D(%H%<`6hCb1AKvsDLe&?>9)r&Sc0Y}gOS(JYJr4&5`1Oxy=0C4>*=zv>2M^g&}8aqRMLsJ`v zKg-)o(NK;KkDXJE$Vk#uu}m<50hY($5JrPfegL@uAi$a!@b@cVWFSE8{saxMynhvd zeA|m6BcdokBOxnF_wq5-PEz_G2dNYR*N>n2v;0tv{lCX#1Y{*dMHCciWkg>h{CMI& z#DK$oe=13Uduu!6zj6NfFaLQ0pzrgi(h9i$@x;I7`TvRPM?3s1dw|_DFZ@zegQ2EkaMuG);0K#VBkx@L2FKXctA7p1M18C7eG#cU*w+v0pAT5R{=){ z6M)vTss2ytl9vpTX9%P4KN2ki5-$+^g&`TxKL5b*$8_u^+_Ws+awY&~5O6X41#S=R zAK?J?HMTRfx0ePa^ft8mPa1`n@Sef+2-<+A+yXk%7Do{YcZfz$pP&&u9G*TUkz*>Ea!13xj~O}zpPCis7< z9S{%}%Rk}$x^}s)^o`1Z4gvzK9RNM@r{W?0OEhU~yOF zUgk6Z$$}~Kzgd3W3@`J({=^gojN-rO^p{hQzhr@ZS>u;k7k{FYs{IoE-$we29E>la zUnaf#2@S0IPtbo&f%g*iW%ih#sPKjW{qujlqyLyo<|W_{fFD-&qx{Gh^Rrk10RPm! zKSI!6KKwF!%+H5Y|NiiQ5_tUgx!_Cqml;8R!jqf)t#1E;|DAQjOQM&m{y&LEEdECH zr~3aFjsKVMFXicf!s}c86a0&*@=Ms4s_Z{uyR82S_Rn61mzXaFfPZ3^IQ|pnA4h2a z+sOD*YWF8A-ClCOlbkmnsV{sb0pj|D?i-{%tD2_+s;C4ZfEoFT;d?l2Cm9ZIVCU*FR~dykvP9 zkNT5^H2$|){v4h9lHg@D;7nG1l$KQBfPCNf(vH#;U{?hOAlcu2S z|E6^R%?tCNI{(M#@@J>X51-4=ati?aZyuPpQlNl!(2v+fMxgfqf6Ke>AAkKnZ|KqV literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000000000..b41128ab65136 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-all.zip +distributionSha256Sum=b3afcc2d5aaf4d23eeab2409d64c54046147322d05acc7fb5a63f84d8a2b8bd7 diff --git a/gradlew b/gradlew new file mode 100755 index 0000000000000..cccdd3d517fc5 --- /dev/null +++ b/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +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="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000000000..e95643d6a2ca6 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +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= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega From cb783bcb5707c422602e9d9c44de1efde87c9289 Mon Sep 17 00:00:00 2001 From: Jim Ferenczi Date: Fri, 5 Jan 2018 11:41:36 +0100 Subject: [PATCH 02/74] Fix global aggregation that requires breadth first and scores (#27942) * Fix global aggregation that requires breadth first and scores This change fixes the deferring collector when it is executed in a global context with a sub collector thats requires to access scores (e.g. top_hits aggregation). The deferring collector replays the best buckets for each document and re-executes the original query if scores are needed. When executed in a global context, the query to replay is a simple match_all query and not the original query. Closes #22321 Closes #27928 --- .../bucket/BestBucketsDeferringCollector.java | 18 +++-- .../bucket/DeferableBucketAggregator.java | 15 ++++- .../BestBucketsDeferringCollectorTests.java | 27 +++++++- .../bucket/terms/TermsAggregatorTests.java | 66 +++++++++++++++++++ 4 files changed, 118 insertions(+), 8 deletions(-) diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/BestBucketsDeferringCollector.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/BestBucketsDeferringCollector.java index 61d85b80ad9e7..d6be0f5786644 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/BestBucketsDeferringCollector.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/BestBucketsDeferringCollector.java @@ -21,6 +21,8 @@ import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.search.DocIdSetIterator; +import org.apache.lucene.search.MatchAllDocsQuery; +import org.apache.lucene.search.Query; import org.apache.lucene.search.Scorer; import org.apache.lucene.search.Weight; import org.apache.lucene.util.packed.PackedInts; @@ -59,6 +61,7 @@ private static class Entry { final List entries = new ArrayList<>(); BucketCollector collector; final SearchContext searchContext; + final boolean isGlobal; LeafReaderContext context; PackedLongValues.Builder docDeltas; PackedLongValues.Builder buckets; @@ -66,9 +69,14 @@ private static class Entry { boolean finished = false; LongHash selectedBuckets; - /** Sole constructor. */ - public BestBucketsDeferringCollector(SearchContext context) { + /** + * Sole constructor. + * @param context The search context + * @param isGlobal Whether this collector visits all documents (global context) + */ + public BestBucketsDeferringCollector(SearchContext context, boolean isGlobal) { this.searchContext = context; + this.isGlobal = isGlobal; } @Override @@ -144,11 +152,11 @@ public void prepareSelectedBuckets(long... selectedBuckets) throws IOException { } this.selectedBuckets = hash; - boolean needsScores = collector.needsScores(); + boolean needsScores = needsScores(); Weight weight = null; if (needsScores) { - weight = searchContext.searcher() - .createNormalizedWeight(searchContext.query(), true); + Query query = isGlobal ? new MatchAllDocsQuery() : searchContext.query(); + weight = searchContext.searcher().createNormalizedWeight(query, true); } for (Entry entry : entries) { final LeafBucketCollector leafCollector = collector.getLeafCollector(entry.context); diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/DeferableBucketAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/DeferableBucketAggregator.java index bbfcef0af4000..0ff5ea12b97be 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/DeferableBucketAggregator.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/DeferableBucketAggregator.java @@ -22,6 +22,7 @@ import org.elasticsearch.search.aggregations.Aggregator; import org.elasticsearch.search.aggregations.AggregatorFactories; import org.elasticsearch.search.aggregations.BucketCollector; +import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregator; import org.elasticsearch.search.aggregations.pipeline.PipelineAggregator; import org.elasticsearch.search.internal.SearchContext; @@ -61,10 +62,20 @@ protected void doPreCollection() throws IOException { collectableSubAggregators = BucketCollector.wrap(collectors); } + public static boolean descendsFromGlobalAggregator(Aggregator parent) { + while (parent != null) { + if (parent.getClass() == GlobalAggregator.class) { + return true; + } + parent = parent.parent(); + } + return false; + } + public DeferringBucketCollector getDeferringCollector() { // Default impl is a collector that selects the best buckets // but an alternative defer policy may be based on best docs. - return new BestBucketsDeferringCollector(context()); + return new BestBucketsDeferringCollector(context(), descendsFromGlobalAggregator(parent())); } /** @@ -74,7 +85,7 @@ public DeferringBucketCollector getDeferringCollector() { * recording of all doc/bucketIds from the first pass and then the sub class * should call {@link #runDeferredCollections(long...)} for the selected set * of buckets that survive the pruning. - * + * * @param aggregator * the child aggregator * @return true if the aggregator should be deferred until a first pass at diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/BestBucketsDeferringCollectorTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/BestBucketsDeferringCollectorTests.java index 975c1a0d4664d..8d60dde58343f 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/BestBucketsDeferringCollectorTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/BestBucketsDeferringCollectorTests.java @@ -27,6 +27,8 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.IndexSearcher; +import org.apache.lucene.search.MatchAllDocsQuery; +import org.apache.lucene.search.Query; import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopDocs; @@ -41,6 +43,8 @@ import java.util.HashSet; import java.util.Set; +import static org.mockito.Mockito.when; + public class BestBucketsDeferringCollectorTests extends AggregatorTestCase { public void testReplay() throws Exception { @@ -59,10 +63,17 @@ public void testReplay() throws Exception { IndexSearcher indexSearcher = new IndexSearcher(indexReader); TermQuery termQuery = new TermQuery(new Term("field", String.valueOf(randomInt(maxNumValues)))); + Query rewrittenQuery = indexSearcher.rewrite(termQuery); TopDocs topDocs = indexSearcher.search(termQuery, numDocs); SearchContext searchContext = createSearchContext(indexSearcher, createIndexSettings()); - BestBucketsDeferringCollector collector = new BestBucketsDeferringCollector(searchContext); + when(searchContext.query()).thenReturn(rewrittenQuery); + BestBucketsDeferringCollector collector = new BestBucketsDeferringCollector(searchContext, false) { + @Override + public boolean needsScores() { + return true; + } + }; Set deferredCollectedDocIds = new HashSet<>(); collector.setDeferredCollector(Collections.singleton(bla(deferredCollectedDocIds))); collector.preCollection(); @@ -70,6 +81,20 @@ public void testReplay() throws Exception { collector.postCollection(); collector.replay(0); + assertEquals(topDocs.scoreDocs.length, deferredCollectedDocIds.size()); + for (ScoreDoc scoreDoc : topDocs.scoreDocs) { + assertTrue("expected docid [" + scoreDoc.doc + "] is missing", deferredCollectedDocIds.contains(scoreDoc.doc)); + } + + topDocs = indexSearcher.search(new MatchAllDocsQuery(), numDocs); + collector = new BestBucketsDeferringCollector(searchContext, true); + deferredCollectedDocIds = new HashSet<>(); + collector.setDeferredCollector(Collections.singleton(bla(deferredCollectedDocIds))); + collector.preCollection(); + indexSearcher.search(new MatchAllDocsQuery(), collector); + collector.postCollection(); + collector.replay(0); + assertEquals(topDocs.scoreDocs.length, deferredCollectedDocIds.size()); for (ScoreDoc scoreDoc : topDocs.scoreDocs) { assertTrue("expected docid [" + scoreDoc.doc + "] is missing", deferredCollectedDocIds.contains(scoreDoc.doc)); diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorTests.java index 74cc35da30030..cbd58bd4acdff 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorTests.java @@ -46,14 +46,21 @@ import org.elasticsearch.index.mapper.NumberFieldMapper; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; +import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregationBuilders; import org.elasticsearch.search.aggregations.Aggregator; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.BucketOrder; import org.elasticsearch.search.aggregations.InternalAggregation; +import org.elasticsearch.search.aggregations.InternalMultiBucketAggregation; +import org.elasticsearch.search.aggregations.bucket.MultiBucketsAggregation; import org.elasticsearch.search.aggregations.bucket.filter.Filter; import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder; +import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder; +import org.elasticsearch.search.aggregations.bucket.global.InternalGlobal; +import org.elasticsearch.search.aggregations.metrics.tophits.InternalTopHits; +import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder; import org.elasticsearch.search.aggregations.support.ValueType; import java.io.IOException; @@ -67,6 +74,8 @@ import java.util.function.BiFunction; import java.util.function.Function; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.instanceOf; public class TermsAggregatorTests extends AggregatorTestCase { @@ -933,6 +942,63 @@ public void testMixLongAndDouble() throws Exception { } } + public void testGlobalAggregationWithScore() throws IOException { + try (Directory directory = newDirectory()) { + try (RandomIndexWriter indexWriter = new RandomIndexWriter(random(), directory)) { + Document document = new Document(); + document.add(new SortedDocValuesField("keyword", new BytesRef("a"))); + indexWriter.addDocument(document); + document = new Document(); + document.add(new SortedDocValuesField("keyword", new BytesRef("c"))); + indexWriter.addDocument(document); + document = new Document(); + document.add(new SortedDocValuesField("keyword", new BytesRef("e"))); + indexWriter.addDocument(document); + try (IndexReader indexReader = maybeWrapReaderEs(indexWriter.getReader())) { + IndexSearcher indexSearcher = newIndexSearcher(indexReader); + String executionHint = randomFrom(TermsAggregatorFactory.ExecutionMode.values()).toString(); + Aggregator.SubAggCollectionMode collectionMode = randomFrom(Aggregator.SubAggCollectionMode.values()); + GlobalAggregationBuilder globalBuilder = new GlobalAggregationBuilder("global") + .subAggregation( + new TermsAggregationBuilder("terms", ValueType.STRING) + .executionHint(executionHint) + .collectMode(collectionMode) + .field("keyword") + .order(BucketOrder.key(true)) + .subAggregation( + new TermsAggregationBuilder("sub_terms", ValueType.STRING) + .executionHint(executionHint) + .collectMode(collectionMode) + .field("keyword").order(BucketOrder.key(true)) + .subAggregation( + new TopHitsAggregationBuilder("top_hits") + .storedField("_none_") + ) + ) + ); + + MappedFieldType fieldType = new KeywordFieldMapper.KeywordFieldType(); + fieldType.setName("keyword"); + fieldType.setHasDocValues(true); + + InternalGlobal result = searchAndReduce(indexSearcher, new MatchAllDocsQuery(), globalBuilder, fieldType); + InternalMultiBucketAggregation terms = result.getAggregations().get("terms"); + assertThat(terms.getBuckets().size(), equalTo(3)); + for (MultiBucketsAggregation.Bucket bucket : terms.getBuckets()) { + InternalMultiBucketAggregation subTerms = bucket.getAggregations().get("sub_terms"); + assertThat(subTerms.getBuckets().size(), equalTo(1)); + MultiBucketsAggregation.Bucket subBucket = subTerms.getBuckets().get(0); + InternalTopHits topHits = subBucket.getAggregations().get("top_hits"); + assertThat(topHits.getHits().getHits().length, equalTo(1)); + for (SearchHit hit : topHits.getHits()) { + assertThat(hit.getScore(), greaterThan(0f)); + } + } + } + } + } + } + private IndexReader createIndexWithLongs() throws IOException { Directory directory = newDirectory(); RandomIndexWriter indexWriter = new RandomIndexWriter(random(), directory); From a4a7150b566007605ccbf046739a6f33f4f69d59 Mon Sep 17 00:00:00 2001 From: Sian Lerk Lau Date: Fri, 22 Dec 2017 14:51:44 +0800 Subject: [PATCH 03/74] Added ASN support for Ingest GeoIP plugin. Closes #27849 --- docs/plugins/ingest-geoip.asciidoc | 10 ++- plugins/ingest-geoip/build.gradle | 7 +- .../ingest/geoip/GeoIpProcessor.java | 72 +++++++++++++++++-- .../geoip/GeoIpProcessorFactoryTests.java | 51 ++++++++++++- .../ingest/geoip/GeoIpProcessorTests.java | 20 ++++++ .../test/ingest_geoip/20_geoip_processor.yml | 40 ++++++++++- 6 files changed, 183 insertions(+), 17 deletions(-) diff --git a/docs/plugins/ingest-geoip.asciidoc b/docs/plugins/ingest-geoip.asciidoc index 35a17f2f14c47..60da9c1f5c36a 100644 --- a/docs/plugins/ingest-geoip.asciidoc +++ b/docs/plugins/ingest-geoip.asciidoc @@ -5,12 +5,12 @@ The GeoIP processor adds information about the geographical location of IP addre This processor adds this information by default under the `geoip` field. The `geoip` processor can resolve both IPv4 and IPv6 addresses. -The ingest-geoip plugin ships by default with the GeoLite2 City and GeoLite2 Country geoip2 databases from Maxmind made available +The ingest-geoip plugin ships by default with the GeoLite2 City, GeoLite2 Country and GeoLite2 ASN geoip2 databases from Maxmind made available under the CCA-ShareAlike 4.0 license. For more details see, http://dev.maxmind.com/geoip/geoip2/geolite2/ The GeoIP processor can run with other geoip2 databases from Maxmind. The files must be copied into the geoip config directory, and the `database_file` option should be used to specify the filename of the custom database. Custom database files must be compressed -with gzip. The geoip config directory is located at `$ES_HOME/config/ingest-geoip` and holds the shipped databases too. +with gzip. The geoip config directory is located at `$ES_HOME/ingest-geoip` and holds the shipped databases too. :plugin_name: ingest-geoip include::install_remove.asciidoc[] @@ -36,7 +36,11 @@ include::install_remove.asciidoc[] `country_iso_code`, `country_name`, `continent_name`, `region_name`, `city_name`, `timezone`, `latitude`, `longitude` and `location`. The fields actually added depend on what has been found and which properties were configured in `properties`. * If the GeoLite2 Country database is used, then the following fields may be added under the `target_field`: `ip`, -`country_iso_code`, `country_name` and `continent_name`. The fields actually added depend on what has been found and which properties were configured in `properties`. +`country_iso_code`, `country_name` and `continent_name`. The fields actually added depend on what has been found and which properties +were configured in `properties`. +* If the GeoLite2 ASN database is used, then the following fields may be added under the `target_field`: `ip`, +`asn`, and `organization_name`. The fields actually added depend on what has been found and which properties were configured +in `properties`. Here is an example that uses the default city database and adds the geographical information to the `geoip` field based on the `ip` field: diff --git a/plugins/ingest-geoip/build.gradle b/plugins/ingest-geoip/build.gradle index b10eef4aec9ad..15dda4f4c102c 100644 --- a/plugins/ingest-geoip/build.gradle +++ b/plugins/ingest-geoip/build.gradle @@ -23,7 +23,7 @@ esplugin { } dependencies { - // Upgrade to 2.10.0 or higher when jackson-core gets upgraded to 2.9.x + // Upgrade to 2.10.0 or higher when jackson-core gets upgraded to 2.9.x. Blocked by #27032 compile ('com.maxmind.geoip2:geoip2:2.9.0') // geoip2 dependencies: compile("com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}") @@ -36,10 +36,7 @@ dependencies { task copyDefaultGeoIp2DatabaseFiles(type: Copy) { from { zipTree(configurations.testCompile.files.find { it.name.contains('geolite2-databases')}) } into "${project.buildDir}/ingest-geoip" - - // For now, do not include GeoLite2-ASN.mmdb.gz file, because it isn't used yet: - include "GeoLite2-City.mmdb.gz" - include "GeoLite2-Country.mmdb.gz" + include "*.mmdb.gz" } project.bundlePlugin.dependsOn(copyDefaultGeoIp2DatabaseFiles) diff --git a/plugins/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/GeoIpProcessor.java b/plugins/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/GeoIpProcessor.java index f358d07025fce..0f192bd595501 100644 --- a/plugins/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/GeoIpProcessor.java +++ b/plugins/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/GeoIpProcessor.java @@ -21,6 +21,7 @@ import com.maxmind.geoip2.DatabaseReader; import com.maxmind.geoip2.exception.AddressNotFoundException; +import com.maxmind.geoip2.model.AsnResponse; import com.maxmind.geoip2.model.CityResponse; import com.maxmind.geoip2.model.CountryResponse; import com.maxmind.geoip2.record.City; @@ -59,6 +60,7 @@ public final class GeoIpProcessor extends AbstractProcessor { public static final String TYPE = "geoip"; private static final String CITY_DB_SUFFIX = "-City"; private static final String COUNTRY_DB_SUFFIX = "-Country"; + private static final String ASN_DB_SUFFIX = "-ASN"; private final String field; private final String targetField; @@ -107,6 +109,12 @@ public void execute(IngestDocument ingestDocument) { } catch (AddressNotFoundRuntimeException e) { geoData = Collections.emptyMap(); } + } else if (databaseType.endsWith(ASN_DB_SUFFIX)) { + try { + geoData = retrieveAsnGeoData(ipAddress); + } catch (AddressNotFoundRuntimeException e) { + geoData = Collections.emptyMap(); + } } else { throw new ElasticsearchParseException("Unsupported database type [" + dbReader.getMetadata().getDatabaseType() + "]", new IllegalStateException()); @@ -256,12 +264,53 @@ private Map retrieveCountryGeoData(InetAddress ipAddress) { return geoData; } + private Map retrieveAsnGeoData(InetAddress ipAddress) { + SpecialPermission.check(); + AsnResponse response = AccessController.doPrivileged((PrivilegedAction) () -> { + try { + return dbReader.asn(ipAddress); + } catch (AddressNotFoundException e) { + throw new AddressNotFoundRuntimeException(e); + } catch (Exception e) { + throw new RuntimeException(e); + } + }); + + Integer asn = response.getAutonomousSystemNumber(); + String organization_name = response.getAutonomousSystemOrganization(); + + Map geoData = new HashMap<>(); + for (Property property : this.properties) { + switch (property) { + case IP: + geoData.put("ip", NetworkAddress.format(ipAddress)); + break; + case ASN: + if (asn != null) { + geoData.put("asn", asn); + } + break; + case ORGANIZATION_NAME: + if (organization_name != null) { + geoData.put("organization_name", organization_name); + } + break; + } + } + return geoData; + } + public static final class Factory implements Processor.Factory { static final Set DEFAULT_CITY_PROPERTIES = EnumSet.of( Property.CONTINENT_NAME, Property.COUNTRY_ISO_CODE, Property.REGION_NAME, Property.CITY_NAME, Property.LOCATION ); - static final Set DEFAULT_COUNTRY_PROPERTIES = EnumSet.of(Property.CONTINENT_NAME, Property.COUNTRY_ISO_CODE); + static final Set DEFAULT_COUNTRY_PROPERTIES = EnumSet.of( + Property.CONTINENT_NAME, Property.COUNTRY_ISO_CODE + ); + static final Set DEFAULT_ASN_PROPERTIES = EnumSet.of( + Property.IP, Property.ASN, Property.ORGANIZATION_NAME + ); private final Map databaseReaders; @@ -302,6 +351,8 @@ public GeoIpProcessor create(Map registry, String pro properties = DEFAULT_CITY_PROPERTIES; } else if (databaseType.endsWith(COUNTRY_DB_SUFFIX)) { properties = DEFAULT_COUNTRY_PROPERTIES; + } else if (databaseType.endsWith(ASN_DB_SUFFIX)) { + properties = DEFAULT_ASN_PROPERTIES; } else { throw newConfigurationException(TYPE, processorTag, "database_file", "Unsupported database type [" + databaseType + "]"); @@ -331,11 +382,20 @@ enum Property { REGION_NAME, CITY_NAME, TIMEZONE, - LOCATION; + LOCATION, + ASN, + ORGANIZATION_NAME; - static final EnumSet ALL_CITY_PROPERTIES = EnumSet.allOf(Property.class); - static final EnumSet ALL_COUNTRY_PROPERTIES = EnumSet.of(Property.IP, Property.CONTINENT_NAME, - Property.COUNTRY_NAME, Property.COUNTRY_ISO_CODE); + static final EnumSet ALL_CITY_PROPERTIES = EnumSet.of( + Property.IP, Property.COUNTRY_ISO_CODE, Property.COUNTRY_NAME, Property.CONTINENT_NAME, + Property.REGION_NAME, Property.CITY_NAME, Property.TIMEZONE, Property.LOCATION + ); + static final EnumSet ALL_COUNTRY_PROPERTIES = EnumSet.of( + Property.IP, Property.CONTINENT_NAME, Property.COUNTRY_NAME, Property.COUNTRY_ISO_CODE + ); + static final EnumSet ALL_ASN_PROPERTIES = EnumSet.of( + Property.IP, Property.ASN, Property.ORGANIZATION_NAME + ); public static Property parseProperty(String databaseType, String value) { Set validProperties = EnumSet.noneOf(Property.class); @@ -343,6 +403,8 @@ public static Property parseProperty(String databaseType, String value) { validProperties = ALL_CITY_PROPERTIES; } else if (databaseType.endsWith(COUNTRY_DB_SUFFIX)) { validProperties = ALL_COUNTRY_PROPERTIES; + } else if (databaseType.endsWith(ASN_DB_SUFFIX)) { + validProperties = ALL_ASN_PROPERTIES; } try { diff --git a/plugins/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/GeoIpProcessorFactoryTests.java b/plugins/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/GeoIpProcessorFactoryTests.java index d76056cac3563..9903bebcf2a11 100644 --- a/plugins/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/GeoIpProcessorFactoryTests.java +++ b/plugins/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/GeoIpProcessorFactoryTests.java @@ -58,6 +58,8 @@ public static void loadDatabaseReaders() throws IOException { geoIpConfigDir.resolve("GeoLite2-City.mmdb.gz")); Files.copy(new ByteArrayInputStream(StreamsUtils.copyToBytesFromClasspath("/GeoLite2-Country.mmdb.gz")), geoIpConfigDir.resolve("GeoLite2-Country.mmdb.gz")); + Files.copy(new ByteArrayInputStream(StreamsUtils.copyToBytesFromClasspath("/GeoLite2-ASN.mmdb.gz")), + geoIpConfigDir.resolve("GeoLite2-ASN.mmdb.gz")); NodeCache cache = randomFrom(NoCache.getInstance(), new GeoIpCache(randomNonNegativeLong())); databaseReaders = IngestGeoIpPlugin.loadDatabaseReaders(geoIpConfigDir, cache); @@ -122,6 +124,24 @@ public void testCountryBuildDefaults() throws Exception { assertFalse(processor.isIgnoreMissing()); } + public void testAsnBuildDefaults() throws Exception { + GeoIpProcessor.Factory factory = new GeoIpProcessor.Factory(databaseReaders); + + Map config = new HashMap<>(); + config.put("field", "_field"); + config.put("database_file", "GeoLite2-ASN.mmdb.gz"); + String processorTag = randomAlphaOfLength(10); + + GeoIpProcessor processor = factory.create(null, processorTag, config); + + assertThat(processor.getTag(), equalTo(processorTag)); + assertThat(processor.getField(), equalTo("_field")); + assertThat(processor.getTargetField(), equalTo("geoip")); + assertThat(processor.getDbReader().getMetadata().getDatabaseType(), equalTo("GeoLite2-ASN")); + assertThat(processor.getProperties(), sameInstance(GeoIpProcessor.Factory.DEFAULT_ASN_PROPERTIES)); + assertFalse(processor.isIgnoreMissing()); + } + public void testBuildTargetField() throws Exception { GeoIpProcessor.Factory factory = new GeoIpProcessor.Factory(databaseReaders); Map config = new HashMap<>(); @@ -146,12 +166,31 @@ public void testBuildDbFile() throws Exception { assertFalse(processor.isIgnoreMissing()); } - public void testBuildWithCountryDbAndCityFields() throws Exception { + public void testBuildWithCountryDbAndAsnFields() throws Exception { GeoIpProcessor.Factory factory = new GeoIpProcessor.Factory(databaseReaders); Map config = new HashMap<>(); config.put("field", "_field"); config.put("database_file", "GeoLite2-Country.mmdb.gz"); - EnumSet cityOnlyProperties = EnumSet.complementOf(GeoIpProcessor.Property.ALL_COUNTRY_PROPERTIES); + EnumSet asnOnlyProperties = EnumSet.copyOf(GeoIpProcessor.Property.ALL_ASN_PROPERTIES); + asnOnlyProperties.remove(GeoIpProcessor.Property.IP); + String asnProperty = RandomPicks.randomFrom(Randomness.get(), asnOnlyProperties).toString(); + config.put("properties", Collections.singletonList(asnProperty)); + try { + factory.create(null, null, config); + fail("Exception expected"); + } catch (ElasticsearchParseException e) { + assertThat(e.getMessage(), equalTo("[properties] illegal property value [" + asnProperty + + "]. valid values are [IP, COUNTRY_ISO_CODE, COUNTRY_NAME, CONTINENT_NAME]")); + } + } + + public void testBuildWithAsnDbAndCityFields() throws Exception { + GeoIpProcessor.Factory factory = new GeoIpProcessor.Factory(databaseReaders); + Map config = new HashMap<>(); + config.put("field", "_field"); + config.put("database_file", "GeoLite2-ASN.mmdb.gz"); + EnumSet cityOnlyProperties = EnumSet.copyOf(GeoIpProcessor.Property.ALL_CITY_PROPERTIES); + cityOnlyProperties.remove(GeoIpProcessor.Property.IP); String cityProperty = RandomPicks.randomFrom(Randomness.get(), cityOnlyProperties).toString(); config.put("properties", Collections.singletonList(cityProperty)); try { @@ -159,7 +198,7 @@ public void testBuildWithCountryDbAndCityFields() throws Exception { fail("Exception expected"); } catch (ElasticsearchParseException e) { assertThat(e.getMessage(), equalTo("[properties] illegal property value [" + cityProperty + - "]. valid values are [IP, COUNTRY_ISO_CODE, COUNTRY_NAME, CONTINENT_NAME]")); + "]. valid values are [IP, ASN, ORGANIZATION_NAME]")); } } @@ -230,6 +269,8 @@ public void testLazyLoading() throws Exception { geoIpConfigDir.resolve("GeoLite2-City.mmdb.gz")); Files.copy(new ByteArrayInputStream(StreamsUtils.copyToBytesFromClasspath("/GeoLite2-Country.mmdb.gz")), geoIpConfigDir.resolve("GeoLite2-Country.mmdb.gz")); + Files.copy(new ByteArrayInputStream(StreamsUtils.copyToBytesFromClasspath("/GeoLite2-ASN.mmdb.gz")), + geoIpConfigDir.resolve("GeoLite2-ASN.mmdb.gz")); // Loading another database reader instances, because otherwise we can't test lazy loading as the // database readers used at class level are reused between tests. (we want to keep that otherwise running this @@ -249,6 +290,10 @@ public void testLazyLoading() throws Exception { config.put("field", "_field"); config.put("database_file", "GeoLite2-Country.mmdb.gz"); factory.create(null, "_tag", config); + config = new HashMap<>(); + config.put("field", "_field"); + config.put("database_file", "GeoLite2-ASN.mmdb.gz"); + factory.create(null, "_tag", config); for (DatabaseReaderLazyLoader lazyLoader : databaseReaders.values()) { assertNotNull(lazyLoader.databaseReader.get()); diff --git a/plugins/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/GeoIpProcessorTests.java b/plugins/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/GeoIpProcessorTests.java index a58d49f3d8958..8e43c04229c5f 100644 --- a/plugins/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/GeoIpProcessorTests.java +++ b/plugins/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/GeoIpProcessorTests.java @@ -187,6 +187,26 @@ public void testCountryWithMissingLocation() throws Exception { assertThat(geoData.get("ip"), equalTo("80.231.5.0")); } + public void testAsn() throws Exception { + String ip = "82.170.213.79"; + InputStream database = getDatabaseFileInputStream("/GeoLite2-ASN.mmdb.gz"); + GeoIpProcessor processor = new GeoIpProcessor(randomAlphaOfLength(10), "source_field", + new DatabaseReader.Builder(database).build(), "target_field", EnumSet.allOf(GeoIpProcessor.Property.class), false); + + Map document = new HashMap<>(); + document.put("source_field", ip); + IngestDocument ingestDocument = RandomDocumentPicks.randomIngestDocument(random(), document); + processor.execute(ingestDocument); + + assertThat(ingestDocument.getSourceAndMetadata().get("source_field"), equalTo(ip)); + @SuppressWarnings("unchecked") + Map geoData = (Map) ingestDocument.getSourceAndMetadata().get("target_field"); + assertThat(geoData.size(), equalTo(3)); + assertThat(geoData.get("ip"), equalTo(ip)); + assertThat(geoData.get("asn"), equalTo(5615)); + assertThat(geoData.get("organization_name"), equalTo("KPN B.V.")); + } + public void testAddressIsNotInTheDatabase() throws Exception { InputStream database = getDatabaseFileInputStream("/GeoLite2-City.mmdb.gz"); GeoIpProcessor processor = new GeoIpProcessor(randomAlphaOfLength(10), "source_field", diff --git a/plugins/ingest-geoip/src/test/resources/rest-api-spec/test/ingest_geoip/20_geoip_processor.yml b/plugins/ingest-geoip/src/test/resources/rest-api-spec/test/ingest_geoip/20_geoip_processor.yml index da02720c2e625..3c9661cc5853b 100644 --- a/plugins/ingest-geoip/src/test/resources/rest-api-spec/test/ingest_geoip/20_geoip_processor.yml +++ b/plugins/ingest-geoip/src/test/resources/rest-api-spec/test/ingest_geoip/20_geoip_processor.yml @@ -87,7 +87,7 @@ - match: { _source.geoip.continent_name: "North America" } --- -"Test geoip processor with different database file": +"Test geoip processor with different database file - GeoLite2-Country": - do: ingest.put_pipeline: id: "my_pipeline" @@ -195,3 +195,41 @@ - match: { _source.geoip.location.lat: 44.9759 } - match: { _source.geoip.region_name: "Minnesota" } - match: { _source.geoip.continent_name: "North America" } + +--- +"Test geoip processor with different database file - GeoLite2-ASN": + - do: + ingest.put_pipeline: + id: "my_pipeline" + body: > + { + "description": "_description", + "processors": [ + { + "geoip" : { + "field" : "field1", + "database_file" : "GeoLite2-ASN.mmdb.gz" + } + } + ] + } + - match: { acknowledged: true } + + - do: + index: + index: test + type: test + id: 1 + pipeline: "my_pipeline" + body: {field1: "82.170.213.79"} + + - do: + get: + index: test + type: test + id: 1 + - match: { _source.field1: "82.170.213.79" } + - length: { _source.geoip: 3 } + - match: { _source.geoip.ip: "82.170.213.79" } + - match: { _source.geoip.asn: 5615 } + - match: { _source.geoip.organization_name: "KPN B.V." } From a38f70b5ddfcb0a70e48b8f2238242cb4e41c99a Mon Sep 17 00:00:00 2001 From: Martijn van Groningen Date: Fri, 5 Jan 2018 14:12:51 +0100 Subject: [PATCH 04/74] fix doc mistake --- docs/plugins/ingest-geoip.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/plugins/ingest-geoip.asciidoc b/docs/plugins/ingest-geoip.asciidoc index 60da9c1f5c36a..b06708331bc0d 100644 --- a/docs/plugins/ingest-geoip.asciidoc +++ b/docs/plugins/ingest-geoip.asciidoc @@ -10,7 +10,7 @@ under the CCA-ShareAlike 4.0 license. For more details see, http://dev.maxmind.c The GeoIP processor can run with other geoip2 databases from Maxmind. The files must be copied into the geoip config directory, and the `database_file` option should be used to specify the filename of the custom database. Custom database files must be compressed -with gzip. The geoip config directory is located at `$ES_HOME/ingest-geoip` and holds the shipped databases too. +with gzip. The geoip config directory is located at `$ES_HOME/config/ingest-geoip` and holds the shipped databases too. :plugin_name: ingest-geoip include::install_remove.asciidoc[] From 7180e539def5effb02cb89739eb52603ef2c110b Mon Sep 17 00:00:00 2001 From: Scott Somerville Date: Fri, 5 Jan 2018 08:19:09 -0500 Subject: [PATCH 05/74] Add getWarmer and getTranslog method to NodeIndicesStats (#28092) When calling the node stats action via the Java API it was not able to return information about warmers and translog even though that is available through the REST API. This change adds methods to make the responses more consistent. --- .../org/elasticsearch/indices/NodeIndicesStats.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/org/elasticsearch/indices/NodeIndicesStats.java b/core/src/main/java/org/elasticsearch/indices/NodeIndicesStats.java index a08e97ab133d9..fa52c88c02bbf 100644 --- a/core/src/main/java/org/elasticsearch/indices/NodeIndicesStats.java +++ b/core/src/main/java/org/elasticsearch/indices/NodeIndicesStats.java @@ -26,7 +26,6 @@ import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.Streamable; -import org.elasticsearch.common.xcontent.ToXContent.Params; import org.elasticsearch.common.xcontent.ToXContentFragment; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.index.Index; @@ -43,6 +42,8 @@ import org.elasticsearch.index.shard.DocsStats; import org.elasticsearch.index.shard.IndexingStats; import org.elasticsearch.index.store.StoreStats; +import org.elasticsearch.index.translog.TranslogStats; +import org.elasticsearch.index.warmer.WarmerStats; import org.elasticsearch.search.suggest.completion.CompletionStats; import java.io.IOException; @@ -117,6 +118,11 @@ public FlushStats getFlush() { return stats.getFlush(); } + @Nullable + public WarmerStats getWarmer() { + return stats.getWarmer(); + } + @Nullable public FieldDataStats getFieldData() { return stats.getFieldData(); @@ -142,6 +148,11 @@ public SegmentsStats getSegments() { return stats.getSegments(); } + @Nullable + public TranslogStats getTranslog() { + return stats.getTranslog(); + } + @Nullable public RecoveryStats getRecoveryStats() { return stats.getRecoveryStats(); From fdb9b5074790d9472e94d26d60b077d75c0146db Mon Sep 17 00:00:00 2001 From: Martijn van Groningen Date: Fri, 5 Jan 2018 14:29:37 +0100 Subject: [PATCH 06/74] test: replaced try-catch statements with expectThrows(...) --- .../geoip/GeoIpProcessorFactoryTests.java | 60 +++++++------------ .../ingest/geoip/GeoIpProcessorTests.java | 9 +-- 2 files changed, 22 insertions(+), 47 deletions(-) diff --git a/plugins/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/GeoIpProcessorFactoryTests.java b/plugins/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/GeoIpProcessorFactoryTests.java index 9903bebcf2a11..49bc4f3b9f2f2 100644 --- a/plugins/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/GeoIpProcessorFactoryTests.java +++ b/plugins/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/GeoIpProcessorFactoryTests.java @@ -175,13 +175,9 @@ public void testBuildWithCountryDbAndAsnFields() throws Exception { asnOnlyProperties.remove(GeoIpProcessor.Property.IP); String asnProperty = RandomPicks.randomFrom(Randomness.get(), asnOnlyProperties).toString(); config.put("properties", Collections.singletonList(asnProperty)); - try { - factory.create(null, null, config); - fail("Exception expected"); - } catch (ElasticsearchParseException e) { - assertThat(e.getMessage(), equalTo("[properties] illegal property value [" + asnProperty + - "]. valid values are [IP, COUNTRY_ISO_CODE, COUNTRY_NAME, CONTINENT_NAME]")); - } + Exception e = expectThrows(ElasticsearchParseException.class, () -> factory.create(null, null, config)); + assertThat(e.getMessage(), equalTo("[properties] illegal property value [" + asnProperty + + "]. valid values are [IP, COUNTRY_ISO_CODE, COUNTRY_NAME, CONTINENT_NAME]")); } public void testBuildWithAsnDbAndCityFields() throws Exception { @@ -193,13 +189,9 @@ public void testBuildWithAsnDbAndCityFields() throws Exception { cityOnlyProperties.remove(GeoIpProcessor.Property.IP); String cityProperty = RandomPicks.randomFrom(Randomness.get(), cityOnlyProperties).toString(); config.put("properties", Collections.singletonList(cityProperty)); - try { - factory.create(null, null, config); - fail("Exception expected"); - } catch (ElasticsearchParseException e) { - assertThat(e.getMessage(), equalTo("[properties] illegal property value [" + cityProperty + - "]. valid values are [IP, ASN, ORGANIZATION_NAME]")); - } + Exception e = expectThrows(ElasticsearchParseException.class, () -> factory.create(null, null, config)); + assertThat(e.getMessage(), equalTo("[properties] illegal property value [" + cityProperty + + "]. valid values are [IP, ASN, ORGANIZATION_NAME]")); } public void testBuildNonExistingDbFile() throws Exception { @@ -208,12 +200,8 @@ public void testBuildNonExistingDbFile() throws Exception { Map config = new HashMap<>(); config.put("field", "_field"); config.put("database_file", "does-not-exist.mmdb.gz"); - try { - factory.create(null, null, config); - fail("Exception expected"); - } catch (ElasticsearchParseException e) { - assertThat(e.getMessage(), equalTo("[database_file] database file [does-not-exist.mmdb.gz] doesn't exist")); - } + Exception e = expectThrows(ElasticsearchParseException.class, () -> factory.create(null, null, config)); + assertThat(e.getMessage(), equalTo("[database_file] database file [does-not-exist.mmdb.gz] doesn't exist")); } public void testBuildFields() throws Exception { @@ -239,26 +227,18 @@ public void testBuildFields() throws Exception { public void testBuildIllegalFieldOption() throws Exception { GeoIpProcessor.Factory factory = new GeoIpProcessor.Factory(databaseReaders); - Map config = new HashMap<>(); - config.put("field", "_field"); - config.put("properties", Collections.singletonList("invalid")); - try { - factory.create(null, null, config); - fail("exception expected"); - } catch (ElasticsearchParseException e) { - assertThat(e.getMessage(), equalTo("[properties] illegal property value [invalid]. valid values are [IP, COUNTRY_ISO_CODE, " + - "COUNTRY_NAME, CONTINENT_NAME, REGION_NAME, CITY_NAME, TIMEZONE, LOCATION]")); - } - - config = new HashMap<>(); - config.put("field", "_field"); - config.put("properties", "invalid"); - try { - factory.create(null, null, config); - fail("exception expected"); - } catch (ElasticsearchParseException e) { - assertThat(e.getMessage(), equalTo("[properties] property isn't a list, but of type [java.lang.String]")); - } + Map config1 = new HashMap<>(); + config1.put("field", "_field"); + config1.put("properties", Collections.singletonList("invalid")); + Exception e = expectThrows(ElasticsearchParseException.class, () -> factory.create(null, null, config1)); + assertThat(e.getMessage(), equalTo("[properties] illegal property value [invalid]. valid values are [IP, COUNTRY_ISO_CODE, " + + "COUNTRY_NAME, CONTINENT_NAME, REGION_NAME, CITY_NAME, TIMEZONE, LOCATION]")); + + Map config2 = new HashMap<>(); + config2.put("field", "_field"); + config2.put("properties", "invalid"); + e = expectThrows(ElasticsearchParseException.class, () -> factory.create(null, null, config2)); + assertThat(e.getMessage(), equalTo("[properties] property isn't a list, but of type [java.lang.String]")); } public void testLazyLoading() throws Exception { diff --git a/plugins/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/GeoIpProcessorTests.java b/plugins/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/GeoIpProcessorTests.java index 8e43c04229c5f..e58cf21f25d0c 100644 --- a/plugins/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/GeoIpProcessorTests.java +++ b/plugins/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/GeoIpProcessorTests.java @@ -228,13 +228,8 @@ public void testInvalid() throws Exception { Map document = new HashMap<>(); document.put("source_field", "www.google.com"); IngestDocument ingestDocument = RandomDocumentPicks.randomIngestDocument(random(), document); - try { - processor.execute(ingestDocument); - fail("did not get expected exception"); - } catch (IllegalArgumentException expected) { - assertNotNull(expected.getMessage()); - assertThat(expected.getMessage(), containsString("not an IP string literal")); - } + Exception e = expectThrows(IllegalArgumentException.class, () -> processor.execute(ingestDocument)); + assertThat(e.getMessage(), containsString("not an IP string literal")); } private static InputStream getDatabaseFileInputStream(String path) throws IOException { From 38701fb6ee9bf9318ccb459698fc3b54ec4fbcbc Mon Sep 17 00:00:00 2001 From: Tim Brooks Date: Fri, 5 Jan 2018 09:41:29 -0700 Subject: [PATCH 07/74] Create nio-transport plugin for NioTransport (#27949) This is related to #27260. This commit moves the NioTransport from :test:framework to a new nio-transport plugin. Additionally, supporting tcp decoding classes are moved to this plugin. Generic byte reading and writing contexts are moved to the nio library. Additionally, this commit adds a basic MockNioTransport to :test:framework that is a TcpTransport implementation for testing that is driven by nio. --- .../common/bytes/BytesReference.java | 33 +++ .../elasticsearch/transport/TcpChannel.java | 14 +- .../elasticsearch/transport/TcpTransport.java | 176 ++++++++---- .../transport/TcpTransportTests.java | 139 ++++++++++ .../elasticsearch/nio/BytesReadContext.java | 64 +++++ .../elasticsearch/nio/BytesWriteContext.java | 36 +-- .../elasticsearch/nio/NioSocketChannel.java | 12 + .../org/elasticsearch/nio/ReadContext.java | 4 + .../nio/BytesReadContextTests.java | 142 ++++++++++ .../nio/BytesWriteContextTests.java | 31 +-- .../nio/SocketEventHandlerTests.java | 3 +- .../netty4/Netty4MessageChannelHandler.java | 3 +- .../netty4/Netty4SizeHeaderFrameDecoder.java | 24 +- .../transport/netty4/Netty4Transport.java | 6 +- .../transport/netty4/NettyTcpChannel.java | 14 +- plugins/transport-nio/build.gradle | 32 +++ .../nio/NioNotEnabledBootstrapCheck.java | 32 +++ .../transport/nio/NioTransport.java | 40 +-- .../transport/nio/NioTransportPlugin.java | 28 +- .../transport/nio/TcpChannelFactory.java | 20 +- .../nio/TcpNioServerSocketChannel.java | 20 +- .../transport/nio/TcpNioSocketChannel.java | 14 +- .../transport/nio/TcpReadHandler.java | 4 +- .../org/elasticsearch/NioIntegTestCase.java | 71 +++++ .../transport/nio/NioTransportIT.java | 132 +++++++++ .../nio/SimpleNioTransportTests.java | 7 - .../smoketest/ESSmokeClientTestCase.java | 6 +- .../elasticsearch/http/HttpSmokeTestCase.java | 6 +- settings.gradle | 1 + .../org/elasticsearch/test/ESTestCase.java | 6 +- .../test/ExternalTestCluster.java | 9 +- .../transport/MockTcpTransport.java | 19 +- .../transport/MockTransportClient.java | 8 +- .../transport/nio/MockNioTransport.java | 252 ++++++++++++++++++ .../transport/nio/MockNioTransportPlugin.java | 50 ++++ .../transport/nio/TcpFrameDecoder.java | 118 -------- .../transport/nio/TcpReadContext.java | 96 ------- .../nio/TestingSocketEventHandler.java | 2 +- .../nio/SimpleMockNioTransportTests.java | 137 ++++++++++ .../transport/nio/TcpFrameDecoderTests.java | 167 ------------ .../transport/nio/TcpReadContextTests.java | 158 ----------- 41 files changed, 1394 insertions(+), 742 deletions(-) create mode 100644 libs/elasticsearch-nio/src/main/java/org/elasticsearch/nio/BytesReadContext.java rename test/framework/src/main/java/org/elasticsearch/transport/nio/TcpWriteContext.java => libs/elasticsearch-nio/src/main/java/org/elasticsearch/nio/BytesWriteContext.java (73%) create mode 100644 libs/elasticsearch-nio/src/test/java/org/elasticsearch/nio/BytesReadContextTests.java rename test/framework/src/test/java/org/elasticsearch/transport/nio/TcpWriteContextTests.java => libs/elasticsearch-nio/src/test/java/org/elasticsearch/nio/BytesWriteContextTests.java (88%) create mode 100644 plugins/transport-nio/build.gradle create mode 100644 plugins/transport-nio/src/main/java/org/elasticsearch/transport/nio/NioNotEnabledBootstrapCheck.java rename {test/framework => plugins/transport-nio}/src/main/java/org/elasticsearch/transport/nio/NioTransport.java (79%) rename {test/framework => plugins/transport-nio}/src/main/java/org/elasticsearch/transport/nio/NioTransportPlugin.java (76%) rename {test/framework => plugins/transport-nio}/src/main/java/org/elasticsearch/transport/nio/TcpChannelFactory.java (85%) rename {test/framework => plugins/transport-nio}/src/main/java/org/elasticsearch/transport/nio/TcpNioServerSocketChannel.java (82%) rename {test/framework => plugins/transport-nio}/src/main/java/org/elasticsearch/transport/nio/TcpNioSocketChannel.java (83%) rename {test/framework => plugins/transport-nio}/src/main/java/org/elasticsearch/transport/nio/TcpReadHandler.java (89%) create mode 100644 plugins/transport-nio/src/test/java/org/elasticsearch/NioIntegTestCase.java create mode 100644 plugins/transport-nio/src/test/java/org/elasticsearch/transport/nio/NioTransportIT.java rename {test/framework => plugins/transport-nio}/src/test/java/org/elasticsearch/transport/nio/SimpleNioTransportTests.java (96%) create mode 100644 test/framework/src/main/java/org/elasticsearch/transport/nio/MockNioTransport.java create mode 100644 test/framework/src/main/java/org/elasticsearch/transport/nio/MockNioTransportPlugin.java delete mode 100644 test/framework/src/main/java/org/elasticsearch/transport/nio/TcpFrameDecoder.java delete mode 100644 test/framework/src/main/java/org/elasticsearch/transport/nio/TcpReadContext.java rename test/framework/src/{test => main}/java/org/elasticsearch/transport/nio/TestingSocketEventHandler.java (100%) create mode 100644 test/framework/src/test/java/org/elasticsearch/transport/nio/SimpleMockNioTransportTests.java delete mode 100644 test/framework/src/test/java/org/elasticsearch/transport/nio/TcpFrameDecoderTests.java delete mode 100644 test/framework/src/test/java/org/elasticsearch/transport/nio/TcpReadContextTests.java diff --git a/core/src/main/java/org/elasticsearch/common/bytes/BytesReference.java b/core/src/main/java/org/elasticsearch/common/bytes/BytesReference.java index 92632ad7874fd..d7f9de345a438 100644 --- a/core/src/main/java/org/elasticsearch/common/bytes/BytesReference.java +++ b/core/src/main/java/org/elasticsearch/common/bytes/BytesReference.java @@ -27,6 +27,8 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.nio.ByteBuffer; +import java.util.ArrayList; import java.util.function.ToIntBiFunction; /** @@ -148,6 +150,37 @@ public static byte[] toBytes(BytesReference reference) { return BytesRef.deepCopyOf(bytesRef).bytes; } + /** + * Returns an array of byte buffers from the given BytesReference. + */ + public static ByteBuffer[] toByteBuffers(BytesReference reference) { + BytesRefIterator byteRefIterator = reference.iterator(); + BytesRef r; + try { + ArrayList buffers = new ArrayList<>(); + while ((r = byteRefIterator.next()) != null) { + buffers.add(ByteBuffer.wrap(r.bytes, r.offset, r.length)); + } + return buffers.toArray(new ByteBuffer[buffers.size()]); + + } catch (IOException e) { + // this is really an error since we don't do IO in our bytesreferences + throw new AssertionError("won't happen", e); + } + } + + /** + * Returns BytesReference composed of the provided ByteBuffers. + */ + public static BytesReference fromByteBuffers(ByteBuffer[] buffers) { + ByteBufferReference[] references = new ByteBufferReference[buffers.length]; + for (int i = 0; i < references.length; ++i) { + references[i] = new ByteBufferReference(buffers[i]); + } + + return new CompositeBytesReference(references); + } + @Override public int compareTo(final BytesReference other) { return compareIterators(this, other, (a, b) -> a.compareTo(b)); diff --git a/core/src/main/java/org/elasticsearch/transport/TcpChannel.java b/core/src/main/java/org/elasticsearch/transport/TcpChannel.java index 22453ac43b4ea..42f1417d79b32 100644 --- a/core/src/main/java/org/elasticsearch/transport/TcpChannel.java +++ b/core/src/main/java/org/elasticsearch/transport/TcpChannel.java @@ -46,12 +46,17 @@ public interface TcpChannel extends Releasable { /** - * Closes the channel. This might be an asynchronous process. There is notguarantee that the channel + * Closes the channel. This might be an asynchronous process. There is no guarantee that the channel * will be closed when this method returns. Use the {@link #addCloseListener(ActionListener)} method * to implement logic that depends on knowing when the channel is closed. */ void close(); + /** + * This returns the profile for this channel. + */ + String getProfile(); + /** * Adds a listener that will be executed when the channel is closed. If the channel is still open when * this listener is added, the listener will be executed by the thread that eventually closes the @@ -86,6 +91,13 @@ public interface TcpChannel extends Releasable { */ InetSocketAddress getLocalAddress(); + /** + * Returns the remote address for this channel. Can be null if channel does not have a remote address. + * + * @return the remote address of this channel. + */ + InetSocketAddress getRemoteAddress(); + /** * Sends a tcp message to the channel. The listener will be executed once the send process has been * completed. diff --git a/core/src/main/java/org/elasticsearch/transport/TcpTransport.java b/core/src/main/java/org/elasticsearch/transport/TcpTransport.java index dd2346443a6cd..54bfcaa6027d7 100644 --- a/core/src/main/java/org/elasticsearch/transport/TcpTransport.java +++ b/core/src/main/java/org/elasticsearch/transport/TcpTransport.java @@ -184,8 +184,12 @@ public abstract class TcpTransport extends AbstractLifecycleComponent implements public static final Setting.AffixSetting PUBLISH_PORT_PROFILE = affixKeySetting("transport.profiles.", "publish_port", key -> intSetting(key, -1, -1, Setting.Property.NodeScope)); - private static final long NINETY_PER_HEAP_SIZE = (long) (JvmInfo.jvmInfo().getMem().getHeapMax().getBytes() * 0.9); + // This is the number of bytes necessary to read the message size + public static final int BYTES_NEEDED_FOR_MESSAGE_SIZE = TcpHeader.MARKER_BYTES_SIZE + TcpHeader.MESSAGE_LENGTH_SIZE; public static final int PING_DATA_SIZE = -1; + private static final long NINETY_PER_HEAP_SIZE = (long) (JvmInfo.jvmInfo().getMem().getHeapMax().getBytes() * 0.9); + private static final BytesReference EMPTY_BYTES_REFERENCE = new BytesArray(new byte[0]); + private final CircuitBreakerService circuitBreakerService; // package visibility for tests protected final ScheduledPing scheduledPing; @@ -317,8 +321,7 @@ public String executor() { public class ScheduledPing extends AbstractLifecycleRunnable { /** - * The magic number (must be lower than 0) for a ping message. This is handled - * specifically in {@link TcpTransport#validateMessageHeader}. + * The magic number (must be lower than 0) for a ping message. */ private final BytesReference pingHeader; final CounterMetric successfulPings = new CounterMetric(); @@ -1210,7 +1213,7 @@ private void sendResponse(Version nodeVersion, TcpChannel channel, final Transpo * @param length the payload length in bytes * @see TcpHeader */ - final BytesReference buildHeader(long requestId, byte status, Version protocolVersion, int length) throws IOException { + private BytesReference buildHeader(long requestId, byte status, Version protocolVersion, int length) throws IOException { try (BytesStreamOutput headerOutput = new BytesStreamOutput(TcpHeader.HEADER_SIZE)) { headerOutput.setVersion(protocolVersion); TcpHeader.writeHeader(headerOutput, requestId, status, protocolVersion, length); @@ -1247,76 +1250,135 @@ private BytesReference buildMessage(long requestId, byte status, Version nodeVer } /** - * Validates the first N bytes of the message header and returns false if the message is - * a ping message and has no payload ie. isn't a real user level message. + * Consumes bytes that are available from network reads. This method returns the number of bytes consumed + * in this call. * - * @throws IllegalStateException if the message is too short, less than the header or less that the header plus the message size - * @throws HttpOnTransportException if the message has no valid header and appears to be a HTTP message - * @throws IllegalArgumentException if the message is greater that the maximum allowed frame size. This is dependent on the available - * memory. + * @param channel the channel read from + * @param bytesReference the bytes available to consume + * @return the number of bytes consumed + * @throws StreamCorruptedException if the message header format is not recognized + * @throws TcpTransport.HttpOnTransportException if the message header appears to be a HTTP message + * @throws IllegalArgumentException if the message length is greater that the maximum allowed frame size. + * This is dependent on the available memory. */ - public static boolean validateMessageHeader(BytesReference buffer) throws IOException { - final int sizeHeaderLength = TcpHeader.MARKER_BYTES_SIZE + TcpHeader.MESSAGE_LENGTH_SIZE; - if (buffer.length() < sizeHeaderLength) { - throw new IllegalStateException("message size must be >= to the header size"); - } - int offset = 0; - if (buffer.get(offset) != 'E' || buffer.get(offset + 1) != 'S') { - // special handling for what is probably HTTP - if (bufferStartsWith(buffer, offset, "GET ") || - bufferStartsWith(buffer, offset, "POST ") || - bufferStartsWith(buffer, offset, "PUT ") || - bufferStartsWith(buffer, offset, "HEAD ") || - bufferStartsWith(buffer, offset, "DELETE ") || - bufferStartsWith(buffer, offset, "OPTIONS ") || - bufferStartsWith(buffer, offset, "PATCH ") || - bufferStartsWith(buffer, offset, "TRACE ")) { - - throw new HttpOnTransportException("This is not a HTTP port"); + public int consumeNetworkReads(TcpChannel channel, BytesReference bytesReference) throws IOException { + BytesReference message = decodeFrame(bytesReference); + + if (message == null) { + return 0; + } else if (message.length() == 0) { + // This is a ping and should not be handled. + return BYTES_NEEDED_FOR_MESSAGE_SIZE; + } else { + try { + messageReceived(message, channel); + } catch (Exception e) { + onException(channel, e); } + return message.length() + BYTES_NEEDED_FOR_MESSAGE_SIZE; + } + } - // we have 6 readable bytes, show 4 (should be enough) - throw new StreamCorruptedException("invalid internal transport message format, got (" - + Integer.toHexString(buffer.get(offset) & 0xFF) + "," - + Integer.toHexString(buffer.get(offset + 1) & 0xFF) + "," - + Integer.toHexString(buffer.get(offset + 2) & 0xFF) + "," - + Integer.toHexString(buffer.get(offset + 3) & 0xFF) + ")"); + /** + * Attempts to a decode a message from the provided bytes. If a full message is not available, null is + * returned. If the message is a ping, an empty {@link BytesReference} will be returned. + * + * @param networkBytes the will be read + * @return the message decoded + * @throws StreamCorruptedException if the message header format is not recognized + * @throws TcpTransport.HttpOnTransportException if the message header appears to be a HTTP message + * @throws IllegalArgumentException if the message length is greater that the maximum allowed frame size. + * This is dependent on the available memory. + */ + public static BytesReference decodeFrame(BytesReference networkBytes) throws IOException { + int messageLength = readMessageLength(networkBytes); + if (messageLength == -1) { + return null; + } else { + int totalLength = messageLength + BYTES_NEEDED_FOR_MESSAGE_SIZE; + if (totalLength > networkBytes.length()) { + return null; + } else if (totalLength == 6) { + return EMPTY_BYTES_REFERENCE; + } else { + return networkBytes.slice(BYTES_NEEDED_FOR_MESSAGE_SIZE, messageLength); + } } + } - final int dataLen; - try (StreamInput input = buffer.streamInput()) { - input.skip(TcpHeader.MARKER_BYTES_SIZE); - dataLen = input.readInt(); - if (dataLen == PING_DATA_SIZE) { - // discard the messages we read and continue, this is achieved by skipping the bytes - // and returning null - return false; + /** + * Validates the first 6 bytes of the message header and returns the length of the message. If 6 bytes + * are not available, it returns -1. + * + * @param networkBytes the will be read + * @return the length of the message + * @throws StreamCorruptedException if the message header format is not recognized + * @throws TcpTransport.HttpOnTransportException if the message header appears to be a HTTP message + * @throws IllegalArgumentException if the message length is greater that the maximum allowed frame size. + * This is dependent on the available memory. + */ + public static int readMessageLength(BytesReference networkBytes) throws IOException { + if (networkBytes.length() < BYTES_NEEDED_FOR_MESSAGE_SIZE) { + return -1; + } else { + return readHeaderBuffer(networkBytes); + } + } + + private static int readHeaderBuffer(BytesReference headerBuffer) throws IOException { + if (headerBuffer.get(0) != 'E' || headerBuffer.get(1) != 'S') { + if (appearsToBeHTTP(headerBuffer)) { + throw new TcpTransport.HttpOnTransportException("This is not a HTTP port"); } + + throw new StreamCorruptedException("invalid internal transport message format, got (" + + Integer.toHexString(headerBuffer.get(0) & 0xFF) + "," + + Integer.toHexString(headerBuffer.get(1) & 0xFF) + "," + + Integer.toHexString(headerBuffer.get(2) & 0xFF) + "," + + Integer.toHexString(headerBuffer.get(3) & 0xFF) + ")"); + } + final int messageLength; + try (StreamInput input = headerBuffer.streamInput()) { + input.skip(TcpHeader.MARKER_BYTES_SIZE); + messageLength = input.readInt(); } - if (dataLen <= 0) { - throw new StreamCorruptedException("invalid data length: " + dataLen); + if (messageLength == TcpTransport.PING_DATA_SIZE) { + // This is a ping + return 0; } - // safety against too large frames being sent - if (dataLen > NINETY_PER_HEAP_SIZE) { - throw new IllegalArgumentException("transport content length received [" + new ByteSizeValue(dataLen) + "] exceeded [" - + new ByteSizeValue(NINETY_PER_HEAP_SIZE) + "]"); + + if (messageLength <= 0) { + throw new StreamCorruptedException("invalid data length: " + messageLength); } - if (buffer.length() < dataLen + sizeHeaderLength) { - throw new IllegalStateException("buffer must be >= to the message size but wasn't"); + if (messageLength > NINETY_PER_HEAP_SIZE) { + throw new IllegalArgumentException("transport content length received [" + new ByteSizeValue(messageLength) + "] exceeded [" + + new ByteSizeValue(NINETY_PER_HEAP_SIZE) + "]"); } - return true; + + return messageLength; + } + + private static boolean appearsToBeHTTP(BytesReference headerBuffer) { + return bufferStartsWith(headerBuffer, "GET") || + bufferStartsWith(headerBuffer, "POST") || + bufferStartsWith(headerBuffer, "PUT") || + bufferStartsWith(headerBuffer, "HEAD") || + bufferStartsWith(headerBuffer, "DELETE") || + // Actually 'OPTIONS'. But we are only guaranteed to have read six bytes at this point. + bufferStartsWith(headerBuffer, "OPTION") || + bufferStartsWith(headerBuffer, "PATCH") || + bufferStartsWith(headerBuffer, "TRACE"); } - private static boolean bufferStartsWith(BytesReference buffer, int offset, String method) { + private static boolean bufferStartsWith(BytesReference buffer, String method) { char[] chars = method.toCharArray(); for (int i = 0; i < chars.length; i++) { - if (buffer.get(offset + i) != chars[i]) { + if (buffer.get(i) != chars[i]) { return false; } } - return true; } @@ -1343,8 +1405,10 @@ public HttpOnTransportException(StreamInput in) throws IOException { /** * This method handles the message receive part for both request and responses */ - public final void messageReceived(BytesReference reference, TcpChannel channel, String profileName, - InetSocketAddress remoteAddress, int messageLengthBytes) throws IOException { + public final void messageReceived(BytesReference reference, TcpChannel channel) throws IOException { + String profileName = channel.getProfile(); + InetSocketAddress remoteAddress = channel.getRemoteAddress(); + int messageLengthBytes = reference.length(); final int totalMessageSize = messageLengthBytes + TcpHeader.MARKER_BYTES_SIZE + TcpHeader.MESSAGE_LENGTH_SIZE; readBytesMetric.inc(totalMessageSize); // we have additional bytes to read, outside of the header diff --git a/core/src/test/java/org/elasticsearch/transport/TcpTransportTests.java b/core/src/test/java/org/elasticsearch/transport/TcpTransportTests.java index 059f82e36037c..f63cd1c7a3e93 100644 --- a/core/src/test/java/org/elasticsearch/transport/TcpTransportTests.java +++ b/core/src/test/java/org/elasticsearch/transport/TcpTransportTests.java @@ -22,8 +22,10 @@ import org.elasticsearch.Version; import org.elasticsearch.action.ActionListener; import org.elasticsearch.cluster.node.DiscoveryNode; +import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.compress.CompressorFactory; +import org.elasticsearch.common.io.stream.BytesStreamOutput; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.settings.Settings; @@ -37,12 +39,17 @@ import org.elasticsearch.threadpool.ThreadPool; import java.io.IOException; +import java.io.StreamCorruptedException; import java.net.InetSocketAddress; +import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.core.IsInstanceOf.instanceOf; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyZeroInteractions; /** Unit tests for {@link TcpTransport} */ public class TcpTransportTests extends ESTestCase { @@ -246,6 +253,11 @@ private static final class FakeChannel implements TcpChannel { public void close() { } + @Override + public String getProfile() { + return null; + } + @Override public void addCloseListener(ActionListener listener) { } @@ -264,6 +276,11 @@ public InetSocketAddress getLocalAddress() { return null; } + @Override + public InetSocketAddress getRemoteAddress() { + return null; + } + @Override public void sendMessage(BytesReference reference, ActionListener listener) { messageCaptor.set(reference); @@ -354,4 +371,126 @@ public void testDefaultConnectionProfile() { assertEquals(3, profile.getNumConnectionsPerType(TransportRequestOptions.Type.BULK)); } + public void testDecodeWithIncompleteHeader() throws IOException { + BytesStreamOutput streamOutput = new BytesStreamOutput(1 << 14); + streamOutput.write('E'); + streamOutput.write('S'); + streamOutput.write(1); + streamOutput.write(1); + + assertNull(TcpTransport.decodeFrame(streamOutput.bytes())); + } + + public void testDecodePing() throws IOException { + BytesStreamOutput streamOutput = new BytesStreamOutput(1 << 14); + streamOutput.write('E'); + streamOutput.write('S'); + streamOutput.writeInt(-1); + + BytesReference message = TcpTransport.decodeFrame(streamOutput.bytes()); + + assertEquals(0, message.length()); + } + + public void testDecodePingWithStartOfSecondMessage() throws IOException { + BytesStreamOutput streamOutput = new BytesStreamOutput(1 << 14); + streamOutput.write('E'); + streamOutput.write('S'); + streamOutput.writeInt(-1); + streamOutput.write('E'); + streamOutput.write('S'); + + BytesReference message = TcpTransport.decodeFrame(streamOutput.bytes()); + + assertEquals(0, message.length()); + } + + public void testDecodeMessage() throws IOException { + BytesStreamOutput streamOutput = new BytesStreamOutput(1 << 14); + streamOutput.write('E'); + streamOutput.write('S'); + streamOutput.writeInt(2); + streamOutput.write('M'); + streamOutput.write('A'); + + BytesReference message = TcpTransport.decodeFrame(streamOutput.bytes()); + + assertEquals(streamOutput.bytes().slice(6, 2), message); + } + + public void testDecodeIncompleteMessage() throws IOException { + BytesStreamOutput streamOutput = new BytesStreamOutput(1 << 14); + streamOutput.write('E'); + streamOutput.write('S'); + streamOutput.writeInt(3); + streamOutput.write('M'); + streamOutput.write('A'); + + BytesReference message = TcpTransport.decodeFrame(streamOutput.bytes()); + + assertNull(message); + } + + public void testInvalidLength() throws IOException { + BytesStreamOutput streamOutput = new BytesStreamOutput(1 << 14); + streamOutput.write('E'); + streamOutput.write('S'); + streamOutput.writeInt(-2); + streamOutput.write('M'); + streamOutput.write('A'); + + try { + TcpTransport.decodeFrame(streamOutput.bytes()); + fail("Expected exception"); + } catch (Exception ex) { + assertThat(ex, instanceOf(StreamCorruptedException.class)); + assertEquals("invalid data length: -2", ex.getMessage()); + } + } + + public void testInvalidHeader() throws IOException { + BytesStreamOutput streamOutput = new BytesStreamOutput(1 << 14); + streamOutput.write('E'); + streamOutput.write('C'); + byte byte1 = randomByte(); + byte byte2 = randomByte(); + streamOutput.write(byte1); + streamOutput.write(byte2); + streamOutput.write(randomByte()); + streamOutput.write(randomByte()); + streamOutput.write(randomByte()); + + try { + TcpTransport.decodeFrame(streamOutput.bytes()); + fail("Expected exception"); + } catch (Exception ex) { + assertThat(ex, instanceOf(StreamCorruptedException.class)); + String expected = "invalid internal transport message format, got (45,43," + + Integer.toHexString(byte1 & 0xFF) + "," + + Integer.toHexString(byte2 & 0xFF) + ")"; + assertEquals(expected, ex.getMessage()); + } + } + + public void testHTTPHeader() throws IOException { + String[] httpHeaders = {"GET", "POST", "PUT", "HEAD", "DELETE", "OPTIONS", "PATCH", "TRACE"}; + + for (String httpHeader : httpHeaders) { + BytesStreamOutput streamOutput = new BytesStreamOutput(1 << 14); + + for (char c : httpHeader.toCharArray()) { + streamOutput.write((byte) c); + } + streamOutput.write(new byte[6]); + + try { + BytesReference bytes = streamOutput.bytes(); + TcpTransport.decodeFrame(bytes); + fail("Expected exception"); + } catch (Exception ex) { + assertThat(ex, instanceOf(TcpTransport.HttpOnTransportException.class)); + assertEquals("This is not a HTTP port", ex.getMessage()); + } + } + } } diff --git a/libs/elasticsearch-nio/src/main/java/org/elasticsearch/nio/BytesReadContext.java b/libs/elasticsearch-nio/src/main/java/org/elasticsearch/nio/BytesReadContext.java new file mode 100644 index 0000000000000..eeda147be6c70 --- /dev/null +++ b/libs/elasticsearch-nio/src/main/java/org/elasticsearch/nio/BytesReadContext.java @@ -0,0 +1,64 @@ +/* + * Licensed to Elasticsearch under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch licenses this file to you 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. + */ + +package org.elasticsearch.nio; + +import java.io.IOException; + +public class BytesReadContext implements ReadContext { + + private final NioSocketChannel channel; + private final ReadConsumer readConsumer; + private final InboundChannelBuffer channelBuffer; + + public BytesReadContext(NioSocketChannel channel, ReadConsumer readConsumer, InboundChannelBuffer channelBuffer) { + this.channel = channel; + this.channelBuffer = channelBuffer; + this.readConsumer = readConsumer; + } + + @Override + public int read() throws IOException { + if (channelBuffer.getRemaining() == 0) { + // Requiring one additional byte will ensure that a new page is allocated. + channelBuffer.ensureCapacity(channelBuffer.getCapacity() + 1); + } + + int bytesRead = channel.read(channelBuffer.sliceBuffersFrom(channelBuffer.getIndex())); + + if (bytesRead == -1) { + return bytesRead; + } + + channelBuffer.incrementIndex(bytesRead); + + int bytesConsumed = Integer.MAX_VALUE; + while (bytesConsumed > 0) { + bytesConsumed = readConsumer.consumeReads(channelBuffer); + channelBuffer.release(bytesConsumed); + } + + return bytesRead; + } + + @Override + public void close() { + channelBuffer.close(); + } +} diff --git a/test/framework/src/main/java/org/elasticsearch/transport/nio/TcpWriteContext.java b/libs/elasticsearch-nio/src/main/java/org/elasticsearch/nio/BytesWriteContext.java similarity index 73% rename from test/framework/src/main/java/org/elasticsearch/transport/nio/TcpWriteContext.java rename to libs/elasticsearch-nio/src/main/java/org/elasticsearch/nio/BytesWriteContext.java index 4d59c445bc895..c2816deef5343 100644 --- a/test/framework/src/main/java/org/elasticsearch/transport/nio/TcpWriteContext.java +++ b/libs/elasticsearch-nio/src/main/java/org/elasticsearch/nio/BytesWriteContext.java @@ -17,41 +17,32 @@ * under the License. */ -package org.elasticsearch.transport.nio; - -import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.BytesRefIterator; -import org.elasticsearch.common.bytes.BytesReference; -import org.elasticsearch.nio.NioSocketChannel; -import org.elasticsearch.nio.SocketSelector; -import org.elasticsearch.nio.WriteContext; -import org.elasticsearch.nio.WriteOperation; +package org.elasticsearch.nio; import java.io.IOException; import java.nio.ByteBuffer; import java.nio.channels.ClosedChannelException; -import java.util.ArrayList; import java.util.LinkedList; import java.util.function.BiConsumer; -public class TcpWriteContext implements WriteContext { +public class BytesWriteContext implements WriteContext { private final NioSocketChannel channel; private final LinkedList queued = new LinkedList<>(); - public TcpWriteContext(NioSocketChannel channel) { + public BytesWriteContext(NioSocketChannel channel) { this.channel = channel; } @Override public void sendMessage(Object message, BiConsumer listener) { - BytesReference reference = (BytesReference) message; + ByteBuffer[] buffers = (ByteBuffer[]) message; if (channel.isWritable() == false) { listener.accept(null, new ClosedChannelException()); return; } - WriteOperation writeOperation = new WriteOperation(channel, toByteBuffers(reference), listener); + WriteOperation writeOperation = new WriteOperation(channel, buffers, listener); SocketSelector selector = channel.getSelector(); if (selector.isOnCurrentThread() == false) { selector.queueWrite(writeOperation); @@ -117,21 +108,4 @@ private void multiFlush() throws IOException { lastOpCompleted = op.isFullyFlushed(); } } - - private static ByteBuffer[] toByteBuffers(BytesReference bytesReference) { - BytesRefIterator byteRefIterator = bytesReference.iterator(); - BytesRef r; - try { - // Most network messages are composed of three buffers. - ArrayList buffers = new ArrayList<>(3); - while ((r = byteRefIterator.next()) != null) { - buffers.add(ByteBuffer.wrap(r.bytes, r.offset, r.length)); - } - return buffers.toArray(new ByteBuffer[buffers.size()]); - - } catch (IOException e) { - // this is really an error since we don't do IO in our bytesreferences - throw new AssertionError("won't happen", e); - } - } } diff --git a/libs/elasticsearch-nio/src/main/java/org/elasticsearch/nio/NioSocketChannel.java b/libs/elasticsearch-nio/src/main/java/org/elasticsearch/nio/NioSocketChannel.java index a6d6c6412ed72..5260c0f5fcf16 100644 --- a/libs/elasticsearch-nio/src/main/java/org/elasticsearch/nio/NioSocketChannel.java +++ b/libs/elasticsearch-nio/src/main/java/org/elasticsearch/nio/NioSocketChannel.java @@ -70,6 +70,18 @@ public int write(ByteBuffer[] buffers) throws IOException { } } + public int read(ByteBuffer buffer) throws IOException { + return socketChannel.read(buffer); + } + + public int read(ByteBuffer[] buffers) throws IOException { + if (buffers.length == 1) { + return socketChannel.read(buffers[0]); + } else { + return (int) socketChannel.read(buffers); + } + } + public int read(InboundChannelBuffer buffer) throws IOException { int bytesRead = (int) socketChannel.read(buffer.sliceBuffersFrom(buffer.getIndex())); diff --git a/libs/elasticsearch-nio/src/main/java/org/elasticsearch/nio/ReadContext.java b/libs/elasticsearch-nio/src/main/java/org/elasticsearch/nio/ReadContext.java index cc9d2c8c43d69..d23ce56f57ad1 100644 --- a/libs/elasticsearch-nio/src/main/java/org/elasticsearch/nio/ReadContext.java +++ b/libs/elasticsearch-nio/src/main/java/org/elasticsearch/nio/ReadContext.java @@ -28,4 +28,8 @@ public interface ReadContext extends AutoCloseable { @Override void close(); + @FunctionalInterface + interface ReadConsumer { + int consumeReads(InboundChannelBuffer channelBuffer) throws IOException; + } } diff --git a/libs/elasticsearch-nio/src/test/java/org/elasticsearch/nio/BytesReadContextTests.java b/libs/elasticsearch-nio/src/test/java/org/elasticsearch/nio/BytesReadContextTests.java new file mode 100644 index 0000000000000..69f187378aca5 --- /dev/null +++ b/libs/elasticsearch-nio/src/test/java/org/elasticsearch/nio/BytesReadContextTests.java @@ -0,0 +1,142 @@ +/* + * Licensed to Elasticsearch under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch licenses this file to you 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. + */ + +package org.elasticsearch.nio; + +import org.elasticsearch.common.util.BigArrays; +import org.elasticsearch.test.ESTestCase; +import org.junit.Before; + +import java.io.IOException; +import java.nio.ByteBuffer; +import java.util.function.Supplier; + +import static org.mockito.Matchers.any; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +public class BytesReadContextTests extends ESTestCase { + + private ReadContext.ReadConsumer readConsumer; + private NioSocketChannel channel; + private BytesReadContext readContext; + private InboundChannelBuffer channelBuffer; + private int messageLength; + + @Before + public void init() { + readConsumer = mock(ReadContext.ReadConsumer.class); + + messageLength = randomInt(96) + 20; + channel = mock(NioSocketChannel.class); + Supplier pageSupplier = () -> + new InboundChannelBuffer.Page(ByteBuffer.allocate(BigArrays.BYTE_PAGE_SIZE), () -> {}); + channelBuffer = new InboundChannelBuffer(pageSupplier); + readContext = new BytesReadContext(channel, readConsumer, channelBuffer); + } + + public void testSuccessfulRead() throws IOException { + byte[] bytes = createMessage(messageLength); + + when(channel.read(any(ByteBuffer[].class))).thenAnswer(invocationOnMock -> { + ByteBuffer[] buffers = (ByteBuffer[]) invocationOnMock.getArguments()[0]; + buffers[0].put(bytes); + return bytes.length; + }); + + when(readConsumer.consumeReads(channelBuffer)).thenReturn(messageLength, 0); + + assertEquals(messageLength, readContext.read()); + + assertEquals(0, channelBuffer.getIndex()); + assertEquals(BigArrays.BYTE_PAGE_SIZE - bytes.length, channelBuffer.getCapacity()); + verify(readConsumer, times(2)).consumeReads(channelBuffer); + } + + public void testMultipleReadsConsumed() throws IOException { + byte[] bytes = createMessage(messageLength * 2); + + when(channel.read(any(ByteBuffer[].class))).thenAnswer(invocationOnMock -> { + ByteBuffer[] buffers = (ByteBuffer[]) invocationOnMock.getArguments()[0]; + buffers[0].put(bytes); + return bytes.length; + }); + + when(readConsumer.consumeReads(channelBuffer)).thenReturn(messageLength, messageLength, 0); + + assertEquals(bytes.length, readContext.read()); + + assertEquals(0, channelBuffer.getIndex()); + assertEquals(BigArrays.BYTE_PAGE_SIZE - bytes.length, channelBuffer.getCapacity()); + verify(readConsumer, times(3)).consumeReads(channelBuffer); + } + + public void testPartialRead() throws IOException { + byte[] bytes = createMessage(messageLength); + + when(channel.read(any(ByteBuffer[].class))).thenAnswer(invocationOnMock -> { + ByteBuffer[] buffers = (ByteBuffer[]) invocationOnMock.getArguments()[0]; + buffers[0].put(bytes); + return bytes.length; + }); + + + when(readConsumer.consumeReads(channelBuffer)).thenReturn(0, messageLength); + + assertEquals(messageLength, readContext.read()); + + assertEquals(bytes.length, channelBuffer.getIndex()); + verify(readConsumer, times(1)).consumeReads(channelBuffer); + + when(readConsumer.consumeReads(channelBuffer)).thenReturn(messageLength * 2, 0); + + assertEquals(messageLength, readContext.read()); + + assertEquals(0, channelBuffer.getIndex()); + assertEquals(BigArrays.BYTE_PAGE_SIZE - (bytes.length * 2), channelBuffer.getCapacity()); + verify(readConsumer, times(3)).consumeReads(channelBuffer); + } + + public void testReadThrowsIOException() throws IOException { + IOException ioException = new IOException(); + when(channel.read(any(ByteBuffer[].class))).thenThrow(ioException); + + IOException ex = expectThrows(IOException.class, () -> readContext.read()); + assertSame(ioException, ex); + } + + public void closeClosesChannelBuffer() { + InboundChannelBuffer buffer = mock(InboundChannelBuffer.class); + BytesReadContext readContext = new BytesReadContext(channel, readConsumer, buffer); + + readContext.close(); + + verify(buffer).close(); + } + + private static byte[] createMessage(int length) { + byte[] bytes = new byte[length]; + for (int i = 0; i < length; ++i) { + bytes[i] = randomByte(); + } + return bytes; + } +} diff --git a/test/framework/src/test/java/org/elasticsearch/transport/nio/TcpWriteContextTests.java b/libs/elasticsearch-nio/src/test/java/org/elasticsearch/nio/BytesWriteContextTests.java similarity index 88% rename from test/framework/src/test/java/org/elasticsearch/transport/nio/TcpWriteContextTests.java rename to libs/elasticsearch-nio/src/test/java/org/elasticsearch/nio/BytesWriteContextTests.java index 158078e707dc2..9d5b1c92cb6b7 100644 --- a/test/framework/src/test/java/org/elasticsearch/transport/nio/TcpWriteContextTests.java +++ b/libs/elasticsearch-nio/src/test/java/org/elasticsearch/nio/BytesWriteContextTests.java @@ -17,12 +17,8 @@ * under the License. */ -package org.elasticsearch.transport.nio; +package org.elasticsearch.nio; -import org.elasticsearch.common.bytes.BytesArray; -import org.elasticsearch.nio.NioSocketChannel; -import org.elasticsearch.nio.SocketSelector; -import org.elasticsearch.nio.WriteOperation; import org.elasticsearch.test.ESTestCase; import org.junit.Before; import org.mockito.ArgumentCaptor; @@ -39,11 +35,11 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -public class TcpWriteContextTests extends ESTestCase { +public class BytesWriteContextTests extends ESTestCase { private SocketSelector selector; private BiConsumer listener; - private TcpWriteContext writeContext; + private BytesWriteContext writeContext; private NioSocketChannel channel; @Before @@ -53,7 +49,7 @@ public void setUp() throws Exception { selector = mock(SocketSelector.class); listener = mock(BiConsumer.class); channel = mock(NioSocketChannel.class); - writeContext = new TcpWriteContext(channel); + writeContext = new BytesWriteContext(channel); when(channel.getSelector()).thenReturn(selector); when(selector.isOnCurrentThread()).thenReturn(true); @@ -62,44 +58,43 @@ public void setUp() throws Exception { public void testWriteFailsIfChannelNotWritable() throws Exception { when(channel.isWritable()).thenReturn(false); - writeContext.sendMessage(new BytesArray(generateBytes(10)), listener); + ByteBuffer[] buffers = {ByteBuffer.wrap(generateBytes(10))}; + writeContext.sendMessage(buffers, listener); verify(listener).accept(isNull(Void.class), any(ClosedChannelException.class)); } public void testSendMessageFromDifferentThreadIsQueuedWithSelector() throws Exception { - byte[] bytes = generateBytes(10); - BytesArray bytesArray = new BytesArray(bytes); ArgumentCaptor writeOpCaptor = ArgumentCaptor.forClass(WriteOperation.class); when(selector.isOnCurrentThread()).thenReturn(false); when(channel.isWritable()).thenReturn(true); - writeContext.sendMessage(bytesArray, listener); + ByteBuffer[] buffers = {ByteBuffer.wrap(generateBytes(10))}; + writeContext.sendMessage(buffers, listener); verify(selector).queueWrite(writeOpCaptor.capture()); WriteOperation writeOp = writeOpCaptor.getValue(); assertSame(listener, writeOp.getListener()); assertSame(channel, writeOp.getChannel()); - assertEquals(ByteBuffer.wrap(bytes), writeOp.getByteBuffers()[0]); + assertEquals(buffers[0], writeOp.getByteBuffers()[0]); } public void testSendMessageFromSameThreadIsQueuedInChannel() throws Exception { - byte[] bytes = generateBytes(10); - BytesArray bytesArray = new BytesArray(bytes); ArgumentCaptor writeOpCaptor = ArgumentCaptor.forClass(WriteOperation.class); when(channel.isWritable()).thenReturn(true); - writeContext.sendMessage(bytesArray, listener); + ByteBuffer[] buffers = {ByteBuffer.wrap(generateBytes(10))}; + writeContext.sendMessage(buffers, listener); verify(selector).queueWriteInChannelBuffer(writeOpCaptor.capture()); WriteOperation writeOp = writeOpCaptor.getValue(); assertSame(listener, writeOp.getListener()); assertSame(channel, writeOp.getChannel()); - assertEquals(ByteBuffer.wrap(bytes), writeOp.getByteBuffers()[0]); + assertEquals(buffers[0], writeOp.getByteBuffers()[0]); } public void testWriteIsQueuedInChannel() throws Exception { @@ -163,7 +158,7 @@ public void testPartialFlush() throws IOException { public void testMultipleWritesPartialFlushes() throws IOException { assertFalse(writeContext.hasQueuedWriteOps()); - BiConsumer listener2 = mock(BiConsumer.class); + BiConsumer listener2 = mock(BiConsumer.class); WriteOperation writeOperation1 = mock(WriteOperation.class); WriteOperation writeOperation2 = mock(WriteOperation.class); when(writeOperation1.getListener()).thenReturn(listener); diff --git a/libs/elasticsearch-nio/src/test/java/org/elasticsearch/nio/SocketEventHandlerTests.java b/libs/elasticsearch-nio/src/test/java/org/elasticsearch/nio/SocketEventHandlerTests.java index ff3d28727973d..2898cf18d5b9d 100644 --- a/libs/elasticsearch-nio/src/test/java/org/elasticsearch/nio/SocketEventHandlerTests.java +++ b/libs/elasticsearch-nio/src/test/java/org/elasticsearch/nio/SocketEventHandlerTests.java @@ -20,7 +20,6 @@ package org.elasticsearch.nio; import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.transport.nio.TcpWriteContext; import org.junit.Before; import java.io.IOException; @@ -54,7 +53,7 @@ public void setUpHandler() throws IOException { readContext = mock(ReadContext.class); when(rawChannel.finishConnect()).thenReturn(true); - channel.setContexts(readContext, new TcpWriteContext(channel), exceptionHandler); + channel.setContexts(readContext, new BytesWriteContext(channel), exceptionHandler); channel.register(); channel.finishConnect(); diff --git a/modules/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/Netty4MessageChannelHandler.java b/modules/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/Netty4MessageChannelHandler.java index 9e59ba0908d0b..3a72bbbd8a20c 100644 --- a/modules/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/Netty4MessageChannelHandler.java +++ b/modules/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/Netty4MessageChannelHandler.java @@ -56,12 +56,11 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception final int expectedReaderIndex = buffer.readerIndex() + remainingMessageSize; try { Channel channel = ctx.channel(); - InetSocketAddress remoteAddress = (InetSocketAddress) channel.remoteAddress(); // netty always copies a buffer, either in NioWorker in its read handler, where it copies to a fresh // buffer, or in the cumulative buffer, which is cleaned each time so it could be bigger than the actual size BytesReference reference = Netty4Utils.toBytesReference(buffer, remainingMessageSize); Attribute channelAttribute = channel.attr(Netty4Transport.CHANNEL_KEY); - transport.messageReceived(reference, channelAttribute.get(), profileName, remoteAddress, remainingMessageSize); + transport.messageReceived(reference, channelAttribute.get()); } finally { // Set the expected position of the buffer, no matter what happened buffer.readerIndex(expectedReaderIndex); diff --git a/modules/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/Netty4SizeHeaderFrameDecoder.java b/modules/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/Netty4SizeHeaderFrameDecoder.java index 144c036f08a4c..500b9b65dc35a 100644 --- a/modules/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/Netty4SizeHeaderFrameDecoder.java +++ b/modules/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/Netty4SizeHeaderFrameDecoder.java @@ -23,6 +23,7 @@ import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.ByteToMessageDecoder; import io.netty.handler.codec.TooLongFrameException; +import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.transport.TcpHeader; import org.elasticsearch.transport.TcpTransport; @@ -30,20 +31,25 @@ final class Netty4SizeHeaderFrameDecoder extends ByteToMessageDecoder { + private static final int HEADER_SIZE = TcpHeader.MARKER_BYTES_SIZE + TcpHeader.MESSAGE_LENGTH_SIZE; + @Override protected void decode(ChannelHandlerContext ctx, ByteBuf in, List out) throws Exception { try { - boolean continueProcessing = TcpTransport.validateMessageHeader(Netty4Utils.toBytesReference(in)); - final ByteBuf message = in.skipBytes(TcpHeader.MARKER_BYTES_SIZE + TcpHeader.MESSAGE_LENGTH_SIZE); - if (!continueProcessing) return; - out.add(message); + BytesReference networkBytes = Netty4Utils.toBytesReference(in); + int messageLength = TcpTransport.readMessageLength(networkBytes) + HEADER_SIZE; + // If the message length is -1, we have not read a complete header. If the message length is + // greater than the network bytes available, we have not read a complete frame. + if (messageLength != -1 && messageLength <= networkBytes.length()) { + final ByteBuf message = in.skipBytes(HEADER_SIZE); + // 6 bytes would mean it is a ping. And we should ignore. + if (messageLength != 6) { + out.add(message); + } + } + } catch (IllegalArgumentException ex) { throw new TooLongFrameException(ex); - } catch (IllegalStateException ex) { - /* decode will be called until the ByteBuf is fully consumed; when it is fully - * consumed, transport#validateMessageHeader will throw an IllegalStateException which - * is okay, it means we have finished consuming the ByteBuf and we can get out - */ } } diff --git a/modules/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/Netty4Transport.java b/modules/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/Netty4Transport.java index 87a09ad8ee3a0..67b1607aa8a3a 100644 --- a/modules/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/Netty4Transport.java +++ b/modules/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/Netty4Transport.java @@ -249,7 +249,7 @@ protected NettyTcpChannel initiateChannel(DiscoveryNode node, TimeValue connectT } addClosedExceptionLogger(channel); - NettyTcpChannel nettyChannel = new NettyTcpChannel(channel); + NettyTcpChannel nettyChannel = new NettyTcpChannel(channel, "default"); channel.attr(CHANNEL_KEY).set(nettyChannel); channelFuture.addListener(f -> { @@ -272,7 +272,7 @@ protected NettyTcpChannel initiateChannel(DiscoveryNode node, TimeValue connectT @Override protected NettyTcpChannel bind(String name, InetSocketAddress address) { Channel channel = serverBootstraps.get(name).bind(address).syncUninterruptibly().channel(); - NettyTcpChannel esChannel = new NettyTcpChannel(channel); + NettyTcpChannel esChannel = new NettyTcpChannel(channel, name); channel.attr(CHANNEL_KEY).set(esChannel); return esChannel; } @@ -335,7 +335,7 @@ protected ServerChannelInitializer(String name) { @Override protected void initChannel(Channel ch) throws Exception { addClosedExceptionLogger(ch); - NettyTcpChannel nettyTcpChannel = new NettyTcpChannel(ch); + NettyTcpChannel nettyTcpChannel = new NettyTcpChannel(ch, name); ch.attr(CHANNEL_KEY).set(nettyTcpChannel); serverAcceptedChannel(nettyTcpChannel); ch.pipeline().addLast("logging", new ESLoggingHandler()); diff --git a/modules/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/NettyTcpChannel.java b/modules/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/NettyTcpChannel.java index 17c18f15ae15c..602835b5ca29e 100644 --- a/modules/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/NettyTcpChannel.java +++ b/modules/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/NettyTcpChannel.java @@ -38,10 +38,12 @@ public class NettyTcpChannel implements TcpChannel { private final Channel channel; + private final String profile; private final CompletableFuture closeContext = new CompletableFuture<>(); - NettyTcpChannel(Channel channel) { + NettyTcpChannel(Channel channel, String profile) { this.channel = channel; + this.profile = profile; this.channel.closeFuture().addListener(f -> { if (f.isSuccess()) { closeContext.complete(null); @@ -62,6 +64,11 @@ public void close() { channel.close(); } + @Override + public String getProfile() { + return profile; + } + @Override public void addCloseListener(ActionListener listener) { closeContext.whenComplete(ActionListener.toBiConsumer(listener)); @@ -82,6 +89,11 @@ public InetSocketAddress getLocalAddress() { return (InetSocketAddress) channel.localAddress(); } + @Override + public InetSocketAddress getRemoteAddress() { + return (InetSocketAddress) channel.remoteAddress(); + } + @Override public void sendMessage(BytesReference reference, ActionListener listener) { ChannelPromise writePromise = channel.newPromise(); diff --git a/plugins/transport-nio/build.gradle b/plugins/transport-nio/build.gradle new file mode 100644 index 0000000000000..60fef4b34241d --- /dev/null +++ b/plugins/transport-nio/build.gradle @@ -0,0 +1,32 @@ +/* + * Licensed to Elasticsearch under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch licenses this file to you 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. + */ + +esplugin { + description 'The nio transport.' + classname 'org.elasticsearch.transport.nio.NioTransportPlugin' +} + +dependencyLicenses.enabled = false + +compileJava.options.compilerArgs << "-Xlint:-try" +compileTestJava.options.compilerArgs << "-Xlint:-rawtypes,-unchecked" + +dependencies { + compile "org.elasticsearch:elasticsearch-nio:${version}" +} \ No newline at end of file diff --git a/plugins/transport-nio/src/main/java/org/elasticsearch/transport/nio/NioNotEnabledBootstrapCheck.java b/plugins/transport-nio/src/main/java/org/elasticsearch/transport/nio/NioNotEnabledBootstrapCheck.java new file mode 100644 index 0000000000000..e998f96da5ca1 --- /dev/null +++ b/plugins/transport-nio/src/main/java/org/elasticsearch/transport/nio/NioNotEnabledBootstrapCheck.java @@ -0,0 +1,32 @@ +/* + * Licensed to Elasticsearch under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch licenses this file to you 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. + */ + +package org.elasticsearch.transport.nio; + +import org.elasticsearch.bootstrap.BootstrapCheck; +import org.elasticsearch.bootstrap.BootstrapContext; + +public class NioNotEnabledBootstrapCheck implements BootstrapCheck { + + @Override + public BootstrapCheckResult check(BootstrapContext context) { + return BootstrapCheckResult.failure("The transport-nio plugin is experimental and not ready for production usage. It should " + + "not be enabled in production."); + } +} diff --git a/test/framework/src/main/java/org/elasticsearch/transport/nio/NioTransport.java b/plugins/transport-nio/src/main/java/org/elasticsearch/transport/nio/NioTransport.java similarity index 79% rename from test/framework/src/main/java/org/elasticsearch/transport/nio/NioTransport.java rename to plugins/transport-nio/src/main/java/org/elasticsearch/transport/nio/NioTransport.java index c716da897a883..d44a606e3c916 100644 --- a/test/framework/src/main/java/org/elasticsearch/transport/nio/NioTransport.java +++ b/plugins/transport-nio/src/main/java/org/elasticsearch/transport/nio/NioTransport.java @@ -19,10 +19,10 @@ package org.elasticsearch.transport.nio; -import org.apache.logging.log4j.Logger; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.action.ActionListener; import org.elasticsearch.cluster.node.DiscoveryNode; +import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.io.stream.NamedWriteableRegistry; import org.elasticsearch.common.network.NetworkService; import org.elasticsearch.common.recycler.Recycler; @@ -34,12 +34,15 @@ import org.elasticsearch.common.util.concurrent.EsExecutors; import org.elasticsearch.indices.breaker.CircuitBreakerService; import org.elasticsearch.nio.AcceptorEventHandler; +import org.elasticsearch.nio.BytesReadContext; +import org.elasticsearch.nio.BytesWriteContext; import org.elasticsearch.nio.InboundChannelBuffer; import org.elasticsearch.nio.NioGroup; -import org.elasticsearch.nio.NioServerSocketChannel; import org.elasticsearch.nio.NioSocketChannel; +import org.elasticsearch.nio.ReadContext; import org.elasticsearch.nio.SocketEventHandler; import org.elasticsearch.threadpool.ThreadPool; +import org.elasticsearch.transport.TcpChannel; import org.elasticsearch.transport.TcpTransport; import org.elasticsearch.transport.Transports; @@ -56,8 +59,8 @@ public class NioTransport extends TcpTransport { - public static final String TRANSPORT_WORKER_THREAD_NAME_PREFIX = Transports.NIO_TRANSPORT_WORKER_THREAD_NAME_PREFIX; - public static final String TRANSPORT_ACCEPTOR_THREAD_NAME_PREFIX = Transports.NIO_TRANSPORT_ACCEPTOR_THREAD_NAME_PREFIX; + private static final String TRANSPORT_WORKER_THREAD_NAME_PREFIX = Transports.NIO_TRANSPORT_WORKER_THREAD_NAME_PREFIX; + private static final String TRANSPORT_ACCEPTOR_THREAD_NAME_PREFIX = Transports.NIO_TRANSPORT_ACCEPTOR_THREAD_NAME_PREFIX; public static final Setting NIO_WORKER_COUNT = new Setting<>("transport.nio.worker_count", @@ -72,9 +75,9 @@ public class NioTransport extends TcpTransport { private volatile NioGroup nioGroup; private volatile TcpChannelFactory clientChannelFactory; - public NioTransport(Settings settings, ThreadPool threadPool, NetworkService networkService, BigArrays bigArrays, - PageCacheRecycler pageCacheRecycler, NamedWriteableRegistry namedWriteableRegistry, - CircuitBreakerService circuitBreakerService) { + NioTransport(Settings settings, ThreadPool threadPool, NetworkService networkService, BigArrays bigArrays, + PageCacheRecycler pageCacheRecycler, NamedWriteableRegistry namedWriteableRegistry, + CircuitBreakerService circuitBreakerService) { super("nio", settings, threadPool, bigArrays, circuitBreakerService, namedWriteableRegistry, networkService); this.pageCacheRecycler = pageCacheRecycler; } @@ -104,17 +107,16 @@ protected void doStart() { } nioGroup = new NioGroup(logger, daemonThreadFactory(this.settings, TRANSPORT_ACCEPTOR_THREAD_NAME_PREFIX), acceptorCount, AcceptorEventHandler::new, daemonThreadFactory(this.settings, TRANSPORT_WORKER_THREAD_NAME_PREFIX), - NioTransport.NIO_WORKER_COUNT.get(settings), this::getSocketEventHandler); + NioTransport.NIO_WORKER_COUNT.get(settings), SocketEventHandler::new); ProfileSettings clientProfileSettings = new ProfileSettings(settings, "default"); - clientChannelFactory = new TcpChannelFactory(clientProfileSettings, getContextSetter("client"), getServerContextSetter()); + clientChannelFactory = new TcpChannelFactory(clientProfileSettings, getContextSetter(), getServerContextSetter()); if (useNetworkServer) { // loop through all profiles and start them up, special handling for default one for (ProfileSettings profileSettings : profileSettings) { String profileName = profileSettings.profileName; - Consumer contextSetter = getContextSetter(profileName); - TcpChannelFactory factory = new TcpChannelFactory(profileSettings, contextSetter, getServerContextSetter()); + TcpChannelFactory factory = new TcpChannelFactory(profileSettings, getContextSetter(), getServerContextSetter()); profileToChannelFactory.putIfAbsent(profileName, factory); bindServer(profileSettings); } @@ -141,22 +143,20 @@ protected void stopInternal() { profileToChannelFactory.clear(); } - protected SocketEventHandler getSocketEventHandler(Logger logger) { - return new SocketEventHandler(logger); - } - final void exceptionCaught(NioSocketChannel channel, Exception exception) { - onException((TcpNioSocketChannel) channel, exception); + onException((TcpChannel) channel, exception); } - private Consumer getContextSetter(String profileName) { + private Consumer getContextSetter() { return (c) -> { Supplier pageSupplier = () -> { Recycler.V bytes = pageCacheRecycler.bytePage(false); return new InboundChannelBuffer.Page(ByteBuffer.wrap(bytes.v()), bytes::close); }; - c.setContexts(new TcpReadContext(c, new TcpReadHandler(profileName, this), new InboundChannelBuffer(pageSupplier)), - new TcpWriteContext(c), this::exceptionCaught); + ReadContext.ReadConsumer nioReadConsumer = channelBuffer -> + consumeNetworkReads(c, BytesReference.fromByteBuffers(channelBuffer.sliceBuffersTo(channelBuffer.getIndex()))); + BytesReadContext readContext = new BytesReadContext(c, nioReadConsumer, new InboundChannelBuffer(pageSupplier)); + c.setContexts(readContext, new BytesWriteContext(c), this::exceptionCaught); }; } @@ -165,7 +165,7 @@ private void acceptChannel(NioSocketChannel channel) { } - private Consumer getServerContextSetter() { + private Consumer getServerContextSetter() { return (c) -> c.setAcceptContext(this::acceptChannel); } } diff --git a/test/framework/src/main/java/org/elasticsearch/transport/nio/NioTransportPlugin.java b/plugins/transport-nio/src/main/java/org/elasticsearch/transport/nio/NioTransportPlugin.java similarity index 76% rename from test/framework/src/main/java/org/elasticsearch/transport/nio/NioTransportPlugin.java rename to plugins/transport-nio/src/main/java/org/elasticsearch/transport/nio/NioTransportPlugin.java index e158fe6fe97c3..f1d63add2466a 100644 --- a/test/framework/src/main/java/org/elasticsearch/transport/nio/NioTransportPlugin.java +++ b/plugins/transport-nio/src/main/java/org/elasticsearch/transport/nio/NioTransportPlugin.java @@ -16,10 +16,14 @@ * specific language governing permissions and limitations * under the License. */ + package org.elasticsearch.transport.nio; +import org.elasticsearch.bootstrap.BootstrapCheck; import org.elasticsearch.common.io.stream.NamedWriteableRegistry; +import org.elasticsearch.common.network.NetworkModule; import org.elasticsearch.common.network.NetworkService; +import org.elasticsearch.common.settings.Setting; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.util.BigArrays; import org.elasticsearch.common.util.PageCacheRecycler; @@ -29,7 +33,9 @@ import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.Transport; +import java.util.Arrays; import java.util.Collections; +import java.util.List; import java.util.Map; import java.util.function.Supplier; @@ -37,21 +43,27 @@ public class NioTransportPlugin extends Plugin implements NetworkPlugin { public static final String NIO_TRANSPORT_NAME = "nio-transport"; + @Override + public List> getSettings() { + return Arrays.asList( + NioTransport.NIO_WORKER_COUNT, + NioTransport.NIO_ACCEPTOR_COUNT + ); + } + @Override public Map> getTransports(Settings settings, ThreadPool threadPool, BigArrays bigArrays, PageCacheRecycler pageCacheRecycler, CircuitBreakerService circuitBreakerService, NamedWriteableRegistry namedWriteableRegistry, NetworkService networkService) { - Settings settings1; - if (NioTransport.NIO_WORKER_COUNT.exists(settings) == false) { - // As this is only used for tests right now, limit the number of worker threads. - settings1 = Settings.builder().put(settings).put(NioTransport.NIO_WORKER_COUNT.getKey(), 2).build(); - } else { - settings1 = settings; - } return Collections.singletonMap(NIO_TRANSPORT_NAME, - () -> new NioTransport(settings1, threadPool, networkService, bigArrays, pageCacheRecycler, namedWriteableRegistry, + () -> new NioTransport(settings, threadPool, networkService, bigArrays, pageCacheRecycler, namedWriteableRegistry, circuitBreakerService)); } + + @Override + public List getBootstrapChecks() { + return Collections.singletonList(new NioNotEnabledBootstrapCheck()); + } } diff --git a/test/framework/src/main/java/org/elasticsearch/transport/nio/TcpChannelFactory.java b/plugins/transport-nio/src/main/java/org/elasticsearch/transport/nio/TcpChannelFactory.java similarity index 85% rename from test/framework/src/main/java/org/elasticsearch/transport/nio/TcpChannelFactory.java rename to plugins/transport-nio/src/main/java/org/elasticsearch/transport/nio/TcpChannelFactory.java index 8f092153c77ed..44c72efb857e9 100644 --- a/test/framework/src/main/java/org/elasticsearch/transport/nio/TcpChannelFactory.java +++ b/plugins/transport-nio/src/main/java/org/elasticsearch/transport/nio/TcpChannelFactory.java @@ -19,12 +19,10 @@ package org.elasticsearch.transport.nio; -import org.elasticsearch.nio.ChannelFactory; -import org.elasticsearch.nio.NioServerSocketChannel; -import org.elasticsearch.nio.NioSocketChannel; -import org.elasticsearch.transport.TcpTransport; import org.elasticsearch.nio.AcceptingSelector; +import org.elasticsearch.nio.ChannelFactory; import org.elasticsearch.nio.SocketSelector; +import org.elasticsearch.transport.TcpTransport; import java.io.IOException; import java.nio.channels.ServerSocketChannel; @@ -39,30 +37,32 @@ */ public class TcpChannelFactory extends ChannelFactory { - private final Consumer contextSetter; - private final Consumer serverContextSetter; + private final Consumer contextSetter; + private final Consumer serverContextSetter; + private final String profileName; - TcpChannelFactory(TcpTransport.ProfileSettings profileSettings, Consumer contextSetter, - Consumer serverContextSetter) { + TcpChannelFactory(TcpTransport.ProfileSettings profileSettings, Consumer contextSetter, + Consumer serverContextSetter) { super(new RawChannelFactory(profileSettings.tcpNoDelay, profileSettings.tcpKeepAlive, profileSettings.reuseAddress, Math.toIntExact(profileSettings.sendBufferSize.getBytes()), Math.toIntExact(profileSettings.receiveBufferSize.getBytes()))); + this.profileName = profileSettings.profileName; this.contextSetter = contextSetter; this.serverContextSetter = serverContextSetter; } @Override public TcpNioSocketChannel createChannel(SocketSelector selector, SocketChannel channel) throws IOException { - TcpNioSocketChannel nioChannel = new TcpNioSocketChannel(channel, selector); + TcpNioSocketChannel nioChannel = new TcpNioSocketChannel(profileName, channel, selector); contextSetter.accept(nioChannel); return nioChannel; } @Override public TcpNioServerSocketChannel createServerChannel(AcceptingSelector selector, ServerSocketChannel channel) throws IOException { - TcpNioServerSocketChannel nioServerChannel = new TcpNioServerSocketChannel(channel, this, selector); + TcpNioServerSocketChannel nioServerChannel = new TcpNioServerSocketChannel(profileName, channel, this, selector); serverContextSetter.accept(nioServerChannel); return nioServerChannel; } diff --git a/test/framework/src/main/java/org/elasticsearch/transport/nio/TcpNioServerSocketChannel.java b/plugins/transport-nio/src/main/java/org/elasticsearch/transport/nio/TcpNioServerSocketChannel.java similarity index 82% rename from test/framework/src/main/java/org/elasticsearch/transport/nio/TcpNioServerSocketChannel.java rename to plugins/transport-nio/src/main/java/org/elasticsearch/transport/nio/TcpNioServerSocketChannel.java index b6b059a434afb..4aa9795dda496 100644 --- a/test/framework/src/main/java/org/elasticsearch/transport/nio/TcpNioServerSocketChannel.java +++ b/plugins/transport-nio/src/main/java/org/elasticsearch/transport/nio/TcpNioServerSocketChannel.java @@ -21,11 +21,12 @@ import org.elasticsearch.action.ActionListener; import org.elasticsearch.common.bytes.BytesReference; +import org.elasticsearch.nio.AcceptingSelector; import org.elasticsearch.nio.NioServerSocketChannel; import org.elasticsearch.transport.TcpChannel; -import org.elasticsearch.nio.AcceptingSelector; import java.io.IOException; +import java.net.InetSocketAddress; import java.nio.channels.ServerSocketChannel; /** @@ -34,9 +35,12 @@ */ public class TcpNioServerSocketChannel extends NioServerSocketChannel implements TcpChannel { - TcpNioServerSocketChannel(ServerSocketChannel socketChannel, TcpChannelFactory channelFactory, AcceptingSelector selector) - throws IOException { + private final String profile; + + TcpNioServerSocketChannel(String profile, ServerSocketChannel socketChannel, TcpChannelFactory channelFactory, + AcceptingSelector selector) throws IOException { super(socketChannel, channelFactory, selector); + this.profile = profile; } @Override @@ -49,6 +53,16 @@ public void setSoLinger(int value) throws IOException { throw new UnsupportedOperationException("Cannot set SO_LINGER on a server channel."); } + @Override + public InetSocketAddress getRemoteAddress() { + return null; + } + + @Override + public String getProfile() { + return profile; + } + @Override public void addCloseListener(ActionListener listener) { addCloseListener(ActionListener.toBiConsumer(listener)); diff --git a/test/framework/src/main/java/org/elasticsearch/transport/nio/TcpNioSocketChannel.java b/plugins/transport-nio/src/main/java/org/elasticsearch/transport/nio/TcpNioSocketChannel.java similarity index 83% rename from test/framework/src/main/java/org/elasticsearch/transport/nio/TcpNioSocketChannel.java rename to plugins/transport-nio/src/main/java/org/elasticsearch/transport/nio/TcpNioSocketChannel.java index cecfcdb736c89..5633899a04b9f 100644 --- a/test/framework/src/main/java/org/elasticsearch/transport/nio/TcpNioSocketChannel.java +++ b/plugins/transport-nio/src/main/java/org/elasticsearch/transport/nio/TcpNioSocketChannel.java @@ -22,8 +22,8 @@ import org.elasticsearch.action.ActionListener; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.nio.NioSocketChannel; -import org.elasticsearch.transport.TcpChannel; import org.elasticsearch.nio.SocketSelector; +import org.elasticsearch.transport.TcpChannel; import java.io.IOException; import java.net.StandardSocketOptions; @@ -31,12 +31,15 @@ public class TcpNioSocketChannel extends NioSocketChannel implements TcpChannel { - public TcpNioSocketChannel(SocketChannel socketChannel, SocketSelector selector) throws IOException { + private final String profile; + + TcpNioSocketChannel(String profile, SocketChannel socketChannel, SocketSelector selector) throws IOException { super(socketChannel, selector); + this.profile = profile; } public void sendMessage(BytesReference reference, ActionListener listener) { - getWriteContext().sendMessage(reference, ActionListener.toBiConsumer(listener)); + getWriteContext().sendMessage(BytesReference.toByteBuffers(reference), ActionListener.toBiConsumer(listener)); } @Override @@ -46,6 +49,11 @@ public void setSoLinger(int value) throws IOException { } } + @Override + public String getProfile() { + return profile; + } + @Override public void addCloseListener(ActionListener listener) { addCloseListener(ActionListener.toBiConsumer(listener)); diff --git a/test/framework/src/main/java/org/elasticsearch/transport/nio/TcpReadHandler.java b/plugins/transport-nio/src/main/java/org/elasticsearch/transport/nio/TcpReadHandler.java similarity index 89% rename from test/framework/src/main/java/org/elasticsearch/transport/nio/TcpReadHandler.java rename to plugins/transport-nio/src/main/java/org/elasticsearch/transport/nio/TcpReadHandler.java index 2e2cc08ad6b0f..37478286831ad 100644 --- a/test/framework/src/main/java/org/elasticsearch/transport/nio/TcpReadHandler.java +++ b/plugins/transport-nio/src/main/java/org/elasticsearch/transport/nio/TcpReadHandler.java @@ -29,14 +29,14 @@ public class TcpReadHandler { private final String profile; private final NioTransport transport; - public TcpReadHandler(String profile, NioTransport transport) { + TcpReadHandler(String profile, NioTransport transport) { this.profile = profile; this.transport = transport; } public void handleMessage(BytesReference reference, TcpNioSocketChannel channel, int messageBytesLength) { try { - transport.messageReceived(reference, channel, profile, channel.getRemoteAddress(), messageBytesLength); + transport.messageReceived(reference, channel); } catch (IOException e) { handleException(channel, e); } diff --git a/plugins/transport-nio/src/test/java/org/elasticsearch/NioIntegTestCase.java b/plugins/transport-nio/src/test/java/org/elasticsearch/NioIntegTestCase.java new file mode 100644 index 0000000000000..e0c8bacca1d85 --- /dev/null +++ b/plugins/transport-nio/src/test/java/org/elasticsearch/NioIntegTestCase.java @@ -0,0 +1,71 @@ +/* + * Licensed to Elasticsearch under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch licenses this file to you 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. + */ +package org.elasticsearch; + +import org.elasticsearch.common.network.NetworkModule; +import org.elasticsearch.common.settings.Settings; +import org.elasticsearch.plugins.Plugin; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.transport.nio.NioTransport; +import org.elasticsearch.transport.nio.NioTransportPlugin; + +import java.util.Collection; +import java.util.Collections; + +public abstract class NioIntegTestCase extends ESIntegTestCase { + + @Override + protected boolean ignoreExternalCluster() { + return true; + } + + @Override + protected boolean addMockTransportService() { + return false; + } + + @Override + protected Settings nodeSettings(int nodeOrdinal) { + Settings.Builder builder = Settings.builder().put(super.nodeSettings(nodeOrdinal)); + // randomize netty settings + if (randomBoolean()) { + builder.put(NioTransport.NIO_WORKER_COUNT.getKey(), random().nextInt(3) + 1); + } + builder.put(NetworkModule.TRANSPORT_TYPE_KEY, NioTransportPlugin.NIO_TRANSPORT_NAME); + return builder.build(); + } + + @Override + protected Settings transportClientSettings() { + Settings.Builder builder = Settings.builder().put(super.transportClientSettings()); + builder.put(NetworkModule.TRANSPORT_TYPE_KEY, NioTransportPlugin.NIO_TRANSPORT_NAME); + return builder.build(); + } + + @Override + protected Collection> nodePlugins() { + return Collections.singletonList(NioTransportPlugin.class); + } + + @Override + protected Collection> transportClientPlugins() { + return Collections.singletonList(NioTransportPlugin.class); + } + +} diff --git a/plugins/transport-nio/src/test/java/org/elasticsearch/transport/nio/NioTransportIT.java b/plugins/transport-nio/src/test/java/org/elasticsearch/transport/nio/NioTransportIT.java new file mode 100644 index 0000000000000..0712717eb6405 --- /dev/null +++ b/plugins/transport-nio/src/test/java/org/elasticsearch/transport/nio/NioTransportIT.java @@ -0,0 +1,132 @@ +/* + * Licensed to Elasticsearch under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch licenses this file to you 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. + */ +package org.elasticsearch.transport.nio; + +import org.elasticsearch.ElasticsearchException; +import org.elasticsearch.NioIntegTestCase; +import org.elasticsearch.Version; +import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; +import org.elasticsearch.client.Client; +import org.elasticsearch.cluster.health.ClusterHealthStatus; +import org.elasticsearch.common.io.stream.NamedWriteableRegistry; +import org.elasticsearch.common.io.stream.StreamInput; +import org.elasticsearch.common.network.NetworkModule; +import org.elasticsearch.common.network.NetworkService; +import org.elasticsearch.common.settings.Settings; +import org.elasticsearch.common.util.BigArrays; +import org.elasticsearch.common.util.PageCacheRecycler; +import org.elasticsearch.indices.breaker.CircuitBreakerService; +import org.elasticsearch.plugins.NetworkPlugin; +import org.elasticsearch.plugins.Plugin; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase.Scope; +import org.elasticsearch.threadpool.ThreadPool; +import org.elasticsearch.transport.TcpChannel; +import org.elasticsearch.transport.TcpTransport; +import org.elasticsearch.transport.Transport; + +import java.io.IOException; +import java.net.InetSocketAddress; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.function.Supplier; + +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.is; + +@ClusterScope(scope = Scope.TEST, supportsDedicatedMasters = false, numDataNodes = 1) +public class NioTransportIT extends NioIntegTestCase { + // static so we can use it in anonymous classes + private static String channelProfileName = null; + + @Override + protected Settings nodeSettings(int nodeOrdinal) { + return Settings.builder().put(super.nodeSettings(nodeOrdinal)) + .put(NetworkModule.TRANSPORT_TYPE_KEY, "exception-throwing").build(); + } + + @Override + protected Collection> nodePlugins() { + List> list = new ArrayList<>(); + list.add(ExceptionThrowingNioTransport.TestPlugin.class); + list.addAll(super.nodePlugins()); + return Collections.unmodifiableCollection(list); + } + + public void testThatConnectionFailsAsIntended() throws Exception { + Client transportClient = internalCluster().transportClient(); + ClusterHealthResponse clusterIndexHealths = transportClient.admin().cluster().prepareHealth().get(); + assertThat(clusterIndexHealths.getStatus(), is(ClusterHealthStatus.GREEN)); + try { + transportClient.filterWithHeader(Collections.singletonMap("ERROR", "MY MESSAGE")).admin().cluster().prepareHealth().get(); + fail("Expected exception, but didn't happen"); + } catch (ElasticsearchException e) { + assertThat(e.getMessage(), containsString("MY MESSAGE")); + assertThat(channelProfileName, is(TcpTransport.DEFAULT_PROFILE)); + } + } + + public static final class ExceptionThrowingNioTransport extends NioTransport { + + public static class TestPlugin extends Plugin implements NetworkPlugin { + + @Override + public Map> getTransports(Settings settings, ThreadPool threadPool, BigArrays bigArrays, + PageCacheRecycler pageCacheRecycler, + CircuitBreakerService circuitBreakerService, + NamedWriteableRegistry namedWriteableRegistry, + NetworkService networkService) { + return Collections.singletonMap("exception-throwing", + () -> new ExceptionThrowingNioTransport(settings, threadPool, networkService, bigArrays, pageCacheRecycler, + namedWriteableRegistry, circuitBreakerService)); + } + } + + ExceptionThrowingNioTransport(Settings settings, ThreadPool threadPool, NetworkService networkService, BigArrays bigArrays, + PageCacheRecycler pageCacheRecycler, NamedWriteableRegistry namedWriteableRegistry, + CircuitBreakerService circuitBreakerService) { + super(settings, threadPool, networkService, bigArrays, pageCacheRecycler, namedWriteableRegistry, circuitBreakerService); + } + + @Override + protected String handleRequest(TcpChannel channel, String profileName, + StreamInput stream, long requestId, int messageLengthBytes, Version version, + InetSocketAddress remoteAddress, byte status) throws IOException { + String action = super.handleRequest(channel, profileName, stream, requestId, messageLengthBytes, version, + remoteAddress, status); + channelProfileName = TcpTransport.DEFAULT_PROFILE; + return action; + } + + @Override + protected void validateRequest(StreamInput buffer, long requestId, String action) + throws IOException { + super.validateRequest(buffer, requestId, action); + String error = threadPool.getThreadContext().getHeader("ERROR"); + if (error != null) { + throw new ElasticsearchException(error); + } + } + + } + +} diff --git a/test/framework/src/test/java/org/elasticsearch/transport/nio/SimpleNioTransportTests.java b/plugins/transport-nio/src/test/java/org/elasticsearch/transport/nio/SimpleNioTransportTests.java similarity index 96% rename from test/framework/src/test/java/org/elasticsearch/transport/nio/SimpleNioTransportTests.java rename to plugins/transport-nio/src/test/java/org/elasticsearch/transport/nio/SimpleNioTransportTests.java index 59eab570876d6..ee65eb5ccbd0d 100644 --- a/test/framework/src/test/java/org/elasticsearch/transport/nio/SimpleNioTransportTests.java +++ b/plugins/transport-nio/src/test/java/org/elasticsearch/transport/nio/SimpleNioTransportTests.java @@ -19,7 +19,6 @@ package org.elasticsearch.transport.nio; -import org.apache.logging.log4j.Logger; import org.elasticsearch.Version; import org.elasticsearch.cluster.node.DiscoveryNode; import org.elasticsearch.common.io.stream.NamedWriteableRegistry; @@ -31,7 +30,6 @@ import org.elasticsearch.common.util.BigArrays; import org.elasticsearch.common.util.MockPageCacheRecycler; import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; -import org.elasticsearch.nio.SocketEventHandler; import org.elasticsearch.node.Node; import org.elasticsearch.test.transport.MockTransportService; import org.elasticsearch.threadpool.ThreadPool; @@ -77,11 +75,6 @@ protected Version executeHandshake(DiscoveryNode node, TcpChannel channel, TimeV protected Version getCurrentVersion() { return version; } - - @Override - protected SocketEventHandler getSocketEventHandler(Logger logger) { - return new TestingSocketEventHandler(logger); - } }; MockTransportService mockTransportService = MockTransportService.createNewService(Settings.EMPTY, transport, version, threadPool, clusterSettings); diff --git a/qa/smoke-test-client/src/test/java/org/elasticsearch/smoketest/ESSmokeClientTestCase.java b/qa/smoke-test-client/src/test/java/org/elasticsearch/smoketest/ESSmokeClientTestCase.java index 908e8e1c71114..8f32271948763 100644 --- a/qa/smoke-test-client/src/test/java/org/elasticsearch/smoketest/ESSmokeClientTestCase.java +++ b/qa/smoke-test-client/src/test/java/org/elasticsearch/smoketest/ESSmokeClientTestCase.java @@ -32,7 +32,7 @@ import org.elasticsearch.plugins.Plugin; import org.elasticsearch.transport.MockTcpTransportPlugin; import org.elasticsearch.transport.client.PreBuiltTransportClient; -import org.elasticsearch.transport.nio.NioTransportPlugin; +import org.elasticsearch.transport.nio.MockNioTransportPlugin; import org.junit.After; import org.junit.AfterClass; import org.junit.Before; @@ -86,8 +86,8 @@ private static Client startClient(Path tempDir, TransportAddress... transportAdd String transportKey; Class transportPlugin; if (usNio) { - transportKey = NioTransportPlugin.NIO_TRANSPORT_NAME; - transportPlugin = NioTransportPlugin.class; + transportKey = MockNioTransportPlugin.MOCK_NIO_TRANSPORT_NAME; + transportPlugin = MockNioTransportPlugin.class; } else { transportKey = MockTcpTransportPlugin.MOCK_TCP_TRANSPORT_NAME; transportPlugin = MockTcpTransportPlugin.class; diff --git a/qa/smoke-test-http/src/test/java/org/elasticsearch/http/HttpSmokeTestCase.java b/qa/smoke-test-http/src/test/java/org/elasticsearch/http/HttpSmokeTestCase.java index bb13d486a9adc..52004277c71bc 100644 --- a/qa/smoke-test-http/src/test/java/org/elasticsearch/http/HttpSmokeTestCase.java +++ b/qa/smoke-test-http/src/test/java/org/elasticsearch/http/HttpSmokeTestCase.java @@ -24,7 +24,7 @@ import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.transport.MockTcpTransportPlugin; import org.elasticsearch.transport.Netty4Plugin; -import org.elasticsearch.transport.nio.NioTransportPlugin; +import org.elasticsearch.transport.nio.MockNioTransportPlugin; import org.junit.BeforeClass; import java.util.Arrays; @@ -47,8 +47,8 @@ public static void setUpTransport() { private static String getTypeKey(Class clazz) { if (clazz.equals(MockTcpTransportPlugin.class)) { return MockTcpTransportPlugin.MOCK_TCP_TRANSPORT_NAME; - } else if (clazz.equals(NioTransportPlugin.class)) { - return NioTransportPlugin.NIO_TRANSPORT_NAME; + } else if (clazz.equals(MockNioTransportPlugin.class)) { + return MockNioTransportPlugin.MOCK_NIO_TRANSPORT_NAME; } else { assert clazz.equals(Netty4Plugin.class); return Netty4Plugin.NETTY_TRANSPORT_NAME; diff --git a/settings.gradle b/settings.gradle index 196ff61048d4e..cd6d2976e0272 100644 --- a/settings.gradle +++ b/settings.gradle @@ -64,6 +64,7 @@ List projects = [ 'plugins:repository-s3', 'plugins:jvm-example', 'plugins:store-smb', + 'plugins:transport-nio', 'qa:auto-create-index', 'qa:ccs-unavailable-clusters', 'qa:evil-tests', diff --git a/test/framework/src/main/java/org/elasticsearch/test/ESTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/ESTestCase.java index 0d185a0ff4c16..ccf32345f99ae 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/ESTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/test/ESTestCase.java @@ -105,7 +105,7 @@ import org.elasticsearch.test.junit.listeners.ReproduceInfoPrinter; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.MockTcpTransportPlugin; -import org.elasticsearch.transport.nio.NioTransportPlugin; +import org.elasticsearch.transport.nio.MockNioTransportPlugin; import org.joda.time.DateTimeZone; import org.junit.After; import org.junit.AfterClass; @@ -900,11 +900,11 @@ public static void setUseNio() throws Exception { } public static String getTestTransportType() { - return useNio ? NioTransportPlugin.NIO_TRANSPORT_NAME : MockTcpTransportPlugin.MOCK_TCP_TRANSPORT_NAME; + return useNio ? MockNioTransportPlugin.MOCK_NIO_TRANSPORT_NAME : MockTcpTransportPlugin.MOCK_TCP_TRANSPORT_NAME; } public static Class getTestTransportPlugin() { - return useNio ? NioTransportPlugin.class : MockTcpTransportPlugin.class; + return useNio ? MockNioTransportPlugin.class : MockTcpTransportPlugin.class; } private static final GeohashGenerator geohashGenerator = new GeohashGenerator(); diff --git a/test/framework/src/main/java/org/elasticsearch/test/ExternalTestCluster.java b/test/framework/src/main/java/org/elasticsearch/test/ExternalTestCluster.java index 90d58786496f7..6496894baad17 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/ExternalTestCluster.java +++ b/test/framework/src/main/java/org/elasticsearch/test/ExternalTestCluster.java @@ -25,7 +25,6 @@ import org.elasticsearch.action.admin.cluster.node.stats.NodeStats; import org.elasticsearch.action.admin.cluster.node.stats.NodesStatsResponse; import org.elasticsearch.client.Client; -import org.elasticsearch.client.transport.TransportClient; import org.elasticsearch.cluster.node.DiscoveryNode; import org.elasticsearch.common.breaker.CircuitBreaker; import org.elasticsearch.common.io.stream.NamedWriteableRegistry; @@ -37,7 +36,7 @@ import org.elasticsearch.plugins.Plugin; import org.elasticsearch.transport.MockTcpTransportPlugin; import org.elasticsearch.transport.MockTransportClient; -import org.elasticsearch.transport.nio.NioTransportPlugin; +import org.elasticsearch.transport.nio.MockNioTransportPlugin; import java.io.IOException; import java.net.InetSocketAddress; @@ -86,10 +85,10 @@ public ExternalTestCluster(Path tempDir, Settings additionalSettings, Collection String transport = getTestTransportType(); clientSettingsBuilder.put(NetworkModule.TRANSPORT_TYPE_KEY, transport); if (pluginClasses.contains(MockTcpTransportPlugin.class) == false && - pluginClasses.contains(NioTransportPlugin.class) == false) { + pluginClasses.contains(MockNioTransportPlugin.class) == false) { pluginClasses = new ArrayList<>(pluginClasses); - if (transport.equals(NioTransportPlugin.NIO_TRANSPORT_NAME)) { - pluginClasses.add(NioTransportPlugin.class); + if (transport.equals(MockNioTransportPlugin.MOCK_NIO_TRANSPORT_NAME)) { + pluginClasses.add(MockNioTransportPlugin.class); } else { pluginClasses.add(MockTcpTransportPlugin.class); } diff --git a/test/framework/src/main/java/org/elasticsearch/transport/MockTcpTransport.java b/test/framework/src/main/java/org/elasticsearch/transport/MockTcpTransport.java index 68f79b1cef779..91b2a2f79e310 100644 --- a/test/framework/src/main/java/org/elasticsearch/transport/MockTcpTransport.java +++ b/test/framework/src/main/java/org/elasticsearch/transport/MockTcpTransport.java @@ -159,14 +159,7 @@ private void readMessage(MockChannel mockChannel, StreamInput input) throws IOEx output.write(minimalHeader); output.writeInt(msgSize); output.write(buffer); - final BytesReference bytes = output.bytes(); - if (TcpTransport.validateMessageHeader(bytes)) { - InetSocketAddress remoteAddress = (InetSocketAddress) socket.getRemoteSocketAddress(); - messageReceived(bytes.slice(TcpHeader.MARKER_BYTES_SIZE + TcpHeader.MESSAGE_LENGTH_SIZE, msgSize), - mockChannel, mockChannel.profile, remoteAddress, msgSize); - } else { - // ping message - we just drop all stuff - } + consumeNetworkReads(mockChannel, output.bytes()); } } @@ -357,6 +350,11 @@ public void close() { } } + @Override + public String getProfile() { + return profile; + } + @Override public void addCloseListener(ActionListener listener) { closeFuture.whenComplete(ActionListener.toBiConsumer(listener)); @@ -380,6 +378,11 @@ public InetSocketAddress getLocalAddress() { return localAddress; } + @Override + public InetSocketAddress getRemoteAddress() { + return (InetSocketAddress) activeChannel.getRemoteSocketAddress(); + } + @Override public void sendMessage(BytesReference reference, ActionListener listener) { try { diff --git a/test/framework/src/main/java/org/elasticsearch/transport/MockTransportClient.java b/test/framework/src/main/java/org/elasticsearch/transport/MockTransportClient.java index ac8c7c6e9972e..cf88ca20acfa0 100644 --- a/test/framework/src/main/java/org/elasticsearch/transport/MockTransportClient.java +++ b/test/framework/src/main/java/org/elasticsearch/transport/MockTransportClient.java @@ -23,7 +23,7 @@ import org.elasticsearch.common.network.NetworkModule; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.plugins.Plugin; -import org.elasticsearch.transport.nio.NioTransportPlugin; +import org.elasticsearch.transport.nio.MockNioTransportPlugin; import java.util.ArrayList; import java.util.Arrays; @@ -59,12 +59,12 @@ private static Collection> addMockTransportIfMissing(Set plugins.add(MockTcpTransportPlugin.class); return plugins; } - } else if (NioTransportPlugin.NIO_TRANSPORT_NAME.equals(transportType)) { - if (plugins.contains(NioTransportPlugin.class)) { + } else if (MockNioTransportPlugin.MOCK_NIO_TRANSPORT_NAME.equals(transportType)) { + if (plugins.contains(MockNioTransportPlugin.class)) { return plugins; } else { plugins = new ArrayList<>(plugins); - plugins.add(NioTransportPlugin.class); + plugins.add(MockNioTransportPlugin.class); return plugins; } } diff --git a/test/framework/src/main/java/org/elasticsearch/transport/nio/MockNioTransport.java b/test/framework/src/main/java/org/elasticsearch/transport/nio/MockNioTransport.java new file mode 100644 index 0000000000000..5911d10fa2973 --- /dev/null +++ b/test/framework/src/main/java/org/elasticsearch/transport/nio/MockNioTransport.java @@ -0,0 +1,252 @@ +/* + * Licensed to Elasticsearch under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch licenses this file to you 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. + */ + +package org.elasticsearch.transport.nio; + +import org.elasticsearch.ElasticsearchException; +import org.elasticsearch.action.ActionListener; +import org.elasticsearch.cluster.node.DiscoveryNode; +import org.elasticsearch.common.bytes.BytesReference; +import org.elasticsearch.common.io.stream.NamedWriteableRegistry; +import org.elasticsearch.common.network.NetworkService; +import org.elasticsearch.common.recycler.Recycler; +import org.elasticsearch.common.settings.Settings; +import org.elasticsearch.common.unit.TimeValue; +import org.elasticsearch.common.util.BigArrays; +import org.elasticsearch.common.util.PageCacheRecycler; +import org.elasticsearch.indices.breaker.CircuitBreakerService; +import org.elasticsearch.nio.AcceptingSelector; +import org.elasticsearch.nio.AcceptorEventHandler; +import org.elasticsearch.nio.BytesReadContext; +import org.elasticsearch.nio.BytesWriteContext; +import org.elasticsearch.nio.ChannelFactory; +import org.elasticsearch.nio.InboundChannelBuffer; +import org.elasticsearch.nio.NioGroup; +import org.elasticsearch.nio.NioServerSocketChannel; +import org.elasticsearch.nio.NioSocketChannel; +import org.elasticsearch.nio.ReadContext; +import org.elasticsearch.nio.SocketSelector; +import org.elasticsearch.threadpool.ThreadPool; +import org.elasticsearch.transport.TcpChannel; +import org.elasticsearch.transport.TcpTransport; +import org.elasticsearch.transport.Transports; + +import java.io.IOException; +import java.net.InetSocketAddress; +import java.net.StandardSocketOptions; +import java.nio.ByteBuffer; +import java.nio.channels.ServerSocketChannel; +import java.nio.channels.SocketChannel; +import java.util.concurrent.ConcurrentMap; +import java.util.function.Supplier; + +import static org.elasticsearch.common.util.concurrent.ConcurrentCollections.newConcurrentMap; +import static org.elasticsearch.common.util.concurrent.EsExecutors.daemonThreadFactory; + +public class MockNioTransport extends TcpTransport { + + private static final String TRANSPORT_WORKER_THREAD_NAME_PREFIX = Transports.NIO_TRANSPORT_WORKER_THREAD_NAME_PREFIX; + private static final String TRANSPORT_ACCEPTOR_THREAD_NAME_PREFIX = Transports.NIO_TRANSPORT_ACCEPTOR_THREAD_NAME_PREFIX; + + private final PageCacheRecycler pageCacheRecycler; + private final ConcurrentMap profileToChannelFactory = newConcurrentMap(); + private volatile NioGroup nioGroup; + private volatile MockTcpChannelFactory clientChannelFactory; + + MockNioTransport(Settings settings, ThreadPool threadPool, NetworkService networkService, BigArrays bigArrays, + PageCacheRecycler pageCacheRecycler, NamedWriteableRegistry namedWriteableRegistry, + CircuitBreakerService circuitBreakerService) { + super("mock-nio", settings, threadPool, bigArrays, circuitBreakerService, namedWriteableRegistry, networkService); + this.pageCacheRecycler = pageCacheRecycler; + } + + @Override + protected MockServerChannel bind(String name, InetSocketAddress address) throws IOException { + MockTcpChannelFactory channelFactory = this.profileToChannelFactory.get(name); + return nioGroup.bindServerChannel(address, channelFactory); + } + + @Override + protected MockSocketChannel initiateChannel(DiscoveryNode node, TimeValue connectTimeout, ActionListener connectListener) + throws IOException { + MockSocketChannel channel = nioGroup.openChannel(node.getAddress().address(), clientChannelFactory); + channel.addConnectListener(ActionListener.toBiConsumer(connectListener)); + return channel; + } + + @Override + protected void doStart() { + boolean success = false; + try { + int acceptorCount = 0; + boolean useNetworkServer = NetworkService.NETWORK_SERVER.get(settings); + if (useNetworkServer) { + acceptorCount = 1; + } + nioGroup = new NioGroup(logger, daemonThreadFactory(this.settings, TRANSPORT_ACCEPTOR_THREAD_NAME_PREFIX), acceptorCount, + AcceptorEventHandler::new, daemonThreadFactory(this.settings, TRANSPORT_WORKER_THREAD_NAME_PREFIX), + 2, TestingSocketEventHandler::new); + + ProfileSettings clientProfileSettings = new ProfileSettings(settings, "default"); + clientChannelFactory = new MockTcpChannelFactory(clientProfileSettings, "client"); + + if (useNetworkServer) { + // loop through all profiles and start them up, special handling for default one + for (ProfileSettings profileSettings : profileSettings) { + String profileName = profileSettings.profileName; + MockTcpChannelFactory factory = new MockTcpChannelFactory(profileSettings, profileName); + profileToChannelFactory.putIfAbsent(profileName, factory); + bindServer(profileSettings); + } + } + + super.doStart(); + success = true; + } catch (IOException e) { + throw new ElasticsearchException(e); + } finally { + if (success == false) { + doStop(); + } + } + } + + @Override + protected void stopInternal() { + try { + nioGroup.close(); + } catch (Exception e) { + logger.warn("unexpected exception while stopping nio group", e); + } + profileToChannelFactory.clear(); + } + + private void exceptionCaught(NioSocketChannel channel, Exception exception) { + onException((TcpChannel) channel, exception); + } + + private void acceptChannel(NioSocketChannel channel) { + serverAcceptedChannel((TcpChannel) channel); + } + + private class MockTcpChannelFactory extends ChannelFactory { + + private final String profileName; + + private MockTcpChannelFactory(ProfileSettings profileSettings, String profileName) { + super(new RawChannelFactory(profileSettings.tcpNoDelay, + profileSettings.tcpKeepAlive, + profileSettings.reuseAddress, + Math.toIntExact(profileSettings.sendBufferSize.getBytes()), + Math.toIntExact(profileSettings.receiveBufferSize.getBytes()))); + this.profileName = profileName; + } + + @Override + public MockSocketChannel createChannel(SocketSelector selector, SocketChannel channel) throws IOException { + MockSocketChannel nioChannel = new MockSocketChannel(profileName, channel, selector); + Supplier pageSupplier = () -> { + Recycler.V bytes = pageCacheRecycler.bytePage(false); + return new InboundChannelBuffer.Page(ByteBuffer.wrap(bytes.v()), bytes::close); + }; + ReadContext.ReadConsumer nioReadConsumer = channelBuffer -> + consumeNetworkReads(nioChannel, BytesReference.fromByteBuffers(channelBuffer.sliceBuffersTo(channelBuffer.getIndex()))); + BytesReadContext readContext = new BytesReadContext(nioChannel, nioReadConsumer, new InboundChannelBuffer(pageSupplier)); + BytesWriteContext writeContext = new BytesWriteContext(nioChannel); + nioChannel.setContexts(readContext, writeContext, MockNioTransport.this::exceptionCaught); + return nioChannel; + } + + @Override + public MockServerChannel createServerChannel(AcceptingSelector selector, ServerSocketChannel channel) throws IOException { + MockServerChannel nioServerChannel = new MockServerChannel(profileName, channel, this, selector); + nioServerChannel.setAcceptContext(MockNioTransport.this::acceptChannel); + return nioServerChannel; + } + } + + private static class MockServerChannel extends NioServerSocketChannel implements TcpChannel { + + private final String profile; + + MockServerChannel(String profile, ServerSocketChannel channel, ChannelFactory channelFactory, AcceptingSelector selector) + throws IOException { + super(channel, channelFactory, selector); + this.profile = profile; + } + + @Override + public String getProfile() { + return profile; + } + + @Override + public void addCloseListener(ActionListener listener) { + addCloseListener(ActionListener.toBiConsumer(listener)); + } + + @Override + public void setSoLinger(int value) throws IOException { + throw new UnsupportedOperationException("Cannot set SO_LINGER on a server channel."); + } + + @Override + public InetSocketAddress getRemoteAddress() { + return null; + } + + @Override + public void sendMessage(BytesReference reference, ActionListener listener) { + throw new UnsupportedOperationException("Cannot send a message to a server channel."); + } + } + + private static class MockSocketChannel extends NioSocketChannel implements TcpChannel { + + private final String profile; + + private MockSocketChannel(String profile, java.nio.channels.SocketChannel socketChannel, SocketSelector selector) + throws IOException { + super(socketChannel, selector); + this.profile = profile; + } + + @Override + public String getProfile() { + return profile; + } + + @Override + public void addCloseListener(ActionListener listener) { + addCloseListener(ActionListener.toBiConsumer(listener)); + } + + @Override + public void setSoLinger(int value) throws IOException { + if (isOpen()) { + getRawChannel().setOption(StandardSocketOptions.SO_LINGER, value); + } + } + + @Override + public void sendMessage(BytesReference reference, ActionListener listener) { + getWriteContext().sendMessage(BytesReference.toByteBuffers(reference), ActionListener.toBiConsumer(listener)); + } + } +} diff --git a/test/framework/src/main/java/org/elasticsearch/transport/nio/MockNioTransportPlugin.java b/test/framework/src/main/java/org/elasticsearch/transport/nio/MockNioTransportPlugin.java new file mode 100644 index 0000000000000..1acd947d5aad2 --- /dev/null +++ b/test/framework/src/main/java/org/elasticsearch/transport/nio/MockNioTransportPlugin.java @@ -0,0 +1,50 @@ +/* + * Licensed to Elasticsearch under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch licenses this file to you 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. + */ +package org.elasticsearch.transport.nio; + +import org.elasticsearch.common.io.stream.NamedWriteableRegistry; +import org.elasticsearch.common.network.NetworkService; +import org.elasticsearch.common.settings.Settings; +import org.elasticsearch.common.util.BigArrays; +import org.elasticsearch.common.util.PageCacheRecycler; +import org.elasticsearch.indices.breaker.CircuitBreakerService; +import org.elasticsearch.plugins.NetworkPlugin; +import org.elasticsearch.plugins.Plugin; +import org.elasticsearch.threadpool.ThreadPool; +import org.elasticsearch.transport.Transport; + +import java.util.Collections; +import java.util.Map; +import java.util.function.Supplier; + +public class MockNioTransportPlugin extends Plugin implements NetworkPlugin { + + public static final String MOCK_NIO_TRANSPORT_NAME = "mock-nio"; + + @Override + public Map> getTransports(Settings settings, ThreadPool threadPool, BigArrays bigArrays, + PageCacheRecycler pageCacheRecycler, + CircuitBreakerService circuitBreakerService, + NamedWriteableRegistry namedWriteableRegistry, + NetworkService networkService) { + return Collections.singletonMap(MOCK_NIO_TRANSPORT_NAME, + () -> new MockNioTransport(settings, threadPool, networkService, bigArrays, pageCacheRecycler, namedWriteableRegistry, + circuitBreakerService)); + } +} diff --git a/test/framework/src/main/java/org/elasticsearch/transport/nio/TcpFrameDecoder.java b/test/framework/src/main/java/org/elasticsearch/transport/nio/TcpFrameDecoder.java deleted file mode 100644 index 1d389e7d121a2..0000000000000 --- a/test/framework/src/main/java/org/elasticsearch/transport/nio/TcpFrameDecoder.java +++ /dev/null @@ -1,118 +0,0 @@ -/* - * Licensed to Elasticsearch under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch licenses this file to you 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. - */ - -package org.elasticsearch.transport.nio; - -import org.elasticsearch.common.bytes.BytesReference; -import org.elasticsearch.common.io.stream.StreamInput; -import org.elasticsearch.common.unit.ByteSizeValue; -import org.elasticsearch.monitor.jvm.JvmInfo; -import org.elasticsearch.transport.TcpHeader; -import org.elasticsearch.transport.TcpTransport; - -import java.io.IOException; -import java.io.StreamCorruptedException; - -public class TcpFrameDecoder { - - private static final long NINETY_PER_HEAP_SIZE = (long) (JvmInfo.jvmInfo().getMem().getHeapMax().getBytes() * 0.9); - private static final int HEADER_SIZE = TcpHeader.MARKER_BYTES_SIZE + TcpHeader.MESSAGE_LENGTH_SIZE; - - private int expectedMessageLength = -1; - - public BytesReference decode(BytesReference bytesReference) throws IOException { - if (bytesReference.length() >= 6) { - int messageLength = readHeaderBuffer(bytesReference); - int totalLength = messageLength + HEADER_SIZE; - if (totalLength > bytesReference.length()) { - expectedMessageLength = totalLength; - return null; - } else if (totalLength == bytesReference.length()) { - expectedMessageLength = -1; - return bytesReference; - } else { - expectedMessageLength = -1; - return bytesReference.slice(0, totalLength); - } - } else { - return null; - } - } - - public int expectedMessageLength() { - return expectedMessageLength; - } - - private int readHeaderBuffer(BytesReference headerBuffer) throws IOException { - if (headerBuffer.get(0) != 'E' || headerBuffer.get(1) != 'S') { - if (appearsToBeHTTP(headerBuffer)) { - throw new TcpTransport.HttpOnTransportException("This is not a HTTP port"); - } - - throw new StreamCorruptedException("invalid internal transport message format, got (" - + Integer.toHexString(headerBuffer.get(0) & 0xFF) + "," - + Integer.toHexString(headerBuffer.get(1) & 0xFF) + "," - + Integer.toHexString(headerBuffer.get(2) & 0xFF) + "," - + Integer.toHexString(headerBuffer.get(3) & 0xFF) + ")"); - } - final int messageLength; - try (StreamInput input = headerBuffer.streamInput()) { - input.skip(TcpHeader.MARKER_BYTES_SIZE); - messageLength = input.readInt(); - } - - if (messageLength == -1) { - // This is a ping - return 0; - } - - if (messageLength <= 0) { - throw new StreamCorruptedException("invalid data length: " + messageLength); - } - - if (messageLength > NINETY_PER_HEAP_SIZE) { - throw new IllegalArgumentException("transport content length received [" + new ByteSizeValue(messageLength) + "] exceeded [" - + new ByteSizeValue(NINETY_PER_HEAP_SIZE) + "]"); - } - - return messageLength; - } - - private static boolean appearsToBeHTTP(BytesReference headerBuffer) { - return bufferStartsWith(headerBuffer, "GET") || - bufferStartsWith(headerBuffer, "POST") || - bufferStartsWith(headerBuffer, "PUT") || - bufferStartsWith(headerBuffer, "HEAD") || - bufferStartsWith(headerBuffer, "DELETE") || - // TODO: Actually 'OPTIONS'. But that does not currently fit in 6 bytes - bufferStartsWith(headerBuffer, "OPTION") || - bufferStartsWith(headerBuffer, "PATCH") || - bufferStartsWith(headerBuffer, "TRACE"); - } - - private static boolean bufferStartsWith(BytesReference buffer, String method) { - char[] chars = method.toCharArray(); - for (int i = 0; i < chars.length; i++) { - if (buffer.get(i) != chars[i]) { - return false; - } - } - return true; - } -} diff --git a/test/framework/src/main/java/org/elasticsearch/transport/nio/TcpReadContext.java b/test/framework/src/main/java/org/elasticsearch/transport/nio/TcpReadContext.java deleted file mode 100644 index ec0298cbc8853..0000000000000 --- a/test/framework/src/main/java/org/elasticsearch/transport/nio/TcpReadContext.java +++ /dev/null @@ -1,96 +0,0 @@ -/* - * Licensed to Elasticsearch under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch licenses this file to you 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. - */ - -package org.elasticsearch.transport.nio; - -import org.elasticsearch.common.bytes.ByteBufferReference; -import org.elasticsearch.common.bytes.BytesReference; -import org.elasticsearch.common.bytes.CompositeBytesReference; -import org.elasticsearch.nio.InboundChannelBuffer; -import org.elasticsearch.nio.NioSocketChannel; -import org.elasticsearch.nio.ReadContext; - -import java.io.IOException; -import java.nio.ByteBuffer; - -public class TcpReadContext implements ReadContext { - - private final TcpReadHandler handler; - private final TcpNioSocketChannel channel; - private final InboundChannelBuffer channelBuffer; - private final TcpFrameDecoder frameDecoder = new TcpFrameDecoder(); - - public TcpReadContext(NioSocketChannel channel, TcpReadHandler handler, InboundChannelBuffer channelBuffer) { - this.handler = handler; - this.channel = (TcpNioSocketChannel) channel; - this.channelBuffer = channelBuffer; - } - - @Override - public int read() throws IOException { - if (channelBuffer.getRemaining() == 0) { - // Requiring one additional byte will ensure that a new page is allocated. - channelBuffer.ensureCapacity(channelBuffer.getCapacity() + 1); - } - - int bytesRead = channel.read(channelBuffer); - - if (bytesRead == -1) { - return bytesRead; - } - - BytesReference message; - - // Frame decoder will throw an exception if the message is improperly formatted, the header is incorrect, - // or the message is corrupted - while ((message = frameDecoder.decode(toBytesReference(channelBuffer))) != null) { - int messageLengthWithHeader = message.length(); - - try { - BytesReference messageWithoutHeader = message.slice(6, message.length() - 6); - - // A message length of 6 bytes it is just a ping. Ignore for now. - if (messageLengthWithHeader != 6) { - handler.handleMessage(messageWithoutHeader, channel, messageWithoutHeader.length()); - } - } catch (Exception e) { - handler.handleException(channel, e); - } finally { - channelBuffer.release(messageLengthWithHeader); - } - } - - return bytesRead; - } - - @Override - public void close() { - channelBuffer.close(); - } - - private static BytesReference toBytesReference(InboundChannelBuffer channelBuffer) { - ByteBuffer[] writtenToBuffers = channelBuffer.sliceBuffersTo(channelBuffer.getIndex()); - ByteBufferReference[] references = new ByteBufferReference[writtenToBuffers.length]; - for (int i = 0; i < references.length; ++i) { - references[i] = new ByteBufferReference(writtenToBuffers[i]); - } - - return new CompositeBytesReference(references); - } -} diff --git a/test/framework/src/test/java/org/elasticsearch/transport/nio/TestingSocketEventHandler.java b/test/framework/src/main/java/org/elasticsearch/transport/nio/TestingSocketEventHandler.java similarity index 100% rename from test/framework/src/test/java/org/elasticsearch/transport/nio/TestingSocketEventHandler.java rename to test/framework/src/main/java/org/elasticsearch/transport/nio/TestingSocketEventHandler.java index a3fa5b9a4b563..ecc00c24f9c81 100644 --- a/test/framework/src/test/java/org/elasticsearch/transport/nio/TestingSocketEventHandler.java +++ b/test/framework/src/main/java/org/elasticsearch/transport/nio/TestingSocketEventHandler.java @@ -20,8 +20,8 @@ package org.elasticsearch.transport.nio; import org.apache.logging.log4j.Logger; -import org.elasticsearch.nio.SocketEventHandler; import org.elasticsearch.nio.NioSocketChannel; +import org.elasticsearch.nio.SocketEventHandler; import java.io.IOException; import java.util.Collections; diff --git a/test/framework/src/test/java/org/elasticsearch/transport/nio/SimpleMockNioTransportTests.java b/test/framework/src/test/java/org/elasticsearch/transport/nio/SimpleMockNioTransportTests.java new file mode 100644 index 0000000000000..bb36ed9f6db1d --- /dev/null +++ b/test/framework/src/test/java/org/elasticsearch/transport/nio/SimpleMockNioTransportTests.java @@ -0,0 +1,137 @@ +/* + * Licensed to Elasticsearch under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch licenses this file to you 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. + */ + +package org.elasticsearch.transport.nio; + +import org.elasticsearch.Version; +import org.elasticsearch.cluster.node.DiscoveryNode; +import org.elasticsearch.common.io.stream.NamedWriteableRegistry; +import org.elasticsearch.common.network.NetworkService; +import org.elasticsearch.common.settings.ClusterSettings; +import org.elasticsearch.common.settings.Settings; +import org.elasticsearch.common.transport.TransportAddress; +import org.elasticsearch.common.unit.TimeValue; +import org.elasticsearch.common.util.BigArrays; +import org.elasticsearch.common.util.MockPageCacheRecycler; +import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; +import org.elasticsearch.node.Node; +import org.elasticsearch.test.transport.MockTransportService; +import org.elasticsearch.threadpool.ThreadPool; +import org.elasticsearch.transport.AbstractSimpleTransportTestCase; +import org.elasticsearch.transport.BindTransportException; +import org.elasticsearch.transport.ConnectTransportException; +import org.elasticsearch.transport.TcpChannel; +import org.elasticsearch.transport.TcpTransport; +import org.elasticsearch.transport.Transport; +import org.elasticsearch.transport.TransportService; + +import java.io.IOException; +import java.net.InetAddress; +import java.net.UnknownHostException; +import java.util.Collections; + +import static java.util.Collections.emptyMap; +import static java.util.Collections.emptySet; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.instanceOf; + +public class SimpleMockNioTransportTests extends AbstractSimpleTransportTestCase { + + public static MockTransportService nioFromThreadPool(Settings settings, ThreadPool threadPool, final Version version, + ClusterSettings clusterSettings, boolean doHandshake) { + NamedWriteableRegistry namedWriteableRegistry = new NamedWriteableRegistry(Collections.emptyList()); + NetworkService networkService = new NetworkService(Collections.emptyList()); + Transport transport = new MockNioTransport(settings, threadPool, + networkService, BigArrays.NON_RECYCLING_INSTANCE, new MockPageCacheRecycler(settings), namedWriteableRegistry, + new NoneCircuitBreakerService()) { + + @Override + protected Version executeHandshake(DiscoveryNode node, TcpChannel channel, TimeValue timeout) throws IOException, + InterruptedException { + if (doHandshake) { + return super.executeHandshake(node, channel, timeout); + } else { + return version.minimumCompatibilityVersion(); + } + } + + @Override + protected Version getCurrentVersion() { + return version; + } + + }; + MockTransportService mockTransportService = + MockTransportService.createNewService(Settings.EMPTY, transport, version, threadPool, clusterSettings); + mockTransportService.start(); + return mockTransportService; + } + + @Override + protected MockTransportService build(Settings settings, Version version, ClusterSettings clusterSettings, boolean doHandshake) { + settings = Settings.builder().put(settings) + .put(TcpTransport.PORT.getKey(), "0") + .build(); + MockTransportService transportService = nioFromThreadPool(settings, threadPool, version, clusterSettings, doHandshake); + transportService.start(); + return transportService; + } + + @Override + protected void closeConnectionChannel(Transport transport, Transport.Connection connection) throws IOException { + @SuppressWarnings("unchecked") + TcpTransport.NodeChannels channels = (TcpTransport.NodeChannels) connection; + TcpChannel.closeChannels(channels.getChannels().subList(0, randomIntBetween(1, channels.getChannels().size())), true); + } + + public void testConnectException() throws UnknownHostException { + try { + serviceA.connectToNode(new DiscoveryNode("C", new TransportAddress(InetAddress.getByName("localhost"), 9876), + emptyMap(), emptySet(),Version.CURRENT)); + fail("Expected ConnectTransportException"); + } catch (ConnectTransportException e) { + assertThat(e.getMessage(), containsString("connect_exception")); + assertThat(e.getMessage(), containsString("[127.0.0.1:9876]")); + Throwable cause = e.getCause(); + assertThat(cause, instanceOf(IOException.class)); + } + } + + public void testBindUnavailableAddress() { + // this is on a lower level since it needs access to the TransportService before it's started + int port = serviceA.boundAddress().publishAddress().getPort(); + Settings settings = Settings.builder() + .put(Node.NODE_NAME_SETTING.getKey(), "foobar") + .put(TransportService.TRACE_LOG_INCLUDE_SETTING.getKey(), "") + .put(TransportService.TRACE_LOG_EXCLUDE_SETTING.getKey(), "NOTHING") + .put("transport.tcp.port", port) + .build(); + ClusterSettings clusterSettings = new ClusterSettings(settings, ClusterSettings.BUILT_IN_CLUSTER_SETTINGS); + BindTransportException bindTransportException = expectThrows(BindTransportException.class, () -> { + MockTransportService transportService = nioFromThreadPool(settings, threadPool, Version.CURRENT, clusterSettings, true); + try { + transportService.start(); + } finally { + transportService.stop(); + transportService.close(); + } + }); + assertEquals("Failed to bind to ["+ port + "]", bindTransportException.getMessage()); + } +} diff --git a/test/framework/src/test/java/org/elasticsearch/transport/nio/TcpFrameDecoderTests.java b/test/framework/src/test/java/org/elasticsearch/transport/nio/TcpFrameDecoderTests.java deleted file mode 100644 index d9ae2de14f176..0000000000000 --- a/test/framework/src/test/java/org/elasticsearch/transport/nio/TcpFrameDecoderTests.java +++ /dev/null @@ -1,167 +0,0 @@ -/* - * Licensed to Elasticsearch under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch licenses this file to you 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. - */ - -package org.elasticsearch.transport.nio; - -import org.elasticsearch.common.bytes.BytesReference; -import org.elasticsearch.common.io.stream.BytesStreamOutput; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.transport.TcpTransport; - -import java.io.IOException; -import java.io.StreamCorruptedException; - -import static org.hamcrest.Matchers.instanceOf; - -public class TcpFrameDecoderTests extends ESTestCase { - - private TcpFrameDecoder frameDecoder = new TcpFrameDecoder(); - - public void testDefaultExceptedMessageLengthIsNegative1() { - assertEquals(-1, frameDecoder.expectedMessageLength()); - } - - public void testDecodeWithIncompleteHeader() throws IOException { - BytesStreamOutput streamOutput = new BytesStreamOutput(1 << 14); - streamOutput.write('E'); - streamOutput.write('S'); - streamOutput.write(1); - streamOutput.write(1); - - assertNull(frameDecoder.decode(streamOutput.bytes())); - assertEquals(-1, frameDecoder.expectedMessageLength()); - } - - public void testDecodePing() throws IOException { - BytesStreamOutput streamOutput = new BytesStreamOutput(1 << 14); - streamOutput.write('E'); - streamOutput.write('S'); - streamOutput.writeInt(-1); - - BytesReference message = frameDecoder.decode(streamOutput.bytes()); - - assertEquals(-1, frameDecoder.expectedMessageLength()); - assertEquals(streamOutput.bytes(), message); - } - - public void testDecodePingWithStartOfSecondMessage() throws IOException { - BytesStreamOutput streamOutput = new BytesStreamOutput(1 << 14); - streamOutput.write('E'); - streamOutput.write('S'); - streamOutput.writeInt(-1); - streamOutput.write('E'); - streamOutput.write('S'); - - BytesReference message = frameDecoder.decode(streamOutput.bytes()); - - assertEquals(6, message.length()); - assertEquals(streamOutput.bytes().slice(0, 6), message); - } - - public void testDecodeMessage() throws IOException { - BytesStreamOutput streamOutput = new BytesStreamOutput(1 << 14); - streamOutput.write('E'); - streamOutput.write('S'); - streamOutput.writeInt(2); - streamOutput.write('M'); - streamOutput.write('A'); - - BytesReference message = frameDecoder.decode(streamOutput.bytes()); - - assertEquals(-1, frameDecoder.expectedMessageLength()); - assertEquals(streamOutput.bytes(), message); - } - - public void testDecodeIncompleteMessage() throws IOException { - BytesStreamOutput streamOutput = new BytesStreamOutput(1 << 14); - streamOutput.write('E'); - streamOutput.write('S'); - streamOutput.writeInt(3); - streamOutput.write('M'); - streamOutput.write('A'); - - BytesReference message = frameDecoder.decode(streamOutput.bytes()); - - assertEquals(9, frameDecoder.expectedMessageLength()); - assertNull(message); - } - - public void testInvalidLength() throws IOException { - BytesStreamOutput streamOutput = new BytesStreamOutput(1 << 14); - streamOutput.write('E'); - streamOutput.write('S'); - streamOutput.writeInt(-2); - streamOutput.write('M'); - streamOutput.write('A'); - - try { - frameDecoder.decode(streamOutput.bytes()); - fail("Expected exception"); - } catch (Exception ex) { - assertThat(ex, instanceOf(StreamCorruptedException.class)); - assertEquals("invalid data length: -2", ex.getMessage()); - } - } - - public void testInvalidHeader() throws IOException { - BytesStreamOutput streamOutput = new BytesStreamOutput(1 << 14); - streamOutput.write('E'); - streamOutput.write('C'); - byte byte1 = randomByte(); - byte byte2 = randomByte(); - streamOutput.write(byte1); - streamOutput.write(byte2); - streamOutput.write(randomByte()); - streamOutput.write(randomByte()); - streamOutput.write(randomByte()); - - try { - frameDecoder.decode(streamOutput.bytes()); - fail("Expected exception"); - } catch (Exception ex) { - assertThat(ex, instanceOf(StreamCorruptedException.class)); - String expected = "invalid internal transport message format, got (45,43," - + Integer.toHexString(byte1 & 0xFF) + "," - + Integer.toHexString(byte2 & 0xFF) + ")"; - assertEquals(expected, ex.getMessage()); - } - } - - public void testHTTPHeader() throws IOException { - String[] httpHeaders = {"GET", "POST", "PUT", "HEAD", "DELETE", "OPTIONS", "PATCH", "TRACE"}; - - for (String httpHeader : httpHeaders) { - BytesStreamOutput streamOutput = new BytesStreamOutput(1 << 14); - - for (char c : httpHeader.toCharArray()) { - streamOutput.write((byte) c); - } - streamOutput.write(new byte[6]); - - try { - BytesReference bytes = streamOutput.bytes(); - frameDecoder.decode(bytes); - fail("Expected exception"); - } catch (Exception ex) { - assertThat(ex, instanceOf(TcpTransport.HttpOnTransportException.class)); - assertEquals("This is not a HTTP port", ex.getMessage()); - } - } - } -} diff --git a/test/framework/src/test/java/org/elasticsearch/transport/nio/TcpReadContextTests.java b/test/framework/src/test/java/org/elasticsearch/transport/nio/TcpReadContextTests.java deleted file mode 100644 index 97a8f456d1096..0000000000000 --- a/test/framework/src/test/java/org/elasticsearch/transport/nio/TcpReadContextTests.java +++ /dev/null @@ -1,158 +0,0 @@ -/* - * Licensed to Elasticsearch under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch licenses this file to you 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. - */ - -package org.elasticsearch.transport.nio; - -import org.elasticsearch.common.bytes.BytesArray; -import org.elasticsearch.common.bytes.CompositeBytesReference; -import org.elasticsearch.common.util.BigArrays; -import org.elasticsearch.nio.InboundChannelBuffer; -import org.elasticsearch.test.ESTestCase; -import org.junit.Before; - -import java.io.IOException; -import java.nio.ByteBuffer; -import java.util.concurrent.atomic.AtomicLong; -import java.util.concurrent.atomic.AtomicReference; -import java.util.function.Supplier; - -import static org.mockito.Matchers.any; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; -import static org.mockito.Mockito.when; - -public class TcpReadContextTests extends ESTestCase { - - private TcpReadHandler handler; - private int messageLength; - private TcpNioSocketChannel channel; - private TcpReadContext readContext; - - @Before - public void init() { - handler = mock(TcpReadHandler.class); - - messageLength = randomInt(96) + 4; - channel = mock(TcpNioSocketChannel.class); - Supplier pageSupplier = () -> - new InboundChannelBuffer.Page(ByteBuffer.allocate(BigArrays.BYTE_PAGE_SIZE), () -> {}); - readContext = new TcpReadContext(channel, handler, new InboundChannelBuffer(pageSupplier)); - } - - public void testSuccessfulRead() throws IOException { - byte[] bytes = createMessage(messageLength); - byte[] fullMessage = combineMessageAndHeader(bytes); - - final AtomicLong bufferCapacity = new AtomicLong(); - when(channel.read(any(InboundChannelBuffer.class))).thenAnswer(invocationOnMock -> { - InboundChannelBuffer buffer = (InboundChannelBuffer) invocationOnMock.getArguments()[0]; - ByteBuffer byteBuffer = buffer.sliceBuffersFrom(buffer.getIndex())[0]; - bufferCapacity.set(buffer.getCapacity() - buffer.getIndex()); - byteBuffer.put(fullMessage); - buffer.incrementIndex(fullMessage.length); - return fullMessage.length; - }); - - readContext.read(); - - verify(handler).handleMessage(new BytesArray(bytes), channel, messageLength); - assertEquals(1024 * 16, bufferCapacity.get()); - - BytesArray bytesArray = new BytesArray(new byte[10]); - bytesArray.slice(5, 5); - bytesArray.slice(5, 0); - } - - public void testPartialRead() throws IOException { - byte[] part1 = createMessage(messageLength); - byte[] fullPart1 = combineMessageAndHeader(part1, messageLength + messageLength); - byte[] part2 = createMessage(messageLength); - - final AtomicLong bufferCapacity = new AtomicLong(); - final AtomicReference bytes = new AtomicReference<>(); - - when(channel.read(any(InboundChannelBuffer.class))).thenAnswer(invocationOnMock -> { - InboundChannelBuffer buffer = (InboundChannelBuffer) invocationOnMock.getArguments()[0]; - ByteBuffer byteBuffer = buffer.sliceBuffersFrom(buffer.getIndex())[0]; - bufferCapacity.set(buffer.getCapacity() - buffer.getIndex()); - byteBuffer.put(bytes.get()); - buffer.incrementIndex(bytes.get().length); - return bytes.get().length; - }); - - - bytes.set(fullPart1); - readContext.read(); - - assertEquals(1024 * 16, bufferCapacity.get()); - verifyZeroInteractions(handler); - - bytes.set(part2); - readContext.read(); - - assertEquals(1024 * 16 - fullPart1.length, bufferCapacity.get()); - - CompositeBytesReference reference = new CompositeBytesReference(new BytesArray(part1), new BytesArray(part2)); - verify(handler).handleMessage(reference, channel, messageLength + messageLength); - } - - public void testReadThrowsIOException() throws IOException { - IOException ioException = new IOException(); - when(channel.read(any())).thenThrow(ioException); - - try { - readContext.read(); - fail("Expected exception"); - } catch (Exception ex) { - assertSame(ioException, ex); - } - } - - public void closeClosesChannelBuffer() { - InboundChannelBuffer buffer = mock(InboundChannelBuffer.class); - TcpReadContext readContext = new TcpReadContext(channel, handler, buffer); - - readContext.close(); - - verify(buffer).close(); - } - - private static byte[] combineMessageAndHeader(byte[] bytes) { - return combineMessageAndHeader(bytes, bytes.length); - } - - private static byte[] combineMessageAndHeader(byte[] bytes, int messageLength) { - byte[] fullMessage = new byte[bytes.length + 6]; - ByteBuffer wrapped = ByteBuffer.wrap(fullMessage); - wrapped.put((byte) 'E'); - wrapped.put((byte) 'S'); - wrapped.putInt(messageLength); - wrapped.put(bytes); - return fullMessage; - } - - private static byte[] createMessage(int length) { - byte[] bytes = new byte[length]; - for (int i = 0; i < length; ++i) { - bytes[i] = randomByte(); - } - return bytes; - } -} From 27bbec0c195d7a88565e20d60e02edb7a593d188 Mon Sep 17 00:00:00 2001 From: hyeonyoung na Date: Sat, 6 Jan 2018 02:16:15 +0900 Subject: [PATCH 08/74] Update contributing docs to use the Gradle wrapper This commit updates the contributing docs to reference the introduction of the Gradle wrapper. Relates #28103 --- CONTRIBUTING.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c211ae374f4a9..92ffa75de6c23 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -99,13 +99,13 @@ We support development in the Eclipse and IntelliJ IDEs. For Eclipse, the minimum version that we support is [Eclipse Oxygen][eclipse] (version 4.7). For IntelliJ, the minimum version that we support is [IntelliJ 2017.2][intellij]. -Eclipse users can automatically configure their IDE: `gradle eclipse` +Eclipse users can automatically configure their IDE: `./gradlew eclipse` then `File: Import: Existing Projects into Workspace`. Select the option `Search for nested projects`. Additionally you will want to ensure that Eclipse is using 2048m of heap by modifying `eclipse.ini` accordingly to avoid GC overhead errors. -IntelliJ users can automatically configure their IDE: `gradle idea` +IntelliJ users can automatically configure their IDE: `./gradlew idea` then `File->New Project From Existing Sources`. Point to the root of the source directory, select `Import project from external model->Gradle`, enable @@ -123,7 +123,7 @@ restart of IDEA). For IDEA 2017.3 and above, in addition to the JVM option, you classpath](https://github.com/elastic/elasticsearch/issues/14348) if that is reported as a source of jar hell. -To run an instance of elasticsearch from the source code run `gradle run` +To run an instance of elasticsearch from the source code run `./gradlew run` The Elasticsearch codebase makes heavy use of Java `assert`s and the test runner requires that assertions be enabled within the JVM. This @@ -151,7 +151,7 @@ To create a distribution from the source, simply run: ```sh cd elasticsearch/ -gradle assemble +./gradlew assemble ``` You will find the newly built packages under: `./distribution/(deb|rpm|tar|zip)/build/distributions/`. @@ -159,7 +159,7 @@ You will find the newly built packages under: `./distribution/(deb|rpm|tar|zip)/ Before submitting your changes, run the test suite to make sure that nothing is broken, with: ```sh -gradle check +./gradlew check ``` Contributing as part of a class @@ -187,7 +187,7 @@ code review process because it wastes our time. * We don't have the capacity to absorb an entire class full of new contributors, especially when they are unlikely to become long time contributors. -Finally, we require that you run `gradle check` before submitting a +Finally, we require that you run `./gradlew check` before submitting a non-documentation contribution. This is mentioned above, but it is worth repeating in this section because it has come up in this context. From b5377d294fa32dd76bda7a5b60eb8d393e4a949a Mon Sep 17 00:00:00 2001 From: Jack Conradson Date: Fri, 5 Jan 2018 13:06:36 -0800 Subject: [PATCH 09/74] Painless: Modify Loader to Load Classes Directly from Definition (#28088) --- .../org/elasticsearch/painless/Compiler.java | 26 ++++- .../elasticsearch/painless/Definition.java | 10 +- .../painless/PainlessPlugin.java | 5 - .../painless/PainlessScriptEngine.java | 19 ++-- .../painless/AnalyzerCasterTests.java | 99 ++++++++++--------- .../painless/BaseClassTests.java | 47 ++++----- .../elasticsearch/painless/DebugTests.java | 4 +- .../org/elasticsearch/painless/Debugger.java | 5 +- .../painless/DefBootstrapTests.java | 3 +- .../painless/PainlessDocGenerator.java | 6 +- .../painless/ScriptTestCase.java | 4 +- .../painless/node/NodeToStringTests.java | 15 +-- 12 files changed, 149 insertions(+), 94 deletions(-) diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/Compiler.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/Compiler.java index 582ba6f4d5b06..ad5e80ba16edd 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/Compiler.java +++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/Compiler.java @@ -69,12 +69,28 @@ final class Compiler { */ static final class Loader extends SecureClassLoader { private final AtomicInteger lambdaCounter = new AtomicInteger(0); + private final Definition definition; /** * @param parent The parent ClassLoader. */ - Loader(ClassLoader parent) { + Loader(ClassLoader parent, Definition definition) { super(parent); + + this.definition = definition; + } + + /** + * Will check to see if the {@link Class} has already been loaded when + * the {@link Definition} was initially created. Allows for {@link Whitelist}ed + * classes to be loaded from other modules/plugins without a direct relationship + * to the module's/plugin's {@link ClassLoader}. + */ + @Override + public Class findClass(String name) throws ClassNotFoundException { + Class found = definition.getClassFromBinaryName(name); + + return found != null ? found : super.findClass(name); } /** @@ -116,6 +132,14 @@ int newLambdaIdentifier() { } } + /** + * Return a new {@link Loader} for a script using the + * {@link Compiler}'s specified {@link Definition}. + */ + public Loader createLoader(ClassLoader parent) { + return new Loader(parent, definition); + } + /** * The class/interface the script is guaranteed to derive/implement. */ diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/Definition.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/Definition.java index 853c836f9cfca..34385dbf7acfc 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/Definition.java +++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/Definition.java @@ -43,7 +43,7 @@ public final class Definition { private static final Pattern TYPE_NAME_PATTERN = Pattern.compile("^[_a-zA-Z][._a-zA-Z0-9]*$"); - private static final String[] DEFINITION_FILES = new String[] { + public static final String[] DEFINITION_FILES = new String[] { "org.elasticsearch.txt", "java.lang.txt", "java.math.txt", @@ -522,6 +522,12 @@ public RuntimeClass getRuntimeClass(Class clazz) { return runtimeMap.get(clazz); } + public Class getClassFromBinaryName(String name) { + Struct struct = structsMap.get(name.replace('$', '.')); + + return struct == null ? null : struct.clazz; + } + /** Collection of all simple types. Used by {@code PainlessDocGenerator} to generate an API reference. */ Collection allSimpleTypes() { return simpleTypesMap.values(); @@ -535,7 +541,7 @@ Collection allSimpleTypes() { public AnalyzerCaster caster; - private Definition(List whitelists) { + public Definition(List whitelists) { structsMap = new HashMap<>(); simpleTypesMap = new HashMap<>(); runtimeMap = new HashMap<>(); diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/PainlessPlugin.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/PainlessPlugin.java index 28b860bb539ce..842af8717a34b 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/PainlessPlugin.java +++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/PainlessPlugin.java @@ -37,11 +37,6 @@ */ public final class PainlessPlugin extends Plugin implements ScriptPlugin, ExtensiblePlugin { - // force to parse our definition at startup (not on the user's first script) - static { - Definition.DEFINITION.hashCode(); - } - @Override public ScriptEngine getScriptEngine(Settings settings, Collection> contexts) { return new PainlessScriptEngine(settings, contexts); diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/PainlessScriptEngine.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/PainlessScriptEngine.java index 5299adb1dc8dd..ac01f45a7fdd6 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/PainlessScriptEngine.java +++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/PainlessScriptEngine.java @@ -99,11 +99,16 @@ public PainlessScriptEngine(Settings settings, Collection> cont Map, Compiler> contextsToCompilers = new HashMap<>(); + // Placeholder definition used for all contexts until SPI is fully integrated. Reduces memory foot print + // by re-using the same definition since caching isn't implemented at this time. + Definition definition = new Definition( + Collections.singletonList(WhitelistLoader.loadFromResourceFiles(Definition.class, Definition.DEFINITION_FILES))); + for (ScriptContext context : contexts) { if (context.instanceClazz.equals(SearchScript.class) || context.instanceClazz.equals(ExecutableScript.class)) { - contextsToCompilers.put(context, new Compiler(GenericElasticsearchScript.class, Definition.DEFINITION)); + contextsToCompilers.put(context, new Compiler(GenericElasticsearchScript.class, definition)); } else { - contextsToCompilers.put(context, new Compiler(context.instanceClazz, Definition.DEFINITION)); + contextsToCompilers.put(context, new Compiler(context.instanceClazz, definition)); } } @@ -126,9 +131,11 @@ public String getType() { @Override public T compile(String scriptName, String scriptSource, ScriptContext context, Map params) { + Compiler compiler = contextsToCompilers.get(context); + if (context.instanceClazz.equals(SearchScript.class)) { GenericElasticsearchScript painlessScript = - (GenericElasticsearchScript)compile(contextsToCompilers.get(context), scriptName, scriptSource, params); + (GenericElasticsearchScript)compile(compiler, scriptName, scriptSource, params); SearchScript.Factory factory = (p, lookup) -> new SearchScript.LeafFactory() { @Override @@ -143,7 +150,7 @@ public boolean needs_score() { return context.factoryClazz.cast(factory); } else if (context.instanceClazz.equals(ExecutableScript.class)) { GenericElasticsearchScript painlessScript = - (GenericElasticsearchScript)compile(contextsToCompilers.get(context), scriptName, scriptSource, params); + (GenericElasticsearchScript)compile(compiler, scriptName, scriptSource, params); ExecutableScript.Factory factory = (p) -> new ScriptImpl(painlessScript, p, null, null); return context.factoryClazz.cast(factory); @@ -155,7 +162,7 @@ public boolean needs_score() { final Loader loader = AccessController.doPrivileged(new PrivilegedAction() { @Override public Loader run() { - return new Loader(getClass().getClassLoader()); + return compiler.createLoader(getClass().getClassLoader()); } }); @@ -414,7 +421,7 @@ Object compile(Compiler compiler, String scriptName, String source, Map() { @Override public Loader run() { - return new Loader(getClass().getClassLoader()); + return compiler.createLoader(getClass().getClassLoader()); } }); diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/AnalyzerCasterTests.java b/modules/lang-painless/src/test/java/org/elasticsearch/painless/AnalyzerCasterTests.java index 249ce122b43e5..58ae31a45c93a 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/AnalyzerCasterTests.java +++ b/modules/lang-painless/src/test/java/org/elasticsearch/painless/AnalyzerCasterTests.java @@ -23,75 +23,82 @@ import org.elasticsearch.painless.Definition.Type; import org.elasticsearch.test.ESTestCase; +import java.util.Collections; + +import static org.elasticsearch.painless.Definition.DEFINITION_FILES; + public class AnalyzerCasterTests extends ESTestCase { + private static final Definition definition = new Definition( + Collections.singletonList(WhitelistLoader.loadFromResourceFiles(Definition.class, DEFINITION_FILES))); + private static void assertCast(Type actual, Type expected, boolean mustBeExplicit) { Location location = new Location("dummy", 0); if (actual.equals(expected)) { assertFalse(mustBeExplicit); - assertNull(Definition.DEFINITION.caster.getLegalCast(location, actual, expected, false, false)); - assertNull(Definition.DEFINITION.caster.getLegalCast(location, actual, expected, true, false)); + assertNull(definition.caster.getLegalCast(location, actual, expected, false, false)); + assertNull(definition.caster.getLegalCast(location, actual, expected, true, false)); return; } - Cast cast = Definition.DEFINITION.caster.getLegalCast(location, actual, expected, true, false); + Cast cast = definition.caster.getLegalCast(location, actual, expected, true, false); assertEquals(actual, cast.from); assertEquals(expected, cast.to); if (mustBeExplicit) { ClassCastException error = expectThrows(ClassCastException.class, - () -> Definition.DEFINITION.caster.getLegalCast(location, actual, expected, false, false)); + () -> definition.caster.getLegalCast(location, actual, expected, false, false)); assertTrue(error.getMessage().startsWith("Cannot cast")); } else { - cast = Definition.DEFINITION.caster.getLegalCast(location, actual, expected, false, false); + cast = definition.caster.getLegalCast(location, actual, expected, false, false); assertEquals(actual, cast.from); assertEquals(expected, cast.to); } } public void testNumericCasts() { - assertCast(Definition.DEFINITION.byteType, Definition.DEFINITION.byteType, false); - assertCast(Definition.DEFINITION.byteType, Definition.DEFINITION.shortType, false); - assertCast(Definition.DEFINITION.byteType, Definition.DEFINITION.intType, false); - assertCast(Definition.DEFINITION.byteType, Definition.DEFINITION.longType, false); - assertCast(Definition.DEFINITION.byteType, Definition.DEFINITION.floatType, false); - assertCast(Definition.DEFINITION.byteType, Definition.DEFINITION.doubleType, false); - - assertCast(Definition.DEFINITION.shortType, Definition.DEFINITION.byteType, true); - assertCast(Definition.DEFINITION.shortType, Definition.DEFINITION.shortType, false); - assertCast(Definition.DEFINITION.shortType, Definition.DEFINITION.intType, false); - assertCast(Definition.DEFINITION.shortType, Definition.DEFINITION.longType, false); - assertCast(Definition.DEFINITION.shortType, Definition.DEFINITION.floatType, false); - assertCast(Definition.DEFINITION.shortType, Definition.DEFINITION.doubleType, false); - - assertCast(Definition.DEFINITION.intType, Definition.DEFINITION.byteType, true); - assertCast(Definition.DEFINITION.intType, Definition.DEFINITION.shortType, true); - assertCast(Definition.DEFINITION.intType, Definition.DEFINITION.intType, false); - assertCast(Definition.DEFINITION.intType, Definition.DEFINITION.longType, false); - assertCast(Definition.DEFINITION.intType, Definition.DEFINITION.floatType, false); - assertCast(Definition.DEFINITION.intType, Definition.DEFINITION.doubleType, false); - - assertCast(Definition.DEFINITION.longType, Definition.DEFINITION.byteType, true); - assertCast(Definition.DEFINITION.longType, Definition.DEFINITION.shortType, true); - assertCast(Definition.DEFINITION.longType, Definition.DEFINITION.intType, true); - assertCast(Definition.DEFINITION.longType, Definition.DEFINITION.longType, false); - assertCast(Definition.DEFINITION.longType, Definition.DEFINITION.floatType, false); - assertCast(Definition.DEFINITION.longType, Definition.DEFINITION.doubleType, false); - - assertCast(Definition.DEFINITION.floatType, Definition.DEFINITION.byteType, true); - assertCast(Definition.DEFINITION.floatType, Definition.DEFINITION.shortType, true); - assertCast(Definition.DEFINITION.floatType, Definition.DEFINITION.intType, true); - assertCast(Definition.DEFINITION.floatType, Definition.DEFINITION.longType, true); - assertCast(Definition.DEFINITION.floatType, Definition.DEFINITION.floatType, false); - assertCast(Definition.DEFINITION.floatType, Definition.DEFINITION.doubleType, false); - - assertCast(Definition.DEFINITION.doubleType, Definition.DEFINITION.byteType, true); - assertCast(Definition.DEFINITION.doubleType, Definition.DEFINITION.shortType, true); - assertCast(Definition.DEFINITION.doubleType, Definition.DEFINITION.intType, true); - assertCast(Definition.DEFINITION.doubleType, Definition.DEFINITION.longType, true); - assertCast(Definition.DEFINITION.doubleType, Definition.DEFINITION.floatType, true); - assertCast(Definition.DEFINITION.doubleType, Definition.DEFINITION.doubleType, false); + assertCast(definition.byteType, definition.byteType, false); + assertCast(definition.byteType, definition.shortType, false); + assertCast(definition.byteType, definition.intType, false); + assertCast(definition.byteType, definition.longType, false); + assertCast(definition.byteType, definition.floatType, false); + assertCast(definition.byteType, definition.doubleType, false); + + assertCast(definition.shortType, definition.byteType, true); + assertCast(definition.shortType, definition.shortType, false); + assertCast(definition.shortType, definition.intType, false); + assertCast(definition.shortType, definition.longType, false); + assertCast(definition.shortType, definition.floatType, false); + assertCast(definition.shortType, definition.doubleType, false); + + assertCast(definition.intType, definition.byteType, true); + assertCast(definition.intType, definition.shortType, true); + assertCast(definition.intType, definition.intType, false); + assertCast(definition.intType, definition.longType, false); + assertCast(definition.intType, definition.floatType, false); + assertCast(definition.intType, definition.doubleType, false); + + assertCast(definition.longType, definition.byteType, true); + assertCast(definition.longType, definition.shortType, true); + assertCast(definition.longType, definition.intType, true); + assertCast(definition.longType, definition.longType, false); + assertCast(definition.longType, definition.floatType, false); + assertCast(definition.longType, definition.doubleType, false); + + assertCast(definition.floatType, definition.byteType, true); + assertCast(definition.floatType, definition.shortType, true); + assertCast(definition.floatType, definition.intType, true); + assertCast(definition.floatType, definition.longType, true); + assertCast(definition.floatType, definition.floatType, false); + assertCast(definition.floatType, definition.doubleType, false); + + assertCast(definition.doubleType, definition.byteType, true); + assertCast(definition.doubleType, definition.shortType, true); + assertCast(definition.doubleType, definition.intType, true); + assertCast(definition.doubleType, definition.longType, true); + assertCast(definition.doubleType, definition.floatType, true); + assertCast(definition.doubleType, definition.doubleType, false); } } diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/BaseClassTests.java b/modules/lang-painless/src/test/java/org/elasticsearch/painless/BaseClassTests.java index cdd51447bc149..2ba8692b8af59 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/BaseClassTests.java +++ b/modules/lang-painless/src/test/java/org/elasticsearch/painless/BaseClassTests.java @@ -37,6 +37,9 @@ */ public class BaseClassTests extends ScriptTestCase { + private final Definition definition = new Definition( + Collections.singletonList(WhitelistLoader.loadFromResourceFiles(Definition.class, Definition.DEFINITION_FILES))); + public abstract static class Gets { private final String testString; @@ -66,7 +69,7 @@ public Map getTestMap() { } public void testGets() { - Compiler compiler = new Compiler(Gets.class, Definition.DEFINITION); + Compiler compiler = new Compiler(Gets.class, definition); Map map = new HashMap<>(); map.put("s", 1); @@ -84,7 +87,7 @@ public abstract static class NoArgs { public abstract Object execute(); } public void testNoArgs() { - Compiler compiler = new Compiler(NoArgs.class, Definition.DEFINITION); + Compiler compiler = new Compiler(NoArgs.class, definition); assertEquals(1, ((NoArgs)scriptEngine.compile(compiler, null, "1", emptyMap())).execute()); assertEquals("foo", ((NoArgs)scriptEngine.compile(compiler, null, "'foo'", emptyMap())).execute()); @@ -108,13 +111,13 @@ public abstract static class OneArg { public abstract Object execute(Object arg); } public void testOneArg() { - Compiler compiler = new Compiler(OneArg.class, Definition.DEFINITION); + Compiler compiler = new Compiler(OneArg.class, definition); Object rando = randomInt(); assertEquals(rando, ((OneArg)scriptEngine.compile(compiler, null, "arg", emptyMap())).execute(rando)); rando = randomAlphaOfLength(5); assertEquals(rando, ((OneArg)scriptEngine.compile(compiler, null, "arg", emptyMap())).execute(rando)); - Compiler noargs = new Compiler(NoArgs.class, Definition.DEFINITION); + Compiler noargs = new Compiler(NoArgs.class, definition); Exception e = expectScriptThrows(IllegalArgumentException.class, () -> scriptEngine.compile(noargs, null, "doc", emptyMap())); assertEquals("Variable [doc] is not defined.", e.getMessage()); @@ -129,7 +132,7 @@ public abstract static class ArrayArg { public abstract Object execute(String[] arg); } public void testArrayArg() { - Compiler compiler = new Compiler(ArrayArg.class, Definition.DEFINITION); + Compiler compiler = new Compiler(ArrayArg.class, definition); String rando = randomAlphaOfLength(5); assertEquals(rando, ((ArrayArg)scriptEngine.compile(compiler, null, "arg[0]", emptyMap())).execute(new String[] {rando, "foo"})); } @@ -139,7 +142,7 @@ public abstract static class PrimitiveArrayArg { public abstract Object execute(int[] arg); } public void testPrimitiveArrayArg() { - Compiler compiler = new Compiler(PrimitiveArrayArg.class, Definition.DEFINITION); + Compiler compiler = new Compiler(PrimitiveArrayArg.class, definition); int rando = randomInt(); assertEquals(rando, ((PrimitiveArrayArg)scriptEngine.compile(compiler, null, "arg[0]", emptyMap())).execute(new int[] {rando, 10})); } @@ -149,7 +152,7 @@ public abstract static class DefArrayArg { public abstract Object execute(Object[] arg); } public void testDefArrayArg() { - Compiler compiler = new Compiler(DefArrayArg.class, Definition.DEFINITION); + Compiler compiler = new Compiler(DefArrayArg.class, definition); Object rando = randomInt(); assertEquals(rando, ((DefArrayArg)scriptEngine.compile(compiler, null, "arg[0]", emptyMap())).execute(new Object[] {rando, 10})); rando = randomAlphaOfLength(5); @@ -167,7 +170,7 @@ public abstract static class ManyArgs { public abstract boolean needsD(); } public void testManyArgs() { - Compiler compiler = new Compiler(ManyArgs.class, Definition.DEFINITION); + Compiler compiler = new Compiler(ManyArgs.class, definition); int rando = randomInt(); assertEquals(rando, ((ManyArgs)scriptEngine.compile(compiler, null, "a", emptyMap())).execute(rando, 0, 0, 0)); assertEquals(10, ((ManyArgs)scriptEngine.compile(compiler, null, "a + b + c + d", emptyMap())).execute(1, 2, 3, 4)); @@ -195,7 +198,7 @@ public abstract static class VarargTest { public abstract Object execute(String... arg); } public void testVararg() { - Compiler compiler = new Compiler(VarargTest.class, Definition.DEFINITION); + Compiler compiler = new Compiler(VarargTest.class, definition); assertEquals("foo bar baz", ((VarargTest)scriptEngine.compile(compiler, null, "String.join(' ', Arrays.asList(arg))", emptyMap())) .execute("foo", "bar", "baz")); } @@ -211,7 +214,7 @@ public Object executeWithASingleOne(int a, int b, int c) { } } public void testDefaultMethods() { - Compiler compiler = new Compiler(DefaultMethods.class, Definition.DEFINITION); + Compiler compiler = new Compiler(DefaultMethods.class, definition); int rando = randomInt(); assertEquals(rando, ((DefaultMethods)scriptEngine.compile(compiler, null, "a", emptyMap())).execute(rando, 0, 0, 0)); assertEquals(rando, ((DefaultMethods)scriptEngine.compile(compiler, null, "a", emptyMap())).executeWithASingleOne(rando, 0, 0)); @@ -225,7 +228,7 @@ public abstract static class ReturnsVoid { public abstract void execute(Map map); } public void testReturnsVoid() { - Compiler compiler = new Compiler(ReturnsVoid.class, Definition.DEFINITION); + Compiler compiler = new Compiler(ReturnsVoid.class, definition); Map map = new HashMap<>(); ((ReturnsVoid)scriptEngine.compile(compiler, null, "map.a = 'foo'", emptyMap())).execute(map); assertEquals(singletonMap("a", "foo"), map); @@ -244,7 +247,7 @@ public abstract static class ReturnsPrimitiveBoolean { public abstract boolean execute(); } public void testReturnsPrimitiveBoolean() { - Compiler compiler = new Compiler(ReturnsPrimitiveBoolean.class, Definition.DEFINITION); + Compiler compiler = new Compiler(ReturnsPrimitiveBoolean.class, definition); assertEquals(true, ((ReturnsPrimitiveBoolean)scriptEngine.compile(compiler, null, "true", emptyMap())).execute()); assertEquals(false, ((ReturnsPrimitiveBoolean)scriptEngine.compile(compiler, null, "false", emptyMap())).execute()); @@ -286,7 +289,7 @@ public abstract static class ReturnsPrimitiveInt { public abstract int execute(); } public void testReturnsPrimitiveInt() { - Compiler compiler = new Compiler(ReturnsPrimitiveInt.class, Definition.DEFINITION); + Compiler compiler = new Compiler(ReturnsPrimitiveInt.class, definition); assertEquals(1, ((ReturnsPrimitiveInt)scriptEngine.compile(compiler, null, "1", emptyMap())).execute()); assertEquals(1, ((ReturnsPrimitiveInt)scriptEngine.compile(compiler, null, "(int) 1L", emptyMap())).execute()); @@ -328,7 +331,7 @@ public abstract static class ReturnsPrimitiveFloat { public abstract float execute(); } public void testReturnsPrimitiveFloat() { - Compiler compiler = new Compiler(ReturnsPrimitiveFloat.class, Definition.DEFINITION); + Compiler compiler = new Compiler(ReturnsPrimitiveFloat.class, definition); assertEquals(1.1f, ((ReturnsPrimitiveFloat)scriptEngine.compile(compiler, null, "1.1f", emptyMap())).execute(), 0); assertEquals(1.1f, ((ReturnsPrimitiveFloat)scriptEngine.compile(compiler, null, "(float) 1.1d", emptyMap())).execute(), 0); @@ -359,7 +362,7 @@ public abstract static class ReturnsPrimitiveDouble { public abstract double execute(); } public void testReturnsPrimitiveDouble() { - Compiler compiler = new Compiler(ReturnsPrimitiveDouble.class, Definition.DEFINITION); + Compiler compiler = new Compiler(ReturnsPrimitiveDouble.class, definition); assertEquals(1.0, ((ReturnsPrimitiveDouble)scriptEngine.compile(compiler, null, "1", emptyMap())).execute(), 0); assertEquals(1.0, ((ReturnsPrimitiveDouble)scriptEngine.compile(compiler, null, "1L", emptyMap())).execute(), 0); @@ -393,7 +396,7 @@ public abstract static class NoArgumentsConstant { public abstract Object execute(String foo); } public void testNoArgumentsConstant() { - Compiler compiler = new Compiler(NoArgumentsConstant.class, Definition.DEFINITION); + Compiler compiler = new Compiler(NoArgumentsConstant.class, definition); Exception e = expectScriptThrows(IllegalArgumentException.class, false, () -> scriptEngine.compile(compiler, null, "1", emptyMap())); assertThat(e.getMessage(), startsWith( @@ -406,7 +409,7 @@ public abstract static class WrongArgumentsConstant { public abstract Object execute(String foo); } public void testWrongArgumentsConstant() { - Compiler compiler = new Compiler(WrongArgumentsConstant.class, Definition.DEFINITION); + Compiler compiler = new Compiler(WrongArgumentsConstant.class, definition); Exception e = expectScriptThrows(IllegalArgumentException.class, false, () -> scriptEngine.compile(compiler, null, "1", emptyMap())); assertThat(e.getMessage(), startsWith( @@ -419,7 +422,7 @@ public abstract static class WrongLengthOfArgumentConstant { public abstract Object execute(String foo); } public void testWrongLengthOfArgumentConstant() { - Compiler compiler = new Compiler(WrongLengthOfArgumentConstant.class, Definition.DEFINITION); + Compiler compiler = new Compiler(WrongLengthOfArgumentConstant.class, definition); Exception e = expectScriptThrows(IllegalArgumentException.class, false, () -> scriptEngine.compile(compiler, null, "1", emptyMap())); assertThat(e.getMessage(), startsWith("[" + WrongLengthOfArgumentConstant.class.getName() + "#ARGUMENTS] has length [2] but [" @@ -431,7 +434,7 @@ public abstract static class UnknownArgType { public abstract Object execute(UnknownArgType foo); } public void testUnknownArgType() { - Compiler compiler = new Compiler(UnknownArgType.class, Definition.DEFINITION); + Compiler compiler = new Compiler(UnknownArgType.class, definition); Exception e = expectScriptThrows(IllegalArgumentException.class, false, () -> scriptEngine.compile(compiler, null, "1", emptyMap())); assertEquals("[foo] is of unknown type [" + UnknownArgType.class.getName() + ". Painless interfaces can only accept arguments " @@ -443,7 +446,7 @@ public abstract static class UnknownReturnType { public abstract UnknownReturnType execute(String foo); } public void testUnknownReturnType() { - Compiler compiler = new Compiler(UnknownReturnType.class, Definition.DEFINITION); + Compiler compiler = new Compiler(UnknownReturnType.class, definition); Exception e = expectScriptThrows(IllegalArgumentException.class, false, () -> scriptEngine.compile(compiler, null, "1", emptyMap())); assertEquals("Painless can only implement execute methods returning a whitelisted type but [" + UnknownReturnType.class.getName() @@ -455,7 +458,7 @@ public abstract static class UnknownArgTypeInArray { public abstract Object execute(UnknownArgTypeInArray[] foo); } public void testUnknownArgTypeInArray() { - Compiler compiler = new Compiler(UnknownArgTypeInArray.class, Definition.DEFINITION); + Compiler compiler = new Compiler(UnknownArgTypeInArray.class, definition); Exception e = expectScriptThrows(IllegalArgumentException.class, false, () -> scriptEngine.compile(compiler, null, "1", emptyMap())); assertEquals("[foo] is of unknown type [" + UnknownArgTypeInArray.class.getName() + ". Painless interfaces can only accept " @@ -467,7 +470,7 @@ public abstract static class TwoExecuteMethods { public abstract Object execute(boolean foo); } public void testTwoExecuteMethods() { - Compiler compiler = new Compiler(TwoExecuteMethods.class, Definition.DEFINITION); + Compiler compiler = new Compiler(TwoExecuteMethods.class, definition); Exception e = expectScriptThrows(IllegalArgumentException.class, false, () -> scriptEngine.compile(compiler, null, "null", emptyMap())); assertEquals("Painless can only implement interfaces that have a single method named [execute] but [" diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/DebugTests.java b/modules/lang-painless/src/test/java/org/elasticsearch/painless/DebugTests.java index ba31ea48d92d9..a55b48f0189b3 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/DebugTests.java +++ b/modules/lang-painless/src/test/java/org/elasticsearch/painless/DebugTests.java @@ -25,6 +25,7 @@ import org.elasticsearch.script.ScriptException; import java.io.IOException; +import java.util.Collections; import java.util.Map; import static java.util.Collections.singletonList; @@ -34,7 +35,8 @@ import static org.hamcrest.Matchers.not; public class DebugTests extends ScriptTestCase { - private final Definition definition = Definition.DEFINITION; + private final Definition definition = new Definition( + Collections.singletonList(WhitelistLoader.loadFromResourceFiles(Definition.class, Definition.DEFINITION_FILES))); public void testExplain() { // Debug.explain can explain an object diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/Debugger.java b/modules/lang-painless/src/test/java/org/elasticsearch/painless/Debugger.java index 2b4a896fb5e66..52ec783db4ef4 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/Debugger.java +++ b/modules/lang-painless/src/test/java/org/elasticsearch/painless/Debugger.java @@ -24,6 +24,7 @@ import java.io.PrintWriter; import java.io.StringWriter; +import java.util.Collections; /** quick and dirty tools for debugging */ final class Debugger { @@ -39,7 +40,9 @@ static String toString(Class iface, String source, CompilerSettings settings) PrintWriter outputWriter = new PrintWriter(output); Textifier textifier = new Textifier(); try { - new Compiler(iface, Definition.DEFINITION).compile("", source, settings, textifier); + new Compiler(iface, new Definition( + Collections.singletonList(WhitelistLoader.loadFromResourceFiles(Definition.class, Definition.DEFINITION_FILES)))) + .compile("", source, settings, textifier); } catch (Exception e) { textifier.print(outputWriter); e.addSuppressed(new Exception("current bytecode: \n" + output)); diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/DefBootstrapTests.java b/modules/lang-painless/src/test/java/org/elasticsearch/painless/DefBootstrapTests.java index 7188caf425197..dccc9c0aeb505 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/DefBootstrapTests.java +++ b/modules/lang-painless/src/test/java/org/elasticsearch/painless/DefBootstrapTests.java @@ -30,7 +30,8 @@ import org.elasticsearch.test.ESTestCase; public class DefBootstrapTests extends ESTestCase { - private final Definition definition = Definition.DEFINITION; + private final Definition definition = new Definition( + Collections.singletonList(WhitelistLoader.loadFromResourceFiles(Definition.class, Definition.DEFINITION_FILES))); /** calls toString() on integers, twice */ public void testOneType() throws Throwable { diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/PainlessDocGenerator.java b/modules/lang-painless/src/test/java/org/elasticsearch/painless/PainlessDocGenerator.java index 74e0f90cc1b9f..edd600c5664f2 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/PainlessDocGenerator.java +++ b/modules/lang-painless/src/test/java/org/elasticsearch/painless/PainlessDocGenerator.java @@ -36,6 +36,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.StandardOpenOption; +import java.util.Collections; import java.util.Comparator; import java.util.List; import java.util.Map; @@ -44,7 +45,6 @@ import static java.util.Comparator.comparing; import static java.util.stream.Collectors.toList; -import static org.elasticsearch.painless.Definition.DEFINITION; /** * Generates an API reference from the method and type whitelists in {@link Definition}. @@ -68,7 +68,9 @@ public static void main(String[] args) throws IOException { Files.newOutputStream(indexPath, StandardOpenOption.CREATE_NEW, StandardOpenOption.WRITE), false, StandardCharsets.UTF_8.name())) { emitGeneratedWarning(indexStream); - List types = DEFINITION.allSimpleTypes().stream().sorted(comparing(t -> t.name)).collect(toList()); + List types = new Definition(Collections.singletonList( + WhitelistLoader.loadFromResourceFiles(Definition.class, Definition.DEFINITION_FILES))). + allSimpleTypes().stream().sorted(comparing(t -> t.name)).collect(toList()); for (Type type : types) { if (type.clazz.isPrimitive()) { // Primitives don't have methods to reference diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/ScriptTestCase.java b/modules/lang-painless/src/test/java/org/elasticsearch/painless/ScriptTestCase.java index 89159c5364798..730dd298f8a54 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/ScriptTestCase.java +++ b/modules/lang-painless/src/test/java/org/elasticsearch/painless/ScriptTestCase.java @@ -33,6 +33,7 @@ import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.HashMap; import java.util.Map; @@ -91,7 +92,8 @@ public Object exec(String script, Map vars, boolean picky) { public Object exec(String script, Map vars, Map compileParams, Scorer scorer, boolean picky) { // test for ambiguity errors before running the actual script if picky is true if (picky) { - Definition definition = Definition.DEFINITION; + Definition definition = new Definition( + Collections.singletonList(WhitelistLoader.loadFromResourceFiles(Definition.class, Definition.DEFINITION_FILES))); ScriptClassInfo scriptClassInfo = new ScriptClassInfo(definition, GenericElasticsearchScript.class); CompilerSettings pickySettings = new CompilerSettings(); pickySettings.setPicky(true); diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/node/NodeToStringTests.java b/modules/lang-painless/src/test/java/org/elasticsearch/painless/node/NodeToStringTests.java index 2bd9753ea26a6..9e3477b1cfe02 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/node/NodeToStringTests.java +++ b/modules/lang-painless/src/test/java/org/elasticsearch/painless/node/NodeToStringTests.java @@ -33,10 +33,12 @@ import org.elasticsearch.painless.Location; import org.elasticsearch.painless.Operation; import org.elasticsearch.painless.ScriptClassInfo; +import org.elasticsearch.painless.WhitelistLoader; import org.elasticsearch.painless.antlr.Walker; import org.elasticsearch.test.ESTestCase; import java.util.Arrays; +import java.util.Collections; import java.util.List; import java.util.Map; @@ -48,7 +50,8 @@ * Tests {@link Object#toString} implementations on all extensions of {@link ANode}. */ public class NodeToStringTests extends ESTestCase { - private final Definition definition = Definition.DEFINITION; + private final Definition definition = new Definition( + Collections.singletonList(WhitelistLoader.loadFromResourceFiles(Definition.class, Definition.DEFINITION_FILES))); public void testEAssignment() { assertToString( @@ -161,12 +164,12 @@ public void testECapturingFunctionRef() { public void testECast() { Location l = new Location(getTestName(), 0); AExpression child = new EConstant(l, "test"); - Cast cast = Cast.standard(Definition.DEFINITION.StringType, Definition.DEFINITION.IntegerType, true); + Cast cast = Cast.standard(definition.StringType, definition.IntegerType, true); assertEquals("(ECast java.lang.Integer (EConstant String 'test'))", new ECast(l, child, cast).toString()); l = new Location(getTestName(), 1); child = new EBinary(l, Operation.ADD, new EConstant(l, "test"), new EConstant(l, 12)); - cast = Cast.standard(Definition.DEFINITION.IntegerType, Definition.DEFINITION.BooleanType, true); + cast = Cast.standard(definition.IntegerType, definition.BooleanType, true); assertEquals("(ECast java.lang.Boolean (EBinary (EConstant String 'test') + (EConstant Integer 12)))", new ECast(l, child, cast).toString()); } @@ -396,7 +399,7 @@ public void testPSubArrayLength() { public void testPSubBrace() { Location l = new Location(getTestName(), 0); - PSubBrace node = new PSubBrace(l, Definition.DEFINITION.intType, new ENumeric(l, "1", 10)); + PSubBrace node = new PSubBrace(l, definition.intType, new ENumeric(l, "1", 10)); node.prefix = new EVariable(l, "a"); assertEquals("(PSubBrace (EVariable a) (ENumeric 1))", node.toString()); } @@ -762,7 +765,7 @@ public void testSIfElse() { public void testSSubEachArray() { Location l = new Location(getTestName(), 0); - Variable v = new Variable(l, "test", Definition.DEFINITION.intType, 5, false); + Variable v = new Variable(l, "test", definition.intType, 5, false); AExpression e = new ENewArray(l, "int", Arrays.asList(new EConstant(l, 1), new EConstant(l, 2), new EConstant(l, 3)), true); SBlock b = new SBlock(l, singletonList(new SReturn(l, new EConstant(l, 5)))); SSubEachArray node = new SSubEachArray(l, v, e, b); @@ -774,7 +777,7 @@ public void testSSubEachArray() { public void testSSubEachIterable() { Location l = new Location(getTestName(), 0); - Variable v = new Variable(l, "test", Definition.DEFINITION.intType, 5, false); + Variable v = new Variable(l, "test", definition.intType, 5, false); AExpression e = new EListInit(l, Arrays.asList(new EConstant(l, 1), new EConstant(l, 2), new EConstant(l, 3))); SBlock b = new SBlock(l, singletonList(new SReturn(l, new EConstant(l, 5)))); SSubEachIterable node = new SSubEachIterable(l, v, e, b); From 79a2c253871e16ea8d426fd98806d3a6119934ae Mon Sep 17 00:00:00 2001 From: Jason Tedor Date: Fri, 5 Jan 2018 17:19:34 -0500 Subject: [PATCH 10/74] Update testing docs to reflect Gradle wrapper This commit updates the testing docs to reflect the usage of the Gradle wrapper. Relates #28107 --- GRADLE.CHEATSHEET | 4 +- README.textile | 4 +- TESTING.asciidoc | 120 +++++++++++++++++++++++----------------------- 3 files changed, 65 insertions(+), 63 deletions(-) diff --git a/GRADLE.CHEATSHEET b/GRADLE.CHEATSHEET index 2c9c34fe1b512..3e61c156d1dbf 100644 --- a/GRADLE.CHEATSHEET +++ b/GRADLE.CHEATSHEET @@ -1,4 +1,6 @@ -As a quick helper, below are the equivalent commands from maven to gradle (TESTING.md has also been updated). You can also run "gradle tasks" to see all tasks that are available to run. +As a quick helper, below are the equivalent commands from Maven to Gradle +(TESTING.md has also been updated). You can also run `./gradlew tasks` to see +all tasks that are available to run. clean -> clean test -> test verify -> check diff --git a/README.textile b/README.textile index 63c45abfe0e38..f17958262d8e4 100644 --- a/README.textile +++ b/README.textile @@ -202,9 +202,9 @@ We have just covered a very small portion of what Elasticsearch is all about. Fo h3. Building from Source -Elasticsearch uses "Gradle":https://gradle.org for its build system. You'll need to have at least version 3.3 of Gradle installed. +Elasticsearch uses "Gradle":https://gradle.org for its build system. -In order to create a distribution, simply run the @gradle assemble@ command in the cloned directory. +In order to create a distribution, simply run the @./gradlew assemble@ command in the cloned directory. The distribution for each project will be created under the @build/distributions@ directory in that project. diff --git a/TESTING.asciidoc b/TESTING.asciidoc index 1cb05792b8298..37f7962ff0c96 100644 --- a/TESTING.asciidoc +++ b/TESTING.asciidoc @@ -13,7 +13,7 @@ To create a distribution without running the tests, simply run the following: ----------------------------- -gradle assemble +./gradlew assemble ----------------------------- === Running Elasticsearch from a checkout @@ -22,7 +22,7 @@ In order to run Elasticsearch from source without building a package, you can run it using Gradle: ------------------------------------- -gradle run +./gradlew run ------------------------------------- === Test case filtering. @@ -33,20 +33,20 @@ gradle run Run a single test case (variants) ---------------------------------------------------------- -gradle test -Dtests.class=org.elasticsearch.package.ClassName -gradle test "-Dtests.class=*.ClassName" +./gradlew test -Dtests.class=org.elasticsearch.package.ClassName +./gradlew test "-Dtests.class=*.ClassName" ---------------------------------------------------------- Run all tests in a package and sub-packages ---------------------------------------------------- -gradle test "-Dtests.class=org.elasticsearch.package.*" +./gradlew test "-Dtests.class=org.elasticsearch.package.*" ---------------------------------------------------- Run any test methods that contain 'esi' (like: ...r*esi*ze...). ------------------------------- -gradle test "-Dtests.method=*esi*" +./gradlew test "-Dtests.method=*esi*" ------------------------------- You can also filter tests by certain annotations ie: @@ -59,7 +59,7 @@ You can also filter tests by certain annotations ie: Those annotation names can be combined into a filter expression like: ------------------------------------------------ -gradle test -Dtests.filter="@nightly and not @backwards" +./gradlew test -Dtests.filter="@nightly and not @backwards" ------------------------------------------------ to run all nightly test but not the ones that are backwards tests. `tests.filter` supports @@ -67,7 +67,7 @@ the boolean operators `and, or, not` and grouping ie: --------------------------------------------------------------- -gradle test -Dtests.filter="@nightly and not(@badapple or @backwards)" +./gradlew test -Dtests.filter="@nightly and not(@badapple or @backwards)" --------------------------------------------------------------- === Seed and repetitions. @@ -75,7 +75,7 @@ gradle test -Dtests.filter="@nightly and not(@badapple or @backwards)" Run with a given seed (seed is a hex-encoded long). ------------------------------ -gradle test -Dtests.seed=DEADBEEF +./gradlew test -Dtests.seed=DEADBEEF ------------------------------ === Repeats _all_ tests of ClassName N times. @@ -84,7 +84,7 @@ Every test repetition will have a different method seed (derived from a single random master seed). -------------------------------------------------- -gradle test -Dtests.iters=N -Dtests.class=*.ClassName +./gradlew test -Dtests.iters=N -Dtests.class=*.ClassName -------------------------------------------------- === Repeats _all_ tests of ClassName N times. @@ -93,7 +93,7 @@ Every test repetition will have exactly the same master (0xdead) and method-level (0xbeef) seed. ------------------------------------------------------------------------ -gradle test -Dtests.iters=N -Dtests.class=*.ClassName -Dtests.seed=DEAD:BEEF +./gradlew test -Dtests.iters=N -Dtests.class=*.ClassName -Dtests.seed=DEAD:BEEF ------------------------------------------------------------------------ === Repeats a given test N times @@ -103,14 +103,14 @@ ie: testFoo[0], testFoo[1], etc... so using testmethod or tests.method ending in a glob is necessary to ensure iterations are run). ------------------------------------------------------------------------- -gradle test -Dtests.iters=N -Dtests.class=*.ClassName -Dtests.method=mytest* +./gradlew test -Dtests.iters=N -Dtests.class=*.ClassName -Dtests.method=mytest* ------------------------------------------------------------------------- Repeats N times but skips any tests after the first failure or M initial failures. ------------------------------------------------------------- -gradle test -Dtests.iters=N -Dtests.failfast=true -Dtestcase=... -gradle test -Dtests.iters=N -Dtests.maxfailures=M -Dtestcase=... +./gradlew test -Dtests.iters=N -Dtests.failfast=true -Dtestcase=... +./gradlew test -Dtests.iters=N -Dtests.maxfailures=M -Dtestcase=... ------------------------------------------------------------- === Test groups. @@ -120,9 +120,9 @@ Test groups can be enabled or disabled (true/false). Default value provided below in [brackets]. ------------------------------------------------------------------ -gradle test -Dtests.nightly=[false] - nightly test group (@Nightly) -gradle test -Dtests.weekly=[false] - weekly tests (@Weekly) -gradle test -Dtests.awaitsfix=[false] - known issue (@AwaitsFix) +./gradlew test -Dtests.nightly=[false] - nightly test group (@Nightly) +./gradlew test -Dtests.weekly=[false] - weekly tests (@Weekly) +./gradlew test -Dtests.awaitsfix=[false] - known issue (@AwaitsFix) ------------------------------------------------------------------ === Load balancing and caches. @@ -132,7 +132,7 @@ want to explicitly specify the number of JVMs you can do so on the command line: ---------------------------- -gradle test -Dtests.jvms=8 +./gradlew test -Dtests.jvms=8 ---------------------------- Or in `~/.gradle/gradle.properties`: @@ -151,7 +151,7 @@ It is possible to provide a version that allows to adapt the tests behaviour to older features or bugs that have been changed or fixed in the meantime. ----------------------------------------- -gradle test -Dtests.compatibility=1.0.0 +./gradlew test -Dtests.compatibility=1.0.0 ----------------------------------------- @@ -160,50 +160,50 @@ gradle test -Dtests.compatibility=1.0.0 Run all tests without stopping on errors (inspect log files). ----------------------------------------- -gradle test -Dtests.haltonfailure=false +./gradlew test -Dtests.haltonfailure=false ----------------------------------------- Run more verbose output (slave JVM parameters, etc.). ---------------------- -gradle test -verbose +./gradlew test -verbose ---------------------- Change the default suite timeout to 5 seconds for all tests (note the exclamation mark). --------------------------------------- -gradle test -Dtests.timeoutSuite=5000! ... +./gradlew test -Dtests.timeoutSuite=5000! ... --------------------------------------- -Change the logging level of ES (not gradle) +Change the logging level of ES (not Gradle) -------------------------------- -gradle test -Dtests.es.logger.level=DEBUG +./gradlew test -Dtests.es.logger.level=DEBUG -------------------------------- Print all the logging output from the test runs to the commandline even if tests are passing. ------------------------------ -gradle test -Dtests.output=always +./gradlew test -Dtests.output=always ------------------------------ Configure the heap size. ------------------------------ -gradle test -Dtests.heap.size=512m +./gradlew test -Dtests.heap.size=512m ------------------------------ Pass arbitrary jvm arguments. ------------------------------ # specify heap dump path -gradle test -Dtests.jvm.argline="-XX:HeapDumpPath=/path/to/heapdumps" +./gradlew test -Dtests.jvm.argline="-XX:HeapDumpPath=/path/to/heapdumps" # enable gc logging -gradle test -Dtests.jvm.argline="-verbose:gc" +./gradlew test -Dtests.jvm.argline="-verbose:gc" # enable security debugging -gradle test -Dtests.jvm.argline="-Djava.security.debug=access,failure" +./gradlew test -Dtests.jvm.argline="-Djava.security.debug=access,failure" ------------------------------ == Backwards Compatibility Tests @@ -214,7 +214,7 @@ To run backwards compatibilty tests untar or unzip a release and run the tests with the following command: --------------------------------------------------------------------------- -gradle test -Dtests.filter="@backwards" -Dtests.bwc.version=x.y.z -Dtests.bwc.path=/path/to/elasticsearch -Dtests.security.manager=false +./gradlew test -Dtests.filter="@backwards" -Dtests.bwc.version=x.y.z -Dtests.bwc.path=/path/to/elasticsearch -Dtests.security.manager=false --------------------------------------------------------------------------- Note that backwards tests must be run with security manager disabled. @@ -222,7 +222,7 @@ If the elasticsearch release is placed under `./backwards/elasticsearch-x.y.z` t can be omitted: --------------------------------------------------------------------------- -gradle test -Dtests.filter="@backwards" -Dtests.bwc.version=x.y.z -Dtests.security.manager=false +./gradlew test -Dtests.filter="@backwards" -Dtests.bwc.version=x.y.z -Dtests.security.manager=false --------------------------------------------------------------------------- To setup the bwc test environment execute the following steps (provided you are @@ -239,20 +239,20 @@ $ tar -xzf elasticsearch-1.2.1.tar.gz To run all verification tasks, including static checks, unit tests, and integration tests: --------------------------------------------------------------------------- -gradle check +./gradlew check --------------------------------------------------------------------------- Note that this will also run the unit tests and precommit tasks first. If you want to just run the integration tests (because you are debugging them): --------------------------------------------------------------------------- -gradle integTest +./gradlew integTest --------------------------------------------------------------------------- If you want to just run the precommit checks: --------------------------------------------------------------------------- -gradle precommit +./gradlew precommit --------------------------------------------------------------------------- == Testing the REST layer @@ -264,18 +264,18 @@ The REST layer is tested through specific tests that are shared between all the elasticsearch official clients and consist of YAML files that describe the operations to be executed and the obtained results that need to be tested. -The REST tests are run automatically when executing the "gradle check" command. To run only the +The REST tests are run automatically when executing the "./gradlew check" command. To run only the REST tests use the following command: --------------------------------------------------------------------------- -gradle :distribution:integ-test-zip:integTest \ +./gradlew :distribution:integ-test-zip:integTest \ -Dtests.class="org.elasticsearch.test.rest.*Yaml*IT" --------------------------------------------------------------------------- A specific test case can be run with --------------------------------------------------------------------------- -gradle :distribution:integ-test-zip:integTest \ +./gradlew :distribution:integ-test-zip:integTest \ -Dtests.class="org.elasticsearch.test.rest.*Yaml*IT" \ -Dtests.method="test {p0=cat.shards/10_basic/Help}" --------------------------------------------------------------------------- @@ -319,25 +319,25 @@ vagrant plugin install vagrant-cachier . Validate your installed dependencies: ------------------------------------- -gradle :qa:vagrant:vagrantCheckVersion +./gradlew :qa:vagrant:vagrantCheckVersion ------------------------------------- -. Download and smoke test the VMs with `gradle vagrantSmokeTest` or -`gradle -Pvagrant.boxes=all vagrantSmokeTest`. The first time you run this it will +. Download and smoke test the VMs with `./gradlew vagrantSmokeTest` or +`./gradlew -Pvagrant.boxes=all vagrantSmokeTest`. The first time you run this it will download the base images and provision the boxes and immediately quit. If you you this again it'll skip the download step. -. Run the tests with `gradle packagingTest`. This will cause gradle to build +. Run the tests with `./gradlew packagingTest`. This will cause Gradle to build the tar, zip, and deb packages and all the plugins. It will then run the tests on ubuntu-1404 and centos-7. We chose those two distributions as the default because they cover deb and rpm packaging and SyvVinit and systemd. -You can run on all the VMs by running `gradle -Pvagrant.boxes=all packagingTest`. -You can run a particular VM with a command like -`gradle -Pvagrant.boxes=oel-7 packagingTest`. See `gradle tasks` for a complete -list of available vagrant boxes for testing. It's important to know that if you -ctrl-c any of these `gradle` commands then the boxes will remain running and -you'll have to terminate them with 'gradle stop'. +You can run on all the VMs by running `./gradlew -Pvagrant.boxes=all +packagingTest`. You can run a particular VM with a command like `./gradlew +-Pvagrant.boxes=oel-7 packagingTest`. See `./gradlew tasks` for a complete list +of available vagrant boxes for testing. It's important to know that if you +interrupt any of these Gradle commands then the boxes will remain running and +you'll have to terminate them with `./gradlew stop`. All the regular vagrant commands should just work so you can get a shell in a VM running trusty by running @@ -402,10 +402,10 @@ that'd consume a ton of ram. In general its best to stick to testing in vagrant because the bats scripts are destructive. When working with a single package it's generally faster to run its -tests in a tighter loop than gradle provides. In one window: +tests in a tighter loop than Gradle provides. In one window: -------------------------------- -gradle :distribution:rpm:assemble +./gradlew :distribution:rpm:assemble -------------------------------- and in another window: @@ -419,7 +419,7 @@ sudo -E bats $BATS_TESTS/*rpm*.bats If you wanted to retest all the release artifacts on a single VM you could: ------------------------------------------------- -gradle setupBats +./gradlew setupBats cd qa/vagrant; vagrant up ubuntu-1404 --provider virtualbox && vagrant ssh ubuntu-1404 cd $BATS_ARCHIVES sudo -E bats $BATS_TESTS/*.bats @@ -428,7 +428,7 @@ sudo -E bats $BATS_TESTS/*.bats You can also use Gradle to prepare the test environment and then starts a single VM: ------------------------------------------------- -gradle vagrantFedora27#up +./gradlew vagrantFedora27#up ------------------------------------------------- Or any of vagrantCentos6#up, vagrantCentos7#up, vagrantDebian8#up, @@ -457,17 +457,17 @@ Backwards compatibility tests exist to test upgrading from each supported versio to the current version. To run all backcompat tests use: ------------------------------------------------- -gradle bwcTest +./gradlew bwcTest ------------------------------------------------- A specific version can be tested as well. For example, to test backcompat with version 5.3.2 run: ------------------------------------------------- -gradle v5.3.2#bwcTest +./gradlew v5.3.2#bwcTest ------------------------------------------------- -When running `gradle check`, some minimal backcompat checks are run. Which version +When running `./gradlew check`, some minimal backcompat checks are run. Which version is tested depends on the branch. On master, this will test against the current stable branch. On the stable branch, it will test against the latest release branch. Finally, on a release branch, it will test against the most recent release. @@ -476,11 +476,11 @@ branch. Finally, on a release branch, it will test against the most recent relea Sometimes a backward compatibility change spans two versions. A common case is a new functionality that needs a BWC bridge in and an unreleased versioned of a release branch (for example, 5.x). -To test the changes, you can instruct gradle to build the BWC version from a another remote/branch combination instead of +To test the changes, you can instruct Gradle to build the BWC version from a another remote/branch combination instead of pulling the release branch from GitHub. You do so using the `tests.bwc.remote` and `tests.bwc.refspec` system properties: ------------------------------------------------- -gradle check -Dtests.bwc.remote=${remote} -Dtests.bwc.refspec=index_req_bwc_5.x +./gradlew check -Dtests.bwc.remote=${remote} -Dtests.bwc.refspec=index_req_bwc_5.x ------------------------------------------------- The branch needs to be available on the remote that the BWC makes of the @@ -495,7 +495,7 @@ will need to: will contain your change. . Create a branch called `index_req_bwc_5.x` off `5.x`. This will contain your bwc layer. . Push both branches to your remote repository. -. Run the tests with `gradle check -Dtests.bwc.remote=${remote} -Dtests.bwc.refspec=index_req_bwc_5.x`. +. Run the tests with `./gradlew check -Dtests.bwc.remote=${remote} -Dtests.bwc.refspec=index_req_bwc_5.x`. == Coverage analysis @@ -522,11 +522,11 @@ mvn -Dtests.coverage verify jacoco:report == Launching and debugging from an IDE -If you want to run elasticsearch from your IDE, the `gradle run` task +If you want to run elasticsearch from your IDE, the `./gradlew run` task supports a remote debugging option: --------------------------------------------------------------------------- -gradle run --debug-jvm +./gradlew run --debug-jvm --------------------------------------------------------------------------- == Debugging remotely from an IDE @@ -549,7 +549,7 @@ and the build will automatically pick it up. You can verify the plugin is included as part of the build by checking the projects of the build. --------------------------------------------------------------------------- -gradle projects +./gradlew projects --------------------------------------------------------------------------- == Environment misc From f999d639be5eb2599f21900be0edff6dbc04d769 Mon Sep 17 00:00:00 2001 From: Jason Tedor Date: Fri, 5 Jan 2018 17:25:10 -0500 Subject: [PATCH 11/74] Update platforms tests to use Gradle wrapper Gradle will no longer be needed in the test VMs as the Gradle wrapper can be used to run the platform tests. This commit updates the platform tests to use the Gradle wrapper, and removes installing Gradle in the VM which will speed up VM provisioning. Relates #28105 --- Vagrantfile | 15 --------------- .../gradle/vagrant/VagrantTestPlugin.groovy | 2 +- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 6ace825e5c36b..f123a572f97ea 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -206,9 +206,6 @@ def provision(config, v.memory = Integer(ENV['VAGRANT_MEMORY'] || 8192) v.cpus = Integer(ENV['VAGRANT_CPUS'] || 4) end - config.vm.synced_folder "#{Dir.home}/.gradle/caches", "/home/vagrant/.gradle/caches", - create: true, - owner: "vagrant" config.vm.provision "dependencies", type: "shell", inline: <<-SHELL set -e set -o pipefail @@ -273,17 +270,6 @@ def provision(config, rm -rf /tmp/bats } - installed gradle || { - echo "==> Installing Gradle" - curl -sS -o /tmp/gradle.zip -L https://services.gradle.org/distributions/gradle-3.3-bin.zip - unzip -q /tmp/gradle.zip -d /opt - rm -rf /tmp/gradle.zip - ln -s /opt/gradle-3.3/bin/gradle /usr/bin/gradle - # make nfs mounted gradle home dir writeable - chown vagrant:vagrant /home/vagrant/.gradle - } - - cat \<\ /etc/profile.d/elasticsearch_vars.sh export ZIP=/elasticsearch/distribution/zip/build/distributions export TAR=/elasticsearch/distribution/tar/build/distributions @@ -293,7 +279,6 @@ export BATS=/project/build/bats export BATS_UTILS=/project/build/bats/utils export BATS_TESTS=/project/build/bats/tests export BATS_ARCHIVES=/project/build/bats/archives -export GRADLE_HOME=/opt/gradle-3.3 VARS cat \<\ /etc/sudoers.d/elasticsearch_vars Defaults env_keep += "ZIP" diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/vagrant/VagrantTestPlugin.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/vagrant/VagrantTestPlugin.groovy index 2510620ac712b..0f55123b5cb6a 100644 --- a/buildSrc/src/main/groovy/org/elasticsearch/gradle/vagrant/VagrantTestPlugin.groovy +++ b/buildSrc/src/main/groovy/org/elasticsearch/gradle/vagrant/VagrantTestPlugin.groovy @@ -43,7 +43,7 @@ class VagrantTestPlugin implements Plugin { private static final BATS = 'bats' private static final String BATS_TEST_COMMAND ="cd \$BATS_ARCHIVES && sudo bats --tap \$BATS_TESTS/*.$BATS" - private static final String PLATFORM_TEST_COMMAND ="rm -rf ~/elasticsearch && rsync -r /elasticsearch/ ~/elasticsearch && cd ~/elasticsearch && \$GRADLE_HOME/bin/gradle test integTest" + private static final String PLATFORM_TEST_COMMAND ="rm -rf ~/elasticsearch && rsync -r /elasticsearch/ ~/elasticsearch && cd ~/elasticsearch && ./gradlew test integTest" @Override void apply(Project project) { From d712f581cade065fca80ee2c978910568bb560f2 Mon Sep 17 00:00:00 2001 From: Jason Tedor Date: Sat, 6 Jan 2018 08:47:23 -0500 Subject: [PATCH 12/74] Fix reproduction info to point to Gradle wrapper With the Gradle wrapper in place, we should point the reproduction info to specify using the Gradle wrapper too. Relates #28104 --- .../org/elasticsearch/gradle/vagrant/VagrantTestPlugin.groovy | 2 +- .../test/junit/listeners/ReproduceInfoPrinter.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/vagrant/VagrantTestPlugin.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/vagrant/VagrantTestPlugin.groovy index 0f55123b5cb6a..b3cc096ee2186 100644 --- a/buildSrc/src/main/groovy/org/elasticsearch/gradle/vagrant/VagrantTestPlugin.groovy +++ b/buildSrc/src/main/groovy/org/elasticsearch/gradle/vagrant/VagrantTestPlugin.groovy @@ -344,7 +344,7 @@ class VagrantTestPlugin implements Plugin { @Override void afterExecute(Task task, TaskState state) { if (state.failure != null) { - println "REPRODUCE WITH: gradle ${packaging.path} " + + println "REPRODUCE WITH: ./gradlew ${packaging.path} " + "-Dtests.seed=${project.testSeed} " } } diff --git a/test/framework/src/main/java/org/elasticsearch/test/junit/listeners/ReproduceInfoPrinter.java b/test/framework/src/main/java/org/elasticsearch/test/junit/listeners/ReproduceInfoPrinter.java index ff6efa3830023..cb2c9ff1d2639 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/junit/listeners/ReproduceInfoPrinter.java +++ b/test/framework/src/main/java/org/elasticsearch/test/junit/listeners/ReproduceInfoPrinter.java @@ -71,7 +71,7 @@ public void testFailure(Failure failure) throws Exception { return; } - final StringBuilder b = new StringBuilder("REPRODUCE WITH: gradle "); + final StringBuilder b = new StringBuilder("REPRODUCE WITH: ./gradlew "); String task = System.getProperty("tests.task"); // TODO: enforce (intellij still runs the runner?) or use default "test" but that won't work for integ b.append(task); From 86ee5523f839d2b3aa3fd65031bf997055344ec5 Mon Sep 17 00:00:00 2001 From: Jason Tedor Date: Sat, 6 Jan 2018 08:49:56 -0500 Subject: [PATCH 13/74] Remove Gradle cheatsheet We are long past the Maven to Gradle transition, and Gradle is commonplace enough these days that we do not need to devote a top-level file on a Gradle cheatsheet. Relates #28113 --- GRADLE.CHEATSHEET | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 GRADLE.CHEATSHEET diff --git a/GRADLE.CHEATSHEET b/GRADLE.CHEATSHEET deleted file mode 100644 index 3e61c156d1dbf..0000000000000 --- a/GRADLE.CHEATSHEET +++ /dev/null @@ -1,9 +0,0 @@ -As a quick helper, below are the equivalent commands from Maven to Gradle -(TESTING.md has also been updated). You can also run `./gradlew tasks` to see -all tasks that are available to run. -clean -> clean -test -> test -verify -> check -verify -Dskip.unit.tests -> integTest -package -DskipTests -> assemble -install -DskipTests -> publishToMavenLocal From 8b0b0c36d3301990d92f72e763e4d49965ab13d1 Mon Sep 17 00:00:00 2001 From: Jason Tedor Date: Sat, 6 Jan 2018 13:03:44 -0500 Subject: [PATCH 14/74] Remove out-of-date projectile file This commit removes an out-of-date projectile file from the top-level directory. Relates #28115 --- .projectile | 31 ------------------------------- 1 file changed, 31 deletions(-) delete mode 100644 .projectile diff --git a/.projectile b/.projectile deleted file mode 100644 index 49e2b292c2610..0000000000000 --- a/.projectile +++ /dev/null @@ -1,31 +0,0 @@ --/target --/core/target --/qa/target --/rest-api-spec/target --/test-framework/target --/plugins/target --/plugins/analysis-icu/target --/plugins/analysis-kuromoji/target --/plugins/analysis-phonetic/target --/plugins/analysis-smartcn/target --/plugins/analysis-stempel/target --/plugins/cloud-aws/target --/plugins/cloud-azure/target --/plugins/cloud-gce/target --/plugins/delete-by-query/target --/plugins/discovery-azure/target --/plugins/discovery-ec2/target --/plugins/discovery-gce/target --/plugins/jvm-example/target --/plugins/lang-expression/target --/plugins/lang-groovy/target --/plugins/lang-javascript/target --/plugins/lang-python/target --/plugins/mapper-murmur3/target --/plugins/mapper-size/target --/plugins/repository-azure/target --/plugins/repository-s3/target --/plugins/site-example/target --/plugins/store-smb/target --/plugins/target --*.class From eaa636d4bbe248aa70017d3df40f6c755ecbe8d1 Mon Sep 17 00:00:00 2001 From: Jason Tedor Date: Sat, 6 Jan 2018 22:44:43 -0500 Subject: [PATCH 15/74] Clarify reproduce info on Windows This commit correct the test failure reproduction line on Windows. Relates #28104 --- .../org/elasticsearch/gradle/vagrant/VagrantTestPlugin.groovy | 4 +++- .../test/junit/listeners/ReproduceInfoPrinter.java | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/vagrant/VagrantTestPlugin.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/vagrant/VagrantTestPlugin.groovy index b3cc096ee2186..82e4ac9b71cd0 100644 --- a/buildSrc/src/main/groovy/org/elasticsearch/gradle/vagrant/VagrantTestPlugin.groovy +++ b/buildSrc/src/main/groovy/org/elasticsearch/gradle/vagrant/VagrantTestPlugin.groovy @@ -1,6 +1,7 @@ package org.elasticsearch.gradle.vagrant import com.carrotsearch.gradle.junit4.RandomizedTestingPlugin +import org.apache.tools.ant.taskdefs.condition.Os import org.elasticsearch.gradle.FileContentsTask import org.gradle.api.* import org.gradle.api.artifacts.dsl.RepositoryHandler @@ -343,8 +344,9 @@ class VagrantTestPlugin implements Plugin { TaskExecutionAdapter packagingReproListener = new TaskExecutionAdapter() { @Override void afterExecute(Task task, TaskState state) { + final String gradlew = Os.isFamily(Os.FAMILY_WINDOWS) ? "gradlew" : "./gradlew" if (state.failure != null) { - println "REPRODUCE WITH: ./gradlew ${packaging.path} " + + println "REPRODUCE WITH: ${gradlew} ${packaging.path} " + "-Dtests.seed=${project.testSeed} " } } diff --git a/test/framework/src/main/java/org/elasticsearch/test/junit/listeners/ReproduceInfoPrinter.java b/test/framework/src/main/java/org/elasticsearch/test/junit/listeners/ReproduceInfoPrinter.java index cb2c9ff1d2639..ca16ac6204a90 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/junit/listeners/ReproduceInfoPrinter.java +++ b/test/framework/src/main/java/org/elasticsearch/test/junit/listeners/ReproduceInfoPrinter.java @@ -20,6 +20,7 @@ import com.carrotsearch.randomizedtesting.ReproduceErrorMessageBuilder; import org.apache.logging.log4j.Logger; +import org.apache.lucene.util.Constants; import org.elasticsearch.common.Strings; import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.test.ESIntegTestCase; @@ -71,7 +72,8 @@ public void testFailure(Failure failure) throws Exception { return; } - final StringBuilder b = new StringBuilder("REPRODUCE WITH: ./gradlew "); + final String gradlew = Constants.WINDOWS ? "gradlew" : "./gradlew"; + final StringBuilder b = new StringBuilder("REPRODUCE WITH: " + gradlew + " "); String task = System.getProperty("tests.task"); // TODO: enforce (intellij still runs the runner?) or use default "test" but that won't work for integ b.append(task); From 2e08916fa6e1e66402c756b2764d65d63ca53100 Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Sun, 7 Jan 2018 13:55:15 -0800 Subject: [PATCH 16/74] Test: Add assumeFalse for test that cannot pass on windows closes #28095 --- .../java/org/elasticsearch/plugins/PluginsServiceTests.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/core/src/test/java/org/elasticsearch/plugins/PluginsServiceTests.java b/core/src/test/java/org/elasticsearch/plugins/PluginsServiceTests.java index 6d01ff14a399c..16c3eb34b0e63 100644 --- a/core/src/test/java/org/elasticsearch/plugins/PluginsServiceTests.java +++ b/core/src/test/java/org/elasticsearch/plugins/PluginsServiceTests.java @@ -531,6 +531,12 @@ public void testJarHellTransitiveMap() throws Exception { } public void testNonExtensibleDep() throws Exception { + // This test opens a child classloader, reading a jar under the test temp + // dir (a dummy plugin). Classloaders are closed by GC, so when test teardown + // occurs the jar is deleted while the classloader is still open. However, on + // windows, files cannot be deleted when they are still open by a process. + assumeFalse("windows deletion behavior is asinine", Constants.WINDOWS); + Path homeDir = createTempDir(); Settings settings = Settings.builder().put(Environment.PATH_HOME_SETTING.getKey(), homeDir).build(); Path pluginsDir = homeDir.resolve("plugins"); From b46bb2efae5e2d00733b8bafa405c1d35bcd9849 Mon Sep 17 00:00:00 2001 From: Martijn van Groningen Date: Sun, 7 Jan 2018 23:20:44 +0100 Subject: [PATCH 17/74] test: do not use asn fields Closes #28124 --- .../ingest/geoip/GeoIpProcessorFactoryTests.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/plugins/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/GeoIpProcessorFactoryTests.java b/plugins/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/GeoIpProcessorFactoryTests.java index 49bc4f3b9f2f2..58119cc1af983 100644 --- a/plugins/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/GeoIpProcessorFactoryTests.java +++ b/plugins/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/GeoIpProcessorFactoryTests.java @@ -209,11 +209,15 @@ public void testBuildFields() throws Exception { Set properties = EnumSet.noneOf(GeoIpProcessor.Property.class); List fieldNames = new ArrayList<>(); + + int counter = 0; int numFields = scaledRandomIntBetween(1, GeoIpProcessor.Property.values().length); - for (int i = 0; i < numFields; i++) { - GeoIpProcessor.Property property = GeoIpProcessor.Property.values()[i]; + for (GeoIpProcessor.Property property : GeoIpProcessor.Property.ALL_CITY_PROPERTIES) { properties.add(property); fieldNames.add(property.name().toLowerCase(Locale.ROOT)); + if (++counter >= numFields) { + break; + } } Map config = new HashMap<>(); config.put("field", "_field"); From db186311c65227b721ad49f275d5b26bdf23986f Mon Sep 17 00:00:00 2001 From: Tim Vernum Date: Mon, 8 Jan 2018 11:11:41 +1000 Subject: [PATCH 18/74] Use the underlying connection version for CCS connections (#28093) Previously this would default to the version of the remote Node. However, if the remote cluster was mixed-version (e.g. it was part way through a rolling upgrade), then the TransportService may have negotiated a connection version that is not identical to connected Node's version. This mismatch would cause the Stream and the (Remote)Connection to report different version numbers, which could cause data to be sent over the wire using an incorrect serialization version. --- .../transport/RemoteClusterConnection.java | 6 ++ .../RemoteClusterConnectionTests.java | 61 +++++++++++++++++++ 2 files changed, 67 insertions(+) diff --git a/core/src/main/java/org/elasticsearch/transport/RemoteClusterConnection.java b/core/src/main/java/org/elasticsearch/transport/RemoteClusterConnection.java index 55edd0c86ec29..e73debc601430 100644 --- a/core/src/main/java/org/elasticsearch/transport/RemoteClusterConnection.java +++ b/core/src/main/java/org/elasticsearch/transport/RemoteClusterConnection.java @@ -23,6 +23,7 @@ import org.apache.lucene.store.AlreadyClosedException; import org.apache.lucene.util.IOUtils; import org.apache.lucene.util.SetOnce; +import org.elasticsearch.Version; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.admin.cluster.node.info.NodeInfo; import org.elasticsearch.action.admin.cluster.node.info.NodesInfoAction; @@ -280,6 +281,11 @@ public void sendRequest(long requestId, String action, TransportRequest request, public void close() throws IOException { assert false: "proxy connections must not be closed"; } + + @Override + public Version getVersion() { + return connection.getVersion(); + } }; } diff --git a/core/src/test/java/org/elasticsearch/transport/RemoteClusterConnectionTests.java b/core/src/test/java/org/elasticsearch/transport/RemoteClusterConnectionTests.java index e6d278af085b2..e7dccf702fe26 100644 --- a/core/src/test/java/org/elasticsearch/transport/RemoteClusterConnectionTests.java +++ b/core/src/test/java/org/elasticsearch/transport/RemoteClusterConnectionTests.java @@ -81,7 +81,11 @@ import static java.util.Collections.emptyMap; import static java.util.Collections.emptySet; +import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.instanceOf; +import static org.hamcrest.Matchers.iterableWithSize; +import static org.hamcrest.Matchers.not; +import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.startsWith; public class RemoteClusterConnectionTests extends ESTestCase { @@ -305,6 +309,63 @@ public void testConnectWithIncompatibleTransports() throws Exception { } } + public void testRemoteConnectionVersionMatchesTransportConnectionVersion() throws Exception { + List knownNodes = new CopyOnWriteArrayList<>(); + final Version previousVersion = VersionUtils.getPreviousVersion(); + try (MockTransportService seedTransport = startTransport("seed_node", knownNodes, previousVersion); + MockTransportService discoverableTransport = startTransport("discoverable_node", knownNodes, Version.CURRENT)) { + + DiscoveryNode seedNode = seedTransport.getLocalDiscoNode(); + assertThat(seedNode, notNullValue()); + knownNodes.add(seedNode); + + DiscoveryNode oldVersionNode = discoverableTransport.getLocalDiscoNode(); + assertThat(oldVersionNode, notNullValue()); + knownNodes.add(oldVersionNode); + + assertThat(seedNode.getVersion(), not(equalTo(oldVersionNode.getVersion()))); + try (MockTransportService service = MockTransportService.createNewService(Settings.EMPTY, Version.CURRENT, threadPool, null)) { + final Transport.Connection seedConnection = new Transport.Connection() { + @Override + public DiscoveryNode getNode() { + return seedNode; + } + + @Override + public void sendRequest(long requestId, String action, TransportRequest request, TransportRequestOptions options) + throws IOException, TransportException { + // no-op + } + + @Override + public void close() throws IOException { + // no-op + } + }; + service.addDelegate(seedNode.getAddress(), new MockTransportService.DelegateTransport(service.getOriginalTransport()) { + @Override + public Connection getConnection(DiscoveryNode node) { + if (node == seedNode) { + return seedConnection; + } + return super.getConnection(node); + } + }); + service.start(); + service.acceptIncomingRequests(); + try (RemoteClusterConnection connection = new RemoteClusterConnection(Settings.EMPTY, "test-cluster", + Arrays.asList(seedNode), service, Integer.MAX_VALUE, n -> true)) { + connection.addConnectedNode(seedNode); + for (DiscoveryNode node : knownNodes) { + final Transport.Connection transportConnection = connection.getConnection(node); + assertThat(transportConnection.getVersion(), equalTo(previousVersion)); + } + assertThat(knownNodes, iterableWithSize(2)); + } + } + } + } + @SuppressForbidden(reason = "calls getLocalHost here but it's fine in this case") public void testSlowNodeCanBeCanceled() throws IOException, InterruptedException { try (ServerSocket socket = new MockServerSocket()) { From ae9c3281fcf8c79831e12831cfc99318fdec6828 Mon Sep 17 00:00:00 2001 From: Yannick Welsch Date: Mon, 8 Jan 2018 10:02:56 +0100 Subject: [PATCH 19/74] [TEST] Wait for replicas to be allocated before shrinking The full-cluster-restart tests are run with two nodes. This can lead to situations where the shrink tests fail because the replicas are not allocated yet and the shrink operation needs the source shards to be available on the same node. --- .../java/org/elasticsearch/upgrades/FullClusterRestartIT.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/qa/full-cluster-restart/src/test/java/org/elasticsearch/upgrades/FullClusterRestartIT.java b/qa/full-cluster-restart/src/test/java/org/elasticsearch/upgrades/FullClusterRestartIT.java index ec755cda6b8d1..06b8406b078dd 100644 --- a/qa/full-cluster-restart/src/test/java/org/elasticsearch/upgrades/FullClusterRestartIT.java +++ b/qa/full-cluster-restart/src/test/java/org/elasticsearch/upgrades/FullClusterRestartIT.java @@ -388,6 +388,8 @@ public void testShrink() throws IOException { .endObject(); }); + ensureGreen(index); // wait for source index to be available on both nodes before starting shrink + String updateSettingsRequestBody = "{\"settings\": {\"index.blocks.write\": true}}"; Response rsp = client().performRequest("PUT", "/" + index + "/_settings", Collections.emptyMap(), new StringEntity(updateSettingsRequestBody, ContentType.APPLICATION_JSON)); @@ -453,6 +455,8 @@ public void testShrinkAfterUpgrade() throws IOException { .endObject(); }); } else { + ensureGreen(index); // wait for source index to be available on both nodes before starting shrink + String updateSettingsRequestBody = "{\"settings\": {\"index.blocks.write\": true}}"; Response rsp = client().performRequest("PUT", "/" + index + "/_settings", Collections.emptyMap(), new StringEntity(updateSettingsRequestBody, ContentType.APPLICATION_JSON)); From fd45a46ce84e6e3f08015ab0fb49308bf8d287e9 Mon Sep 17 00:00:00 2001 From: olcbean <26058559+olcbean@users.noreply.github.com> Date: Mon, 8 Jan 2018 10:57:45 +0100 Subject: [PATCH 20/74] Deprecate `isShardsAcked()` in favour of `isShardsAcknowledged()` (#27819) Several responses include the shards_acknowledged flag (indicating whether the requisite number of shard copies started before the completion of the operation) and there are two different getters used : isShardsAcknowledged() and isShardsAcked(). This PR deprecates the isShardsAcked() in favour of isShardsAcknowledged() in CreateIndexResponse, RolloverResponse and CreateIndexClusterStateUpdateResponse. Closes #27784 --- .../IndicesClientDocumentationIT.java | 5 ++-- .../indices/create/CreateIndexRequest.java | 2 +- .../create/CreateIndexRequestBuilder.java | 2 +- .../indices/create/CreateIndexResponse.java | 30 +++++++++++++------ .../create/TransportCreateIndexAction.java | 2 +- .../indices/rollover/RolloverRequest.java | 2 +- .../rollover/RolloverRequestBuilder.java | 2 +- .../indices/rollover/RolloverResponse.java | 30 +++++++++++++------ .../rollover/TransportRolloverAction.java | 5 ++-- .../admin/indices/shrink/ResizeRequest.java | 2 +- .../indices/shrink/ResizeRequestBuilder.java | 2 +- .../admin/indices/shrink/ResizeResponse.java | 4 +-- .../indices/shrink/TransportResizeAction.java | 4 +-- ...CreateIndexClusterStateUpdateResponse.java | 15 +++++++--- .../metadata/MetaDataCreateIndexService.java | 10 +++---- .../admin/indices/create/CreateIndexIT.java | 6 ++-- .../create/CreateIndexResponseTests.java | 10 +++---- .../indices/open/OpenIndexResponseTests.java | 4 +-- .../support/ActiveShardsObserverIT.java | 6 ++-- .../RandomExceptionCircuitBreakerIT.java | 2 +- .../hamcrest/ElasticsearchAssertions.java | 2 +- 21 files changed, 90 insertions(+), 57 deletions(-) diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/IndicesClientDocumentationIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/IndicesClientDocumentationIT.java index 56a241f8d92c8..42d19fab82fe9 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/IndicesClientDocumentationIT.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/IndicesClientDocumentationIT.java @@ -190,10 +190,10 @@ public void testCreateIndex() throws IOException { // tag::create-index-response boolean acknowledged = createIndexResponse.isAcknowledged(); // <1> - boolean shardsAcked = createIndexResponse.isShardsAcked(); // <2> + boolean shardsAcknowledged = createIndexResponse.isShardsAcknowledged(); // <2> // end::create-index-response assertTrue(acknowledged); - assertTrue(shardsAcked); + assertTrue(shardsAcknowledged); } } @@ -202,7 +202,6 @@ public void testCreateIndexAsync() throws Exception { { CreateIndexRequest request = new CreateIndexRequest("twitter"); - // tag::create-index-execute-async client.indices().createIndexAsync(request, new ActionListener() { @Override diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequest.java b/core/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequest.java index f628974834cb5..17941b582ec31 100644 --- a/core/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequest.java +++ b/core/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequest.java @@ -453,7 +453,7 @@ public ActiveShardCount waitForActiveShards() { * non-negative integer, up to the number of copies per shard (number of replicas + 1), * to wait for the desired amount of shard copies to become active before returning. * Index creation will only wait up until the timeout value for the number of shard copies - * to be active before returning. Check {@link CreateIndexResponse#isShardsAcked()} to + * to be active before returning. Check {@link CreateIndexResponse#isShardsAcknowledged()} to * determine if the requisite shard copies were all started before returning or timing out. * * @param waitForActiveShards number of active shard copies to wait on diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequestBuilder.java index d5ad01da645d9..fabe269124e9e 100644 --- a/core/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequestBuilder.java +++ b/core/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequestBuilder.java @@ -254,7 +254,7 @@ public CreateIndexRequestBuilder setUpdateAllTypes(boolean updateAllTypes) { * non-negative integer, up to the number of copies per shard (number of replicas + 1), * to wait for the desired amount of shard copies to become active before returning. * Index creation will only wait up until the timeout value for the number of shard copies - * to be active before returning. Check {@link CreateIndexResponse#isShardsAcked()} to + * to be active before returning. Check {@link CreateIndexResponse#isShardsAcknowledged()} to * determine if the requisite shard copies were all started before returning or timing out. * * @param waitForActiveShards number of active shard copies to wait on diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexResponse.java b/core/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexResponse.java index 5c07b4024ee7a..46203d369d9e1 100644 --- a/core/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexResponse.java +++ b/core/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexResponse.java @@ -52,16 +52,16 @@ public class CreateIndexResponse extends AcknowledgedResponse implements ToXCont PARSER.declareField(constructorArg(), (parser, context) -> parser.text(), INDEX, ObjectParser.ValueType.STRING); } - private boolean shardsAcked; + private boolean shardsAcknowledged; private String index; protected CreateIndexResponse() { } - protected CreateIndexResponse(boolean acknowledged, boolean shardsAcked, String index) { + protected CreateIndexResponse(boolean acknowledged, boolean shardsAcknowledged, String index) { super(acknowledged); - assert acknowledged || shardsAcked == false; // if its not acknowledged, then shards acked should be false too - this.shardsAcked = shardsAcked; + assert acknowledged || shardsAcknowledged == false; // if its not acknowledged, then shardsAcknowledged should be false too + this.shardsAcknowledged = shardsAcknowledged; this.index = index; } @@ -69,7 +69,7 @@ protected CreateIndexResponse(boolean acknowledged, boolean shardsAcked, String public void readFrom(StreamInput in) throws IOException { super.readFrom(in); readAcknowledged(in); - shardsAcked = in.readBoolean(); + shardsAcknowledged = in.readBoolean(); if (in.getVersion().onOrAfter(Version.V_5_6_0)) { index = in.readString(); } @@ -79,7 +79,7 @@ public void readFrom(StreamInput in) throws IOException { public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); writeAcknowledged(out); - out.writeBoolean(shardsAcked); + out.writeBoolean(shardsAcknowledged); if (out.getVersion().onOrAfter(Version.V_5_6_0)) { out.writeString(index); } @@ -87,11 +87,23 @@ public void writeTo(StreamOutput out) throws IOException { /** * Returns true if the requisite number of shards were started before - * returning from the index creation operation. If {@link #isAcknowledged()} + * returning from the index creation operation. If {@link #isAcknowledged()} * is false, then this also returns false. + * + * @deprecated use {@link #isShardsAcknowledged()} */ + @Deprecated public boolean isShardsAcked() { - return shardsAcked; + return shardsAcknowledged; + } + + /** + * Returns true if the requisite number of shards were started before + * returning from the index creation operation. If {@link #isAcknowledged()} + * is false, then this also returns false. + */ + public boolean isShardsAcknowledged() { + return shardsAcknowledged; } public String index() { @@ -99,7 +111,7 @@ public String index() { } public void addCustomFields(XContentBuilder builder) throws IOException { - builder.field(SHARDS_ACKNOWLEDGED.getPreferredName(), isShardsAcked()); + builder.field(SHARDS_ACKNOWLEDGED.getPreferredName(), isShardsAcknowledged()); builder.field(INDEX.getPreferredName(), index()); } diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/create/TransportCreateIndexAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/create/TransportCreateIndexAction.java index 0ac8d02f97760..372c2eb861237 100644 --- a/core/src/main/java/org/elasticsearch/action/admin/indices/create/TransportCreateIndexAction.java +++ b/core/src/main/java/org/elasticsearch/action/admin/indices/create/TransportCreateIndexAction.java @@ -79,7 +79,7 @@ protected void masterOperation(final CreateIndexRequest request, final ClusterSt .waitForActiveShards(request.waitForActiveShards()); createIndexService.createIndex(updateRequest, ActionListener.wrap(response -> - listener.onResponse(new CreateIndexResponse(response.isAcknowledged(), response.isShardsAcked(), indexName)), + listener.onResponse(new CreateIndexResponse(response.isAcknowledged(), response.isShardsAcknowledged(), indexName)), listener::onFailure)); } diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverRequest.java b/core/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverRequest.java index c25fc7eb537d3..34d56239b5ce8 100644 --- a/core/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverRequest.java +++ b/core/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverRequest.java @@ -202,7 +202,7 @@ CreateIndexRequest getCreateIndexRequest() { * non-negative integer, up to the number of copies per shard (number of replicas + 1), * to wait for the desired amount of shard copies to become active before returning. * Index creation will only wait up until the timeout value for the number of shard copies - * to be active before returning. Check {@link RolloverResponse#isShardsAcked()} to + * to be active before returning. Check {@link RolloverResponse#isShardsAcknowledged()} to * determine if the requisite shard copies were all started before returning or timing out. * * @param waitForActiveShards number of active shard copies to wait on diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverRequestBuilder.java index 55df220ec0700..818def9d19a09 100644 --- a/core/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverRequestBuilder.java +++ b/core/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverRequestBuilder.java @@ -87,7 +87,7 @@ public RolloverRequestBuilder mapping(String type, String source) { * non-negative integer, up to the number of copies per shard (number of replicas + 1), * to wait for the desired amount of shard copies to become active before returning. * Index creation will only wait up until the timeout value for the number of shard copies - * to be active before returning. Check {@link RolloverResponse#isShardsAcked()} to + * to be active before returning. Check {@link RolloverResponse#isShardsAcknowledged()} to * determine if the requisite shard copies were all started before returning or timing out. * * @param waitForActiveShards number of active shard copies to wait on diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverResponse.java b/core/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverResponse.java index 8c1be3501a820..2dcf4f510470f 100644 --- a/core/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverResponse.java +++ b/core/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverResponse.java @@ -48,19 +48,19 @@ public final class RolloverResponse extends ActionResponse implements ToXContent private boolean dryRun; private boolean rolledOver; private boolean acknowledged; - private boolean shardsAcked; + private boolean shardsAcknowledged; RolloverResponse() { } RolloverResponse(String oldIndex, String newIndex, Set conditionResults, - boolean dryRun, boolean rolledOver, boolean acknowledged, boolean shardsAcked) { + boolean dryRun, boolean rolledOver, boolean acknowledged, boolean shardsAcknowledged) { this.oldIndex = oldIndex; this.newIndex = newIndex; this.dryRun = dryRun; this.rolledOver = rolledOver; this.acknowledged = acknowledged; - this.shardsAcked = shardsAcked; + this.shardsAcknowledged = shardsAcknowledged; this.conditionStatus = conditionResults.stream() .map(result -> new AbstractMap.SimpleEntry<>(result.condition.toString(), result.matched)) .collect(Collectors.toSet()); @@ -105,7 +105,7 @@ public boolean isRolledOver() { * Returns true if the creation of the new rollover index and switching of the * alias to the newly created index was successful, and returns false otherwise. * If {@link #isDryRun()} is true, then this will also return false. If this - * returns false, then {@link #isShardsAcked()} will also return false. + * returns false, then {@link #isShardsAcknowledged()} will also return false. */ public boolean isAcknowledged() { return acknowledged; @@ -113,11 +113,23 @@ public boolean isAcknowledged() { /** * Returns true if the requisite number of shards were started in the newly - * created rollover index before returning. If {@link #isAcknowledged()} is + * created rollover index before returning. If {@link #isAcknowledged()} is * false, then this will also return false. + * + * @deprecated use {@link #isShardsAcknowledged()} */ + @Deprecated public boolean isShardsAcked() { - return shardsAcked; + return shardsAcknowledged; + } + + /** + * Returns true if the requisite number of shards were started in the newly + * created rollover index before returning. If {@link #isAcknowledged()} is + * false, then this will also return false. + */ + public boolean isShardsAcknowledged() { + return shardsAcknowledged; } @Override @@ -136,7 +148,7 @@ public void readFrom(StreamInput in) throws IOException { dryRun = in.readBoolean(); rolledOver = in.readBoolean(); acknowledged = in.readBoolean(); - shardsAcked = in.readBoolean(); + shardsAcknowledged = in.readBoolean(); } @Override @@ -152,7 +164,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeBoolean(dryRun); out.writeBoolean(rolledOver); out.writeBoolean(acknowledged); - out.writeBoolean(shardsAcked); + out.writeBoolean(shardsAcknowledged); } @Override @@ -163,7 +175,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws builder.field(ROLLED_OVER, rolledOver); builder.field(DRY_RUN, dryRun); builder.field(ACKNOWLEDGED, acknowledged); - builder.field(SHARDS_ACKED, shardsAcked); + builder.field(SHARDS_ACKED, shardsAcknowledged); builder.startObject(CONDITIONS); for (Map.Entry entry : conditionStatus) { builder.field(entry.getKey(), entry.getValue()); diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/rollover/TransportRolloverAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/rollover/TransportRolloverAction.java index c66f534bd8130..48d03f3ac94c6 100644 --- a/core/src/main/java/org/elasticsearch/action/admin/indices/rollover/TransportRolloverAction.java +++ b/core/src/main/java/org/elasticsearch/action/admin/indices/rollover/TransportRolloverAction.java @@ -140,8 +140,9 @@ public void onResponse(IndicesStatsResponse statsResponse) { activeShardsObserver.waitForActiveShards(new String[]{rolloverIndexName}, rolloverRequest.getCreateIndexRequest().waitForActiveShards(), rolloverRequest.masterNodeTimeout(), - isShardsAcked -> listener.onResponse(new RolloverResponse(sourceIndexName, rolloverIndexName, - conditionResults, false, true, true, isShardsAcked)), + isShardsAcknowledged -> listener.onResponse(new RolloverResponse( + sourceIndexName, rolloverIndexName, conditionResults, false, true, true, + isShardsAcknowledged)), listener::onFailure); } else { listener.onResponse(new RolloverResponse(sourceIndexName, rolloverIndexName, conditionResults, diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/shrink/ResizeRequest.java b/core/src/main/java/org/elasticsearch/action/admin/indices/shrink/ResizeRequest.java index f2f648f70ffa9..016ada92794f6 100644 --- a/core/src/main/java/org/elasticsearch/action/admin/indices/shrink/ResizeRequest.java +++ b/core/src/main/java/org/elasticsearch/action/admin/indices/shrink/ResizeRequest.java @@ -142,7 +142,7 @@ public String getSourceIndex() { * non-negative integer, up to the number of copies per shard (number of replicas + 1), * to wait for the desired amount of shard copies to become active before returning. * Index creation will only wait up until the timeout value for the number of shard copies - * to be active before returning. Check {@link ResizeResponse#isShardsAcked()} to + * to be active before returning. Check {@link ResizeResponse#isShardsAcknowledged()} to * determine if the requisite shard copies were all started before returning or timing out. * * @param waitForActiveShards number of active shard copies to wait on diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/shrink/ResizeRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/admin/indices/shrink/ResizeRequestBuilder.java index 6d8d98c0d75f0..4443dfd9e6c5f 100644 --- a/core/src/main/java/org/elasticsearch/action/admin/indices/shrink/ResizeRequestBuilder.java +++ b/core/src/main/java/org/elasticsearch/action/admin/indices/shrink/ResizeRequestBuilder.java @@ -56,7 +56,7 @@ public ResizeRequestBuilder setSettings(Settings settings) { * non-negative integer, up to the number of copies per shard (number of replicas + 1), * to wait for the desired amount of shard copies to become active before returning. * Index creation will only wait up until the timeout value for the number of shard copies - * to be active before returning. Check {@link ResizeResponse#isShardsAcked()} to + * to be active before returning. Check {@link ResizeResponse#isShardsAcknowledged()} to * determine if the requisite shard copies were all started before returning or timing out. * * @param waitForActiveShards number of active shard copies to wait on diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/shrink/ResizeResponse.java b/core/src/main/java/org/elasticsearch/action/admin/indices/shrink/ResizeResponse.java index cea74ced69cfc..efbb87e291b4d 100644 --- a/core/src/main/java/org/elasticsearch/action/admin/indices/shrink/ResizeResponse.java +++ b/core/src/main/java/org/elasticsearch/action/admin/indices/shrink/ResizeResponse.java @@ -25,7 +25,7 @@ public final class ResizeResponse extends CreateIndexResponse { ResizeResponse() { } - ResizeResponse(boolean acknowledged, boolean shardsAcked, String index) { - super(acknowledged, shardsAcked, index); + ResizeResponse(boolean acknowledged, boolean shardsAcknowledged, String index) { + super(acknowledged, shardsAcknowledged, index); } } diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/shrink/TransportResizeAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/shrink/TransportResizeAction.java index c5a15be22a847..688d33a0be734 100644 --- a/core/src/main/java/org/elasticsearch/action/admin/indices/shrink/TransportResizeAction.java +++ b/core/src/main/java/org/elasticsearch/action/admin/indices/shrink/TransportResizeAction.java @@ -109,8 +109,8 @@ public void onResponse(IndicesStatsResponse indicesStatsResponse) { createIndexService.createIndex( updateRequest, ActionListener.wrap(response -> - listener.onResponse(new ResizeResponse(response.isAcknowledged(), response.isShardsAcked(), - updateRequest.index())), listener::onFailure + listener.onResponse(new ResizeResponse(response.isAcknowledged(), response.isShardsAcknowledged(), + updateRequest.index())), listener::onFailure ) ); } diff --git a/core/src/main/java/org/elasticsearch/cluster/ack/CreateIndexClusterStateUpdateResponse.java b/core/src/main/java/org/elasticsearch/cluster/ack/CreateIndexClusterStateUpdateResponse.java index 4f0e99ae558fe..2e9089af79ac9 100644 --- a/core/src/main/java/org/elasticsearch/cluster/ack/CreateIndexClusterStateUpdateResponse.java +++ b/core/src/main/java/org/elasticsearch/cluster/ack/CreateIndexClusterStateUpdateResponse.java @@ -24,17 +24,24 @@ */ public class CreateIndexClusterStateUpdateResponse extends ClusterStateUpdateResponse { - private final boolean shardsAcked; + private final boolean shardsAcknowledged; - public CreateIndexClusterStateUpdateResponse(boolean acknowledged, boolean shardsAcked) { + public CreateIndexClusterStateUpdateResponse(boolean acknowledged, boolean shardsAcknowledged) { super(acknowledged); - this.shardsAcked = shardsAcked; + this.shardsAcknowledged = shardsAcknowledged; } /** * Returns whether the requisite number of shard copies started before the completion of the operation. + * + * @deprecated use {@link #isShardsAcknowledged()} */ + @Deprecated public boolean isShardsAcked() { - return shardsAcked; + return shardsAcknowledged; + } + + public boolean isShardsAcknowledged() { + return shardsAcknowledged; } } diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java b/core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java index 01783060c0b8a..4ef451e19478b 100644 --- a/core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java +++ b/core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java @@ -191,9 +191,9 @@ public static void validateIndexOrAliasName(String index, BiFunction { if (response.isAcknowledged()) { activeShardsObserver.waitForActiveShards(new String[]{request.index()}, request.waitForActiveShards(), request.ackTimeout(), - shardsAcked -> { - if (shardsAcked == false) { + shardsAcknowledged -> { + if (shardsAcknowledged == false) { logger.debug("[{}] index created, but the operation timed out while waiting for " + "enough shards to be started.", request.index()); } - listener.onResponse(new CreateIndexClusterStateUpdateResponse(response.isAcknowledged(), shardsAcked)); + listener.onResponse(new CreateIndexClusterStateUpdateResponse(response.isAcknowledged(), shardsAcknowledged)); }, listener::onFailure); } else { listener.onResponse(new CreateIndexClusterStateUpdateResponse(false, false)); diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexIT.java b/core/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexIT.java index 3f99e43739376..14d6647071453 100644 --- a/core/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexIT.java +++ b/core/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexIT.java @@ -308,14 +308,16 @@ public void testDefaultWaitForActiveShardsUsesIndexSetting() throws Exception { .put(settings) .put(SETTING_WAIT_FOR_ACTIVE_SHARDS.getKey(), "all") .build(); - assertFalse(client().admin().indices().prepareCreate("test-idx-2").setSettings(settings).setTimeout("100ms").get().isShardsAcked()); + assertFalse(client().admin().indices().prepareCreate("test-idx-2").setSettings(settings).setTimeout("100ms").get() + .isShardsAcknowledged()); // the numeric equivalent of all should also fail settings = Settings.builder() .put(settings) .put(SETTING_WAIT_FOR_ACTIVE_SHARDS.getKey(), Integer.toString(numReplicas + 1)) .build(); - assertFalse(client().admin().indices().prepareCreate("test-idx-3").setSettings(settings).setTimeout("100ms").get().isShardsAcked()); + assertFalse(client().admin().indices().prepareCreate("test-idx-3").setSettings(settings).setTimeout("100ms").get() + .isShardsAcknowledged()); } public void testInvalidPartitionSize() { diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexResponseTests.java b/core/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexResponseTests.java index b0fdae9ca62b9..6f6518462213f 100644 --- a/core/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexResponseTests.java +++ b/core/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexResponseTests.java @@ -44,7 +44,7 @@ public void testSerialization() throws IOException { try (StreamInput in = output.bytes().streamInput()) { CreateIndexResponse serialized = new CreateIndexResponse(); serialized.readFrom(in); - assertEquals(response.isShardsAcked(), serialized.isShardsAcked()); + assertEquals(response.isShardsAcknowledged(), serialized.isShardsAcknowledged()); assertEquals(response.isAcknowledged(), serialized.isAcknowledged()); assertEquals(response.index(), serialized.index()); } @@ -63,7 +63,7 @@ public void testSerializationWithOldVersion() throws IOException { in.setVersion(oldVersion); CreateIndexResponse serialized = new CreateIndexResponse(); serialized.readFrom(in); - assertEquals(response.isShardsAcked(), serialized.isShardsAcked()); + assertEquals(response.isShardsAcknowledged(), serialized.isShardsAcknowledged()); assertEquals(response.isAcknowledged(), serialized.isAcknowledged()); assertNull(serialized.index()); } @@ -110,7 +110,7 @@ private void doFromXContentTestWithRandomFields(boolean addRandomFields) throws } assertEquals(createIndexResponse.index(), parsedCreateIndexResponse.index()); - assertEquals(createIndexResponse.isShardsAcked(), parsedCreateIndexResponse.isShardsAcked()); + assertEquals(createIndexResponse.isShardsAcknowledged(), parsedCreateIndexResponse.isShardsAcknowledged()); assertEquals(createIndexResponse.isAcknowledged(), parsedCreateIndexResponse.isAcknowledged()); } @@ -119,9 +119,9 @@ private void doFromXContentTestWithRandomFields(boolean addRandomFields) throws */ private static CreateIndexResponse createTestItem() throws IOException { boolean acknowledged = randomBoolean(); - boolean shardsAcked = acknowledged && randomBoolean(); + boolean shardsAcknowledged = acknowledged && randomBoolean(); String index = randomAlphaOfLength(5); - return new CreateIndexResponse(acknowledged, shardsAcked, index); + return new CreateIndexResponse(acknowledged, shardsAcknowledged, index); } } diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/open/OpenIndexResponseTests.java b/core/src/test/java/org/elasticsearch/action/admin/indices/open/OpenIndexResponseTests.java index 09ceb7960347b..df49de0c1eeb0 100644 --- a/core/src/test/java/org/elasticsearch/action/admin/indices/open/OpenIndexResponseTests.java +++ b/core/src/test/java/org/elasticsearch/action/admin/indices/open/OpenIndexResponseTests.java @@ -57,7 +57,7 @@ public void testFromToXContent() throws IOException { private static OpenIndexResponse createTestItem() { boolean acknowledged = randomBoolean(); - boolean shardsAcked = acknowledged && randomBoolean(); - return new OpenIndexResponse(acknowledged, shardsAcked); + boolean shardsAcknowledged = acknowledged && randomBoolean(); + return new OpenIndexResponse(acknowledged, shardsAcknowledged); } } diff --git a/core/src/test/java/org/elasticsearch/action/support/ActiveShardsObserverIT.java b/core/src/test/java/org/elasticsearch/action/support/ActiveShardsObserverIT.java index f3611663b426a..2f0dd64b7ec02 100644 --- a/core/src/test/java/org/elasticsearch/action/support/ActiveShardsObserverIT.java +++ b/core/src/test/java/org/elasticsearch/action/support/ActiveShardsObserverIT.java @@ -51,7 +51,7 @@ public void testCreateIndexNoActiveShardsTimesOut() throws Exception { .setWaitForActiveShards(randomBoolean() ? ActiveShardCount.from(1) : ActiveShardCount.ALL) .setTimeout("100ms") .get() - .isShardsAcked()); + .isShardsAcknowledged()); waitForIndexCreationToComplete(indexName); } @@ -86,7 +86,7 @@ public void testCreateIndexNotEnoughActiveShardsTimesOut() throws Exception { .setWaitForActiveShards(randomIntBetween(numDataNodes + 1, numReplicas + 1)) .setTimeout("100ms") .get() - .isShardsAcked()); + .isShardsAcknowledged()); waitForIndexCreationToComplete(indexName); } @@ -116,7 +116,7 @@ public void testCreateIndexWaitsForAllActiveShards() throws Exception { .setWaitForActiveShards(ActiveShardCount.ALL) .setTimeout("100ms") .get() - .isShardsAcked()); + .isShardsAcknowledged()); waitForIndexCreationToComplete(indexName); if (client().admin().indices().prepareExists(indexName).get().isExists()) { client().admin().indices().prepareDelete(indexName).get(); diff --git a/core/src/test/java/org/elasticsearch/indices/memory/breaker/RandomExceptionCircuitBreakerIT.java b/core/src/test/java/org/elasticsearch/indices/memory/breaker/RandomExceptionCircuitBreakerIT.java index ed38ec8b05b96..4ab4cab52cf10 100644 --- a/core/src/test/java/org/elasticsearch/indices/memory/breaker/RandomExceptionCircuitBreakerIT.java +++ b/core/src/test/java/org/elasticsearch/indices/memory/breaker/RandomExceptionCircuitBreakerIT.java @@ -128,7 +128,7 @@ public void testBreakerWithRandomExceptions() throws IOException, InterruptedExc .setSettings(settings) .addMapping("type", mapping, XContentType.JSON).execute().actionGet(); final int numDocs; - if (response.isShardsAcked() == false) { + if (response.isShardsAcknowledged() == false) { /* some seeds just won't let you create the index at all and we enter a ping-pong mode * trying one node after another etc. that is ok but we need to make sure we don't wait * forever when indexing documents so we set numDocs = 1 and expect all shards to fail diff --git a/test/framework/src/main/java/org/elasticsearch/test/hamcrest/ElasticsearchAssertions.java b/test/framework/src/main/java/org/elasticsearch/test/hamcrest/ElasticsearchAssertions.java index 708a95e4a49f2..4eaaa96df7649 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/hamcrest/ElasticsearchAssertions.java +++ b/test/framework/src/main/java/org/elasticsearch/test/hamcrest/ElasticsearchAssertions.java @@ -143,7 +143,7 @@ public static void assertAcked(CreateIndexResponse response) { assertThat(response.getClass().getSimpleName() + " failed - not acked", response.isAcknowledged(), equalTo(true)); assertVersionSerializable(response); assertTrue(response.getClass().getSimpleName() + " failed - index creation acked but not all shards were started", - response.isShardsAcked()); + response.isShardsAcknowledged()); } /** From 04ce0e762562056b60e5a987ecbc397405b3e561 Mon Sep 17 00:00:00 2001 From: Tanguy Leroux Date: Mon, 8 Jan 2018 15:03:40 +0100 Subject: [PATCH 21/74] Avoid concurrent snapshot finalizations when deleting an INIT snapshot (#28078) This commit removes the finalization of a snapshot by the snapshot deletion request. This way, the deletion marks the snapshot as ABORTED in cluster state and waits for the snapshot completion. It is the responsability of the snapshot execution to detect the abortion and terminates itself correctly. This avoids concurrent snapshot finalizations and also ordinates the operations: the deletion aborts the snapshot and waits for the snapshot completion, the creation detects the abortion and stops by itself and finalizes the snapshot, then the deletion resumes and continues the deletion process. --- .../snapshots/SnapshotsService.java | 73 ++++++++++++------- .../SharedClusterSnapshotRestoreIT.java | 6 +- 2 files changed, 48 insertions(+), 31 deletions(-) diff --git a/core/src/main/java/org/elasticsearch/snapshots/SnapshotsService.java b/core/src/main/java/org/elasticsearch/snapshots/SnapshotsService.java index e19394714731f..ec63b7d228ec5 100644 --- a/core/src/main/java/org/elasticsearch/snapshots/SnapshotsService.java +++ b/core/src/main/java/org/elasticsearch/snapshots/SnapshotsService.java @@ -372,8 +372,8 @@ private void beginSnapshot(final ClusterState clusterState, return; } clusterService.submitStateUpdateTask("update_snapshot [" + snapshot.snapshot() + "]", new ClusterStateUpdateTask() { - boolean accepted = false; - SnapshotsInProgress.Entry updatedSnapshot; + + SnapshotsInProgress.Entry endSnapshot; String failure = null; @Override @@ -381,17 +381,23 @@ public ClusterState execute(ClusterState currentState) { SnapshotsInProgress snapshots = currentState.custom(SnapshotsInProgress.TYPE); List entries = new ArrayList<>(); for (SnapshotsInProgress.Entry entry : snapshots.entries()) { - if (entry.snapshot().equals(snapshot.snapshot()) && entry.state() != State.ABORTED) { - // Replace the snapshot that was just created + if (entry.snapshot().equals(snapshot.snapshot()) == false) { + entries.add(entry); + continue; + } + + if (entry.state() != State.ABORTED) { + // Replace the snapshot that was just intialized ImmutableOpenMap shards = shards(currentState, entry.indices()); if (!partial) { Tuple, Set> indicesWithMissingShards = indicesWithMissingShards(shards, currentState.metaData()); Set missing = indicesWithMissingShards.v1(); Set closed = indicesWithMissingShards.v2(); if (missing.isEmpty() == false || closed.isEmpty() == false) { - StringBuilder failureMessage = new StringBuilder(); - updatedSnapshot = new SnapshotsInProgress.Entry(entry, State.FAILED, shards); - entries.add(updatedSnapshot); + endSnapshot = new SnapshotsInProgress.Entry(entry, State.FAILED, shards); + entries.add(endSnapshot); + + final StringBuilder failureMessage = new StringBuilder(); if (missing.isEmpty() == false) { failureMessage.append("Indices don't have primary shards "); failureMessage.append(missing); @@ -407,13 +413,16 @@ public ClusterState execute(ClusterState currentState) { continue; } } - updatedSnapshot = new SnapshotsInProgress.Entry(entry, State.STARTED, shards); + SnapshotsInProgress.Entry updatedSnapshot = new SnapshotsInProgress.Entry(entry, State.STARTED, shards); entries.add(updatedSnapshot); - if (!completed(shards.values())) { - accepted = true; + if (completed(shards.values())) { + endSnapshot = updatedSnapshot; } } else { - entries.add(entry); + assert entry.state() == State.ABORTED : "expecting snapshot to be aborted during initialization"; + failure = "snapshot was aborted during initialization"; + endSnapshot = entry; + entries.add(endSnapshot); } } return ClusterState.builder(currentState) @@ -448,8 +457,8 @@ public void clusterStateProcessed(String source, ClusterState oldState, ClusterS // We should end snapshot only if 1) we didn't accept it for processing (which happens when there // is nothing to do) and 2) there was a snapshot in metadata that we should end. Otherwise we should // go ahead and continue working on this snapshot rather then end here. - if (!accepted && updatedSnapshot != null) { - endSnapshot(updatedSnapshot, failure); + if (endSnapshot != null) { + endSnapshot(endSnapshot, failure); } } }); @@ -750,6 +759,11 @@ public ClusterState execute(ClusterState currentState) throws Exception { } entries.add(updatedSnapshot); } else if (snapshot.state() == State.INIT && newMaster) { + changed = true; + // Mark the snapshot as aborted as it failed to start from the previous master + updatedSnapshot = new SnapshotsInProgress.Entry(snapshot, State.ABORTED, snapshot.shards()); + entries.add(updatedSnapshot); + // Clean up the snapshot that failed to start from the old master deleteSnapshot(snapshot.snapshot(), new DeleteSnapshotListener() { @Override @@ -935,7 +949,7 @@ private Tuple, Set> indicesWithMissingShards(ImmutableOpenMa * * @param entry snapshot */ - void endSnapshot(SnapshotsInProgress.Entry entry) { + void endSnapshot(final SnapshotsInProgress.Entry entry) { endSnapshot(entry, null); } @@ -1144,24 +1158,26 @@ public ClusterState execute(ClusterState currentState) throws Exception { } else { // This snapshot is currently running - stopping shards first waitForSnapshot = true; - ImmutableOpenMap shards; - if (snapshotEntry.state() == State.STARTED && snapshotEntry.shards() != null) { - // snapshot is currently running - stop started shards - ImmutableOpenMap.Builder shardsBuilder = ImmutableOpenMap.builder(); + + final ImmutableOpenMap shards; + + final State state = snapshotEntry.state(); + if (state == State.INIT) { + // snapshot is still initializing, mark it as aborted + shards = snapshotEntry.shards(); + + } else if (state == State.STARTED) { + // snapshot is started - mark every non completed shard as aborted + final ImmutableOpenMap.Builder shardsBuilder = ImmutableOpenMap.builder(); for (ObjectObjectCursor shardEntry : snapshotEntry.shards()) { ShardSnapshotStatus status = shardEntry.value; - if (!status.state().completed()) { - shardsBuilder.put(shardEntry.key, new ShardSnapshotStatus(status.nodeId(), State.ABORTED, - "aborted by snapshot deletion")); - } else { - shardsBuilder.put(shardEntry.key, status); + if (status.state().completed() == false) { + status = new ShardSnapshotStatus(status.nodeId(), State.ABORTED, "aborted by snapshot deletion"); } + shardsBuilder.put(shardEntry.key, status); } shards = shardsBuilder.build(); - } else if (snapshotEntry.state() == State.INIT) { - // snapshot hasn't started yet - end it - shards = snapshotEntry.shards(); - endSnapshot(snapshotEntry); + } else { boolean hasUncompletedShards = false; // Cleanup in case a node gone missing and snapshot wasn't updated for some reason @@ -1178,7 +1194,8 @@ public ClusterState execute(ClusterState currentState) throws Exception { logger.debug("trying to delete completed snapshot - should wait for shards to finalize on all nodes"); return currentState; } else { - // no shards to wait for - finish the snapshot + // no shards to wait for but a node is gone - this is the only case + // where we force to finish the snapshot logger.debug("trying to delete completed snapshot with no finalizing shards - can delete immediately"); shards = snapshotEntry.shards(); endSnapshot(snapshotEntry); diff --git a/core/src/test/java/org/elasticsearch/snapshots/SharedClusterSnapshotRestoreIT.java b/core/src/test/java/org/elasticsearch/snapshots/SharedClusterSnapshotRestoreIT.java index 19c842a277afe..1b3a35ff160fb 100644 --- a/core/src/test/java/org/elasticsearch/snapshots/SharedClusterSnapshotRestoreIT.java +++ b/core/src/test/java/org/elasticsearch/snapshots/SharedClusterSnapshotRestoreIT.java @@ -3151,7 +3151,7 @@ public void testSnapshottingWithMissingSequenceNumbers() { assertThat(shardStats.getSeqNoStats().getMaxSeqNo(), equalTo(15L)); } - @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/27974") + @TestLogging("org.elasticsearch.snapshots:TRACE") public void testAbortedSnapshotDuringInitDoesNotStart() throws Exception { final Client client = client(); @@ -3163,11 +3163,11 @@ public void testAbortedSnapshotDuringInitDoesNotStart() throws Exception { )); createIndex("test-idx"); - final int nbDocs = scaledRandomIntBetween(1, 100); + final int nbDocs = scaledRandomIntBetween(100, 500); for (int i = 0; i < nbDocs; i++) { index("test-idx", "_doc", Integer.toString(i), "foo", "bar" + i); } - refresh(); + flushAndRefresh("test-idx"); assertThat(client.prepareSearch("test-idx").setSize(0).get().getHits().getTotalHits(), equalTo((long) nbDocs)); // Create a snapshot From 49636992acf93c3880fb1ea816b556be8f2ab36e Mon Sep 17 00:00:00 2001 From: Nhat Nguyen Date: Mon, 8 Jan 2018 09:39:34 -0500 Subject: [PATCH 22/74] Fail rollover if duplicated alias found in template (#28110) If a newly created index from a rollover request matches with an index template whose aliases contains the rollover request alias, the alias will point to multiple indices. This will cause indexing requests to be rejected. To avoid such situation, we make sure that there is no duplicated alias before creating a new index; otherwise abort and report an error to the caller. Closes #26976 --- .../rollover/TransportRolloverAction.java | 18 ++++++++++++++++++ .../metadata/MetaDataCreateIndexService.java | 18 +----------------- .../MetaDataIndexTemplateService.java | 19 +++++++++++++++++++ .../admin/indices/rollover/RolloverIT.java | 11 +++++++++++ .../TransportRolloverActionTests.java | 16 ++++++++++++++++ .../MetaDataIndexTemplateServiceTests.java | 19 +++++++++++++++++-- 6 files changed, 82 insertions(+), 19 deletions(-) diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/rollover/TransportRolloverAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/rollover/TransportRolloverAction.java index 48d03f3ac94c6..2ed5192e6cfb2 100644 --- a/core/src/main/java/org/elasticsearch/action/admin/indices/rollover/TransportRolloverAction.java +++ b/core/src/main/java/org/elasticsearch/action/admin/indices/rollover/TransportRolloverAction.java @@ -37,9 +37,11 @@ import org.elasticsearch.cluster.metadata.AliasOrIndex; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver; +import org.elasticsearch.cluster.metadata.IndexTemplateMetaData; import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.cluster.metadata.MetaDataCreateIndexService; import org.elasticsearch.cluster.metadata.MetaDataIndexAliasesService; +import org.elasticsearch.cluster.metadata.MetaDataIndexTemplateService; import org.elasticsearch.cluster.service.ClusterService; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.settings.Settings; @@ -115,6 +117,7 @@ protected void masterOperation(final RolloverRequest rolloverRequest, final Clus : generateRolloverIndexName(sourceProvidedName, indexNameExpressionResolver); final String rolloverIndexName = indexNameExpressionResolver.resolveDateMathExpression(unresolvedName); MetaDataCreateIndexService.validateIndexName(rolloverIndexName, state); // will fail if the index already exists + checkNoDuplicatedAliasInIndexTemplate(metaData, rolloverIndexName, rolloverRequest.getAlias()); client.admin().indices().prepareStats(sourceIndexName).clear().setDocs(true).execute( new ActionListener() { @Override @@ -238,4 +241,19 @@ static CreateIndexClusterStateUpdateRequest prepareCreateIndexRequest(final Stri .mappings(createIndexRequest.mappings()); } + /** + * If the newly created index matches with an index template whose aliases contains the rollover alias, + * the rollover alias will point to multiple indices. This causes indexing requests to be rejected. + * To avoid this, we make sure that there is no duplicated alias in index templates before creating a new index. + */ + static void checkNoDuplicatedAliasInIndexTemplate(MetaData metaData, String rolloverIndexName, String rolloverRequestAlias) { + final List matchedTemplates = MetaDataIndexTemplateService.findTemplates(metaData, rolloverIndexName); + for (IndexTemplateMetaData template : matchedTemplates) { + if (template.aliases().containsKey(rolloverRequestAlias)) { + throw new IllegalArgumentException(String.format(Locale.ROOT, + "Rollover alias [%s] can point to multiple indices, found duplicated alias [%s] in index template [%s]", + rolloverRequestAlias, template.aliases().keys(), template.name())); + } + } + } } diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java b/core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java index 4ef451e19478b..28a7570ca5582 100644 --- a/core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java +++ b/core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java @@ -277,7 +277,7 @@ public ClusterState execute(ClusterState currentState) throws Exception { // we only find a template when its an API call (a new index) // find templates, highest order are better matching - List templates = findTemplates(request, currentState); + List templates = MetaDataIndexTemplateService.findTemplates(currentState.metaData(), request.index()); Map customs = new HashMap<>(); @@ -564,22 +564,6 @@ public void onFailure(String source, Exception e) { } super.onFailure(source, e); } - - private List findTemplates(CreateIndexClusterStateUpdateRequest request, ClusterState state) throws IOException { - List templateMetadata = new ArrayList<>(); - for (ObjectCursor cursor : state.metaData().templates().values()) { - IndexTemplateMetaData metadata = cursor.value; - for (String template: metadata.patterns()) { - if (Regex.simpleMatch(template, request.index())) { - templateMetadata.add(metadata); - break; - } - } - } - - CollectionUtil.timSort(templateMetadata, Comparator.comparingInt(IndexTemplateMetaData::order).reversed()); - return templateMetadata; - } } private void validate(CreateIndexClusterStateUpdateRequest request, ClusterState state) { diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexTemplateService.java b/core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexTemplateService.java index 883d7f2fc47ec..9d8da37cbeeba 100644 --- a/core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexTemplateService.java +++ b/core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexTemplateService.java @@ -20,6 +20,7 @@ import com.carrotsearch.hppc.cursors.ObjectCursor; +import org.apache.lucene.util.CollectionUtil; import org.elasticsearch.Version; import org.elasticsearch.action.admin.indices.alias.Alias; import org.elasticsearch.action.support.master.MasterNodeRequest; @@ -48,6 +49,7 @@ import java.util.ArrayList; import java.util.Collections; +import java.util.Comparator; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -193,6 +195,23 @@ public void clusterStateProcessed(String source, ClusterState oldState, ClusterS }); } + /** + * Finds index templates whose index pattern matched with the given index name. + * The result is sorted by {@link IndexTemplateMetaData#order} descending. + */ + public static List findTemplates(MetaData metaData, String indexName) { + final List matchedTemplates = new ArrayList<>(); + for (ObjectCursor cursor : metaData.templates().values()) { + final IndexTemplateMetaData template = cursor.value; + final boolean matched = template.patterns().stream().anyMatch(pattern -> Regex.simpleMatch(pattern, indexName)); + if (matched) { + matchedTemplates.add(template); + } + } + CollectionUtil.timSort(matchedTemplates, Comparator.comparingInt(IndexTemplateMetaData::order).reversed()); + return matchedTemplates; + } + private static void validateAndAddTemplate(final PutRequest request, IndexTemplateMetaData.Builder templateBuilder, IndicesService indicesService, NamedXContentRegistry xContentRegistry) throws Exception { Index createdIndex = null; diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/rollover/RolloverIT.java b/core/src/test/java/org/elasticsearch/action/admin/indices/rollover/RolloverIT.java index c047611f71932..e2c31db81ce60 100644 --- a/core/src/test/java/org/elasticsearch/action/admin/indices/rollover/RolloverIT.java +++ b/core/src/test/java/org/elasticsearch/action/admin/indices/rollover/RolloverIT.java @@ -277,4 +277,15 @@ public void testRolloverMaxSize() throws Exception { assertThat("No rollover with an empty index", response.isRolledOver(), equalTo(false)); } } + + public void testRejectIfAliasFoundInTemplate() throws Exception { + client().admin().indices().preparePutTemplate("logs") + .setPatterns(Collections.singletonList("logs-*")).addAlias(new Alias("logs-write")).get(); + assertAcked(client().admin().indices().prepareCreate("logs-000001").get()); + ensureYellow("logs-write"); + final IllegalArgumentException error = expectThrows(IllegalArgumentException.class, + () -> client().admin().indices().prepareRolloverIndex("logs-write").addMaxIndexSizeCondition(new ByteSizeValue(1)).get()); + assertThat(error.getMessage(), equalTo( + "Rollover alias [logs-write] can point to multiple indices, found duplicated alias [[logs-write]] in index template [logs]")); + } } diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/rollover/TransportRolloverActionTests.java b/core/src/test/java/org/elasticsearch/action/admin/indices/rollover/TransportRolloverActionTests.java index dcb3a87df74f4..3366646e24a79 100644 --- a/core/src/test/java/org/elasticsearch/action/admin/indices/rollover/TransportRolloverActionTests.java +++ b/core/src/test/java/org/elasticsearch/action/admin/indices/rollover/TransportRolloverActionTests.java @@ -29,6 +29,7 @@ import org.elasticsearch.cluster.metadata.AliasMetaData; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver; +import org.elasticsearch.cluster.metadata.IndexTemplateMetaData; import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.common.UUIDs; import org.elasticsearch.common.settings.Settings; @@ -40,11 +41,13 @@ import org.elasticsearch.test.ESTestCase; import org.mockito.ArgumentCaptor; +import java.util.Arrays; import java.util.List; import java.util.Locale; import java.util.Set; import static org.elasticsearch.action.admin.indices.rollover.TransportRolloverAction.evaluateConditions; +import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasSize; import static org.mockito.Matchers.any; @@ -241,6 +244,19 @@ public void testCreateIndexRequest() throws Exception { assertThat(createIndexRequest.cause(), equalTo("rollover_index")); } + public void testRejectDuplicateAlias() throws Exception { + final IndexTemplateMetaData template = IndexTemplateMetaData.builder("test-template") + .patterns(Arrays.asList("foo-*", "bar-*")) + .putAlias(AliasMetaData.builder("foo-write")).putAlias(AliasMetaData.builder("bar-write")) + .build(); + final MetaData metaData = MetaData.builder().put(createMetaData(), false).put(template).build(); + String indexName = randomFrom("foo-123", "bar-xyz"); + String aliasName = randomFrom("foo-write", "bar-write"); + final IllegalArgumentException ex = expectThrows(IllegalArgumentException.class, + () -> TransportRolloverAction.checkNoDuplicatedAliasInIndexTemplate(metaData, indexName, aliasName)); + assertThat(ex.getMessage(), containsString("index template [test-template]")); + } + private IndicesStatsResponse createIndicesStatResponse(long totalDocs, long primaryDocs) { final CommonStats primaryStats = mock(CommonStats.class); when(primaryStats.getDocs()).thenReturn(new DocsStats(primaryDocs, 0, between(1, 10000))); diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/template/put/MetaDataIndexTemplateServiceTests.java b/core/src/test/java/org/elasticsearch/action/admin/indices/template/put/MetaDataIndexTemplateServiceTests.java index 58012909b8f2e..d3c133915e7b8 100644 --- a/core/src/test/java/org/elasticsearch/action/admin/indices/template/put/MetaDataIndexTemplateServiceTests.java +++ b/core/src/test/java/org/elasticsearch/action/admin/indices/template/put/MetaDataIndexTemplateServiceTests.java @@ -20,8 +20,10 @@ package org.elasticsearch.action.admin.indices.template.put; import org.elasticsearch.action.admin.indices.alias.Alias; +import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.metadata.AliasValidator; import org.elasticsearch.cluster.metadata.IndexMetaData; +import org.elasticsearch.cluster.metadata.IndexTemplateMetaData; import org.elasticsearch.cluster.metadata.MetaDataCreateIndexService; import org.elasticsearch.cluster.metadata.MetaDataIndexTemplateService; import org.elasticsearch.cluster.metadata.MetaDataIndexTemplateService.PutRequest; @@ -38,16 +40,17 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.HashMap; import java.util.HashSet; import java.util.List; -import java.util.Map; import java.util.Set; import java.util.concurrent.CountDownLatch; +import java.util.stream.Collectors; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.instanceOf; +import static org.hamcrest.Matchers.contains; +import static org.hamcrest.Matchers.empty; public class MetaDataIndexTemplateServiceTests extends ESSingleNodeTestCase { public void testIndexTemplateInvalidNumberOfShards() { @@ -154,6 +157,18 @@ public void testAliasInvalidFilterInvalidJson() throws Exception { assertThat(errors.get(0).getMessage(), equalTo("failed to parse filter for alias [invalid_alias]")); } + public void testFindTemplates() throws Exception { + client().admin().indices().prepareDeleteTemplate("*").get(); // Delete all existing templates + putTemplateDetail(new PutRequest("test", "foo-1").patterns(Arrays.asList("foo-*")).order(1)); + putTemplateDetail(new PutRequest("test", "foo-2").patterns(Arrays.asList("foo-*")).order(2)); + putTemplateDetail(new PutRequest("test", "bar").patterns(Arrays.asList("bar-*")).order(between(0, 100))); + final ClusterState state = client().admin().cluster().prepareState().get().getState(); + assertThat(MetaDataIndexTemplateService.findTemplates(state.metaData(), "foo-1234").stream() + .map(IndexTemplateMetaData::name).collect(Collectors.toList()), contains("foo-2", "foo-1")); + assertThat(MetaDataIndexTemplateService.findTemplates(state.metaData(), "bar-xyz").stream() + .map(IndexTemplateMetaData::name).collect(Collectors.toList()), contains("bar")); + assertThat(MetaDataIndexTemplateService.findTemplates(state.metaData(), "baz"), empty()); + } private static List putTemplate(NamedXContentRegistry xContentRegistry, PutRequest request) { MetaDataCreateIndexService createIndexService = new MetaDataCreateIndexService( From a58dc8d82cc3e89dbbd30adcd444371a3d10f614 Mon Sep 17 00:00:00 2001 From: Andrew Banchich Date: Mon, 8 Jan 2018 10:55:48 -0500 Subject: [PATCH 23/74] [Docs] Fix Date Math example descriptions (#28125) --- docs/reference/api-conventions.asciidoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/reference/api-conventions.asciidoc b/docs/reference/api-conventions.asciidoc index db138912683f3..7cd608d0bb533 100644 --- a/docs/reference/api-conventions.asciidoc +++ b/docs/reference/api-conventions.asciidoc @@ -218,8 +218,8 @@ The supported units are: Assuming `now` is `2001-01-01 12:00:00`, some examples are: `now+1h`:: `now` in milliseconds plus one hour. Resolves to: `2001-01-01 13:00:00` -`now-1h`:: `now` in milliseconds plus one hour. Resolves to: `2001-01-01 11:00:00` -`now-1h/d`:: `now` in milliseconds rounded down to UTC 00:00. Resolves to: `2001-01-01 00:00:00`` +`now-1h`:: `now` in milliseconds minus one hour. Resolves to: `2001-01-01 11:00:00` +`now-1h/d`:: `now` in milliseconds minus one hour, rounded down to UTC 00:00. Resolves to: `2001-01-01 00:00:00`` `2001-01-01\|\|+1M/d`:: `now` in milliseconds plus one month. Resolves to: `2001-02-01 00:00:00` [float] From af3c2fcd65fa16b19c3719c87f701e8de0cfdc2f Mon Sep 17 00:00:00 2001 From: Jason Tedor Date: Mon, 8 Jan 2018 10:48:16 -0500 Subject: [PATCH 24/74] Fix expected plugins test for transport-nio We have a packaging test that tries to install all plugins, and then asserts that all expected plugins are installed. The expected plugins are dervied from the list of plugins in the plugins sub-project. The plugin transport-nio was recently added here, but explicit commands to install and remove this plugin were never added. This commit addresses this. --- .../packaging/tests/module_and_plugin_test_cases.bash | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/qa/vagrant/src/test/resources/packaging/tests/module_and_plugin_test_cases.bash b/qa/vagrant/src/test/resources/packaging/tests/module_and_plugin_test_cases.bash index 767ebf95dd6fe..fb721d5c6d9ad 100644 --- a/qa/vagrant/src/test/resources/packaging/tests/module_and_plugin_test_cases.bash +++ b/qa/vagrant/src/test/resources/packaging/tests/module_and_plugin_test_cases.bash @@ -271,6 +271,10 @@ fi install_and_check_plugin store smb } +@test "[$GROUP] install transport-nio plugin" { + install_and_check_plugin transport nio +} + @test "[$GROUP] check the installed plugins can be listed with 'plugins list' and result matches the list of plugins in plugins pom" { "$ESHOME/bin/elasticsearch-plugin" list | cut -d'@' -f1 > /tmp/installed compare_plugins_list "/tmp/installed" "'plugins list'" @@ -373,6 +377,10 @@ fi remove_plugin store-smb } +@test "[$GROUP] remove transport-nio plugin" { + remove_plugin transport-nio +} + @test "[$GROUP] start elasticsearch with all plugins removed" { start_elasticsearch_service } From ff3db0b50ecb654e6f393c5200156a8aefb059eb Mon Sep 17 00:00:00 2001 From: Tim Brooks Date: Mon, 8 Jan 2018 10:18:19 -0700 Subject: [PATCH 25/74] Cleanup TcpChannelFactory and remove classes (#28102) This commit is related to #27260. It moves the TcpChannelFactory into NioTransport so that consumers do not have to be passed around. Additionally it deletes an unused read handler. --- .../transport/nio/NioTransport.java | 57 ++++++++++----- .../transport/nio/TcpChannelFactory.java | 69 ------------------- .../nio/TcpNioServerSocketChannel.java | 4 +- .../transport/nio/TcpReadHandler.java | 48 ------------- .../transport/nio/NioTransportIT.java | 1 - 5 files changed, 42 insertions(+), 137 deletions(-) delete mode 100644 plugins/transport-nio/src/main/java/org/elasticsearch/transport/nio/TcpChannelFactory.java delete mode 100644 plugins/transport-nio/src/main/java/org/elasticsearch/transport/nio/TcpReadHandler.java diff --git a/plugins/transport-nio/src/main/java/org/elasticsearch/transport/nio/NioTransport.java b/plugins/transport-nio/src/main/java/org/elasticsearch/transport/nio/NioTransport.java index d44a606e3c916..42063878b4b2f 100644 --- a/plugins/transport-nio/src/main/java/org/elasticsearch/transport/nio/NioTransport.java +++ b/plugins/transport-nio/src/main/java/org/elasticsearch/transport/nio/NioTransport.java @@ -33,14 +33,17 @@ import org.elasticsearch.common.util.PageCacheRecycler; import org.elasticsearch.common.util.concurrent.EsExecutors; import org.elasticsearch.indices.breaker.CircuitBreakerService; +import org.elasticsearch.nio.AcceptingSelector; import org.elasticsearch.nio.AcceptorEventHandler; import org.elasticsearch.nio.BytesReadContext; import org.elasticsearch.nio.BytesWriteContext; +import org.elasticsearch.nio.ChannelFactory; import org.elasticsearch.nio.InboundChannelBuffer; import org.elasticsearch.nio.NioGroup; import org.elasticsearch.nio.NioSocketChannel; import org.elasticsearch.nio.ReadContext; import org.elasticsearch.nio.SocketEventHandler; +import org.elasticsearch.nio.SocketSelector; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TcpChannel; import org.elasticsearch.transport.TcpTransport; @@ -49,8 +52,9 @@ import java.io.IOException; import java.net.InetSocketAddress; import java.nio.ByteBuffer; +import java.nio.channels.ServerSocketChannel; +import java.nio.channels.SocketChannel; import java.util.concurrent.ConcurrentMap; -import java.util.function.Consumer; import java.util.function.Supplier; import static org.elasticsearch.common.settings.Setting.intSetting; @@ -110,13 +114,13 @@ protected void doStart() { NioTransport.NIO_WORKER_COUNT.get(settings), SocketEventHandler::new); ProfileSettings clientProfileSettings = new ProfileSettings(settings, "default"); - clientChannelFactory = new TcpChannelFactory(clientProfileSettings, getContextSetter(), getServerContextSetter()); + clientChannelFactory = new TcpChannelFactory(clientProfileSettings); if (useNetworkServer) { // loop through all profiles and start them up, special handling for default one for (ProfileSettings profileSettings : profileSettings) { String profileName = profileSettings.profileName; - TcpChannelFactory factory = new TcpChannelFactory(profileSettings, getContextSetter(), getServerContextSetter()); + TcpChannelFactory factory = new TcpChannelFactory(profileSettings); profileToChannelFactory.putIfAbsent(profileName, factory); bindServer(profileSettings); } @@ -143,29 +147,46 @@ protected void stopInternal() { profileToChannelFactory.clear(); } - final void exceptionCaught(NioSocketChannel channel, Exception exception) { + private void exceptionCaught(NioSocketChannel channel, Exception exception) { onException((TcpChannel) channel, exception); } - private Consumer getContextSetter() { - return (c) -> { + private void acceptChannel(NioSocketChannel channel) { + serverAcceptedChannel((TcpNioSocketChannel) channel); + } + + private class TcpChannelFactory extends ChannelFactory { + + private final String profileName; + + TcpChannelFactory(TcpTransport.ProfileSettings profileSettings) { + super(new RawChannelFactory(profileSettings.tcpNoDelay, + profileSettings.tcpKeepAlive, + profileSettings.reuseAddress, + Math.toIntExact(profileSettings.sendBufferSize.getBytes()), + Math.toIntExact(profileSettings.receiveBufferSize.getBytes()))); + this.profileName = profileSettings.profileName; + } + + @Override + public TcpNioSocketChannel createChannel(SocketSelector selector, SocketChannel channel) throws IOException { + TcpNioSocketChannel nioChannel = new TcpNioSocketChannel(profileName, channel, selector); Supplier pageSupplier = () -> { Recycler.V bytes = pageCacheRecycler.bytePage(false); return new InboundChannelBuffer.Page(ByteBuffer.wrap(bytes.v()), bytes::close); }; ReadContext.ReadConsumer nioReadConsumer = channelBuffer -> - consumeNetworkReads(c, BytesReference.fromByteBuffers(channelBuffer.sliceBuffersTo(channelBuffer.getIndex()))); - BytesReadContext readContext = new BytesReadContext(c, nioReadConsumer, new InboundChannelBuffer(pageSupplier)); - c.setContexts(readContext, new BytesWriteContext(c), this::exceptionCaught); - }; - } - - private void acceptChannel(NioSocketChannel channel) { - serverAcceptedChannel((TcpNioSocketChannel) channel); - - } + consumeNetworkReads(nioChannel, BytesReference.fromByteBuffers(channelBuffer.sliceBuffersTo(channelBuffer.getIndex()))); + BytesReadContext readContext = new BytesReadContext(nioChannel, nioReadConsumer, new InboundChannelBuffer(pageSupplier)); + nioChannel.setContexts(readContext, new BytesWriteContext(nioChannel), NioTransport.this::exceptionCaught); + return nioChannel; + } - private Consumer getServerContextSetter() { - return (c) -> c.setAcceptContext(this::acceptChannel); + @Override + public TcpNioServerSocketChannel createServerChannel(AcceptingSelector selector, ServerSocketChannel channel) throws IOException { + TcpNioServerSocketChannel nioServerChannel = new TcpNioServerSocketChannel(profileName, channel, this, selector); + nioServerChannel.setAcceptContext(NioTransport.this::acceptChannel); + return nioServerChannel; + } } } diff --git a/plugins/transport-nio/src/main/java/org/elasticsearch/transport/nio/TcpChannelFactory.java b/plugins/transport-nio/src/main/java/org/elasticsearch/transport/nio/TcpChannelFactory.java deleted file mode 100644 index 44c72efb857e9..0000000000000 --- a/plugins/transport-nio/src/main/java/org/elasticsearch/transport/nio/TcpChannelFactory.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Licensed to Elasticsearch under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch licenses this file to you 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. - */ - -package org.elasticsearch.transport.nio; - -import org.elasticsearch.nio.AcceptingSelector; -import org.elasticsearch.nio.ChannelFactory; -import org.elasticsearch.nio.SocketSelector; -import org.elasticsearch.transport.TcpTransport; - -import java.io.IOException; -import java.nio.channels.ServerSocketChannel; -import java.nio.channels.SocketChannel; -import java.util.function.Consumer; - -/** - * This is an implementation of {@link ChannelFactory} which returns channels that adhere to the - * {@link org.elasticsearch.transport.TcpChannel} interface. The channels will use the provided - * {@link TcpTransport.ProfileSettings}. The provided context setters will be called with the channel after - * construction. - */ -public class TcpChannelFactory extends ChannelFactory { - - private final Consumer contextSetter; - private final Consumer serverContextSetter; - private final String profileName; - - TcpChannelFactory(TcpTransport.ProfileSettings profileSettings, Consumer contextSetter, - Consumer serverContextSetter) { - super(new RawChannelFactory(profileSettings.tcpNoDelay, - profileSettings.tcpKeepAlive, - profileSettings.reuseAddress, - Math.toIntExact(profileSettings.sendBufferSize.getBytes()), - Math.toIntExact(profileSettings.receiveBufferSize.getBytes()))); - this.profileName = profileSettings.profileName; - this.contextSetter = contextSetter; - this.serverContextSetter = serverContextSetter; - } - - @Override - public TcpNioSocketChannel createChannel(SocketSelector selector, SocketChannel channel) throws IOException { - TcpNioSocketChannel nioChannel = new TcpNioSocketChannel(profileName, channel, selector); - contextSetter.accept(nioChannel); - return nioChannel; - } - - @Override - public TcpNioServerSocketChannel createServerChannel(AcceptingSelector selector, ServerSocketChannel channel) throws IOException { - TcpNioServerSocketChannel nioServerChannel = new TcpNioServerSocketChannel(profileName, channel, this, selector); - serverContextSetter.accept(nioServerChannel); - return nioServerChannel; - } -} diff --git a/plugins/transport-nio/src/main/java/org/elasticsearch/transport/nio/TcpNioServerSocketChannel.java b/plugins/transport-nio/src/main/java/org/elasticsearch/transport/nio/TcpNioServerSocketChannel.java index 4aa9795dda496..7f657c763486d 100644 --- a/plugins/transport-nio/src/main/java/org/elasticsearch/transport/nio/TcpNioServerSocketChannel.java +++ b/plugins/transport-nio/src/main/java/org/elasticsearch/transport/nio/TcpNioServerSocketChannel.java @@ -22,6 +22,7 @@ import org.elasticsearch.action.ActionListener; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.nio.AcceptingSelector; +import org.elasticsearch.nio.ChannelFactory; import org.elasticsearch.nio.NioServerSocketChannel; import org.elasticsearch.transport.TcpChannel; @@ -37,7 +38,8 @@ public class TcpNioServerSocketChannel extends NioServerSocketChannel implements private final String profile; - TcpNioServerSocketChannel(String profile, ServerSocketChannel socketChannel, TcpChannelFactory channelFactory, + TcpNioServerSocketChannel(String profile, ServerSocketChannel socketChannel, + ChannelFactory channelFactory, AcceptingSelector selector) throws IOException { super(socketChannel, channelFactory, selector); this.profile = profile; diff --git a/plugins/transport-nio/src/main/java/org/elasticsearch/transport/nio/TcpReadHandler.java b/plugins/transport-nio/src/main/java/org/elasticsearch/transport/nio/TcpReadHandler.java deleted file mode 100644 index 37478286831ad..0000000000000 --- a/plugins/transport-nio/src/main/java/org/elasticsearch/transport/nio/TcpReadHandler.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Licensed to Elasticsearch under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch licenses this file to you 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. - */ - -package org.elasticsearch.transport.nio; - -import org.elasticsearch.common.bytes.BytesReference; -import org.elasticsearch.nio.NioSocketChannel; - -import java.io.IOException; - -public class TcpReadHandler { - - private final String profile; - private final NioTransport transport; - - TcpReadHandler(String profile, NioTransport transport) { - this.profile = profile; - this.transport = transport; - } - - public void handleMessage(BytesReference reference, TcpNioSocketChannel channel, int messageBytesLength) { - try { - transport.messageReceived(reference, channel); - } catch (IOException e) { - handleException(channel, e); - } - } - - public void handleException(NioSocketChannel channel, Exception e) { - transport.exceptionCaught(channel, e); - } -} diff --git a/plugins/transport-nio/src/test/java/org/elasticsearch/transport/nio/NioTransportIT.java b/plugins/transport-nio/src/test/java/org/elasticsearch/transport/nio/NioTransportIT.java index 0712717eb6405..df53a4d79c7ad 100644 --- a/plugins/transport-nio/src/test/java/org/elasticsearch/transport/nio/NioTransportIT.java +++ b/plugins/transport-nio/src/test/java/org/elasticsearch/transport/nio/NioTransportIT.java @@ -128,5 +128,4 @@ protected void validateRequest(StreamInput buffer, long requestId, String action } } - } From c46222ea158c1397ab7abe0b3b9833209255f7c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maxime=20Gr=C3=A9au?= Date: Mon, 8 Jan 2018 19:36:33 +0100 Subject: [PATCH 26/74] Fix Licenses values for CDDL and Custom URL (#27999) * Fix license SPDX identifiers (CDDL) * Fix license type for Custom URL: * If the license is identified but not listed as an SPDX identifier, the character `;` is used after the identifier to set the license URL. --- .../org/elasticsearch/gradle/DependenciesInfoTask.groovy | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/DependenciesInfoTask.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/DependenciesInfoTask.groovy index ddd5248396ce3..eb82b4675f287 100644 --- a/buildSrc/src/main/groovy/org/elasticsearch/gradle/DependenciesInfoTask.groovy +++ b/buildSrc/src/main/groovy/org/elasticsearch/gradle/DependenciesInfoTask.groovy @@ -88,7 +88,7 @@ public class DependenciesInfoTask extends DefaultTask { * *
  • UNKNOWN if LICENSE file is not present for this dependency.
    • *
  • one SPDX identifier if the LICENSE content matches with an SPDX license.
    • - *
  • Custom:URL if it's not an SPDX license, + *
  • Custom;URL if it's not an SPDX license, * URL is the Github URL to the LICENSE file in elasticsearch repository.
    • * * @@ -116,7 +116,7 @@ public class DependenciesInfoTask extends DefaultTask { // As we have the license file, we create a Custom entry with the URL to this license file. final gitBranch = System.getProperty('build.branch', 'master') final String githubBaseURL = "https://raw.githubusercontent.com/elastic/elasticsearch/${gitBranch}/" - return "Custom:${license.getCanonicalPath().replaceFirst('.*/elasticsearch/', githubBaseURL)}" + return "Custom;${license.getCanonicalPath().replaceFirst('.*/elasticsearch/', githubBaseURL)}" } return spdx } else { @@ -156,10 +156,10 @@ public class DependenciesInfoTask extends DefaultTask { spdx = 'LGPL-3.0' break case ~/.*${CDDL_1_0}.*/: - spdx = 'CDDL_1_0' + spdx = 'CDDL-1.0' break case ~/.*${CDDL_1_1}.*/: - spdx = 'CDDL_1_1' + spdx = 'CDDL-1.1' break case ~/.*${ICU}.*/: spdx = 'ICU' From 06d1ed8ba889829e281f3194f2cc288bb482ad38 Mon Sep 17 00:00:00 2001 From: Nathan Gass Date: Tue, 9 Jan 2018 01:41:35 +0100 Subject: [PATCH 27/74] Fix upgrading indices which use a custom similarity plugin. (#26985) Use a fake similarity map that always returns a value in MetaDataIndexUpgradeService.checkMappingsCompatibility instead of an empty map. Closes #25350 --- .../metadata/MetaDataIndexUpgradeService.java | 39 ++++++++++++++++--- 1 file changed, 33 insertions(+), 6 deletions(-) diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexUpgradeService.java b/core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexUpgradeService.java index d58ed04a930f9..e17b9fbb4d56a 100644 --- a/core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexUpgradeService.java +++ b/core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexUpgradeService.java @@ -32,6 +32,7 @@ import org.elasticsearch.index.analysis.NamedAnalyzer; import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.similarity.SimilarityService; +import org.elasticsearch.index.similarity.SimilarityProvider; import org.elasticsearch.indices.mapper.MapperRegistry; import java.util.AbstractMap; @@ -132,19 +133,43 @@ private static boolean isSupportedVersion(IndexMetaData indexMetaData, Version m */ private void checkMappingsCompatibility(IndexMetaData indexMetaData) { try { - // We cannot instantiate real analysis server at this point because the node might not have - // been started yet. However, we don't really need real analyzers at this stage - so we can fake it + + // We cannot instantiate real analysis server or similiarity service at this point because the node + // might not have been started yet. However, we don't really need real analyzers or similarities at + // this stage - so we can fake it using constant maps accepting every key. + // This is ok because all used similarities and analyzers for this index were known before the upgrade. + // Missing analyzers and similarities plugin will still trigger the apropriate error during the + // actual upgrade. + IndexSettings indexSettings = new IndexSettings(indexMetaData, this.settings); - SimilarityService similarityService = new SimilarityService(indexSettings, null, Collections.emptyMap()); + + final Map similarityMap = new AbstractMap() { + @Override + public boolean containsKey(Object key) { + return true; + } + + @Override + public SimilarityProvider.Factory get(Object key) { + assert key instanceof String : "key must be a string but was: " + key.getClass(); + return SimilarityService.BUILT_IN.get(SimilarityService.DEFAULT_SIMILARITY); + } + + // this entrySet impl isn't fully correct but necessary as SimilarityService will iterate + // over all similarities + @Override + public Set> entrySet() { + return Collections.emptySet(); + } + }; + SimilarityService similarityService = new SimilarityService(indexSettings, null, similarityMap); final NamedAnalyzer fakeDefault = new NamedAnalyzer("default", AnalyzerScope.INDEX, new Analyzer() { @Override protected TokenStreamComponents createComponents(String fieldName) { throw new UnsupportedOperationException("shouldn't be here"); } }); - // this is just a fake map that always returns the same value for any possible string key - // also the entrySet impl isn't fully correct but we implement it since internally - // IndexAnalyzers will iterate over all analyzers to close them. + final Map analyzerMap = new AbstractMap() { @Override public NamedAnalyzer get(Object key) { @@ -152,6 +177,8 @@ public NamedAnalyzer get(Object key) { return new NamedAnalyzer((String)key, AnalyzerScope.INDEX, fakeDefault.analyzer()); } + // this entrySet impl isn't fully correct but necessary as IndexAnalyzers will iterate + // over all analyzers to close them @Override public Set> entrySet() { return Collections.emptySet(); From 1d1dcd4ae7de849efaa92b8fb6495bdc68d020ba Mon Sep 17 00:00:00 2001 From: Jack Conradson Date: Mon, 8 Jan 2018 17:54:45 -0800 Subject: [PATCH 28/74] Painless: Add a simple cache for whitelist methods and fields. (#28142) With support for multiple contexts we are adding some caching to the whitelist to keep the memory footprint for definitions from exploding. --- .../elasticsearch/painless/Definition.java | 64 ++++++++++++++----- 1 file changed, 49 insertions(+), 15 deletions(-) diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/Definition.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/Definition.java index 34385dbf7acfc..7d8b4ff4e614e 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/Definition.java +++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/Definition.java @@ -41,6 +41,9 @@ */ public final class Definition { + private static final Map methodCache = new HashMap<>(); + private static final Map fieldCache = new HashMap<>(); + private static final Pattern TYPE_NAME_PATTERN = Pattern.compile("^[_a-zA-Z][._a-zA-Z0-9]*$"); public static final String[] DEFINITION_FILES = new String[] { @@ -533,6 +536,22 @@ Collection allSimpleTypes() { return simpleTypesMap.values(); } + private static String buildMethodCacheKey(String structName, String methodName, List arguments) { + StringBuilder key = new StringBuilder(); + key.append(structName); + key.append(methodName); + + for (Type argument : arguments) { + key.append(argument.name); + } + + return key.toString(); + } + + private static String buildFieldCacheKey(String structName, String fieldName, String typeName) { + return structName + fieldName + typeName; + } + // INTERNAL IMPLEMENTATION: private final Map, RuntimeClass> runtimeMap; @@ -836,8 +855,10 @@ private void addConstructor(String ownerStructName, Whitelist.Constructor whitel " with constructor parameters " + whitelistConstructor.painlessParameterTypeNames); } - painlessConstructor = new Method("", ownerStruct, null, getTypeInternal("void"), painlessParametersTypes, - asmConstructor, javaConstructor.getModifiers(), javaHandle); + painlessConstructor = methodCache.computeIfAbsent(buildMethodCacheKey(ownerStruct.name, "", painlessParametersTypes), + key -> new Method("", ownerStruct, null, getTypeInternal("void"), painlessParametersTypes, + asmConstructor, javaConstructor.getModifiers(), javaHandle)); + ownerStruct.constructors.put(painlessMethodKey, painlessConstructor); } else if (painlessConstructor.arguments.equals(painlessParametersTypes) == false){ throw new IllegalArgumentException( @@ -859,7 +880,7 @@ private void addMethod(ClassLoader whitelistClassLoader, String ownerStructName, " [" + whitelistMethod.javaMethodName + "] for owner struct [" + ownerStructName + "]."); } - Class javaAugmentedClass = null; + Class javaAugmentedClass; if (whitelistMethod.javaAugmentedClassName != null) { try { @@ -869,6 +890,8 @@ private void addMethod(ClassLoader whitelistClassLoader, String ownerStructName, "not found for method with name [" + whitelistMethod.javaMethodName + "] " + "and parameters " + whitelistMethod.painlessParameterTypeNames, cnfe); } + } else { + javaAugmentedClass = null; } int augmentedOffset = javaAugmentedClass == null ? 0 : 1; @@ -939,8 +962,10 @@ private void addMethod(ClassLoader whitelistClassLoader, String ownerStructName, "[" + whitelistMethod.javaMethodName + "] and parameters " + whitelistMethod.painlessParameterTypeNames); } - painlessMethod = new Method(whitelistMethod.javaMethodName, ownerStruct, null, painlessReturnType, - painlessParametersTypes, asmMethod, javaMethod.getModifiers(), javaMethodHandle); + painlessMethod = methodCache.computeIfAbsent( + buildMethodCacheKey(ownerStruct.name, whitelistMethod.javaMethodName, painlessParametersTypes), + key -> new Method(whitelistMethod.javaMethodName, ownerStruct, null, painlessReturnType, painlessParametersTypes, + asmMethod, javaMethod.getModifiers(), javaMethodHandle)); ownerStruct.staticMethods.put(painlessMethodKey, painlessMethod); } else if ((painlessMethod.name.equals(whitelistMethod.javaMethodName) && painlessMethod.rtn.equals(painlessReturnType) && painlessMethod.arguments.equals(painlessParametersTypes)) == false) { @@ -963,8 +988,10 @@ private void addMethod(ClassLoader whitelistClassLoader, String ownerStructName, "[" + whitelistMethod.javaMethodName + "] and parameters " + whitelistMethod.painlessParameterTypeNames); } - painlessMethod = new Method(whitelistMethod.javaMethodName, ownerStruct, javaAugmentedClass, painlessReturnType, - painlessParametersTypes, asmMethod, javaMethod.getModifiers(), javaMethodHandle); + painlessMethod = methodCache.computeIfAbsent( + buildMethodCacheKey(ownerStruct.name, whitelistMethod.javaMethodName, painlessParametersTypes), + key -> new Method(whitelistMethod.javaMethodName, ownerStruct, javaAugmentedClass, painlessReturnType, + painlessParametersTypes, asmMethod, javaMethod.getModifiers(), javaMethodHandle)); ownerStruct.methods.put(painlessMethodKey, painlessMethod); } else if ((painlessMethod.name.equals(whitelistMethod.javaMethodName) && painlessMethod.rtn.equals(painlessReturnType) && painlessMethod.arguments.equals(painlessParametersTypes)) == false) { @@ -1016,33 +1043,40 @@ private void addField(String ownerStructName, Whitelist.Field whitelistField) { Field painlessField = ownerStruct.staticMembers.get(whitelistField.javaFieldName); if (painlessField == null) { - painlessField = new Field(whitelistField.javaFieldName, javaField.getName(), - ownerStruct, painlessFieldType, javaField.getModifiers(), null, null); + painlessField = fieldCache.computeIfAbsent( + buildFieldCacheKey(ownerStruct.name, whitelistField.javaFieldName, painlessFieldType.name), + key -> new Field(whitelistField.javaFieldName, javaField.getName(), + ownerStruct, painlessFieldType, javaField.getModifiers(), null, null)); ownerStruct.staticMembers.put(whitelistField.javaFieldName, painlessField); } else if (painlessField.type.equals(painlessFieldType) == false) { throw new IllegalArgumentException("illegal duplicate static fields [" + whitelistField.javaFieldName + "] " + "found within the struct [" + ownerStruct.name + "] with type [" + whitelistField.painlessFieldTypeName + "]"); } } else { - MethodHandle javaMethodHandleGetter = null; - MethodHandle javaMethodHandleSetter = null; + MethodHandle javaMethodHandleGetter; + MethodHandle javaMethodHandleSetter; try { if (Modifier.isStatic(javaField.getModifiers()) == false) { javaMethodHandleGetter = MethodHandles.publicLookup().unreflectGetter(javaField); javaMethodHandleSetter = MethodHandles.publicLookup().unreflectSetter(javaField); + } else { + javaMethodHandleGetter = null; + javaMethodHandleSetter = null; } } catch (IllegalAccessException exception) { throw new IllegalArgumentException("getter/setter [" + whitelistField.javaFieldName + "]" + " not found for class [" + ownerStruct.clazz.getName() + "]."); } - Field painlessField = ownerStruct.staticMembers.get(whitelistField.javaFieldName); + Field painlessField = ownerStruct.members.get(whitelistField.javaFieldName); if (painlessField == null) { - painlessField = new Field(whitelistField.javaFieldName, javaField.getName(), - ownerStruct, painlessFieldType, javaField.getModifiers(), javaMethodHandleGetter, javaMethodHandleSetter); - ownerStruct.staticMembers.put(whitelistField.javaFieldName, painlessField); + painlessField = fieldCache.computeIfAbsent( + buildFieldCacheKey(ownerStruct.name, whitelistField.javaFieldName, painlessFieldType.name), + key -> new Field(whitelistField.javaFieldName, javaField.getName(), + ownerStruct, painlessFieldType, javaField.getModifiers(), javaMethodHandleGetter, javaMethodHandleSetter)); + ownerStruct.members.put(whitelistField.javaFieldName, painlessField); } else if (painlessField.type.equals(painlessFieldType) == false) { throw new IllegalArgumentException("illegal duplicate member fields [" + whitelistField.javaFieldName + "] " + "found within the struct [" + ownerStruct.name + "] with type [" + whitelistField.painlessFieldTypeName + "]"); From a85772cbe5cf55719281647370a09babe44b49ca Mon Sep 17 00:00:00 2001 From: Jason Tedor Date: Mon, 8 Jan 2018 21:47:22 -0500 Subject: [PATCH 29/74] Use Gradle wrapper when building BWC This commit modifies the BWC build to invoke the Gradle wrapper. The motivation for this is two-fold: - BWC versions might be dependent on a different version of Gradle than the current version of Gradle - in a follow-up we are going to need to be able to set JAVA_HOME to a different value than the current value of JAVA_HOME Relates #28138 --- distribution/bwc/build.gradle | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/distribution/bwc/build.gradle b/distribution/bwc/build.gradle index a2e88dc38a511..4c6323c337e16 100644 --- a/distribution/bwc/build.gradle +++ b/distribution/bwc/build.gradle @@ -115,17 +115,34 @@ if (project.hasProperty('bwcVersion')) { File bwcDeb = file("${checkoutDir}/distribution/deb/build/distributions/elasticsearch-${bwcVersion}.deb") File bwcRpm = file("${checkoutDir}/distribution/rpm/build/distributions/elasticsearch-${bwcVersion}.rpm") File bwcZip = file("${checkoutDir}/distribution/zip/build/distributions/elasticsearch-${bwcVersion}.zip") - task buildBwcVersion(type: GradleBuild) { + task buildBwcVersion(type: Exec) { dependsOn checkoutBwcBranch, writeBuildMetadata - dir = checkoutDir - tasks = [':distribution:deb:assemble', ':distribution:rpm:assemble', ':distribution:zip:assemble'] - startParameter.systemPropertiesArgs = ['build.snapshot': System.getProperty("build.snapshot") ?: "true"] + workingDir = checkoutDir + executable = new File(checkoutDir, 'gradlew').toString() + final ArrayList commandLineArgs = [ + ":distribution:deb:assemble", + ":distribution:rpm:assemble", + ":distribution:zip:assemble", + "-Dbuild.snapshot=${System.getProperty('build.snapshot') ?: 'true'}"] + final LogLevel logLevel = gradle.startParameter.logLevel + if ([LogLevel.QUIET, LogLevel.WARN, LogLevel.INFO, LogLevel.DEBUG].contains(logLevel)) { + commandLineArgs << "--${logLevel.name().toLowerCase(Locale.ENGLISH)}" + } + final String showStacktraceName = gradle.startParameter.showStacktrace.name() + assert ["INTERNAL_EXCEPTIONS", "ALWAYS", "ALWAYS_FULL"].contains(showStacktraceName) + if (showStacktraceName.equals("ALWAYS")) { + commandLineArgs << "--stacktrace" + } else if (showStacktraceName.equals("ALWAYS_FULL")) { + commandLineArgs << "--full-stacktrace" + } + args = commandLineArgs doLast { List missing = [bwcDeb, bwcRpm, bwcZip].grep { file -> - false == file.exists() } + false == file.exists() + } if (false == missing.empty) { throw new InvalidUserDataException( - "Building bwc version didn't generate expected files ${missing}") + "Building bwc version didn't generate expected files ${missing}") } } } From 234c37a323d78b67f2de7d6142a7a91acba85788 Mon Sep 17 00:00:00 2001 From: Takumasa Ochi <4468155+aeroastro@users.noreply.github.com> Date: Tue, 9 Jan 2018 18:01:25 +0900 Subject: [PATCH 30/74] [Docs] Fix some typos in comments (#28098) --- .../elasticsearch/action/search/TransportSearchAction.java | 6 +++--- .../main/java/org/elasticsearch/search/SearchService.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/org/elasticsearch/action/search/TransportSearchAction.java b/core/src/main/java/org/elasticsearch/action/search/TransportSearchAction.java index ab0a88cc59498..fd5a37295f77a 100644 --- a/core/src/main/java/org/elasticsearch/action/search/TransportSearchAction.java +++ b/core/src/main/java/org/elasticsearch/action/search/TransportSearchAction.java @@ -313,7 +313,7 @@ private void executeSearch(SearchTask task, SearchTimeProvider timeProvider, Sea // optimize search type for cases where there is only one shard group to search on if (shardIterators.size() == 1) { - // if we only have one group, then we always want Q_A_F, no need for DFS, and no need to do THEN since we hit one shard + // if we only have one group, then we always want Q_T_F, no need for DFS, and no need to do THEN since we hit one shard searchRequest.searchType(QUERY_THEN_FETCH); } if (searchRequest.isSuggestOnly()) { @@ -338,8 +338,8 @@ private void executeSearch(SearchTask task, SearchTimeProvider timeProvider, Sea if (searchRequest.isMaxConcurrentShardRequestsSet() == false) { // we try to set a default of max concurrent shard requests based on // the node count but upper-bound it by 256 by default to keep it sane. A single - // search request that fans out lots of shards should hit a cluster too hard while 256 is already a lot - // we multiply is by the default number of shards such that a single request in a cluster of 1 would hit all shards of a + // search request that fans out lots of shards should hit a cluster too hard while 256 is already a lot. + // we multiply it by the default number of shards such that a single request in a cluster of 1 would hit all shards of a // default index. searchRequest.setMaxConcurrentShardRequests(Math.min(256, nodeCount * IndexMetaData.INDEX_NUMBER_OF_SHARDS_SETTING.getDefault(Settings.EMPTY))); diff --git a/core/src/main/java/org/elasticsearch/search/SearchService.java b/core/src/main/java/org/elasticsearch/search/SearchService.java index 9ac83276000ac..9e60c4f130700 100644 --- a/core/src/main/java/org/elasticsearch/search/SearchService.java +++ b/core/src/main/java/org/elasticsearch/search/SearchService.java @@ -855,7 +855,7 @@ private void parseSource(DefaultSearchContext context, SearchSourceBuilder sourc /** * Shortcut ids to load, we load only "from" and up to "size". The phase controller - * handles this as well since the result is always size * shards for Q_A_F + * handles this as well since the result is always size * shards for Q_T_F */ private void shortcutDocIdsToLoad(SearchContext context) { final int[] docIdsToLoad; From 82da56c9762fc02e4563851ec2054f9097299aed Mon Sep 17 00:00:00 2001 From: Yannick Welsch Date: Tue, 9 Jan 2018 11:58:16 +0100 Subject: [PATCH 31/74] Fix Gradle wrapper usage on Windows when building BWC (#28146) Relates #28138 --- distribution/bwc/build.gradle | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/distribution/bwc/build.gradle b/distribution/bwc/build.gradle index 4c6323c337e16..93f6ffe2c9b77 100644 --- a/distribution/bwc/build.gradle +++ b/distribution/bwc/build.gradle @@ -17,7 +17,7 @@ * under the License. */ - +import org.apache.tools.ant.taskdefs.condition.Os import org.elasticsearch.gradle.LoggedExec import org.elasticsearch.gradle.Version import java.util.regex.Matcher @@ -118,7 +118,12 @@ if (project.hasProperty('bwcVersion')) { task buildBwcVersion(type: Exec) { dependsOn checkoutBwcBranch, writeBuildMetadata workingDir = checkoutDir - executable = new File(checkoutDir, 'gradlew').toString() + if (Os.isFamily(Os.FAMILY_WINDOWS)) { + executable 'cmd' + args '/C', 'call', new File(checkoutDir, 'gradlew').toString() + } else { + executable = new File(checkoutDir, 'gradlew').toString() + } final ArrayList commandLineArgs = [ ":distribution:deb:assemble", ":distribution:rpm:assemble", @@ -135,7 +140,7 @@ if (project.hasProperty('bwcVersion')) { } else if (showStacktraceName.equals("ALWAYS_FULL")) { commandLineArgs << "--full-stacktrace" } - args = commandLineArgs + args commandLineArgs doLast { List missing = [bwcDeb, bwcRpm, bwcZip].grep { file -> false == file.exists() From bba591bea0b1c4b718559f14cba9b5af412662a6 Mon Sep 17 00:00:00 2001 From: Tanguy Leroux Date: Tue, 9 Jan 2018 14:01:57 +0100 Subject: [PATCH 32/74] Consistent updates of IndexShardSnapshotStatus (#28130) This commit changes IndexShardSnapshotStatus so that the Stage is updated coherently with any required information. It also provides a asCopy() method that returns the status of a IndexShardSnapshotStatus at a given point in time, ensuring that all information are coherent. Closes #26480 --- .../status/SnapshotIndexShardStatus.java | 15 +- .../snapshots/status/SnapshotStats.java | 21 +- .../status/TransportNodesSnapshotsStatus.java | 16 +- .../TransportSnapshotsStatusAction.java | 3 +- .../snapshots/IndexShardSnapshotStatus.java | 323 +++++++++--------- .../repositories/Repository.java | 2 +- .../blobstore/BlobStoreRepository.java | 125 ++++--- .../snapshots/SnapshotShardsService.java | 66 ++-- .../snapshots/SnapshotsService.java | 9 +- .../snapshots/SnapshotShardsServiceIT.java | 2 +- .../index/shard/IndexShardTestCase.java | 10 +- 11 files changed, 288 insertions(+), 304 deletions(-) diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotIndexShardStatus.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotIndexShardStatus.java index 324cb3712adf1..1b7ead5b96510 100644 --- a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotIndexShardStatus.java +++ b/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotIndexShardStatus.java @@ -22,7 +22,6 @@ import org.elasticsearch.action.support.broadcast.BroadcastShardResponse; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; -import org.elasticsearch.common.xcontent.ToXContent.Params; import org.elasticsearch.common.xcontent.ToXContentFragment; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.index.shard.ShardId; @@ -49,13 +48,13 @@ private SnapshotIndexShardStatus() { this.stats = new SnapshotStats(); } - SnapshotIndexShardStatus(ShardId shardId, IndexShardSnapshotStatus indexShardStatus) { + SnapshotIndexShardStatus(ShardId shardId, IndexShardSnapshotStatus.Copy indexShardStatus) { this(shardId, indexShardStatus, null); } - SnapshotIndexShardStatus(ShardId shardId, IndexShardSnapshotStatus indexShardStatus, String nodeId) { + SnapshotIndexShardStatus(ShardId shardId, IndexShardSnapshotStatus.Copy indexShardStatus, String nodeId) { super(shardId); - switch (indexShardStatus.stage()) { + switch (indexShardStatus.getStage()) { case INIT: stage = SnapshotIndexShardStage.INIT; break; @@ -72,10 +71,12 @@ private SnapshotIndexShardStatus() { stage = SnapshotIndexShardStage.FAILURE; break; default: - throw new IllegalArgumentException("Unknown stage type " + indexShardStatus.stage()); + throw new IllegalArgumentException("Unknown stage type " + indexShardStatus.getStage()); } - stats = new SnapshotStats(indexShardStatus); - failure = indexShardStatus.failure(); + this.stats = new SnapshotStats(indexShardStatus.getStartTime(), indexShardStatus.getTotalTime(), + indexShardStatus.getNumberOfFiles(), indexShardStatus.getProcessedFiles(), + indexShardStatus.getTotalSize(), indexShardStatus.getProcessedSize()); + this.failure = indexShardStatus.getFailure(); this.nodeId = nodeId; } diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotStats.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotStats.java index ba11e51d56f87..5b2bdd7c614c6 100644 --- a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotStats.java +++ b/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotStats.java @@ -25,33 +25,28 @@ import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.ToXContentFragment; import org.elasticsearch.common.xcontent.XContentBuilder; -import org.elasticsearch.index.snapshots.IndexShardSnapshotStatus; import java.io.IOException; public class SnapshotStats implements Streamable, ToXContentFragment { - private long startTime; + private long startTime; private long time; - private int numberOfFiles; - private int processedFiles; - private long totalSize; - private long processedSize; SnapshotStats() { } - SnapshotStats(IndexShardSnapshotStatus indexShardStatus) { - startTime = indexShardStatus.startTime(); - time = indexShardStatus.time(); - numberOfFiles = indexShardStatus.numberOfFiles(); - processedFiles = indexShardStatus.processedFiles(); - totalSize = indexShardStatus.totalSize(); - processedSize = indexShardStatus.processedSize(); + SnapshotStats(long startTime, long time, int numberOfFiles, int processedFiles, long totalSize, long processedSize) { + this.startTime = startTime; + this.time = time; + this.numberOfFiles = numberOfFiles; + this.processedFiles = processedFiles; + this.totalSize = totalSize; + this.processedSize = processedSize; } /** diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportNodesSnapshotsStatus.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportNodesSnapshotsStatus.java index 872793f6ef21a..77578546b9585 100644 --- a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportNodesSnapshotsStatus.java +++ b/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportNodesSnapshotsStatus.java @@ -96,7 +96,7 @@ protected NodesSnapshotStatus newResponse(Request request, List> snapshotMapBuilder = new HashMap<>(); try { - String nodeId = clusterService.localNode().getId(); + final String nodeId = clusterService.localNode().getId(); for (Snapshot snapshot : request.snapshots) { Map shardsStatus = snapshotShardsService.currentSnapshotShards(snapshot); if (shardsStatus == null) { @@ -104,15 +104,17 @@ protected NodeSnapshotStatus nodeOperation(NodeRequest request) { } Map shardMapBuilder = new HashMap<>(); for (Map.Entry shardEntry : shardsStatus.entrySet()) { - SnapshotIndexShardStatus shardStatus; - IndexShardSnapshotStatus.Stage stage = shardEntry.getValue().stage(); + final ShardId shardId = shardEntry.getKey(); + + final IndexShardSnapshotStatus.Copy lastSnapshotStatus = shardEntry.getValue().asCopy(); + final IndexShardSnapshotStatus.Stage stage = lastSnapshotStatus.getStage(); + + String shardNodeId = null; if (stage != IndexShardSnapshotStatus.Stage.DONE && stage != IndexShardSnapshotStatus.Stage.FAILURE) { // Store node id for the snapshots that are currently running. - shardStatus = new SnapshotIndexShardStatus(shardEntry.getKey(), shardEntry.getValue(), nodeId); - } else { - shardStatus = new SnapshotIndexShardStatus(shardEntry.getKey(), shardEntry.getValue()); + shardNodeId = nodeId; } - shardMapBuilder.put(shardEntry.getKey(), shardStatus); + shardMapBuilder.put(shardEntry.getKey(), new SnapshotIndexShardStatus(shardId, lastSnapshotStatus, shardNodeId)); } snapshotMapBuilder.put(snapshot, unmodifiableMap(shardMapBuilder)); } diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportSnapshotsStatusAction.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportSnapshotsStatusAction.java index 71bb1995dd57e..dc13c8dab5188 100644 --- a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportSnapshotsStatusAction.java +++ b/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportSnapshotsStatusAction.java @@ -233,7 +233,8 @@ private SnapshotsStatusResponse buildResponse(SnapshotsStatusRequest request, Li Map shardStatues = snapshotsService.snapshotShards(request.repository(), snapshotInfo); for (Map.Entry shardStatus : shardStatues.entrySet()) { - shardStatusBuilder.add(new SnapshotIndexShardStatus(shardStatus.getKey(), shardStatus.getValue())); + IndexShardSnapshotStatus.Copy lastSnapshotStatus = shardStatus.getValue().asCopy(); + shardStatusBuilder.add(new SnapshotIndexShardStatus(shardStatus.getKey(), lastSnapshotStatus)); } final SnapshotsInProgress.State state; switch (snapshotInfo.state()) { diff --git a/core/src/main/java/org/elasticsearch/index/snapshots/IndexShardSnapshotStatus.java b/core/src/main/java/org/elasticsearch/index/snapshots/IndexShardSnapshotStatus.java index 644caa7520be5..f1c247a41bb6d 100644 --- a/core/src/main/java/org/elasticsearch/index/snapshots/IndexShardSnapshotStatus.java +++ b/core/src/main/java/org/elasticsearch/index/snapshots/IndexShardSnapshotStatus.java @@ -19,6 +19,9 @@ package org.elasticsearch.index.snapshots; +import java.util.Objects; +import java.util.concurrent.atomic.AtomicReference; + /** * Represent shard snapshot status */ @@ -47,119 +50,85 @@ public enum Stage { /** * Snapshot failed */ - FAILURE + FAILURE, + /** + * Snapshot aborted + */ + ABORTED } - private Stage stage = Stage.INIT; - + private final AtomicReference stage; private long startTime; - - private long time; - + private long totalTime; private int numberOfFiles; - - private volatile int processedFiles; - + private int processedFiles; private long totalSize; - - private volatile long processedSize; - + private long processedSize; private long indexVersion; - - private volatile boolean aborted; - private String failure; - /** - * Returns current snapshot stage - * - * @return current snapshot stage - */ - public Stage stage() { - return this.stage; - } - - /** - * Sets new snapshot stage - * - * @param stage new snapshot stage - */ - public void updateStage(Stage stage) { - this.stage = stage; - } - - /** - * Returns snapshot start time - * - * @return snapshot start time - */ - public long startTime() { - return this.startTime; - } - - /** - * Sets snapshot start time - * - * @param startTime snapshot start time - */ - public void startTime(long startTime) { + private IndexShardSnapshotStatus(final Stage stage, final long startTime, final long totalTime, + final int numberOfFiles, final int processedFiles, final long totalSize, final long processedSize, + final long indexVersion, final String failure) { + this.stage = new AtomicReference<>(Objects.requireNonNull(stage)); this.startTime = startTime; + this.totalTime = totalTime; + this.numberOfFiles = numberOfFiles; + this.processedFiles = processedFiles; + this.totalSize = totalSize; + this.processedSize = processedSize; + this.indexVersion = indexVersion; + this.failure = failure; } - /** - * Returns snapshot processing time - * - * @return processing time - */ - public long time() { - return this.time; + public synchronized Copy moveToStarted(final long startTime, final int numberOfFiles, final long totalSize) { + if (stage.compareAndSet(Stage.INIT, Stage.STARTED)) { + this.startTime = startTime; + this.numberOfFiles = numberOfFiles; + this.totalSize = totalSize; + } else { + throw new IllegalStateException("Unable to move the shard snapshot status to [STARTED]: " + + "expecting [INIT] but got [" + stage.get() + "]"); + } + return asCopy(); } - /** - * Sets snapshot processing time - * - * @param time snapshot processing time - */ - public void time(long time) { - this.time = time; + public synchronized Copy moveToFinalize(final long indexVersion) { + if (stage.compareAndSet(Stage.STARTED, Stage.FINALIZE)) { + this.indexVersion = indexVersion; + } else { + throw new IllegalStateException("Unable to move the shard snapshot status to [FINALIZE]: " + + "expecting [STARTED] but got [" + stage.get() + "]"); + } + return asCopy(); } - /** - * Returns true if snapshot process was aborted - * - * @return true if snapshot process was aborted - */ - public boolean aborted() { - return this.aborted; + public synchronized Copy moveToDone(final long endTime) { + if (stage.compareAndSet(Stage.FINALIZE, Stage.DONE)) { + this.totalTime = Math.max(0L, endTime - startTime); + } else { + throw new IllegalStateException("Unable to move the shard snapshot status to [DONE]: " + + "expecting [FINALIZE] but got [" + stage.get() + "]"); + } + return asCopy(); } - /** - * Marks snapshot as aborted - */ - public void abort() { - this.aborted = true; + public synchronized Copy abortIfNotCompleted(final String failure) { + if (stage.compareAndSet(Stage.INIT, Stage.ABORTED) || stage.compareAndSet(Stage.STARTED, Stage.ABORTED)) { + this.failure = failure; + } + return asCopy(); } - /** - * Sets files stats - * - * @param numberOfFiles number of files in this snapshot - * @param totalSize total size of files in this snapshot - */ - public void files(int numberOfFiles, long totalSize) { - this.numberOfFiles = numberOfFiles; - this.totalSize = totalSize; + public synchronized void moveToFailed(final long endTime, final String failure) { + if (stage.getAndSet(Stage.FAILURE) != Stage.FAILURE) { + this.totalTime = Math.max(0L, endTime - startTime); + this.failure = failure; + } } - /** - * Sets processed files stats - * - * @param numberOfFiles number of files in this snapshot - * @param totalSize total size of files in this snapshot - */ - public synchronized void processedFiles(int numberOfFiles, long totalSize) { - processedFiles = numberOfFiles; - processedSize = totalSize; + public boolean isAborted() { + return stage.get() == Stage.ABORTED; } /** @@ -171,71 +140,111 @@ public synchronized void addProcessedFile(long size) { } /** - * Number of files - * - * @return number of files - */ - public int numberOfFiles() { - return numberOfFiles; - } - - /** - * Total snapshot size - * - * @return snapshot size - */ - public long totalSize() { - return totalSize; - } - - /** - * Number of processed files - * - * @return number of processed files - */ - public int processedFiles() { - return processedFiles; - } - - /** - * Size of processed files + * Returns a copy of the current {@link IndexShardSnapshotStatus}. This method is + * intended to be used when a coherent state of {@link IndexShardSnapshotStatus} is needed. * - * @return size of processed files - */ - public long processedSize() { - return processedSize; - } - - - /** - * Sets index version - * - * @param indexVersion index version - */ - public void indexVersion(long indexVersion) { - this.indexVersion = indexVersion; - } - - /** - * Returns index version - * - * @return index version - */ - public long indexVersion() { - return indexVersion; - } - - /** - * Sets the reason for the failure if the snapshot is in the {@link IndexShardSnapshotStatus.Stage#FAILURE} state - */ - public void failure(String failure) { - this.failure = failure; - } - - /** - * Returns the reason for the failure if the snapshot is in the {@link IndexShardSnapshotStatus.Stage#FAILURE} state - */ - public String failure() { - return failure; + * @return a {@link IndexShardSnapshotStatus.Copy} + */ + public synchronized IndexShardSnapshotStatus.Copy asCopy() { + return new IndexShardSnapshotStatus.Copy(stage.get(), startTime, totalTime, numberOfFiles, processedFiles, totalSize, processedSize, + indexVersion, failure); + } + + public static IndexShardSnapshotStatus newInitializing() { + return new IndexShardSnapshotStatus(Stage.INIT, 0L, 0L, 0, 0, 0, 0, 0, null); + } + + public static IndexShardSnapshotStatus newFailed(final String failure) { + assert failure != null : "expecting non null failure for a failed IndexShardSnapshotStatus"; + if (failure == null) { + throw new IllegalArgumentException("A failure description is required for a failed IndexShardSnapshotStatus"); + } + return new IndexShardSnapshotStatus(Stage.FAILURE, 0L, 0L, 0, 0, 0, 0, 0, failure); + } + + public static IndexShardSnapshotStatus newDone(final long startTime, final long totalTime, final int files, final long size) { + // The snapshot is done which means the number of processed files is the same as total + return new IndexShardSnapshotStatus(Stage.DONE, startTime, totalTime, files, files, size, size, 0, null); + } + + /** + * Returns an immutable state of {@link IndexShardSnapshotStatus} at a given point in time. + */ + public static class Copy { + + private final Stage stage; + private final long startTime; + private final long totalTime; + private final int numberOfFiles; + private final int processedFiles; + private final long totalSize; + private final long processedSize; + private final long indexVersion; + private final String failure; + + public Copy(final Stage stage, final long startTime, final long totalTime, + final int numberOfFiles, final int processedFiles, final long totalSize, final long processedSize, + final long indexVersion, final String failure) { + this.stage = stage; + this.startTime = startTime; + this.totalTime = totalTime; + this.numberOfFiles = numberOfFiles; + this.processedFiles = processedFiles; + this.totalSize = totalSize; + this.processedSize = processedSize; + this.indexVersion = indexVersion; + this.failure = failure; + } + + public Stage getStage() { + return stage; + } + + public long getStartTime() { + return startTime; + } + + public long getTotalTime() { + return totalTime; + } + + public int getNumberOfFiles() { + return numberOfFiles; + } + + public int getProcessedFiles() { + return processedFiles; + } + + public long getTotalSize() { + return totalSize; + } + + public long getProcessedSize() { + return processedSize; + } + + public long getIndexVersion() { + return indexVersion; + } + + public String getFailure() { + return failure; + } + + @Override + public String toString() { + return "index shard snapshot status (" + + "stage=" + stage + + ", startTime=" + startTime + + ", totalTime=" + totalTime + + ", numberOfFiles=" + numberOfFiles + + ", processedFiles=" + processedFiles + + ", totalSize=" + totalSize + + ", processedSize=" + processedSize + + ", indexVersion=" + indexVersion + + ", failure='" + failure + '\'' + + ')'; + } } } diff --git a/core/src/main/java/org/elasticsearch/repositories/Repository.java b/core/src/main/java/org/elasticsearch/repositories/Repository.java index f711a72b67757..4c3d58e67ff72 100644 --- a/core/src/main/java/org/elasticsearch/repositories/Repository.java +++ b/core/src/main/java/org/elasticsearch/repositories/Repository.java @@ -180,7 +180,7 @@ SnapshotInfo finalizeSnapshot(SnapshotId snapshotId, List indices, long * Repository implementations shouldn't release the snapshot index commit point. It is done by the method caller. *

    * As snapshot process progresses, implementation of this method should update {@link IndexShardSnapshotStatus} object and check - * {@link IndexShardSnapshotStatus#aborted()} to see if the snapshot process should be aborted. + * {@link IndexShardSnapshotStatus#isAborted()} to see if the snapshot process should be aborted. * * @param shard shard to be snapshotted * @param snapshotId snapshot id diff --git a/core/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreRepository.java b/core/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreRepository.java index 06812be5aab2c..9068c6ff39743 100644 --- a/core/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreRepository.java +++ b/core/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreRepository.java @@ -805,17 +805,11 @@ private void writeAtomic(final String blobName, final BytesReference bytesRef) t @Override public void snapshotShard(IndexShard shard, SnapshotId snapshotId, IndexId indexId, IndexCommit snapshotIndexCommit, IndexShardSnapshotStatus snapshotStatus) { - SnapshotContext snapshotContext = new SnapshotContext(shard, snapshotId, indexId, snapshotStatus); - snapshotStatus.startTime(System.currentTimeMillis()); - + SnapshotContext snapshotContext = new SnapshotContext(shard, snapshotId, indexId, snapshotStatus, System.currentTimeMillis()); try { snapshotContext.snapshot(snapshotIndexCommit); - snapshotStatus.time(System.currentTimeMillis() - snapshotStatus.startTime()); - snapshotStatus.updateStage(IndexShardSnapshotStatus.Stage.DONE); } catch (Exception e) { - snapshotStatus.time(System.currentTimeMillis() - snapshotStatus.startTime()); - snapshotStatus.updateStage(IndexShardSnapshotStatus.Stage.FAILURE); - snapshotStatus.failure(ExceptionsHelper.detailedMessage(e)); + snapshotStatus.moveToFailed(System.currentTimeMillis(), ExceptionsHelper.detailedMessage(e)); if (e instanceof IndexShardSnapshotFailedException) { throw (IndexShardSnapshotFailedException) e; } else { @@ -838,14 +832,7 @@ public void restoreShard(IndexShard shard, SnapshotId snapshotId, Version versio public IndexShardSnapshotStatus getShardSnapshotStatus(SnapshotId snapshotId, Version version, IndexId indexId, ShardId shardId) { Context context = new Context(snapshotId, version, indexId, shardId); BlobStoreIndexShardSnapshot snapshot = context.loadSnapshot(); - IndexShardSnapshotStatus status = new IndexShardSnapshotStatus(); - status.updateStage(IndexShardSnapshotStatus.Stage.DONE); - status.startTime(snapshot.startTime()); - status.files(snapshot.numberOfFiles(), snapshot.totalSize()); - // The snapshot is done which means the number of processed files is the same as total - status.processedFiles(snapshot.numberOfFiles(), snapshot.totalSize()); - status.time(snapshot.time()); - return status; + return IndexShardSnapshotStatus.newDone(snapshot.startTime(), snapshot.time(), snapshot.numberOfFiles(), snapshot.totalSize()); } @Override @@ -1103,8 +1090,8 @@ protected Tuple buildBlobStoreIndexShardS private class SnapshotContext extends Context { private final Store store; - private final IndexShardSnapshotStatus snapshotStatus; + private final long startTime; /** * Constructs new context @@ -1114,10 +1101,11 @@ private class SnapshotContext extends Context { * @param indexId the id of the index being snapshotted * @param snapshotStatus snapshot status to report progress */ - SnapshotContext(IndexShard shard, SnapshotId snapshotId, IndexId indexId, IndexShardSnapshotStatus snapshotStatus) { + SnapshotContext(IndexShard shard, SnapshotId snapshotId, IndexId indexId, IndexShardSnapshotStatus snapshotStatus, long startTime) { super(snapshotId, Version.CURRENT, indexId, shard.shardId()); this.snapshotStatus = snapshotStatus; this.store = shard.store(); + this.startTime = startTime; } /** @@ -1125,24 +1113,25 @@ private class SnapshotContext extends Context { * * @param snapshotIndexCommit snapshot commit point */ - public void snapshot(IndexCommit snapshotIndexCommit) { + public void snapshot(final IndexCommit snapshotIndexCommit) { logger.debug("[{}] [{}] snapshot to [{}] ...", shardId, snapshotId, metadata.name()); - store.incRef(); + + final Map blobs; try { - final Map blobs; - try { - blobs = blobContainer.listBlobs(); - } catch (IOException e) { - throw new IndexShardSnapshotFailedException(shardId, "failed to list blobs", e); - } + blobs = blobContainer.listBlobs(); + } catch (IOException e) { + throw new IndexShardSnapshotFailedException(shardId, "failed to list blobs", e); + } - long generation = findLatestFileNameGeneration(blobs); - Tuple tuple = buildBlobStoreIndexShardSnapshots(blobs); - BlobStoreIndexShardSnapshots snapshots = tuple.v1(); - int fileListGeneration = tuple.v2(); + long generation = findLatestFileNameGeneration(blobs); + Tuple tuple = buildBlobStoreIndexShardSnapshots(blobs); + BlobStoreIndexShardSnapshots snapshots = tuple.v1(); + int fileListGeneration = tuple.v2(); - final List indexCommitPointFiles = new ArrayList<>(); + final List indexCommitPointFiles = new ArrayList<>(); + store.incRef(); + try { int indexNumberOfFiles = 0; long indexTotalFilesSize = 0; ArrayList filesToSnapshot = new ArrayList<>(); @@ -1156,10 +1145,11 @@ public void snapshot(IndexCommit snapshotIndexCommit) { throw new IndexShardSnapshotFailedException(shardId, "Failed to get store file metadata", e); } for (String fileName : fileNames) { - if (snapshotStatus.aborted()) { + if (snapshotStatus.isAborted()) { logger.debug("[{}] [{}] Aborted on the file [{}], exiting", shardId, snapshotId, fileName); throw new IndexShardSnapshotFailedException(shardId, "Aborted"); } + logger.trace("[{}] [{}] Processing [{}]", shardId, snapshotId, fileName); final StoreFileMetaData md = metadata.get(fileName); BlobStoreIndexShardSnapshot.FileInfo existingFileInfo = null; @@ -1195,14 +1185,7 @@ public void snapshot(IndexCommit snapshotIndexCommit) { } } - snapshotStatus.files(indexNumberOfFiles, indexTotalFilesSize); - - if (snapshotStatus.aborted()) { - logger.debug("[{}] [{}] Aborted during initialization", shardId, snapshotId); - throw new IndexShardSnapshotFailedException(shardId, "Aborted"); - } - - snapshotStatus.updateStage(IndexShardSnapshotStatus.Stage.STARTED); + snapshotStatus.moveToStarted(startTime, indexNumberOfFiles, indexTotalFilesSize); for (BlobStoreIndexShardSnapshot.FileInfo snapshotFileInfo : filesToSnapshot) { try { @@ -1211,36 +1194,42 @@ public void snapshot(IndexCommit snapshotIndexCommit) { throw new IndexShardSnapshotFailedException(shardId, "Failed to perform snapshot (index files)", e); } } - - snapshotStatus.indexVersion(snapshotIndexCommit.getGeneration()); - // now create and write the commit point - snapshotStatus.updateStage(IndexShardSnapshotStatus.Stage.FINALIZE); - - BlobStoreIndexShardSnapshot snapshot = new BlobStoreIndexShardSnapshot(snapshotId.getName(), - snapshotIndexCommit.getGeneration(), indexCommitPointFiles, snapshotStatus.startTime(), - // snapshotStatus.startTime() is assigned on the same machine, so it's safe to use with VLong - System.currentTimeMillis() - snapshotStatus.startTime(), indexNumberOfFiles, indexTotalFilesSize); - //TODO: The time stored in snapshot doesn't include cleanup time. - logger.trace("[{}] [{}] writing shard snapshot file", shardId, snapshotId); - try { - indexShardSnapshotFormat.write(snapshot, blobContainer, snapshotId.getUUID()); - } catch (IOException e) { - throw new IndexShardSnapshotFailedException(shardId, "Failed to write commit point", e); - } - - // delete all files that are not referenced by any commit point - // build a new BlobStoreIndexShardSnapshot, that includes this one and all the saved ones - List newSnapshotsList = new ArrayList<>(); - newSnapshotsList.add(new SnapshotFiles(snapshot.snapshot(), snapshot.indexFiles())); - for (SnapshotFiles point : snapshots) { - newSnapshotsList.add(point); - } - // finalize the snapshot and rewrite the snapshot index with the next sequential snapshot index - finalize(newSnapshotsList, fileListGeneration + 1, blobs); - snapshotStatus.updateStage(IndexShardSnapshotStatus.Stage.DONE); } finally { store.decRef(); } + + final IndexShardSnapshotStatus.Copy lastSnapshotStatus = snapshotStatus.moveToFinalize(snapshotIndexCommit.getGeneration()); + + // now create and write the commit point + final BlobStoreIndexShardSnapshot snapshot = new BlobStoreIndexShardSnapshot(snapshotId.getName(), + lastSnapshotStatus.getIndexVersion(), + indexCommitPointFiles, + lastSnapshotStatus.getStartTime(), + // snapshotStatus.startTime() is assigned on the same machine, + // so it's safe to use with VLong + System.currentTimeMillis() - lastSnapshotStatus.getStartTime(), + lastSnapshotStatus.getNumberOfFiles(), + lastSnapshotStatus.getTotalSize()); + + //TODO: The time stored in snapshot doesn't include cleanup time. + logger.trace("[{}] [{}] writing shard snapshot file", shardId, snapshotId); + try { + indexShardSnapshotFormat.write(snapshot, blobContainer, snapshotId.getUUID()); + } catch (IOException e) { + throw new IndexShardSnapshotFailedException(shardId, "Failed to write commit point", e); + } + + // delete all files that are not referenced by any commit point + // build a new BlobStoreIndexShardSnapshot, that includes this one and all the saved ones + List newSnapshotsList = new ArrayList<>(); + newSnapshotsList.add(new SnapshotFiles(snapshot.snapshot(), snapshot.indexFiles())); + for (SnapshotFiles point : snapshots) { + newSnapshotsList.add(point); + } + // finalize the snapshot and rewrite the snapshot index with the next sequential snapshot index + finalize(newSnapshotsList, fileListGeneration + 1, blobs); + snapshotStatus.moveToDone(System.currentTimeMillis()); + } /** @@ -1335,7 +1324,7 @@ public int read(byte[] b, int off, int len) throws IOException { } private void checkAborted() { - if (snapshotStatus.aborted()) { + if (snapshotStatus.isAborted()) { logger.debug("[{}] [{}] Aborted on the file [{}], exiting", shardId, snapshotId, fileName); throw new IndexShardSnapshotFailedException(shardId, "Aborted"); } diff --git a/core/src/main/java/org/elasticsearch/snapshots/SnapshotShardsService.java b/core/src/main/java/org/elasticsearch/snapshots/SnapshotShardsService.java index 248f9a555a3d6..35e0b10fd8769 100644 --- a/core/src/main/java/org/elasticsearch/snapshots/SnapshotShardsService.java +++ b/core/src/main/java/org/elasticsearch/snapshots/SnapshotShardsService.java @@ -51,7 +51,6 @@ import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.common.unit.ByteSizeValue; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.util.concurrent.AbstractRunnable; import org.elasticsearch.index.engine.Engine; @@ -188,7 +187,7 @@ public void beforeIndexShardClosed(ShardId shardId, @Nullable IndexShard indexSh Map shards = snapshotShards.getValue().shards; if (shards.containsKey(shardId)) { logger.debug("[{}] shard closing, abort snapshotting for snapshot [{}]", shardId, snapshotShards.getKey().getSnapshotId()); - shards.get(shardId).abort(); + shards.get(shardId).abortIfNotCompleted("shard is closing, aborting"); } } } @@ -230,9 +229,7 @@ private void processIndexShardSnapshots(ClusterChangedEvent event) { // running shards is missed, then the snapshot is removed is a subsequent cluster // state update, which is being processed here for (IndexShardSnapshotStatus snapshotStatus : entry.getValue().shards.values()) { - if (snapshotStatus.stage() == Stage.INIT || snapshotStatus.stage() == Stage.STARTED) { - snapshotStatus.abort(); - } + snapshotStatus.abortIfNotCompleted("snapshot has been removed in cluster state, aborting"); } } } @@ -255,7 +252,7 @@ private void processIndexShardSnapshots(ClusterChangedEvent event) { if (localNodeId.equals(shard.value.nodeId())) { if (shard.value.state() == State.INIT && (snapshotShards == null || !snapshotShards.shards.containsKey(shard.key))) { logger.trace("[{}] - Adding shard to the queue", shard.key); - startedShards.put(shard.key, new IndexShardSnapshotStatus()); + startedShards.put(shard.key, IndexShardSnapshotStatus.newInitializing()); } } } @@ -278,30 +275,26 @@ private void processIndexShardSnapshots(ClusterChangedEvent event) { // Abort all running shards for this snapshot SnapshotShards snapshotShards = shardSnapshots.get(entry.snapshot()); if (snapshotShards != null) { + final String failure = "snapshot has been aborted"; for (ObjectObjectCursor shard : entry.shards()) { - IndexShardSnapshotStatus snapshotStatus = snapshotShards.shards.get(shard.key); + + final IndexShardSnapshotStatus snapshotStatus = snapshotShards.shards.get(shard.key); if (snapshotStatus != null) { - switch (snapshotStatus.stage()) { - case INIT: - case STARTED: - snapshotStatus.abort(); - break; - case FINALIZE: - logger.debug("[{}] trying to cancel snapshot on shard [{}] that is finalizing, " + - "letting it finish", entry.snapshot(), shard.key); - break; - case DONE: - logger.debug("[{}] trying to cancel snapshot on the shard [{}] that is already done, " + - "updating status on the master", entry.snapshot(), shard.key); - notifySuccessfulSnapshotShard(entry.snapshot(), shard.key, localNodeId); - break; - case FAILURE: - logger.debug("[{}] trying to cancel snapshot on the shard [{}] that has already failed, " + - "updating status on the master", entry.snapshot(), shard.key); - notifyFailedSnapshotShard(entry.snapshot(), shard.key, localNodeId, snapshotStatus.failure()); - break; - default: - throw new IllegalStateException("Unknown snapshot shard stage " + snapshotStatus.stage()); + final IndexShardSnapshotStatus.Copy lastSnapshotStatus = snapshotStatus.abortIfNotCompleted(failure); + final Stage stage = lastSnapshotStatus.getStage(); + if (stage == Stage.FINALIZE) { + logger.debug("[{}] trying to cancel snapshot on shard [{}] that is finalizing, " + + "letting it finish", entry.snapshot(), shard.key); + + } else if (stage == Stage.DONE) { + logger.debug("[{}] trying to cancel snapshot on the shard [{}] that is already done, " + + "updating status on the master", entry.snapshot(), shard.key); + notifySuccessfulSnapshotShard(entry.snapshot(), shard.key, localNodeId); + + } else if (stage == Stage.FAILURE) { + logger.debug("[{}] trying to cancel snapshot on the shard [{}] that has already failed, " + + "updating status on the master", entry.snapshot(), shard.key); + notifyFailedSnapshotShard(entry.snapshot(), shard.key, localNodeId, lastSnapshotStatus.getFailure()); } } } @@ -400,12 +393,8 @@ private void snapshot(final IndexShard indexShard, final Snapshot snapshot, fina try (Engine.IndexCommitRef snapshotRef = indexShard.acquireIndexCommit(true)) { repository.snapshotShard(indexShard, snapshot.getSnapshotId(), indexId, snapshotRef.getIndexCommit(), snapshotStatus); if (logger.isDebugEnabled()) { - StringBuilder details = new StringBuilder(); - details.append(" index : version [").append(snapshotStatus.indexVersion()); - details.append("], number_of_files [").append(snapshotStatus.numberOfFiles()); - details.append("] with total_size [").append(new ByteSizeValue(snapshotStatus.totalSize())).append("]\n"); - logger.debug("snapshot ({}) completed to {}, took [{}]\n{}", snapshot, repository, - TimeValue.timeValueMillis(snapshotStatus.time()), details); + final IndexShardSnapshotStatus.Copy lastSnapshotStatus = snapshotStatus.asCopy(); + logger.debug("snapshot ({}) completed to {} with {}", snapshot, repository, lastSnapshotStatus); } } } catch (SnapshotFailedEngineException | IndexShardSnapshotFailedException e) { @@ -432,21 +421,22 @@ private void syncShardStatsOnNewMaster(ClusterChangedEvent event) { ImmutableOpenMap masterShards = snapshot.shards(); for(Map.Entry localShard : localShards.entrySet()) { ShardId shardId = localShard.getKey(); - IndexShardSnapshotStatus localShardStatus = localShard.getValue(); ShardSnapshotStatus masterShard = masterShards.get(shardId); if (masterShard != null && masterShard.state().completed() == false) { + final IndexShardSnapshotStatus.Copy indexShardSnapshotStatus = localShard.getValue().asCopy(); + final Stage stage = indexShardSnapshotStatus.getStage(); // Master knows about the shard and thinks it has not completed - if (localShardStatus.stage() == Stage.DONE) { + if (stage == Stage.DONE) { // but we think the shard is done - we need to make new master know that the shard is done logger.debug("[{}] new master thinks the shard [{}] is not completed but the shard is done locally, " + "updating status on the master", snapshot.snapshot(), shardId); notifySuccessfulSnapshotShard(snapshot.snapshot(), shardId, localNodeId); - } else if (localShard.getValue().stage() == Stage.FAILURE) { + } else if (stage == Stage.FAILURE) { // but we think the shard failed - we need to make new master know that the shard failed logger.debug("[{}] new master thinks the shard [{}] is not completed but the shard failed locally, " + "updating status on master", snapshot.snapshot(), shardId); - notifyFailedSnapshotShard(snapshot.snapshot(), shardId, localNodeId, localShardStatus.failure()); + notifyFailedSnapshotShard(snapshot.snapshot(), shardId, localNodeId, indexShardSnapshotStatus.getFailure()); } } } diff --git a/core/src/main/java/org/elasticsearch/snapshots/SnapshotsService.java b/core/src/main/java/org/elasticsearch/snapshots/SnapshotsService.java index ec63b7d228ec5..bf8edcf576704 100644 --- a/core/src/main/java/org/elasticsearch/snapshots/SnapshotsService.java +++ b/core/src/main/java/org/elasticsearch/snapshots/SnapshotsService.java @@ -607,10 +607,7 @@ public Map snapshotShards(final String reposi ShardId shardId = new ShardId(indexMetaData.getIndex(), i); SnapshotShardFailure shardFailure = findShardFailure(snapshotInfo.shardFailures(), shardId); if (shardFailure != null) { - IndexShardSnapshotStatus shardSnapshotStatus = new IndexShardSnapshotStatus(); - shardSnapshotStatus.updateStage(IndexShardSnapshotStatus.Stage.FAILURE); - shardSnapshotStatus.failure(shardFailure.reason()); - shardStatus.put(shardId, shardSnapshotStatus); + shardStatus.put(shardId, IndexShardSnapshotStatus.newFailed(shardFailure.reason())); } else { final IndexShardSnapshotStatus shardSnapshotStatus; if (snapshotInfo.state() == SnapshotState.FAILED) { @@ -621,9 +618,7 @@ public Map snapshotShards(final String reposi // snapshot status will throw an exception. Instead, we create // a status for the shard to indicate that the shard snapshot // could not be taken due to partial being set to false. - shardSnapshotStatus = new IndexShardSnapshotStatus(); - shardSnapshotStatus.updateStage(IndexShardSnapshotStatus.Stage.FAILURE); - shardSnapshotStatus.failure("skipped"); + shardSnapshotStatus = IndexShardSnapshotStatus.newFailed("skipped"); } else { shardSnapshotStatus = repository.getShardSnapshotStatus( snapshotInfo.snapshotId(), diff --git a/core/src/test/java/org/elasticsearch/snapshots/SnapshotShardsServiceIT.java b/core/src/test/java/org/elasticsearch/snapshots/SnapshotShardsServiceIT.java index 651cd96776e75..8431c8fa69f54 100644 --- a/core/src/test/java/org/elasticsearch/snapshots/SnapshotShardsServiceIT.java +++ b/core/src/test/java/org/elasticsearch/snapshots/SnapshotShardsServiceIT.java @@ -93,7 +93,7 @@ public void testRetryPostingSnapshotStatusMessages() throws Exception { assertBusy(() -> { final Snapshot snapshot = new Snapshot("test-repo", snapshotId); List stages = snapshotShardsService.currentSnapshotShards(snapshot) - .values().stream().map(IndexShardSnapshotStatus::stage).collect(Collectors.toList()); + .values().stream().map(status -> status.asCopy().getStage()).collect(Collectors.toList()); assertThat(stages, hasSize(shards)); assertThat(stages, everyItem(equalTo(IndexShardSnapshotStatus.Stage.DONE))); }); diff --git a/test/framework/src/main/java/org/elasticsearch/index/shard/IndexShardTestCase.java b/test/framework/src/main/java/org/elasticsearch/index/shard/IndexShardTestCase.java index c06b4a433cb0a..4737befa30e45 100644 --- a/test/framework/src/main/java/org/elasticsearch/index/shard/IndexShardTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/index/shard/IndexShardTestCase.java @@ -619,16 +619,18 @@ protected void recoverShardFromSnapshot(final IndexShard shard, protected void snapshotShard(final IndexShard shard, final Snapshot snapshot, final Repository repository) throws IOException { - final IndexShardSnapshotStatus snapshotStatus = new IndexShardSnapshotStatus(); + final IndexShardSnapshotStatus snapshotStatus = IndexShardSnapshotStatus.newInitializing(); try (Engine.IndexCommitRef indexCommitRef = shard.acquireIndexCommit(true)) { Index index = shard.shardId().getIndex(); IndexId indexId = new IndexId(index.getName(), index.getUUID()); repository.snapshotShard(shard, snapshot.getSnapshotId(), indexId, indexCommitRef.getIndexCommit(), snapshotStatus); } - assertEquals(IndexShardSnapshotStatus.Stage.DONE, snapshotStatus.stage()); - assertEquals(shard.snapshotStoreMetadata().size(), snapshotStatus.numberOfFiles()); - assertNull(snapshotStatus.failure()); + + final IndexShardSnapshotStatus.Copy lastSnapshotStatus = snapshotStatus.asCopy(); + assertEquals(IndexShardSnapshotStatus.Stage.DONE, lastSnapshotStatus.getStage()); + assertEquals(shard.snapshotStoreMetadata().size(), lastSnapshotStatus.getNumberOfFiles()); + assertNull(lastSnapshotStatus.getFailure()); } /** From 79e8ef0305893da8a8961a1bec9d53e41a7c19ce Mon Sep 17 00:00:00 2001 From: Jason Tedor Date: Tue, 9 Jan 2018 00:40:59 -0500 Subject: [PATCH 33/74] Declare empty package dirs as output dirs Otherwise newer versions of Gradle will see the outputs as stale and remove the directory between having created the directory and copying files into the directory (leading to the directory being created again, this time missing some sub-directories). --- distribution/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/distribution/build.gradle b/distribution/build.gradle index 01ed3102dcf6b..542a34bb4f52f 100644 --- a/distribution/build.gradle +++ b/distribution/build.gradle @@ -335,6 +335,7 @@ configure(distributions.findAll { ['deb', 'rpm'].contains(it.name) }) { task createEtc(type: EmptyDirTask) { dir "${packagingFiles}/etc/elasticsearch" dirMode 0750 + outputs.dir dir } task fillEtc(type: Copy) { From 36729d1c46bbf1b56a7dacc4b079d708830ebbba Mon Sep 17 00:00:00 2001 From: Jim Ferenczi Date: Tue, 9 Jan 2018 18:28:43 +0100 Subject: [PATCH 34/74] Add the ability to bundle multiple plugins into a meta plugin (#28022) This commit adds the ability to package multiple plugins in a single zip. The zip file for a meta plugin must contains the following structure: |____elasticsearch/ | |____ <-- The plugin files for plugin1 (the content of the elastisearch directory) | |____ <-- The plugin files for plugin2 | |____ meta-plugin-descriptor.properties <-- example contents below The meta plugin properties descriptor is mandatory and must contain the following properties: description: simple summary of the meta plugin. name: the meta plugin name The installation process installs each plugin in a sub-folder inside the meta plugin directory. The example above would create the following structure in the plugins directory: |_____ plugins | |____ | | |____ meta-plugin-descriptor.properties | | |____ | | |____ If the sub plugins contain a config or a bin directory, they are copied in a sub folder inside the meta plugin config/bin directory. |_____ config | |____ | | |____ | | |____ |_____ bin | |____ | | |____ | | |____ The sub-plugins are loaded at startup like normal plugins with the same restrictions; they have a separate class loader and a sub-plugin cannot have the same name than another plugin (or a sub-plugin inside another meta plugin). It is also not possible to remove a sub-plugin inside a meta plugin, only full removal of the meta plugin is allowed. Closes #27316 --- .../meta-plugin-descriptor.properties | 21 ++ .../cluster/node/info/PluginsAndModules.java | 9 +- .../org/elasticsearch/bootstrap/Security.java | 12 +- .../org/elasticsearch/bootstrap/Spawner.java | 38 ++- .../elasticsearch/plugins/MetaPluginInfo.java | 149 ++++++++++ .../org/elasticsearch/plugins/PluginInfo.java | 69 ++++- .../elasticsearch/plugins/PluginsService.java | 34 +-- .../plugins/MetaPluginInfoTests.java | 120 ++++++++ .../plugins/PluginInfoTests.java | 34 +-- .../plugins/PluginsServiceTests.java | 6 +- .../plugins/InstallPluginCommand.java | 210 ++++++++++---- .../plugins/ListPluginsCommand.java | 44 ++- .../plugins/InstallPluginCommandTests.java | 260 ++++++++++++++++-- .../plugins/ListPluginsCommandTests.java | 122 +++++++- .../plugins/RemovePluginCommandTests.java | 31 ++- docs/plugins/authors.asciidoc | 33 ++- plugins/examples/meta-plugin/build.gradle | 56 ++++ .../meta-plugin/dummy-plugin1/build.gradle | 29 ++ .../elasticsearch/example/DummyPlugin1.java | 29 ++ .../meta-plugin/dummy-plugin2/build.gradle | 29 ++ .../elasticsearch/example/DummyPlugin2.java | 29 ++ .../meta-plugin-descriptor.properties | 4 + ...SmokeTestPluginsClientYamlTestSuiteIT.java | 39 +++ .../test/smoke_test_plugins/10_basic.yml | 14 + .../bootstrap/SpawnerNoBootstrapTests.java | 86 +++++- settings.gradle | 25 +- .../elasticsearch/plugins/PluginTestUtil.java | 14 +- 27 files changed, 1331 insertions(+), 215 deletions(-) create mode 100644 buildSrc/src/main/resources/meta-plugin-descriptor.properties create mode 100644 core/src/main/java/org/elasticsearch/plugins/MetaPluginInfo.java create mode 100644 core/src/test/java/org/elasticsearch/plugins/MetaPluginInfoTests.java create mode 100644 plugins/examples/meta-plugin/build.gradle create mode 100644 plugins/examples/meta-plugin/dummy-plugin1/build.gradle create mode 100644 plugins/examples/meta-plugin/dummy-plugin1/src/main/java/org/elasticsearch/example/DummyPlugin1.java create mode 100644 plugins/examples/meta-plugin/dummy-plugin2/build.gradle create mode 100644 plugins/examples/meta-plugin/dummy-plugin2/src/main/java/org/elasticsearch/example/DummyPlugin2.java create mode 100644 plugins/examples/meta-plugin/src/main/resources/meta-plugin-descriptor.properties create mode 100644 plugins/examples/meta-plugin/src/test/java/org/elasticsearch/smoketest/SmokeTestPluginsClientYamlTestSuiteIT.java create mode 100644 plugins/examples/meta-plugin/src/test/resources/rest-api-spec/test/smoke_test_plugins/10_basic.yml diff --git a/buildSrc/src/main/resources/meta-plugin-descriptor.properties b/buildSrc/src/main/resources/meta-plugin-descriptor.properties new file mode 100644 index 0000000000000..16dbe4c38a55b --- /dev/null +++ b/buildSrc/src/main/resources/meta-plugin-descriptor.properties @@ -0,0 +1,21 @@ +# Elasticsearch meta plugin descriptor file +# This file must exist as 'meta-plugin-descriptor.properties' in a folder named `elasticsearch`. +# +### example meta plugin for "meta-foo" +# +# meta-foo.zip <-- zip file for the meta plugin, with this structure: +#|____elasticsearch/ +#| |____ <-- The plugin files for bundled_plugin_1 (the content of the elastisearch directory) +#| |____ <-- The plugin files for bundled_plugin_2 +#| |____ meta-plugin-descriptor.properties <-- example contents below: +# +# description=My meta plugin +# name=meta-foo +# +### mandatory elements for all meta plugins: +# +# 'description': simple summary of the meta plugin +description=${description} +# +# 'name': the meta plugin name +name=${name} \ No newline at end of file diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/info/PluginsAndModules.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/node/info/PluginsAndModules.java index e562adf2602c1..67ee575678988 100644 --- a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/info/PluginsAndModules.java +++ b/core/src/main/java/org/elasticsearch/action/admin/cluster/node/info/PluginsAndModules.java @@ -30,6 +30,7 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Collections; +import java.util.Comparator; import java.util.List; /** @@ -60,23 +61,23 @@ public void writeTo(StreamOutput out) throws IOException { */ public List getPluginInfos() { List plugins = new ArrayList<>(this.plugins); - Collections.sort(plugins, (p1, p2) -> p1.getName().compareTo(p2.getName())); + Collections.sort(plugins, Comparator.comparing(PluginInfo::getName)); return plugins; } - + /** * Returns an ordered list based on modules name */ public List getModuleInfos() { List modules = new ArrayList<>(this.modules); - Collections.sort(modules, (p1, p2) -> p1.getName().compareTo(p2.getName())); + Collections.sort(modules, Comparator.comparing(PluginInfo::getName)); return modules; } public void addPlugin(PluginInfo info) { plugins.add(info); } - + public void addModule(PluginInfo info) { modules.add(info); } diff --git a/core/src/main/java/org/elasticsearch/bootstrap/Security.java b/core/src/main/java/org/elasticsearch/bootstrap/Security.java index 89a1f794e89f8..e3de41c09c1c2 100644 --- a/core/src/main/java/org/elasticsearch/bootstrap/Security.java +++ b/core/src/main/java/org/elasticsearch/bootstrap/Security.java @@ -163,16 +163,8 @@ static Map getCodebaseJarMap(Set urls) { static Map getPluginPermissions(Environment environment) throws IOException, NoSuchAlgorithmException { Map map = new HashMap<>(); // collect up set of plugins and modules by listing directories. - Set pluginsAndModules = new LinkedHashSet<>(); // order is already lost, but some filesystems have it - if (Files.exists(environment.pluginsFile())) { - try (DirectoryStream stream = Files.newDirectoryStream(environment.pluginsFile())) { - for (Path plugin : stream) { - if (pluginsAndModules.add(plugin) == false) { - throw new IllegalStateException("duplicate plugin: " + plugin); - } - } - } - } + Set pluginsAndModules = new LinkedHashSet<>(PluginInfo.extractAllPlugins(environment.pluginsFile())); + if (Files.exists(environment.modulesFile())) { try (DirectoryStream stream = Files.newDirectoryStream(environment.modulesFile())) { for (Path module : stream) { diff --git a/core/src/main/java/org/elasticsearch/bootstrap/Spawner.java b/core/src/main/java/org/elasticsearch/bootstrap/Spawner.java index 0b9913f7f06a4..d6d66e1828361 100644 --- a/core/src/main/java/org/elasticsearch/bootstrap/Spawner.java +++ b/core/src/main/java/org/elasticsearch/bootstrap/Spawner.java @@ -21,14 +21,12 @@ import org.apache.lucene.util.Constants; import org.apache.lucene.util.IOUtils; -import org.elasticsearch.common.io.FileSystemUtils; import org.elasticsearch.env.Environment; import org.elasticsearch.plugins.Platforms; import org.elasticsearch.plugins.PluginInfo; import java.io.Closeable; import java.io.IOException; -import java.nio.file.DirectoryStream; import java.nio.file.Files; import java.nio.file.Path; import java.util.ArrayList; @@ -72,27 +70,23 @@ void spawnNativePluginControllers(final Environment environment) throws IOExcept * For each plugin, attempt to spawn the controller daemon. Silently ignore any plugin that * don't include a controller for the correct platform. */ - try (DirectoryStream stream = Files.newDirectoryStream(pluginsFile)) { - for (final Path plugin : stream) { - if (FileSystemUtils.isDesktopServicesStore(plugin)) { - continue; - } - final PluginInfo info = PluginInfo.readFromProperties(plugin); - final Path spawnPath = Platforms.nativeControllerPath(plugin); - if (!Files.isRegularFile(spawnPath)) { - continue; - } - if (!info.hasNativeController()) { - final String message = String.format( - Locale.ROOT, - "plugin [%s] does not have permission to fork native controller", - plugin.getFileName()); - throw new IllegalArgumentException(message); - } - final Process process = - spawnNativePluginController(spawnPath, environment.tmpFile()); - processes.add(process); + List paths = PluginInfo.extractAllPlugins(pluginsFile); + for (Path plugin : paths) { + final PluginInfo info = PluginInfo.readFromProperties(plugin); + final Path spawnPath = Platforms.nativeControllerPath(plugin); + if (!Files.isRegularFile(spawnPath)) { + continue; } + if (!info.hasNativeController()) { + final String message = String.format( + Locale.ROOT, + "plugin [%s] does not have permission to fork native controller", + plugin.getFileName()); + throw new IllegalArgumentException(message); + } + final Process process = + spawnNativePluginController(spawnPath, environment.tmpFile()); + processes.add(process); } } diff --git a/core/src/main/java/org/elasticsearch/plugins/MetaPluginInfo.java b/core/src/main/java/org/elasticsearch/plugins/MetaPluginInfo.java new file mode 100644 index 0000000000000..d8bb176273ce2 --- /dev/null +++ b/core/src/main/java/org/elasticsearch/plugins/MetaPluginInfo.java @@ -0,0 +1,149 @@ +/* + * Licensed to Elasticsearch under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch licenses this file to you 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. + */ + +package org.elasticsearch.plugins; + +import java.io.IOException; +import java.io.InputStream; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.Arrays; +import java.util.Map; +import java.util.Properties; +import java.util.function.Function; +import java.util.stream.Collectors; + +/** + * An in-memory representation of the meta plugin descriptor. + */ +public class MetaPluginInfo { + static final String ES_META_PLUGIN_PROPERTIES = "meta-plugin-descriptor.properties"; + + private final String name; + private final String description; + + /** + * Construct plugin info. + * + * @param name the name of the plugin + * @param description a description of the plugin + */ + private MetaPluginInfo(String name, String description) { + this.name = name; + this.description = description; + } + + /** + * @return Whether the provided {@code path} is a meta plugin. + */ + public static boolean isMetaPlugin(final Path path) { + return Files.exists(path.resolve(ES_META_PLUGIN_PROPERTIES)); + } + + /** + * @return Whether the provided {@code path} is a meta properties file. + */ + public static boolean isPropertiesFile(final Path path) { + return ES_META_PLUGIN_PROPERTIES.equals(path.getFileName().toString()); + } + + /** reads (and validates) meta plugin metadata descriptor file */ + + /** + * Reads and validates the meta plugin descriptor file. + * + * @param path the path to the root directory for the meta plugin + * @return the meta plugin info + * @throws IOException if an I/O exception occurred reading the meta plugin descriptor + */ + public static MetaPluginInfo readFromProperties(final Path path) throws IOException { + final Path descriptor = path.resolve(ES_META_PLUGIN_PROPERTIES); + + final Map propsMap; + { + final Properties props = new Properties(); + try (InputStream stream = Files.newInputStream(descriptor)) { + props.load(stream); + } + propsMap = props.stringPropertyNames().stream().collect(Collectors.toMap(Function.identity(), props::getProperty)); + } + + final String name = propsMap.remove("name"); + if (name == null || name.isEmpty()) { + throw new IllegalArgumentException( + "property [name] is missing for meta plugin in [" + descriptor + "]"); + } + final String description = propsMap.remove("description"); + if (description == null) { + throw new IllegalArgumentException( + "property [description] is missing for meta plugin [" + name + "]"); + } + + if (propsMap.isEmpty() == false) { + throw new IllegalArgumentException("Unknown properties in meta plugin descriptor: " + propsMap.keySet()); + } + + return new MetaPluginInfo(name, description); + } + + /** + * The name of the meta plugin. + * + * @return the meta plugin name + */ + public String getName() { + return name; + } + + /** + * The description of the meta plugin. + * + * @return the meta plugin description + */ + public String getDescription() { + return description; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + + MetaPluginInfo that = (MetaPluginInfo) o; + + if (!name.equals(that.name)) return false; + + return true; + } + + @Override + public int hashCode() { + return name.hashCode(); + } + + @Override + public String toString() { + final StringBuilder information = new StringBuilder() + .append("- Plugin information:\n") + .append("Name: ").append(name).append("\n") + .append("Description: ").append(description); + return information.toString(); + } + +} diff --git a/core/src/main/java/org/elasticsearch/plugins/PluginInfo.java b/core/src/main/java/org/elasticsearch/plugins/PluginInfo.java index 01cc7ea65908b..42c9df6d3dd3e 100644 --- a/core/src/main/java/org/elasticsearch/plugins/PluginInfo.java +++ b/core/src/main/java/org/elasticsearch/plugins/PluginInfo.java @@ -22,7 +22,9 @@ import org.elasticsearch.Version; import org.elasticsearch.bootstrap.JarHell; import org.elasticsearch.common.Booleans; +import org.elasticsearch.common.Nullable; import org.elasticsearch.common.Strings; +import org.elasticsearch.common.io.FileSystemUtils; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.Writeable; @@ -31,14 +33,19 @@ import java.io.IOException; import java.io.InputStream; +import java.nio.file.DirectoryStream; import java.nio.file.Files; import java.nio.file.Path; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; +import java.util.HashSet; +import java.util.LinkedList; import java.util.List; import java.util.Locale; import java.util.Map; import java.util.Properties; +import java.util.Set; import java.util.function.Function; import java.util.stream.Collectors; @@ -125,7 +132,46 @@ public void writeTo(final StreamOutput out) throws IOException { } } - /** reads (and validates) plugin metadata descriptor file */ + /** + * Extracts all {@link PluginInfo} from the provided {@code rootPath} expanding meta plugins if needed. + * @param rootPath the path where the plugins are installed + * @return A list of all plugin paths installed in the {@code rootPath} + * @throws IOException if an I/O exception occurred reading the plugin descriptors + */ + public static List extractAllPlugins(final Path rootPath) throws IOException { + final List plugins = new LinkedList<>(); // order is already lost, but some filesystems have it + final Set seen = new HashSet<>(); + if (Files.exists(rootPath)) { + try (DirectoryStream stream = Files.newDirectoryStream(rootPath)) { + for (Path plugin : stream) { + if (FileSystemUtils.isDesktopServicesStore(plugin) || + plugin.getFileName().toString().startsWith(".removing-")) { + continue; + } + if (seen.add(plugin.getFileName().toString()) == false) { + throw new IllegalStateException("duplicate plugin: " + plugin); + } + if (MetaPluginInfo.isMetaPlugin(plugin)) { + try (DirectoryStream subStream = Files.newDirectoryStream(plugin)) { + for (Path subPlugin : subStream) { + if (MetaPluginInfo.isPropertiesFile(subPlugin) || + FileSystemUtils.isDesktopServicesStore(subPlugin)) { + continue; + } + if (seen.add(subPlugin.getFileName().toString()) == false) { + throw new IllegalStateException("duplicate plugin: " + subPlugin); + } + plugins.add(subPlugin); + } + } + } else { + plugins.add(plugin); + } + } + } + } + return plugins; + } /** * Reads and validates the plugin descriptor file. @@ -341,16 +387,19 @@ public int hashCode() { @Override public String toString() { + return toString(""); + } + + public String toString(String prefix) { final StringBuilder information = new StringBuilder() - .append("- Plugin information:\n") - .append("Name: ").append(name).append("\n") - .append("Description: ").append(description).append("\n") - .append("Version: ").append(version).append("\n") - .append("Native Controller: ").append(hasNativeController).append("\n") - .append("Requires Keystore: ").append(requiresKeystore).append("\n") - .append("Extended Plugins: ").append(extendedPlugins).append("\n") - .append(" * Classname: ").append(classname); + .append(prefix).append("- Plugin information:\n") + .append(prefix).append("Name: ").append(name).append("\n") + .append(prefix).append("Description: ").append(description).append("\n") + .append(prefix).append("Version: ").append(version).append("\n") + .append(prefix).append("Native Controller: ").append(hasNativeController).append("\n") + .append(prefix).append("Requires Keystore: ").append(requiresKeystore).append("\n") + .append(prefix).append("Extended Plugins: ").append(extendedPlugins).append("\n") + .append(prefix).append(" * Classname: ").append(classname); return information.toString(); } - } diff --git a/core/src/main/java/org/elasticsearch/plugins/PluginsService.java b/core/src/main/java/org/elasticsearch/plugins/PluginsService.java index 445edec1c19c4..d60d01273bbba 100644 --- a/core/src/main/java/org/elasticsearch/plugins/PluginsService.java +++ b/core/src/main/java/org/elasticsearch/plugins/PluginsService.java @@ -34,7 +34,6 @@ import org.elasticsearch.common.component.AbstractComponent; import org.elasticsearch.common.component.LifecycleComponent; import org.elasticsearch.common.inject.Module; -import org.elasticsearch.common.io.FileSystemUtils; import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.common.settings.Setting; import org.elasticsearch.common.settings.Setting.Property; @@ -322,29 +321,20 @@ static Set getPluginBundles(Path pluginsDirectory) throws IOException { Logger logger = Loggers.getLogger(PluginsService.class); Set bundles = new LinkedHashSet<>(); - try (DirectoryStream stream = Files.newDirectoryStream(pluginsDirectory)) { - for (Path plugin : stream) { - if (FileSystemUtils.isDesktopServicesStore(plugin)) { - continue; - } - if (plugin.getFileName().toString().startsWith(".removing-")) { - continue; - } - logger.trace("--- adding plugin [{}]", plugin.toAbsolutePath()); - final PluginInfo info; - try { - info = PluginInfo.readFromProperties(plugin); - } catch (IOException e) { - throw new IllegalStateException("Could not load plugin descriptor for existing plugin [" - + plugin.getFileName() + "]. Was the plugin built before 2.0?", e); - } - - if (bundles.add(new Bundle(info, plugin)) == false) { - throw new IllegalStateException("duplicate plugin: " + info); - } + List infos = PluginInfo.extractAllPlugins(pluginsDirectory); + for (Path plugin : infos) { + logger.trace("--- adding plugin [{}]", plugin.toAbsolutePath()); + final PluginInfo info; + try { + info = PluginInfo.readFromProperties(plugin); + } catch (IOException e) { + throw new IllegalStateException("Could not load plugin descriptor for existing plugin [" + + plugin.getFileName() + "]. Was the plugin built before 2.0?", e); + } + if (bundles.add(new Bundle(info, plugin)) == false) { + throw new IllegalStateException("duplicate plugin: " + info); } } - return bundles; } diff --git a/core/src/test/java/org/elasticsearch/plugins/MetaPluginInfoTests.java b/core/src/test/java/org/elasticsearch/plugins/MetaPluginInfoTests.java new file mode 100644 index 0000000000000..2b7f50056a9c8 --- /dev/null +++ b/core/src/test/java/org/elasticsearch/plugins/MetaPluginInfoTests.java @@ -0,0 +1,120 @@ +/* + * Licensed to Elasticsearch under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch licenses this file to you 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. + */ + +package org.elasticsearch.plugins; + +import org.apache.lucene.util.LuceneTestCase; +import org.elasticsearch.Version; +import org.elasticsearch.test.ESTestCase; + +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; + +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.endsWith; + +@LuceneTestCase.SuppressFileSystems(value = "ExtrasFS") +public class MetaPluginInfoTests extends ESTestCase { + + public void testReadFromProperties() throws Exception { + Path pluginDir = createTempDir().resolve("fake-meta-plugin"); + PluginTestUtil.writeMetaPluginProperties(pluginDir, + "description", "fake desc", + "name", "my_meta_plugin"); + MetaPluginInfo info = MetaPluginInfo.readFromProperties(pluginDir); + assertEquals("my_meta_plugin", info.getName()); + assertEquals("fake desc", info.getDescription()); + } + + public void testReadFromPropertiesNameMissing() throws Exception { + Path pluginDir = createTempDir().resolve("fake-meta-plugin"); + PluginTestUtil.writeMetaPluginProperties(pluginDir); + IllegalArgumentException e = expectThrows(IllegalArgumentException.class, () -> MetaPluginInfo.readFromProperties(pluginDir)); + assertThat(e.getMessage(), containsString("property [name] is missing for")); + + PluginTestUtil.writeMetaPluginProperties(pluginDir, "name", ""); + e = expectThrows(IllegalArgumentException.class, () -> MetaPluginInfo.readFromProperties(pluginDir)); + assertThat(e.getMessage(), containsString("property [name] is missing for")); + } + + public void testReadFromPropertiesDescriptionMissing() throws Exception { + Path pluginDir = createTempDir().resolve("fake-meta-plugin"); + PluginTestUtil.writeMetaPluginProperties(pluginDir, "name", "fake-meta-plugin"); + IllegalArgumentException e = expectThrows(IllegalArgumentException.class, () -> MetaPluginInfo.readFromProperties(pluginDir)); + assertThat(e.getMessage(), containsString("[description] is missing")); + } + + public void testUnknownProperties() throws Exception { + Path pluginDir = createTempDir().resolve("fake-meta-plugin"); + PluginTestUtil.writeMetaPluginProperties(pluginDir, + "extra", "property", + "unknown", "property", + "description", "fake desc", + "name", "my_meta_plugin"); + IllegalArgumentException e = expectThrows(IllegalArgumentException.class, () -> MetaPluginInfo.readFromProperties(pluginDir)); + assertThat(e.getMessage(), containsString("Unknown properties in meta plugin descriptor")); + } + + public void testExtractAllPluginsWithDuplicates() throws Exception { + Path pluginDir = createTempDir().resolve("plugins"); + // Simple plugin + Path plugin1 = pluginDir.resolve("plugin1"); + Files.createDirectories(plugin1); + PluginTestUtil.writePluginProperties(plugin1, + "description", "fake desc", + "name", "plugin1", + "version", "1.0", + "elasticsearch.version", Version.CURRENT.toString(), + "java.version", System.getProperty("java.specification.version"), + "classname", "FakePlugin"); + + // Meta plugin + Path metaPlugin = pluginDir.resolve("meta_plugin"); + Files.createDirectory(metaPlugin); + PluginTestUtil.writeMetaPluginProperties(metaPlugin, + "description", "fake desc", + "name", "meta_plugin"); + Path plugin2 = metaPlugin.resolve("plugin1"); + Files.createDirectory(plugin2); + PluginTestUtil.writePluginProperties(plugin2, + "description", "fake desc", + "name", "plugin1", + "version", "1.0", + "elasticsearch.version", Version.CURRENT.toString(), + "java.version", System.getProperty("java.specification.version"), + "classname", "FakePlugin"); + Path plugin3 = metaPlugin.resolve("plugin2"); + Files.createDirectory(plugin3); + PluginTestUtil.writePluginProperties(plugin3, + "description", "fake desc", + "name", "plugin2", + "version", "1.0", + "elasticsearch.version", Version.CURRENT.toString(), + "java.version", System.getProperty("java.specification.version"), + "classname", "FakePlugin"); + + IllegalStateException exc = + expectThrows(IllegalStateException.class, () -> PluginInfo.extractAllPlugins(pluginDir)); + assertThat(exc.getMessage(), containsString("duplicate plugin")); + assertThat(exc.getMessage(), endsWith("plugin1")); + } +} diff --git a/core/src/test/java/org/elasticsearch/plugins/PluginInfoTests.java b/core/src/test/java/org/elasticsearch/plugins/PluginInfoTests.java index 6d2b09f87eb70..a767dad204efc 100644 --- a/core/src/test/java/org/elasticsearch/plugins/PluginInfoTests.java +++ b/core/src/test/java/org/elasticsearch/plugins/PluginInfoTests.java @@ -41,7 +41,7 @@ public class PluginInfoTests extends ESTestCase { public void testReadFromProperties() throws Exception { Path pluginDir = createTempDir().resolve("fake-plugin"); - PluginTestUtil.writeProperties(pluginDir, + PluginTestUtil.writePluginProperties(pluginDir, "description", "fake desc", "name", "my_plugin", "version", "1.0", @@ -58,25 +58,25 @@ public void testReadFromProperties() throws Exception { public void testReadFromPropertiesNameMissing() throws Exception { Path pluginDir = createTempDir().resolve("fake-plugin"); - PluginTestUtil.writeProperties(pluginDir); + PluginTestUtil.writePluginProperties(pluginDir); IllegalArgumentException e = expectThrows(IllegalArgumentException.class, () -> PluginInfo.readFromProperties(pluginDir)); assertThat(e.getMessage(), containsString("property [name] is missing in")); - PluginTestUtil.writeProperties(pluginDir, "name", ""); + PluginTestUtil.writePluginProperties(pluginDir, "name", ""); e = expectThrows(IllegalArgumentException.class, () -> PluginInfo.readFromProperties(pluginDir)); assertThat(e.getMessage(), containsString("property [name] is missing in")); } public void testReadFromPropertiesDescriptionMissing() throws Exception { Path pluginDir = createTempDir().resolve("fake-plugin"); - PluginTestUtil.writeProperties(pluginDir, "name", "fake-plugin"); + PluginTestUtil.writePluginProperties(pluginDir, "name", "fake-plugin"); IllegalArgumentException e = expectThrows(IllegalArgumentException.class, () -> PluginInfo.readFromProperties(pluginDir)); assertThat(e.getMessage(), containsString("[description] is missing")); } public void testReadFromPropertiesVersionMissing() throws Exception { Path pluginDir = createTempDir().resolve("fake-plugin"); - PluginTestUtil.writeProperties( + PluginTestUtil.writePluginProperties( pluginDir, "description", "fake desc", "name", "fake-plugin"); IllegalArgumentException e = expectThrows(IllegalArgumentException.class, () -> PluginInfo.readFromProperties(pluginDir)); assertThat(e.getMessage(), containsString("[version] is missing")); @@ -84,7 +84,7 @@ public void testReadFromPropertiesVersionMissing() throws Exception { public void testReadFromPropertiesElasticsearchVersionMissing() throws Exception { Path pluginDir = createTempDir().resolve("fake-plugin"); - PluginTestUtil.writeProperties(pluginDir, + PluginTestUtil.writePluginProperties(pluginDir, "description", "fake desc", "name", "my_plugin", "version", "1.0"); @@ -94,7 +94,7 @@ public void testReadFromPropertiesElasticsearchVersionMissing() throws Exception public void testReadFromPropertiesJavaVersionMissing() throws Exception { Path pluginDir = createTempDir().resolve("fake-plugin"); - PluginTestUtil.writeProperties(pluginDir, + PluginTestUtil.writePluginProperties(pluginDir, "description", "fake desc", "name", "my_plugin", "elasticsearch.version", Version.CURRENT.toString(), @@ -106,7 +106,7 @@ public void testReadFromPropertiesJavaVersionMissing() throws Exception { public void testReadFromPropertiesJavaVersionIncompatible() throws Exception { String pluginName = "fake-plugin"; Path pluginDir = createTempDir().resolve(pluginName); - PluginTestUtil.writeProperties(pluginDir, + PluginTestUtil.writePluginProperties(pluginDir, "description", "fake desc", "name", pluginName, "elasticsearch.version", Version.CURRENT.toString(), @@ -120,7 +120,7 @@ public void testReadFromPropertiesJavaVersionIncompatible() throws Exception { public void testReadFromPropertiesBadJavaVersionFormat() throws Exception { String pluginName = "fake-plugin"; Path pluginDir = createTempDir().resolve(pluginName); - PluginTestUtil.writeProperties(pluginDir, + PluginTestUtil.writePluginProperties(pluginDir, "description", "fake desc", "name", pluginName, "elasticsearch.version", Version.CURRENT.toString(), @@ -134,7 +134,7 @@ public void testReadFromPropertiesBadJavaVersionFormat() throws Exception { public void testReadFromPropertiesBogusElasticsearchVersion() throws Exception { Path pluginDir = createTempDir().resolve("fake-plugin"); - PluginTestUtil.writeProperties(pluginDir, + PluginTestUtil.writePluginProperties(pluginDir, "description", "fake desc", "version", "1.0", "name", "my_plugin", @@ -145,7 +145,7 @@ public void testReadFromPropertiesBogusElasticsearchVersion() throws Exception { public void testReadFromPropertiesOldElasticsearchVersion() throws Exception { Path pluginDir = createTempDir().resolve("fake-plugin"); - PluginTestUtil.writeProperties(pluginDir, + PluginTestUtil.writePluginProperties(pluginDir, "description", "fake desc", "name", "my_plugin", "version", "1.0", @@ -156,7 +156,7 @@ public void testReadFromPropertiesOldElasticsearchVersion() throws Exception { public void testReadFromPropertiesJvmMissingClassname() throws Exception { Path pluginDir = createTempDir().resolve("fake-plugin"); - PluginTestUtil.writeProperties(pluginDir, + PluginTestUtil.writePluginProperties(pluginDir, "description", "fake desc", "name", "my_plugin", "version", "1.0", @@ -168,7 +168,7 @@ public void testReadFromPropertiesJvmMissingClassname() throws Exception { public void testExtendedPluginsSingleExtension() throws Exception { Path pluginDir = createTempDir().resolve("fake-plugin"); - PluginTestUtil.writeProperties(pluginDir, + PluginTestUtil.writePluginProperties(pluginDir, "description", "fake desc", "name", "my_plugin", "version", "1.0", @@ -182,7 +182,7 @@ public void testExtendedPluginsSingleExtension() throws Exception { public void testExtendedPluginsMultipleExtensions() throws Exception { Path pluginDir = createTempDir().resolve("fake-plugin"); - PluginTestUtil.writeProperties(pluginDir, + PluginTestUtil.writePluginProperties(pluginDir, "description", "fake desc", "name", "my_plugin", "version", "1.0", @@ -196,7 +196,7 @@ public void testExtendedPluginsMultipleExtensions() throws Exception { public void testExtendedPluginsEmpty() throws Exception { Path pluginDir = createTempDir().resolve("fake-plugin"); - PluginTestUtil.writeProperties(pluginDir, + PluginTestUtil.writePluginProperties(pluginDir, "description", "fake desc", "name", "my_plugin", "version", "1.0", @@ -224,7 +224,7 @@ public void testPluginListSorted() { List plugins = new ArrayList<>(); plugins.add(new PluginInfo("c", "foo", "dummy", "dummyclass", Collections.emptyList(), randomBoolean(), randomBoolean())); plugins.add(new PluginInfo("b", "foo", "dummy", "dummyclass", Collections.emptyList(),randomBoolean(), randomBoolean())); - plugins.add(new PluginInfo("e", "foo", "dummy", "dummyclass", Collections.emptyList(),randomBoolean(), randomBoolean())); + plugins.add(new PluginInfo( "e", "foo", "dummy", "dummyclass", Collections.emptyList(),randomBoolean(), randomBoolean())); plugins.add(new PluginInfo("a", "foo", "dummy", "dummyclass", Collections.emptyList(),randomBoolean(), randomBoolean())); plugins.add(new PluginInfo("d", "foo", "dummy", "dummyclass", Collections.emptyList(),randomBoolean(), randomBoolean())); PluginsAndModules pluginsInfo = new PluginsAndModules(plugins, Collections.emptyList()); @@ -236,7 +236,7 @@ public void testPluginListSorted() { public void testUnknownProperties() throws Exception { Path pluginDir = createTempDir().resolve("fake-plugin"); - PluginTestUtil.writeProperties(pluginDir, + PluginTestUtil.writePluginProperties(pluginDir, "extra", "property", "unknown", "property", "description", "fake desc", diff --git a/core/src/test/java/org/elasticsearch/plugins/PluginsServiceTests.java b/core/src/test/java/org/elasticsearch/plugins/PluginsServiceTests.java index 16c3eb34b0e63..1bb9d675988d8 100644 --- a/core/src/test/java/org/elasticsearch/plugins/PluginsServiceTests.java +++ b/core/src/test/java/org/elasticsearch/plugins/PluginsServiceTests.java @@ -180,7 +180,7 @@ public void testStartupWithRemovingMarker() throws IOException { Files.createFile(fake.resolve("plugin.jar")); final Path removing = home.resolve("plugins").resolve(".removing-fake"); Files.createFile(removing); - PluginTestUtil.writeProperties( + PluginTestUtil.writePluginProperties( fake, "description", "fake", "name", "fake", @@ -541,7 +541,7 @@ public void testNonExtensibleDep() throws Exception { Settings settings = Settings.builder().put(Environment.PATH_HOME_SETTING.getKey(), homeDir).build(); Path pluginsDir = homeDir.resolve("plugins"); Path mypluginDir = pluginsDir.resolve("myplugin"); - PluginTestUtil.writeProperties( + PluginTestUtil.writePluginProperties( mypluginDir, "description", "whatever", "name", "myplugin", @@ -554,7 +554,7 @@ public void testNonExtensibleDep() throws Exception { Files.copy(jar, mypluginDir.resolve("plugin.jar")); } Path nonextensibleDir = pluginsDir.resolve("nonextensible"); - PluginTestUtil.writeProperties( + PluginTestUtil.writePluginProperties( nonextensibleDir, "description", "whatever", "name", "nonextensible", diff --git a/distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/InstallPluginCommand.java b/distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/InstallPluginCommand.java index 5fedb050ff2e1..216eb46411ac2 100644 --- a/distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/InstallPluginCommand.java +++ b/distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/InstallPluginCommand.java @@ -30,6 +30,7 @@ import org.elasticsearch.cli.ExitCodes; import org.elasticsearch.cli.Terminal; import org.elasticsearch.cli.UserException; +import org.elasticsearch.common.Strings; import org.elasticsearch.common.SuppressForbidden; import org.elasticsearch.common.collect.Tuple; import org.elasticsearch.common.hash.MessageDigests; @@ -86,8 +87,8 @@ *

  • A URL to a plugin zip
    • * * - * Plugins are packaged as zip files. Each packaged plugin must contain a - * plugin properties file. See {@link PluginInfo}. + * Plugins are packaged as zip files. Each packaged plugin must contain a plugin properties file + * or a meta plugin properties file. See {@link PluginInfo} and {@link MetaPluginInfo}, respectively. *

    * The installation process first extracts the plugin files into a temporary * directory in order to verify the plugin satisfies the following requirements: @@ -105,6 +106,11 @@ * files specific to the plugin. The config files be installed into a subdirectory of the * elasticsearch config directory, using the name of the plugin. If any files to be installed * already exist, they will be skipped. + *

    + * If the plugin is a meta plugin, the installation process installs each plugin separately + * inside the meta plugin directory. The {@code bin} and {@code config} directory are also moved + * inside the meta plugin directory. + *

    */ class InstallPluginCommand extends EnvironmentAwareCommand { @@ -527,22 +533,44 @@ private Path stagingDirectoryWithoutPosixPermissions(Path pluginsDir) throws IOE return Files.createTempDirectory(pluginsDir, ".installing-"); } - /** Load information about the plugin, and verify it can be installed with no errors. */ - private PluginInfo verify(Terminal terminal, Path pluginRoot, boolean isBatch, Environment env) throws Exception { - // read and validate the plugin descriptor - PluginInfo info = PluginInfo.readFromProperties(pluginRoot); - - // checking for existing version of the plugin - final Path destination = env.pluginsFile().resolve(info.getName()); + // checking for existing version of the plugin + private void verifyPluginName(Path pluginPath, String pluginName, Path candidateDir) throws UserException, IOException { + final Path destination = pluginPath.resolve(pluginName); if (Files.exists(destination)) { final String message = String.format( Locale.ROOT, "plugin directory [%s] already exists; if you need to update the plugin, " + "uninstall it first using command 'remove %s'", destination.toAbsolutePath(), - info.getName()); + pluginName); throw new UserException(PLUGIN_EXISTS, message); } + // checks meta plugins too + try (DirectoryStream stream = Files.newDirectoryStream(pluginPath)) { + for (Path plugin : stream) { + if (candidateDir.equals(plugin.resolve(pluginName))) { + continue; + } + if (MetaPluginInfo.isMetaPlugin(plugin) && Files.exists(plugin.resolve(pluginName))) { + final MetaPluginInfo info = MetaPluginInfo.readFromProperties(plugin); + final String message = String.format( + Locale.ROOT, + "plugin name [%s] already exists in a meta plugin; if you need to update the meta plugin, " + + "uninstall it first using command 'remove %s'", + plugin.resolve(pluginName).toAbsolutePath(), + info.getName()); + throw new UserException(PLUGIN_EXISTS, message); + } + } + } + } + + /** Load information about the plugin, and verify it can be installed with no errors. */ + private PluginInfo verify(Terminal terminal, Path pluginRoot, boolean isBatch, Environment env) throws Exception { + final PluginInfo info = PluginInfo.readFromProperties(pluginRoot); + + // checking for existing version of the plugin + verifyPluginName(env.pluginsFile(), info.getName(), pluginRoot); PluginsService.checkForFailedPluginRemovals(env.pluginsFile()); @@ -569,14 +597,15 @@ private PluginInfo verify(Terminal terminal, Path pluginRoot, boolean isBatch, E } /** check a candidate plugin for jar hell before installing it */ - void jarHellCheck(PluginInfo info, Path candidate, Path pluginsDir, Path modulesDir) throws Exception { + void jarHellCheck(PluginInfo candidateInfo, Path candidateDir, Path pluginsDir, Path modulesDir) throws Exception { // create list of current jars in classpath final Set jars = new HashSet<>(JarHell.parseClassPath()); + // read existing bundles. this does some checks on the installation too. Set bundles = new HashSet<>(PluginsService.getPluginBundles(pluginsDir)); bundles.addAll(PluginsService.getModuleBundles(modulesDir)); - bundles.add(new PluginsService.Bundle(info, candidate)); + bundles.add(new PluginsService.Bundle(candidateInfo, candidateDir)); List sortedBundles = PluginsService.sortBundles(bundles); // check jarhell of all plugins so we know this plugin and anything depending on it are ok together @@ -590,78 +619,138 @@ void jarHellCheck(PluginInfo info, Path candidate, Path pluginsDir, Path modules // TODO: verify the classname exists in one of the jars! } - /** - * Installs the plugin from {@code tmpRoot} into the plugins dir. - * If the plugin has a bin dir and/or a config dir, those are copied. - */ private void install(Terminal terminal, boolean isBatch, Path tmpRoot, Environment env) throws Exception { List deleteOnFailure = new ArrayList<>(); deleteOnFailure.add(tmpRoot); - try { - PluginInfo info = verify(terminal, tmpRoot, isBatch, env); - final Path destination = env.pluginsFile().resolve(info.getName()); + if (MetaPluginInfo.isMetaPlugin(tmpRoot)) { + installMetaPlugin(terminal, isBatch, tmpRoot, env, deleteOnFailure); + } else { + installPlugin(terminal, isBatch, tmpRoot, env, deleteOnFailure); + } + } catch (Exception installProblem) { + try { + IOUtils.rm(deleteOnFailure.toArray(new Path[0])); + } catch (IOException exceptionWhileRemovingFiles) { + installProblem.addSuppressed(exceptionWhileRemovingFiles); + } + throw installProblem; + } + } - Path tmpBinDir = tmpRoot.resolve("bin"); + /** + * Installs the meta plugin and all the bundled plugins from {@code tmpRoot} into the plugins dir. + * If a bundled plugin has a bin dir and/or a config dir, those are copied. + */ + private void installMetaPlugin(Terminal terminal, boolean isBatch, Path tmpRoot, + Environment env, List deleteOnFailure) throws Exception { + final MetaPluginInfo metaInfo = MetaPluginInfo.readFromProperties(tmpRoot); + verifyPluginName(env.pluginsFile(), metaInfo.getName(), tmpRoot); + final Path destination = env.pluginsFile().resolve(metaInfo.getName()); + deleteOnFailure.add(destination); + terminal.println(VERBOSE, metaInfo.toString()); + final List pluginPaths = new ArrayList<>(); + try (DirectoryStream paths = Files.newDirectoryStream(tmpRoot)) { + // Extract bundled plugins path and validate plugin names + for (Path plugin : paths) { + if (MetaPluginInfo.isPropertiesFile(plugin)) { + continue; + } + final PluginInfo info = PluginInfo.readFromProperties(plugin); + verifyPluginName(env.pluginsFile(), info.getName(), plugin); + pluginPaths.add(plugin); + } + } + final List pluginInfos = new ArrayList<>(); + for (Path plugin : pluginPaths) { + final PluginInfo info = verify(terminal, plugin, isBatch, env); + pluginInfos.add(info); + Path tmpBinDir = plugin.resolve("bin"); if (Files.exists(tmpBinDir)) { - Path destBinDir = env.binFile().resolve(info.getName()); + Path destBinDir = env.binFile().resolve(metaInfo.getName()).resolve(info.getName()); deleteOnFailure.add(destBinDir); installBin(info, tmpBinDir, destBinDir); } - Path tmpConfigDir = tmpRoot.resolve("config"); + Path tmpConfigDir = plugin.resolve("config"); if (Files.exists(tmpConfigDir)) { // some files may already exist, and we don't remove plugin config files on plugin removal, // so any installed config files are left on failure too - installConfig(info, tmpConfigDir, env.configFile().resolve(info.getName())); + Path destConfigDir = env.configFile().resolve(metaInfo.getName()).resolve(info.getName()); + installConfig(info, tmpConfigDir, destConfigDir); } + } + movePlugin(tmpRoot, destination); + for (PluginInfo info : pluginInfos) { + if (info.requiresKeystore()) { + createKeystoreIfNeeded(terminal, env, info); + break; + } + } + String[] plugins = pluginInfos.stream().map(PluginInfo::getName).toArray(String[]::new); + terminal.println("-> Installed " + metaInfo.getName() + " with: " + Strings.arrayToCommaDelimitedString(plugins)); + } - Files.move(tmpRoot, destination, StandardCopyOption.ATOMIC_MOVE); - Files.walkFileTree(destination, new SimpleFileVisitor() { - @Override - public FileVisitResult visitFile(final Path file, final BasicFileAttributes attrs) throws IOException { - if ("bin".equals(file.getParent().getFileName().toString())) { - setFileAttributes(file, BIN_FILES_PERMS); - } else { - setFileAttributes(file, PLUGIN_FILES_PERMS); - } - return FileVisitResult.CONTINUE; - } + /** + * Installs the plugin from {@code tmpRoot} into the plugins dir. + * If the plugin has a bin dir and/or a config dir, those are copied. + */ + private void installPlugin(Terminal terminal, boolean isBatch, Path tmpRoot, + Environment env, List deleteOnFailure) throws Exception { + final PluginInfo info = verify(terminal, tmpRoot, isBatch, env); + final Path destination = env.pluginsFile().resolve(info.getName()); + deleteOnFailure.add(destination); - @Override - public FileVisitResult postVisitDirectory(final Path dir, final IOException exc) throws IOException { - setFileAttributes(dir, PLUGIN_DIR_PERMS); - return FileVisitResult.CONTINUE; - } - }); + Path tmpBinDir = tmpRoot.resolve("bin"); + if (Files.exists(tmpBinDir)) { + Path destBinDir = env.binFile().resolve(info.getName()); + deleteOnFailure.add(destBinDir); + installBin(info, tmpBinDir, destBinDir); + } - if (info.requiresKeystore()) { - KeyStoreWrapper keystore = KeyStoreWrapper.load(env.configFile()); - if (keystore == null) { - terminal.println("Elasticsearch keystore is required by plugin [" + info.getName() + "], creating..."); - keystore = KeyStoreWrapper.create(new char[0]); - keystore.save(env.configFile()); + Path tmpConfigDir = tmpRoot.resolve("config"); + if (Files.exists(tmpConfigDir)) { + // some files may already exist, and we don't remove plugin config files on plugin removal, + // so any installed config files are left on failure too + Path destConfigDir = env.configFile().resolve(info.getName()); + installConfig(info, tmpConfigDir, destConfigDir); + } + movePlugin(tmpRoot, destination); + if (info.requiresKeystore()) { + createKeystoreIfNeeded(terminal, env, info); + } + terminal.println("-> Installed " + info.getName()); + } + + /** Moves the plugin directory into its final destination. **/ + private void movePlugin(Path tmpRoot, Path destination) throws IOException { + Files.move(tmpRoot, destination, StandardCopyOption.ATOMIC_MOVE); + Files.walkFileTree(destination, new SimpleFileVisitor() { + @Override + public FileVisitResult visitFile(final Path file, final BasicFileAttributes attrs) throws IOException { + if ("bin".equals(file.getParent().getFileName().toString())) { + setFileAttributes(file, BIN_FILES_PERMS); + } else { + setFileAttributes(file, PLUGIN_FILES_PERMS); } + return FileVisitResult.CONTINUE; } - terminal.println("-> Installed " + info.getName()); - - } catch (Exception installProblem) { - try { - IOUtils.rm(deleteOnFailure.toArray(new Path[0])); - } catch (IOException exceptionWhileRemovingFiles) { - installProblem.addSuppressed(exceptionWhileRemovingFiles); + @Override + public FileVisitResult postVisitDirectory(final Path dir, final IOException exc) throws IOException { + setFileAttributes(dir, PLUGIN_DIR_PERMS); + return FileVisitResult.CONTINUE; } - throw installProblem; - } + }); } + /** Copies the files from {@code tmpBinDir} into {@code destBinDir}, along with permissions from dest dirs parent. */ private void installBin(PluginInfo info, Path tmpBinDir, Path destBinDir) throws Exception { if (Files.isDirectory(tmpBinDir) == false) { throw new UserException(PLUGIN_MALFORMED, "bin in plugin " + info.getName() + " is not a directory"); } - Files.createDirectory(destBinDir); + Files.createDirectories(destBinDir); setFileAttributes(destBinDir, BIN_DIR_PERMS); try (DirectoryStream stream = Files.newDirectoryStream(tmpBinDir)) { @@ -719,6 +808,15 @@ private void installConfig(PluginInfo info, Path tmpConfigDir, Path destConfigDi IOUtils.rm(tmpConfigDir); // clean up what we just copied } + private void createKeystoreIfNeeded(Terminal terminal, Environment env, PluginInfo info) throws Exception { + KeyStoreWrapper keystore = KeyStoreWrapper.load(env.configFile()); + if (keystore == null) { + terminal.println("Elasticsearch keystore is required by plugin [" + info.getName() + "], creating..."); + keystore = KeyStoreWrapper.create(new char[0]); + keystore.save(env.configFile()); + } + } + private static void setOwnerGroup(final Path path, final PosixFileAttributes attributes) throws IOException { Objects.requireNonNull(attributes); PosixFileAttributeView fileAttributeView = Files.getFileAttributeView(path, PosixFileAttributeView.class); diff --git a/distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/ListPluginsCommand.java b/distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/ListPluginsCommand.java index c2b5ce34b5469..70acf62bd8e1c 100644 --- a/distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/ListPluginsCommand.java +++ b/distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/ListPluginsCommand.java @@ -22,6 +22,7 @@ import joptsimple.OptionSet; import org.elasticsearch.cli.EnvironmentAwareCommand; import org.elasticsearch.cli.Terminal; +import org.elasticsearch.common.Nullable; import org.elasticsearch.env.Environment; import java.io.IOException; @@ -29,8 +30,11 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; /** * A command for the plugin cli to list plugins installed in elasticsearch. @@ -56,16 +60,38 @@ protected void execute(Terminal terminal, OptionSet options, Environment env) th } Collections.sort(plugins); for (final Path plugin : plugins) { - terminal.println(Terminal.Verbosity.SILENT, plugin.getFileName().toString()); - try { - PluginInfo info = PluginInfo.readFromProperties(env.pluginsFile().resolve(plugin.toAbsolutePath())); - terminal.println(Terminal.Verbosity.VERBOSE, info.toString()); - } catch (IllegalArgumentException e) { - if (e.getMessage().contains("incompatible with version")) { - terminal.println("WARNING: " + e.getMessage()); - } else { - throw e; + if (MetaPluginInfo.isMetaPlugin(plugin)) { + MetaPluginInfo metaInfo = MetaPluginInfo.readFromProperties(plugin); + List subPluginPaths = new ArrayList<>(); + try (DirectoryStream subPaths = Files.newDirectoryStream(plugin)) { + for (Path subPlugin : subPaths) { + if (MetaPluginInfo.isPropertiesFile(subPlugin)) { + continue; + } + subPluginPaths.add(subPlugin); + } } + Collections.sort(subPluginPaths); + terminal.println(Terminal.Verbosity.SILENT, metaInfo.getName()); + for (Path subPlugin : subPluginPaths) { + printPlugin(env, terminal, subPlugin, "\t"); + } + } else { + printPlugin(env, terminal, plugin, ""); + } + } + } + + private void printPlugin(Environment env, Terminal terminal, Path plugin, String prefix) throws IOException { + terminal.println(Terminal.Verbosity.SILENT, prefix + plugin.getFileName().toString()); + try { + PluginInfo info = PluginInfo.readFromProperties(env.pluginsFile().resolve(plugin.toAbsolutePath())); + terminal.println(Terminal.Verbosity.VERBOSE, info.toString(prefix)); + } catch (IllegalArgumentException e) { + if (e.getMessage().contains("incompatible with version")) { + terminal.println("WARNING: " + e.getMessage()); + } else { + throw e; } } } diff --git a/distribution/tools/plugin-cli/src/test/java/org/elasticsearch/plugins/InstallPluginCommandTests.java b/distribution/tools/plugin-cli/src/test/java/org/elasticsearch/plugins/InstallPluginCommandTests.java index e545609ccbff1..9d05fe1e76654 100644 --- a/distribution/tools/plugin-cli/src/test/java/org/elasticsearch/plugins/InstallPluginCommandTests.java +++ b/distribution/tools/plugin-cli/src/test/java/org/elasticsearch/plugins/InstallPluginCommandTests.java @@ -115,7 +115,7 @@ public void setUp() throws Exception { super.setUp(); skipJarHellCommand = new InstallPluginCommand() { @Override - void jarHellCheck(PluginInfo info, Path candidate, Path pluginsDir, Path modulesDir) throws Exception { + void jarHellCheck(PluginInfo candidateInfo, Path candidate, Path pluginsDir, Path modulesDir) throws Exception { // no jarhell check } }; @@ -214,7 +214,19 @@ static String createPluginUrl(String name, Path structure, String... additionalP return createPlugin(name, structure, false, additionalProps).toUri().toURL().toString(); } - static Path createPlugin(String name, Path structure, boolean createSecurityPolicyFile, String... additionalProps) throws IOException { + /** creates an meta plugin .zip and returns the url for testing */ + static String createMetaPluginUrl(String name, Path structure) throws IOException { + return createMetaPlugin(name, structure).toUri().toURL().toString(); + } + + static void writeMetaPlugin(String name, Path structure) throws IOException { + PluginTestUtil.writeMetaPluginProperties(structure, + "description", "fake desc", + "name", name + ); + } + + static void writePlugin(String name, Path structure, boolean createSecurityPolicyFile, String... additionalProps) throws IOException { String[] properties = Stream.concat(Stream.of( "description", "fake desc", "name", name, @@ -223,12 +235,22 @@ static Path createPlugin(String name, Path structure, boolean createSecurityPoli "java.version", System.getProperty("java.specification.version"), "classname", "FakePlugin" ), Arrays.stream(additionalProps)).toArray(String[]::new); - PluginTestUtil.writeProperties(structure, properties); + PluginTestUtil.writePluginProperties(structure, properties); if (createSecurityPolicyFile) { String securityPolicyContent = "grant {\n permission java.lang.RuntimePermission \"setFactory\";\n};\n"; Files.write(structure.resolve("plugin-security.policy"), securityPolicyContent.getBytes(StandardCharsets.UTF_8)); } - writeJar(structure.resolve("plugin.jar"), "FakePlugin"); + String className = name.substring(0, 1).toUpperCase(Locale.ENGLISH) + name.substring(1) + "Plugin"; + writeJar(structure.resolve("plugin.jar"), className); + } + + static Path createPlugin(String name, Path structure, boolean createSecurityPolicyFile, String... additionalProps) throws IOException { + writePlugin(name, structure, createSecurityPolicyFile, additionalProps); + return writeZip(structure, "elasticsearch"); + } + + static Path createMetaPlugin(String name, Path structure) throws IOException { + writeMetaPlugin(name, structure); return writeZip(structure, "elasticsearch"); } @@ -243,8 +265,20 @@ MockTerminal installPlugin(String pluginUrl, Path home, InstallPluginCommand com return terminal; } + void assertMetaPlugin(String metaPlugin, String name, Path original, Environment env) throws IOException { + assertPluginInternal(name, original, env, + env.pluginsFile().resolve(metaPlugin), env.configFile().resolve(metaPlugin), env.binFile().resolve(metaPlugin)); + } + + void assertPlugin(String name, Path original, Environment env) throws IOException { - Path got = env.pluginsFile().resolve(name); + assertPluginInternal(name, original, env, + env.pluginsFile(), env.configFile(), env.binFile()); + } + + void assertPluginInternal(String name, Path original, Environment env, + Path pluginsFile, Path configFile, Path binFile) throws IOException { + Path got = pluginsFile.resolve(name); assertTrue("dir " + name + " exists", Files.exists(got)); if (isPosix) { @@ -265,12 +299,12 @@ void assertPlugin(String name, Path original, Environment env) throws IOExceptio assertFalse("bin was not copied", Files.exists(got.resolve("bin"))); assertFalse("config was not copied", Files.exists(got.resolve("config"))); if (Files.exists(original.resolve("bin"))) { - Path binDir = env.binFile().resolve(name); + Path binDir = binFile.resolve(name); assertTrue("bin dir exists", Files.exists(binDir)); assertTrue("bin is a dir", Files.isDirectory(binDir)); PosixFileAttributes binAttributes = null; if (isPosix) { - binAttributes = Files.readAttributes(env.binFile(), PosixFileAttributes.class); + binAttributes = Files.readAttributes(binFile, PosixFileAttributes.class); } try (DirectoryStream stream = Files.newDirectoryStream(binDir)) { for (Path file : stream) { @@ -283,7 +317,7 @@ void assertPlugin(String name, Path original, Environment env) throws IOExceptio } } if (Files.exists(original.resolve("config"))) { - Path configDir = env.configFile().resolve(name); + Path configDir = configFile.resolve(name); assertTrue("config dir exists", Files.exists(configDir)); assertTrue("config is a dir", Files.isDirectory(configDir)); @@ -292,7 +326,7 @@ void assertPlugin(String name, Path original, Environment env) throws IOExceptio if (isPosix) { PosixFileAttributes configAttributes = - Files.getFileAttributeView(env.configFile(), PosixFileAttributeView.class).readAttributes(); + Files.getFileAttributeView(configFile, PosixFileAttributeView.class).readAttributes(); user = configAttributes.owner(); group = configAttributes.group(); @@ -344,9 +378,23 @@ public void testSomethingWorks() throws Exception { assertPlugin("fake", pluginDir, env.v2()); } - public void testInstallFailsIfPreviouslyRemovedPluginFailed() throws Exception { + public void testWithMetaPlugin() throws Exception { Tuple env = createEnv(fs, temp); Path pluginDir = createPluginDir(temp); + Files.createDirectory(pluginDir.resolve("fake1")); + writePlugin("fake1", pluginDir.resolve("fake1"), false); + Files.createDirectory(pluginDir.resolve("fake2")); + writePlugin("fake2", pluginDir.resolve("fake2"), false); + String pluginZip = createMetaPluginUrl("my_plugins", pluginDir); + installPlugin(pluginZip, env.v1()); + assertMetaPlugin("my_plugins", "fake1", pluginDir, env.v2()); + assertMetaPlugin("my_plugins", "fake2", pluginDir, env.v2()); + } + + public void testInstallFailsIfPreviouslyRemovedPluginFailed() throws Exception { + Tuple env = createEnv(fs, temp); + Path metaDir = createPluginDir(temp); + Path pluginDir = metaDir.resolve("fake"); String pluginZip = createPluginUrl("fake", pluginDir); final Path removing = env.v2().pluginsFile().resolve(".removing-failed"); Files.createDirectory(removing); @@ -356,6 +404,11 @@ public void testInstallFailsIfPreviouslyRemovedPluginFailed() throws Exception { "found file [%s] from a failed attempt to remove the plugin [failed]; execute [elasticsearch-plugin remove failed]", removing); assertThat(e, hasToString(containsString(expected))); + + // test with meta plugin + String metaZip = createMetaPluginUrl("my_plugins", metaDir); + final IllegalStateException e1 = expectThrows(IllegalStateException.class, () -> installPlugin(metaZip, env.v1())); + assertThat(e1, hasToString(containsString(expected))); } public void testSpaceInUrl() throws Exception { @@ -418,6 +471,23 @@ public void testJarHell() throws Exception { assertInstallCleaned(environment.v2()); } + public void testJarHellInMetaPlugin() throws Exception { + // jar hell test needs a real filesystem + assumeTrue("real filesystem", isReal); + Tuple environment = createEnv(fs, temp); + Path pluginDir = createPluginDir(temp); + Files.createDirectory(pluginDir.resolve("fake1")); + writePlugin("fake1", pluginDir.resolve("fake1"), false); + Files.createDirectory(pluginDir.resolve("fake2")); + writePlugin("fake2", pluginDir.resolve("fake2"), false); // adds plugin.jar with Fake2Plugin + writeJar(pluginDir.resolve("fake2").resolve("other.jar"), "Fake2Plugin"); + String pluginZip = createMetaPluginUrl("my_plugins", pluginDir); + IllegalStateException e = expectThrows(IllegalStateException.class, + () -> installPlugin(pluginZip, environment.v1(), defaultCommand)); + assertTrue(e.getMessage(), e.getMessage().contains("jar hell")); + assertInstallCleaned(environment.v2()); + } + public void testIsolatedPlugins() throws Exception { Tuple env = createEnv(fs, temp); // these both share the same FakePlugin class @@ -441,6 +511,23 @@ public void testExistingPlugin() throws Exception { assertInstallCleaned(env.v2()); } + public void testExistingMetaPlugin() throws Exception { + Tuple env = createEnv(fs, temp); + Path metaZip = createPluginDir(temp); + Path pluginDir = metaZip.resolve("fake"); + Files.createDirectory(pluginDir); + String pluginZip = createPluginUrl("fake", pluginDir); + installPlugin(pluginZip, env.v1()); + UserException e = expectThrows(UserException.class, () -> installPlugin(pluginZip, env.v1())); + assertTrue(e.getMessage(), e.getMessage().contains("already exists")); + assertInstallCleaned(env.v2()); + + String anotherZip = createMetaPluginUrl("another_plugins", metaZip); + e = expectThrows(UserException.class, () -> installPlugin(anotherZip, env.v1())); + assertTrue(e.getMessage(), e.getMessage().contains("already exists")); + assertInstallCleaned(env.v2()); + } + public void testBin() throws Exception { Tuple env = createEnv(fs, temp); Path pluginDir = createPluginDir(temp); @@ -452,20 +539,43 @@ public void testBin() throws Exception { assertPlugin("fake", pluginDir, env.v2()); } + public void testMetaBin() throws Exception { + Tuple env = createEnv(fs, temp); + Path metaDir = createPluginDir(temp); + Path pluginDir = metaDir.resolve("fake"); + Files.createDirectory(pluginDir); + writePlugin("fake", pluginDir, false); + Path binDir = pluginDir.resolve("bin"); + Files.createDirectory(binDir); + Files.createFile(binDir.resolve("somescript")); + String pluginZip = createMetaPluginUrl("my_plugins", metaDir); + installPlugin(pluginZip, env.v1()); + assertMetaPlugin("my_plugins","fake", pluginDir, env.v2()); + } + public void testBinNotDir() throws Exception { Tuple env = createEnv(fs, temp); - Path pluginDir = createPluginDir(temp); + Path metaDir = createPluginDir(temp); + Path pluginDir = metaDir.resolve("fake"); + Files.createDirectory(pluginDir); Path binDir = pluginDir.resolve("bin"); Files.createFile(binDir); String pluginZip = createPluginUrl("fake", pluginDir); UserException e = expectThrows(UserException.class, () -> installPlugin(pluginZip, env.v1())); assertTrue(e.getMessage(), e.getMessage().contains("not a directory")); assertInstallCleaned(env.v2()); + + String metaZip = createMetaPluginUrl("my_plugins", metaDir); + e = expectThrows(UserException.class, () -> installPlugin(metaZip, env.v1())); + assertTrue(e.getMessage(), e.getMessage().contains("not a directory")); + assertInstallCleaned(env.v2()); } public void testBinContainsDir() throws Exception { Tuple env = createEnv(fs, temp); - Path pluginDir = createPluginDir(temp); + Path metaDir = createPluginDir(temp); + Path pluginDir = metaDir.resolve("fake"); + Files.createDirectory(pluginDir); Path dirInBinDir = pluginDir.resolve("bin").resolve("foo"); Files.createDirectories(dirInBinDir); Files.createFile(dirInBinDir.resolve("somescript")); @@ -473,11 +583,16 @@ public void testBinContainsDir() throws Exception { UserException e = expectThrows(UserException.class, () -> installPlugin(pluginZip, env.v1())); assertTrue(e.getMessage(), e.getMessage().contains("Directories not allowed in bin dir for plugin")); assertInstallCleaned(env.v2()); + + String metaZip = createMetaPluginUrl("my_plugins", metaDir); + e = expectThrows(UserException.class, () -> installPlugin(metaZip, env.v1())); + assertTrue(e.getMessage(), e.getMessage().contains("Directories not allowed in bin dir for plugin")); + assertInstallCleaned(env.v2()); } public void testBinConflict() throws Exception { Tuple env = createEnv(fs, temp); - Path pluginDir = createPluginDir(temp); + Path pluginDir = createPluginDir(temp); Path binDir = pluginDir.resolve("bin"); Files.createDirectory(binDir); Files.createFile(binDir.resolve("somescript")); @@ -505,6 +620,27 @@ public void testBinPermissions() throws Exception { } } + public void testMetaBinPermissions() throws Exception { + assumeTrue("posix filesystem", isPosix); + Tuple env = createEnv(fs, temp); + Path metaDir = createPluginDir(temp); + Path pluginDir = metaDir.resolve("fake"); + Files.createDirectory(pluginDir); + writePlugin("fake", pluginDir, false); + Path binDir = pluginDir.resolve("bin"); + Files.createDirectory(binDir); + Files.createFile(binDir.resolve("somescript")); + String pluginZip = createMetaPluginUrl("my_plugins", metaDir); + try (PosixPermissionsResetter binAttrs = new PosixPermissionsResetter(env.v2().binFile())) { + Set perms = binAttrs.getCopyPermissions(); + // make sure at least one execute perm is missing, so we know we forced it during installation + perms.remove(PosixFilePermission.GROUP_EXECUTE); + binAttrs.setPermissions(perms); + installPlugin(pluginZip, env.v1()); + assertMetaPlugin("my_plugins", "fake", pluginDir, env.v2()); + } + } + public void testPluginPermissions() throws Exception { assumeTrue("posix filesystem", isPosix); @@ -596,15 +732,44 @@ public void testExistingConfig() throws Exception { assertTrue(Files.exists(envConfigDir.resolve("other.yml"))); } + public void testExistingMetaConfig() throws Exception { + Tuple env = createEnv(fs, temp); + Path envConfigDir = env.v2().configFile().resolve("my_plugins").resolve("fake"); + Files.createDirectories(envConfigDir); + Files.write(envConfigDir.resolve("custom.yml"), "existing config".getBytes(StandardCharsets.UTF_8)); + Path metaDir = createPluginDir(temp); + Path pluginDir = metaDir.resolve("fake"); + Files.createDirectory(pluginDir); + writePlugin("fake", pluginDir, false); + Path configDir = pluginDir.resolve("config"); + Files.createDirectory(configDir); + Files.write(configDir.resolve("custom.yml"), "new config".getBytes(StandardCharsets.UTF_8)); + Files.createFile(configDir.resolve("other.yml")); + String pluginZip = createMetaPluginUrl("my_plugins", metaDir); + installPlugin(pluginZip, env.v1()); + assertMetaPlugin("my_plugins", "fake", pluginDir, env.v2()); + List configLines = Files.readAllLines(envConfigDir.resolve("custom.yml"), StandardCharsets.UTF_8); + assertEquals(1, configLines.size()); + assertEquals("existing config", configLines.get(0)); + assertTrue(Files.exists(envConfigDir.resolve("other.yml"))); + } + public void testConfigNotDir() throws Exception { Tuple env = createEnv(fs, temp); - Path pluginDir = createPluginDir(temp); + Path metaDir = createPluginDir(temp); + Path pluginDir = metaDir.resolve("fake"); + Files.createDirectories(pluginDir); Path configDir = pluginDir.resolve("config"); Files.createFile(configDir); String pluginZip = createPluginUrl("fake", pluginDir); UserException e = expectThrows(UserException.class, () -> installPlugin(pluginZip, env.v1())); assertTrue(e.getMessage(), e.getMessage().contains("not a directory")); assertInstallCleaned(env.v2()); + + String metaZip = createMetaPluginUrl("my_plugins", metaDir); + e = expectThrows(UserException.class, () -> installPlugin(metaZip, env.v1())); + assertTrue(e.getMessage(), e.getMessage().contains("not a directory")); + assertInstallCleaned(env.v2()); } public void testConfigContainsDir() throws Exception { @@ -619,26 +784,21 @@ public void testConfigContainsDir() throws Exception { assertInstallCleaned(env.v2()); } - public void testConfigConflict() throws Exception { - Tuple env = createEnv(fs, temp); - Path pluginDir = createPluginDir(temp); - Path configDir = pluginDir.resolve("config"); - Files.createDirectory(configDir); - Files.createFile(configDir.resolve("myconfig.yml")); - String pluginZip = createPluginUrl("elasticsearch.yml", pluginDir); - FileAlreadyExistsException e = expectThrows(FileAlreadyExistsException.class, () -> installPlugin(pluginZip, env.v1())); - assertTrue(e.getMessage(), e.getMessage().contains(env.v2().configFile().resolve("elasticsearch.yml").toString())); - assertInstallCleaned(env.v2()); - } - public void testMissingDescriptor() throws Exception { Tuple env = createEnv(fs, temp); - Path pluginDir = createPluginDir(temp); + Path metaDir = createPluginDir(temp); + Path pluginDir = metaDir.resolve("fake"); + Files.createDirectory(pluginDir); Files.createFile(pluginDir.resolve("fake.yml")); String pluginZip = writeZip(pluginDir, "elasticsearch").toUri().toURL().toString(); NoSuchFileException e = expectThrows(NoSuchFileException.class, () -> installPlugin(pluginZip, env.v1())); assertTrue(e.getMessage(), e.getMessage().contains("plugin-descriptor.properties")); assertInstallCleaned(env.v2()); + + String metaZip = createMetaPluginUrl("my_plugins", metaDir); + e = expectThrows(NoSuchFileException.class, () -> installPlugin(metaZip, env.v1())); + assertTrue(e.getMessage(), e.getMessage().contains("plugin-descriptor.properties")); + assertInstallCleaned(env.v2()); } public void testMissingDirectory() throws Exception { @@ -651,6 +811,16 @@ public void testMissingDirectory() throws Exception { assertInstallCleaned(env.v2()); } + public void testMissingDirectoryMeta() throws Exception { + Tuple env = createEnv(fs, temp); + Path pluginDir = createPluginDir(temp); + Files.createFile(pluginDir.resolve(MetaPluginInfo.ES_META_PLUGIN_PROPERTIES)); + String pluginZip = writeZip(pluginDir, null).toUri().toURL().toString(); + UserException e = expectThrows(UserException.class, () -> installPlugin(pluginZip, env.v1())); + assertTrue(e.getMessage(), e.getMessage().contains("`elasticsearch` directory is missing in the plugin zip")); + assertInstallCleaned(env.v2()); + } + public void testZipRelativeOutsideEntryName() throws Exception { Tuple env = createEnv(fs, temp); Path zip = createTempDir().resolve("broken.zip"); @@ -748,6 +918,29 @@ public void testPluginAlreadyInstalled() throws Exception { "if you need to update the plugin, uninstall it first using command 'remove fake'")); } + public void testMetaPluginAlreadyInstalled() throws Exception { + Tuple env = createEnv(fs, temp); + { + // install fake plugin + Path pluginDir = createPluginDir(temp); + String pluginZip = createPluginUrl("fake", pluginDir); + installPlugin(pluginZip, env.v1()); + } + + Path pluginDir = createPluginDir(temp); + Files.createDirectory(pluginDir.resolve("fake")); + writePlugin("fake", pluginDir.resolve("fake"), false); + Files.createDirectory(pluginDir.resolve("other")); + writePlugin("other", pluginDir.resolve("other"), false); + String metaZip = createMetaPluginUrl("meta", pluginDir); + final UserException e = expectThrows(UserException.class, + () -> installPlugin(metaZip, env.v1(), randomFrom(skipJarHellCommand, defaultCommand))); + assertThat( + e.getMessage(), + equalTo("plugin directory [" + env.v2().pluginsFile().resolve("fake") + "] already exists; " + + "if you need to update the plugin, uninstall it first using command 'remove fake'")); + } + private void installPlugin(MockTerminal terminal, boolean isBatch) throws Exception { Tuple env = createEnv(fs, temp); Path pluginDir = createPluginDir(temp); @@ -791,7 +984,7 @@ String getStagingHash() { return stagingHash; } @Override - void jarHellCheck(PluginInfo info, Path candidate, Path pluginsDir, Path modulesDir) throws Exception { + void jarHellCheck(PluginInfo candidateInfo, Path candidate, Path pluginsDir, Path modulesDir) throws Exception { // no jarhell check } }; @@ -951,6 +1144,17 @@ public void testKeystoreRequiredCreated() throws Exception { assertTrue(Files.exists(KeyStoreWrapper.keystorePath(env.v2().configFile()))); } + public void testKeystoreRequiredCreatedWithMetaPlugin() throws Exception { + Tuple env = createEnv(fs, temp); + Path metaDir = createPluginDir(temp); + Path pluginDir = metaDir.resolve("fake"); + Files.createDirectory(pluginDir); + writePlugin("fake", pluginDir, false, "requires.keystore", "true"); + String metaZip = createMetaPluginUrl("my_plugins", metaDir); + MockTerminal terminal = installPlugin(metaZip, env.v1()); + assertTrue(Files.exists(KeyStoreWrapper.keystorePath(env.v2().configFile()))); + } + private Function checksum(final MessageDigest digest) { return checksumAndString(digest, ""); } diff --git a/distribution/tools/plugin-cli/src/test/java/org/elasticsearch/plugins/ListPluginsCommandTests.java b/distribution/tools/plugin-cli/src/test/java/org/elasticsearch/plugins/ListPluginsCommandTests.java index 4a243daf2ba70..372a4cae8f263 100644 --- a/distribution/tools/plugin-cli/src/test/java/org/elasticsearch/plugins/ListPluginsCommandTests.java +++ b/distribution/tools/plugin-cli/src/test/java/org/elasticsearch/plugins/ListPluginsCommandTests.java @@ -33,7 +33,6 @@ import org.elasticsearch.Version; import org.elasticsearch.cli.ExitCodes; import org.elasticsearch.cli.MockTerminal; -import org.elasticsearch.cli.Terminal; import org.elasticsearch.cli.UserException; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.env.Environment; @@ -94,18 +93,39 @@ private static void buildFakePlugin( final String description, final String name, final String classname) throws IOException { - buildFakePlugin(env, description, name, classname, false, false); + buildFakePlugin(env, null, description, name, classname, false, false); } private static void buildFakePlugin( final Environment env, + final String metaPlugin, + final String description, + final String name, + final String classname) throws IOException { + buildFakePlugin(env, metaPlugin, description, name, classname, false, false); + } + + private static void buildFakePlugin( + final Environment env, + final String description, + final String name, + final String classname, + final boolean hasNativeController, + final boolean requiresKeystore) throws IOException { + buildFakePlugin(env, null, description, name, classname, hasNativeController, requiresKeystore); + } + + private static void buildFakePlugin( + final Environment env, + final String metaPlugin, final String description, final String name, final String classname, final boolean hasNativeController, final boolean requiresKeystore) throws IOException { - PluginTestUtil.writeProperties( - env.pluginsFile().resolve(name), + Path dest = metaPlugin != null ? env.pluginsFile().resolve(metaPlugin) : env.pluginsFile(); + PluginTestUtil.writePluginProperties( + dest.resolve(name), "description", description, "name", name, "version", "1.0", @@ -116,6 +136,16 @@ private static void buildFakePlugin( "requires.keystore", Boolean.toString(requiresKeystore)); } + private static void buildFakeMetaPlugin( + final Environment env, + final String description, + final String name) throws IOException { + PluginTestUtil.writeMetaPluginProperties( + env.pluginsFile().resolve(name), + "description", description, + "name", name); + } + public void testPluginsDirMissing() throws Exception { Files.delete(env.pluginsFile()); IOException e = expectThrows(IOException.class, () -> listPlugins(home)); @@ -140,6 +170,16 @@ public void testTwoPlugins() throws Exception { assertEquals(buildMultiline("fake1", "fake2"), terminal.getOutput()); } + public void testMetaPlugin() throws Exception { + buildFakeMetaPlugin(env, "fake meta desc", "meta_plugin"); + buildFakePlugin(env, "meta_plugin", "fake desc", "fake1", "org.fake1"); + buildFakePlugin(env, "meta_plugin", "fake desc 2", "fake2", "org.fake2"); + buildFakePlugin(env, "fake desc 3", "fake3", "org.fake3"); + buildFakePlugin(env, "fake desc 4", "fake4", "org.fake4"); + MockTerminal terminal = listPlugins(home); + assertEquals(buildMultiline("fake3", "fake4", "meta_plugin", "\tfake1", "\tfake2"), terminal.getOutput()); + } + public void testPluginWithVerbose() throws Exception { buildFakePlugin(env, "fake desc", "fake_plugin", "org.fake"); String[] params = { "-v" }; @@ -226,6 +266,37 @@ public void testPluginWithVerboseMultiplePlugins() throws Exception { terminal.getOutput()); } + public void testPluginWithVerboseMetaPlugins() throws Exception { + buildFakeMetaPlugin(env, "fake meta desc", "meta_plugin"); + buildFakePlugin(env, "meta_plugin", "fake desc 1", "fake_plugin1", "org.fake"); + buildFakePlugin(env, "meta_plugin", "fake desc 2", "fake_plugin2", "org.fake2"); + String[] params = { "-v" }; + MockTerminal terminal = listPlugins(home, params); + assertEquals( + buildMultiline( + "Plugins directory: " + env.pluginsFile(), + "meta_plugin", + "\tfake_plugin1", + "\t- Plugin information:", + "\tName: fake_plugin1", + "\tDescription: fake desc 1", + "\tVersion: 1.0", + "\tNative Controller: false", + "\tRequires Keystore: false", + "\tExtended Plugins: []", + "\t * Classname: org.fake", + "\tfake_plugin2", + "\t- Plugin information:", + "\tName: fake_plugin2", + "\tDescription: fake desc 2", + "\tVersion: 1.0", + "\tNative Controller: false", + "\tRequires Keystore: false", + "\tExtended Plugins: []", + "\t * Classname: org.fake2"), + terminal.getOutput()); + } + public void testPluginWithoutVerboseMultiplePlugins() throws Exception { buildFakePlugin(env, "fake desc 1", "fake_plugin1", "org.fake"); buildFakePlugin(env, "fake desc 2", "fake_plugin2", "org.fake2"); @@ -243,7 +314,7 @@ public void testPluginWithoutDescriptorFile() throws Exception{ public void testPluginWithWrongDescriptorFile() throws Exception{ final Path pluginDir = env.pluginsFile().resolve("fake1"); - PluginTestUtil.writeProperties(pluginDir, "description", "fake desc"); + PluginTestUtil.writePluginProperties(pluginDir, "description", "fake desc"); IllegalArgumentException e = expectThrows( IllegalArgumentException.class, () -> listPlugins(home)); @@ -253,8 +324,21 @@ public void testPluginWithWrongDescriptorFile() throws Exception{ e.getMessage()); } + public void testMetaPluginWithWrongDescriptorFile() throws Exception{ + buildFakeMetaPlugin(env, "fake meta desc", "meta_plugin"); + final Path pluginDir = env.pluginsFile().resolve("meta_plugin").resolve("fake_plugin1"); + PluginTestUtil.writePluginProperties(pluginDir, "description", "fake desc"); + IllegalArgumentException e = expectThrows( + IllegalArgumentException.class, + () -> listPlugins(home)); + final Path descriptorPath = pluginDir.resolve(PluginInfo.ES_PLUGIN_PROPERTIES); + assertEquals( + "property [name] is missing in [" + descriptorPath.toString() + "]", + e.getMessage()); + } + public void testExistingIncompatiblePlugin() throws Exception { - PluginTestUtil.writeProperties(env.pluginsFile().resolve("fake_plugin1"), + PluginTestUtil.writePluginProperties(env.pluginsFile().resolve("fake_plugin1"), "description", "fake desc 1", "name", "fake_plugin1", "version", "1.0", @@ -278,4 +362,30 @@ public void testExistingIncompatiblePlugin() throws Exception { assertEquals("fake_plugin1\nfake_plugin2\n", terminal.getOutput()); } + public void testExistingIncompatibleMetaPlugin() throws Exception { + buildFakeMetaPlugin(env, "fake meta desc", "meta_plugin"); + PluginTestUtil.writePluginProperties(env.pluginsFile().resolve("meta_plugin").resolve("fake_plugin1"), + "description", "fake desc 1", + "name", "fake_plugin1", + "version", "1.0", + "elasticsearch.version", Version.fromString("1.0.0").toString(), + "java.version", System.getProperty("java.specification.version"), + "classname", "org.fake1"); + buildFakePlugin(env, "fake desc 2", "fake_plugin2", "org.fake2"); + + MockTerminal terminal = listPlugins(home); + final String message = String.format(Locale.ROOT, + "plugin [%s] is incompatible with version [%s]; was designed for version [%s]", + "fake_plugin1", + Version.CURRENT.toString(), + "1.0.0"); + assertEquals( + "fake_plugin2\nmeta_plugin\n\tfake_plugin1\n" + "WARNING: " + message + "\n", + terminal.getOutput()); + + String[] params = {"-s"}; + terminal = listPlugins(home, params); + assertEquals("fake_plugin2\nmeta_plugin\n\tfake_plugin1\n", terminal.getOutput()); + } + } diff --git a/distribution/tools/plugin-cli/src/test/java/org/elasticsearch/plugins/RemovePluginCommandTests.java b/distribution/tools/plugin-cli/src/test/java/org/elasticsearch/plugins/RemovePluginCommandTests.java index c128a245cd2ec..d15e0e642c836 100644 --- a/distribution/tools/plugin-cli/src/test/java/org/elasticsearch/plugins/RemovePluginCommandTests.java +++ b/distribution/tools/plugin-cli/src/test/java/org/elasticsearch/plugins/RemovePluginCommandTests.java @@ -79,8 +79,12 @@ public void setUp() throws Exception { } void createPlugin(String name) throws Exception { - PluginTestUtil.writeProperties( - env.pluginsFile().resolve(name), + createPlugin(env.pluginsFile(), name); + } + + void createPlugin(Path path, String name) throws Exception { + PluginTestUtil.writePluginProperties( + path.resolve(name), "description", "dummy", "name", name, "version", "1.0", @@ -89,6 +93,16 @@ void createPlugin(String name) throws Exception { "classname", "SomeClass"); } + void createMetaPlugin(String name, String... plugins) throws Exception { + PluginTestUtil.writeMetaPluginProperties( + env.pluginsFile().resolve(name), + "description", "dummy", + "name", name); + for (String plugin : plugins) { + createPlugin(env.pluginsFile().resolve(name), plugin); + } + } + static MockTerminal removePlugin(String name, Path home, boolean purge) throws Exception { Environment env = TestEnvironment.newEnvironment(Settings.builder().put("path.home", home).build()); MockTerminal terminal = new MockTerminal(); @@ -123,6 +137,19 @@ public void testBasic() throws Exception { assertRemoveCleaned(env); } + public void testBasicMeta() throws Exception { + createMetaPlugin("meta", "fake1"); + createPlugin("other"); + removePlugin("meta", home, randomBoolean()); + assertFalse(Files.exists(env.pluginsFile().resolve("meta"))); + assertTrue(Files.exists(env.pluginsFile().resolve("other"))); + assertRemoveCleaned(env); + + UserException exc = + expectThrows(UserException.class, () -> removePlugin("fake1", home, randomBoolean())); + assertThat(exc.getMessage(), containsString("plugin [fake1] not found")); + } + public void testBin() throws Exception { createPlugin("fake"); Path binDir = env.binFile().resolve("fake"); diff --git a/docs/plugins/authors.asciidoc b/docs/plugins/authors.asciidoc index 8dc06d1433ad1..fd408e358fe74 100644 --- a/docs/plugins/authors.asciidoc +++ b/docs/plugins/authors.asciidoc @@ -1,10 +1,18 @@ [[plugin-authors]] == Help for plugin authors +:plugin-properties-files: {docdir}/../../buildSrc/src/main/resources + The Elasticsearch repository contains examples of: * a https://github.com/elastic/elasticsearch/tree/master/plugins/jvm-example[Java plugin] which contains Java code. +* a https://github.com/elastic/elasticsearch/tree/master/plugins/examples/rescore[Java plugin] + which contains a rescore plugin. +* a https://github.com/elastic/elasticsearch/tree/master/plugins/examples/script-expert-scoring[Java plugin] + which contains a script plugin. +* a https://github.com/elastic/elasticsearch/tree/master/plugins/examples/meta-plugin[Java plugin] + which contains a meta plugin. These examples provide the bare bones needed to get started. For more information about how to write a plugin, we recommend looking at the plugins @@ -18,10 +26,13 @@ All plugin files must be contained in a directory called `elasticsearch`. [float] === Plugin descriptor file -All plugins must contain a file called `plugin-descriptor.properties` in the folder named `elasticsearch`. The format -for this file is described in detail here: +All plugins must contain a file called `plugin-descriptor.properties` in the folder named `elasticsearch`. +The format for this file is described in detail in this example: -https://github.com/elastic/elasticsearch/blob/master/buildSrc/src/main/resources/plugin-descriptor.properties[`/buildSrc/src/main/resources/plugin-descriptor.properties`]. +["source","properties",subs="attributes"] +-------------------------------------------------- +include-tagged::{plugin-properties-files}/plugin-descriptor.properties[plugin-descriptor.properties] +-------------------------------------------------- Either fill in this template yourself or, if you are using Elasticsearch's Gradle build system, you can fill in the necessary values in the `build.gradle` file for your plugin. @@ -112,3 +123,19 @@ AccessController.doPrivileged( See http://www.oracle.com/technetwork/java/seccodeguide-139067.html[Secure Coding Guidelines for Java SE] for more information. + +[float] +=== Meta Plugin + +It is also possible to bundle multiple plugins into a meta plugin. +A directory for each sub-plugin must be contained in a directory called `elasticsearch. +The meta plugin must also contain a file called `meta-plugin-descriptor.properties` in the directory named +`elasticsearch`. +The format for this file is described in detail in this example: + +["source","properties",subs="attributes"] +-------------------------------------------------- +include-tagged::{plugin-properties-files}/meta-plugin-descriptor.properties[meta-plugin-descriptor.properties] +-------------------------------------------------- + +A meta plugin can be installed/removed like a normal plugin with the `bin/elasticsearch-plugin` command. diff --git a/plugins/examples/meta-plugin/build.gradle b/plugins/examples/meta-plugin/build.gradle new file mode 100644 index 0000000000000..3674837b0b2f9 --- /dev/null +++ b/plugins/examples/meta-plugin/build.gradle @@ -0,0 +1,56 @@ +/* + * Licensed to Elasticsearch under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch licenses this file to you 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. + */ + +// A meta plugin packaging example that bundles multiple plugins in a single zip. +apply plugin: 'elasticsearch.standalone-rest-test' +apply plugin: 'elasticsearch.rest-test' + +File plugins = new File(buildDir, 'plugins-unzip') +subprojects { + // unzip the subproject plugins + task unzip(type:Copy, dependsOn: "${project.path}:bundlePlugin") { + File dest = new File(plugins, project.name) + from { zipTree(project(project.path).bundlePlugin.outputs.files.singleFile) } + eachFile { f -> f.path = f.path.replaceFirst('elasticsearch', '') } + into dest + } +} + +// Build the meta plugin zip from the subproject plugins (unzipped) +task buildZip(type:Zip) { + subprojects.each { dependsOn("${it.name}:unzip") } + from plugins + from 'src/main/resources/meta-plugin-descriptor.properties' + into 'elasticsearch' + includeEmptyDirs false +} + +integTestCluster { + dependsOn buildZip + + // This is important, so that all the modules are available too. + // There are index templates that use token filters that are in analysis-module and + // processors are being used that are in ingest-common module. + distribution = 'zip' + + // Install the meta plugin before start. + setupCommand 'installMetaPlugin', + 'bin/elasticsearch-plugin', 'install', 'file:' + buildZip.archivePath +} +check.dependsOn integTest diff --git a/plugins/examples/meta-plugin/dummy-plugin1/build.gradle b/plugins/examples/meta-plugin/dummy-plugin1/build.gradle new file mode 100644 index 0000000000000..5a02e993f8c25 --- /dev/null +++ b/plugins/examples/meta-plugin/dummy-plugin1/build.gradle @@ -0,0 +1,29 @@ +/* + * Licensed to Elasticsearch under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch licenses this file to you 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. + */ + +apply plugin: 'elasticsearch.esplugin' + +esplugin { + name 'dummy-plugin1' + description 'A dummy plugin' + classname 'org.elasticsearch.example.DummyPlugin1' +} + +test.enabled = false +integTestRunner.enabled = false \ No newline at end of file diff --git a/plugins/examples/meta-plugin/dummy-plugin1/src/main/java/org/elasticsearch/example/DummyPlugin1.java b/plugins/examples/meta-plugin/dummy-plugin1/src/main/java/org/elasticsearch/example/DummyPlugin1.java new file mode 100644 index 0000000000000..65102dbc2e337 --- /dev/null +++ b/plugins/examples/meta-plugin/dummy-plugin1/src/main/java/org/elasticsearch/example/DummyPlugin1.java @@ -0,0 +1,29 @@ +/* + * Licensed to Elasticsearch under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch licenses this file to you 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. + */ + +package org.elasticsearch.example; + +import org.elasticsearch.plugins.Plugin; +import org.elasticsearch.plugins.SearchPlugin; + +import java.util.List; + +import static java.util.Collections.singletonList; + +public class DummyPlugin1 extends Plugin {} diff --git a/plugins/examples/meta-plugin/dummy-plugin2/build.gradle b/plugins/examples/meta-plugin/dummy-plugin2/build.gradle new file mode 100644 index 0000000000000..d90983adfed0c --- /dev/null +++ b/plugins/examples/meta-plugin/dummy-plugin2/build.gradle @@ -0,0 +1,29 @@ +/* + * Licensed to Elasticsearch under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch licenses this file to you 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. + */ + +apply plugin: 'elasticsearch.esplugin' + +esplugin { + name 'dummy-plugin2' + description 'Another dummy plugin' + classname 'org.elasticsearch.example.DummyPlugin2' +} + +test.enabled = false +integTestRunner.enabled = false \ No newline at end of file diff --git a/plugins/examples/meta-plugin/dummy-plugin2/src/main/java/org/elasticsearch/example/DummyPlugin2.java b/plugins/examples/meta-plugin/dummy-plugin2/src/main/java/org/elasticsearch/example/DummyPlugin2.java new file mode 100644 index 0000000000000..2d74d7603d15f --- /dev/null +++ b/plugins/examples/meta-plugin/dummy-plugin2/src/main/java/org/elasticsearch/example/DummyPlugin2.java @@ -0,0 +1,29 @@ +/* + * Licensed to Elasticsearch under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch licenses this file to you 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. + */ + +package org.elasticsearch.example; + +import org.elasticsearch.plugins.Plugin; +import org.elasticsearch.plugins.SearchPlugin; + +import java.util.List; + +import static java.util.Collections.singletonList; + +public class DummyPlugin2 extends Plugin {} diff --git a/plugins/examples/meta-plugin/src/main/resources/meta-plugin-descriptor.properties b/plugins/examples/meta-plugin/src/main/resources/meta-plugin-descriptor.properties new file mode 100644 index 0000000000000..1fd5a86b95a54 --- /dev/null +++ b/plugins/examples/meta-plugin/src/main/resources/meta-plugin-descriptor.properties @@ -0,0 +1,4 @@ +# The name of the meta plugin +name=my_meta_plugin +# The description of the meta plugin +description=A meta plugin example \ No newline at end of file diff --git a/plugins/examples/meta-plugin/src/test/java/org/elasticsearch/smoketest/SmokeTestPluginsClientYamlTestSuiteIT.java b/plugins/examples/meta-plugin/src/test/java/org/elasticsearch/smoketest/SmokeTestPluginsClientYamlTestSuiteIT.java new file mode 100644 index 0000000000000..d1f9e6b73703e --- /dev/null +++ b/plugins/examples/meta-plugin/src/test/java/org/elasticsearch/smoketest/SmokeTestPluginsClientYamlTestSuiteIT.java @@ -0,0 +1,39 @@ +/* + * Licensed to Elasticsearch under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch licenses this file to you 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. + */ + +package org.elasticsearch.smoketest; + +import com.carrotsearch.randomizedtesting.annotations.Name; +import com.carrotsearch.randomizedtesting.annotations.ParametersFactory; + +import org.elasticsearch.test.rest.yaml.ClientYamlTestCandidate; +import org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase; + +public class SmokeTestPluginsClientYamlTestSuiteIT extends ESClientYamlSuiteTestCase { + + public SmokeTestPluginsClientYamlTestSuiteIT(@Name("yaml") ClientYamlTestCandidate testCandidate) { + super(testCandidate); + } + + @ParametersFactory + public static Iterable parameters() throws Exception { + return ESClientYamlSuiteTestCase.createParameters(); + } +} + diff --git a/plugins/examples/meta-plugin/src/test/resources/rest-api-spec/test/smoke_test_plugins/10_basic.yml b/plugins/examples/meta-plugin/src/test/resources/rest-api-spec/test/smoke_test_plugins/10_basic.yml new file mode 100644 index 0000000000000..011a278ed8949 --- /dev/null +++ b/plugins/examples/meta-plugin/src/test/resources/rest-api-spec/test/smoke_test_plugins/10_basic.yml @@ -0,0 +1,14 @@ +# Integration tests for testing meta plugins +# +"Check meta plugin install": + - do: + cluster.state: {} + + # Get master node id + - set: { master_node: master } + + - do: + nodes.info: {} + + - match: { nodes.$master.plugins.0.name: dummy-plugin1 } + - match: { nodes.$master.plugins.1.name: dummy-plugin2 } diff --git a/qa/no-bootstrap-tests/src/test/java/org/elasticsearch/bootstrap/SpawnerNoBootstrapTests.java b/qa/no-bootstrap-tests/src/test/java/org/elasticsearch/bootstrap/SpawnerNoBootstrapTests.java index d9d4ab5c3aca9..e4e603dff9503 100644 --- a/qa/no-bootstrap-tests/src/test/java/org/elasticsearch/bootstrap/SpawnerNoBootstrapTests.java +++ b/qa/no-bootstrap-tests/src/test/java/org/elasticsearch/bootstrap/SpawnerNoBootstrapTests.java @@ -78,7 +78,7 @@ public void testNoControllerSpawn() throws IOException, InterruptedException { // This plugin will NOT have a controller daemon Path plugin = environment.pluginsFile().resolve("a_plugin"); Files.createDirectories(plugin); - PluginTestUtil.writeProperties( + PluginTestUtil.writePluginProperties( plugin, "description", "a_plugin", "version", Version.CURRENT.toString(), @@ -114,7 +114,7 @@ public void testControllerSpawn() throws IOException, InterruptedException { // this plugin will have a controller daemon Path plugin = environment.pluginsFile().resolve("test_plugin"); Files.createDirectories(plugin); - PluginTestUtil.writeProperties( + PluginTestUtil.writePluginProperties( plugin, "description", "test_plugin", "version", Version.CURRENT.toString(), @@ -129,7 +129,7 @@ public void testControllerSpawn() throws IOException, InterruptedException { // this plugin will not have a controller daemon Path otherPlugin = environment.pluginsFile().resolve("other_plugin"); Files.createDirectories(otherPlugin); - PluginTestUtil.writeProperties( + PluginTestUtil.writePluginProperties( otherPlugin, "description", "other_plugin", "version", Version.CURRENT.toString(), @@ -163,6 +163,84 @@ public void testControllerSpawn() throws IOException, InterruptedException { } } + /** + * Two plugins in a meta plugin - one with a controller daemon and one without. + */ + public void testControllerSpawnMetaPlugin() throws IOException, InterruptedException { + /* + * On Windows you can not directly run a batch file - you have to run cmd.exe with the batch + * file as an argument and that's out of the remit of the controller daemon process spawner. + */ + assumeFalse("This test does not work on Windows", Constants.WINDOWS); + + Path esHome = createTempDir().resolve("esHome"); + Settings.Builder settingsBuilder = Settings.builder(); + settingsBuilder.put(Environment.PATH_HOME_SETTING.getKey(), esHome.toString()); + Settings settings = settingsBuilder.build(); + + Environment environment = TestEnvironment.newEnvironment(settings); + + Path metaPlugin = environment.pluginsFile().resolve("meta_plugin"); + Files.createDirectories(metaPlugin); + PluginTestUtil.writeMetaPluginProperties( + metaPlugin, + "description", "test_plugin", + "name", "meta_plugin", + "plugins", "test_plugin,other_plugin"); + + // this plugin will have a controller daemon + Path plugin = metaPlugin.resolve("test_plugin"); + + Files.createDirectories(plugin); + PluginTestUtil.writePluginProperties( + plugin, + "description", "test_plugin", + "version", Version.CURRENT.toString(), + "elasticsearch.version", Version.CURRENT.toString(), + "name", "test_plugin", + "java.version", "1.8", + "classname", "TestPlugin", + "has.native.controller", "true"); + Path controllerProgram = Platforms.nativeControllerPath(plugin); + createControllerProgram(controllerProgram); + + // this plugin will not have a controller daemon + Path otherPlugin = metaPlugin.resolve("other_plugin"); + Files.createDirectories(otherPlugin); + PluginTestUtil.writePluginProperties( + otherPlugin, + "description", "other_plugin", + "version", Version.CURRENT.toString(), + "elasticsearch.version", Version.CURRENT.toString(), + "name", "other_plugin", + "java.version", "1.8", + "classname", "OtherPlugin", + "has.native.controller", "false"); + + Spawner spawner = new Spawner(); + spawner.spawnNativePluginControllers(environment); + + List processes = spawner.getProcesses(); + /* + * As there should only be a reference in the list for the plugin that had the controller + * daemon, we expect one here. + */ + assertThat(processes, hasSize(1)); + Process process = processes.get(0); + final InputStreamReader in = + new InputStreamReader(process.getInputStream(), StandardCharsets.UTF_8); + try (BufferedReader stdoutReader = new BufferedReader(in)) { + String line = stdoutReader.readLine(); + assertEquals("I am alive", line); + spawner.close(); + /* + * Fail if the process does not die within one second; usually it will be even quicker + * but it depends on OS scheduling. + */ + assertTrue(process.waitFor(1, TimeUnit.SECONDS)); + } + } + public void testControllerSpawnWithIncorrectDescriptor() throws IOException { // this plugin will have a controller daemon Path esHome = createTempDir().resolve("esHome"); @@ -174,7 +252,7 @@ public void testControllerSpawnWithIncorrectDescriptor() throws IOException { Path plugin = environment.pluginsFile().resolve("test_plugin"); Files.createDirectories(plugin); - PluginTestUtil.writeProperties( + PluginTestUtil.writePluginProperties( plugin, "description", "test_plugin", "version", Version.CURRENT.toString(), diff --git a/settings.gradle b/settings.gradle index cd6d2976e0272..d4b280c346b3b 100644 --- a/settings.gradle +++ b/settings.gradle @@ -90,15 +90,6 @@ List projects = [ 'qa:query-builder-bwc' ] -File examplePluginsDir = new File(rootProject.projectDir, 'plugins/examples') -List examplePlugins = [] -for (File example : examplePluginsDir.listFiles()) { - if (example.isDirectory() == false) continue; - if (example.name.startsWith('build') || example.name.startsWith('.')) continue; - projects.add("example-plugins:${example.name}".toString()) - examplePlugins.add(example.name) -} - projects.add("libs") File libsDir = new File(rootProject.projectDir, 'libs') for (File libDir : new File(rootProject.projectDir, 'libs').listFiles()) { @@ -124,11 +115,6 @@ if (isEclipse) { include projects.toArray(new String[0]) project(':build-tools').projectDir = new File(rootProject.projectDir, 'buildSrc') -project(':example-plugins').projectDir = new File(rootProject.projectDir, 'plugins/examples') - -for (String example : examplePlugins) { - project(":example-plugins:${example}").projectDir = new File(rootProject.projectDir, "plugins/examples/${example}") -} /* The BWC snapshot projects share the same build directory and build file, * but apply to different backwards compatibility branches. */ @@ -170,7 +156,7 @@ void addSubProjects(String path, File dir, List projects, List b } // TODO do we want to assert that there's nothing else in the bwc directory? } else { - if (path.isEmpty()) { + if (path.isEmpty() || path.startsWith(':example-plugins')) { project(projectName).projectDir = dir } for (File subdir : dir.listFiles()) { @@ -179,6 +165,15 @@ void addSubProjects(String path, File dir, List projects, List b } } +// include example plugins +File examplePluginsDir = new File(rootProject.projectDir, 'plugins/examples') +for (File example : examplePluginsDir.listFiles()) { + if (example.isDirectory() == false) continue; + if (example.name.startsWith('build') || example.name.startsWith('.')) continue; + addSubProjects(':example-plugins', example, projects, []) +} +project(':example-plugins').projectDir = new File(rootProject.projectDir, 'plugins/examples') + // look for extra plugins for elasticsearch File extraProjects = new File(rootProject.projectDir.parentFile, "${dirName}-extra") if (extraProjects.exists()) { diff --git a/test/framework/src/main/java/org/elasticsearch/plugins/PluginTestUtil.java b/test/framework/src/main/java/org/elasticsearch/plugins/PluginTestUtil.java index 10f4de2482a94..5a92c99d61870 100644 --- a/test/framework/src/main/java/org/elasticsearch/plugins/PluginTestUtil.java +++ b/test/framework/src/main/java/org/elasticsearch/plugins/PluginTestUtil.java @@ -27,12 +27,18 @@ /** Utility methods for testing plugins */ public class PluginTestUtil { - + public static void writeMetaPluginProperties(Path pluginDir, String... stringProps) throws IOException { + writeProperties(pluginDir.resolve(MetaPluginInfo.ES_META_PLUGIN_PROPERTIES), stringProps); + } + + public static void writePluginProperties(Path pluginDir, String... stringProps) throws IOException { + writeProperties(pluginDir.resolve(PluginInfo.ES_PLUGIN_PROPERTIES), stringProps); + } + /** convenience method to write a plugin properties file */ - public static void writeProperties(Path pluginDir, String... stringProps) throws IOException { + private static void writeProperties(Path propertiesFile, String... stringProps) throws IOException { assert stringProps.length % 2 == 0; - Files.createDirectories(pluginDir); - Path propertiesFile = pluginDir.resolve(PluginInfo.ES_PLUGIN_PROPERTIES); + Files.createDirectories(propertiesFile.getParent()); Properties properties = new Properties(); for (int i = 0; i < stringProps.length; i += 2) { properties.put(stringProps[i], stringProps[i + 1]); From 2c24ac742634e8c0af849f74d885e0efd52f3c0f Mon Sep 17 00:00:00 2001 From: Jason Tedor Date: Tue, 9 Jan 2018 12:51:50 -0500 Subject: [PATCH 35/74] Set watermarks in single-node test cases We set the watermarks to low values in other test cases to prevent test failures on nodes with low disk space (if the disk space is too low, the test will fail anyway but we should not prematurely fail). This commit sets the watermarks in the single-node test cases to avoid test failures in such situations. Relates #28134 --- .../java/org/elasticsearch/test/ESSingleNodeTestCase.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/test/framework/src/main/java/org/elasticsearch/test/ESSingleNodeTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/ESSingleNodeTestCase.java index 0363a938dd18f..d6c4942ab6084 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/ESSingleNodeTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/test/ESSingleNodeTestCase.java @@ -29,6 +29,7 @@ import org.elasticsearch.cluster.health.ClusterHealthStatus; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.metadata.MetaData; +import org.elasticsearch.cluster.routing.allocation.DiskThresholdSettings; import org.elasticsearch.common.Priority; import org.elasticsearch.common.network.NetworkModule; import org.elasticsearch.common.settings.Settings; @@ -176,6 +177,10 @@ private Node newNode() { .put("transport.type", getTestTransportType()) .put(Node.NODE_DATA_SETTING.getKey(), true) .put(NodeEnvironment.NODE_ID_SEED_SETTING.getKey(), random().nextLong()) + // default the watermarks low values to prevent tests from failing on nodes without enough disk space + .put(DiskThresholdSettings.CLUSTER_ROUTING_ALLOCATION_LOW_DISK_WATERMARK_SETTING.getKey(), "1b") + .put(DiskThresholdSettings.CLUSTER_ROUTING_ALLOCATION_HIGH_DISK_WATERMARK_SETTING.getKey(), "1b") + .put(DiskThresholdSettings.CLUSTER_ROUTING_ALLOCATION_DISK_FLOOD_STAGE_WATERMARK_SETTING.getKey(), "1b") .put(nodeSettings()) // allow test cases to provide their own settings or override these .build(); Collection> plugins = getPlugins(); From 8ceae2a3800e9ca1e541bcea1e8b2887b64aa6f3 Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Tue, 9 Jan 2018 12:44:09 -0800 Subject: [PATCH 36/74] Build: Allow deps to be a direct jar (#28096) Currently the code which disable transitive dependencies assumes all deps are a "module dependency" in gradle. But a jar file dep is not. This commit relaxes the closure signature to allow any dependency and only enforce the transitive disabling for module dependencies. --- .../main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy index 3cb3bc7b6e322..63012a2d99d13 100644 --- a/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy +++ b/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy @@ -32,6 +32,7 @@ import org.gradle.api.Project import org.gradle.api.Task import org.gradle.api.XmlProvider import org.gradle.api.artifacts.Configuration +import org.gradle.api.artifacts.Dependency import org.gradle.api.artifacts.ModuleDependency import org.gradle.api.artifacts.ModuleVersionIdentifier import org.gradle.api.artifacts.ProjectDependency @@ -274,8 +275,9 @@ class BuildPlugin implements Plugin { }) // force all dependencies added directly to compile/testCompile to be non-transitive, except for ES itself - Closure disableTransitiveDeps = { ModuleDependency dep -> - if (!(dep instanceof ProjectDependency) && dep.group.startsWith('org.elasticsearch') == false) { + Closure disableTransitiveDeps = { Dependency dep -> + if (dep instanceof ModuleDependency && !(dep instanceof ProjectDependency) + && dep.group.startsWith('org.elasticsearch') == false) { dep.transitive = false // also create a configuration just for this dependency version, so that later From ccaba016ac1ee8e6682cbc0b1f84d605d937d73f Mon Sep 17 00:00:00 2001 From: Jason Tedor Date: Tue, 9 Jan 2018 17:20:55 -0500 Subject: [PATCH 37/74] Fix task ordering in rolling upgrade tests The configuration of the upgraded cluster task was missing a dependency on the stopping of the second old node in the cluster. In some cases (e.g., --parallel) Gradle would then try to run the configuration of a node in the upgraded cluster before it had even configured the old nodes in the cluster. Relates #28036 --- qa/rolling-upgrade/build.gradle | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/qa/rolling-upgrade/build.gradle b/qa/rolling-upgrade/build.gradle index 13cccbd006232..31d056037d865 100644 --- a/qa/rolling-upgrade/build.gradle +++ b/qa/rolling-upgrade/build.gradle @@ -74,11 +74,10 @@ for (Version version : versionCollection.versionsWireCompatibleWithCurrent) { finalizedBy "${baseName}#oldClusterTestCluster#node0.stop" } - Task upgradedClusterTest = tasks.create(name: "${baseName}#upgradedClusterTest", type: RestIntegTestTask) { - dependsOn(mixedClusterTestRunner, "${baseName}#oldClusterTestCluster#node0.stop") - } + Task upgradedClusterTest = tasks.create(name: "${baseName}#upgradedClusterTest", type: RestIntegTestTask) configure(extensions.findByName("${baseName}#upgradedClusterTestCluster")) { + dependsOn mixedClusterTestRunner, "${baseName}#oldClusterTestCluster#node0.stop" distribution = 'zip' clusterName = 'rolling-upgrade' unicastTransportUri = { seedNode, node, ant -> mixedClusterTest.nodes.get(0).transportUri() } From 5ac05faab598eed0012efd511677201ab4d76d04 Mon Sep 17 00:00:00 2001 From: Jim Ferenczi Date: Wed, 10 Jan 2018 00:00:27 +0100 Subject: [PATCH 38/74] [Docs] fix plugin properties inclusion for plugins authors --- docs/plugins/authors.asciidoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/plugins/authors.asciidoc b/docs/plugins/authors.asciidoc index fd408e358fe74..be58c3edb00c7 100644 --- a/docs/plugins/authors.asciidoc +++ b/docs/plugins/authors.asciidoc @@ -31,7 +31,7 @@ The format for this file is described in detail in this example: ["source","properties",subs="attributes"] -------------------------------------------------- -include-tagged::{plugin-properties-files}/plugin-descriptor.properties[plugin-descriptor.properties] +include::{plugin-properties-files}/plugin-descriptor.properties[] -------------------------------------------------- Either fill in this template yourself or, if you are using Elasticsearch's Gradle build system, you @@ -135,7 +135,7 @@ The format for this file is described in detail in this example: ["source","properties",subs="attributes"] -------------------------------------------------- -include-tagged::{plugin-properties-files}/meta-plugin-descriptor.properties[meta-plugin-descriptor.properties] +include::{plugin-properties-files}/meta-plugin-descriptor.properties[] -------------------------------------------------- A meta plugin can be installed/removed like a normal plugin with the `bin/elasticsearch-plugin` command. From 3fb0cb91a979241d403f62b1b6af35cd7385a23f Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Tue, 9 Jan 2018 15:01:37 -0800 Subject: [PATCH 39/74] Docs: Clarify password protection support with keystore (#28157) closes #27932 --- docs/reference/setup/secure-settings.asciidoc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/reference/setup/secure-settings.asciidoc b/docs/reference/setup/secure-settings.asciidoc index 933e649da58fd..78731f7663d11 100644 --- a/docs/reference/setup/secure-settings.asciidoc +++ b/docs/reference/setup/secure-settings.asciidoc @@ -3,8 +3,7 @@ Some settings are sensitive, and relying on filesystem permissions to protect their values is not sufficient. For this use case, Elasticsearch provides a -keystore, which may be password protected, and the `elasticsearch-keystore` -tool to manage the settings in the keystore. +keystore and the `elasticsearch-keystore` tool to manage the settings in the keystore. NOTE: All commands here should be run as the user which will run Elasticsearch. @@ -14,6 +13,9 @@ documentation for each setting to see if it is supported as part of the keystore NOTE: All the modifications to the keystore take affect only after restarting Elasticsearch. +NOTE: The elasticsearch keystore currently only provides obfuscation. In the future, +password protection will be added. + [float] [[creating-keystore]] === Creating the keystore From 5d795afddb541325b5d20c1a433d0720c05e2ded Mon Sep 17 00:00:00 2001 From: Jack Conradson Date: Tue, 9 Jan 2018 15:06:51 -0800 Subject: [PATCH 40/74] Painless: Add public member read/write access test. (#28156) --- .../main/java/org/elasticsearch/painless/FeatureTest.java | 1 + .../org/elasticsearch/painless/org.elasticsearch.txt | 1 + .../test/java/org/elasticsearch/painless/BasicAPITests.java | 5 +++++ 3 files changed, 7 insertions(+) diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/FeatureTest.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/FeatureTest.java index 1561aeddf83e3..1e94c19f6d90e 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/FeatureTest.java +++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/FeatureTest.java @@ -26,6 +26,7 @@ public class FeatureTest { private int x; private int y; + public int z; /** empty ctor */ public FeatureTest() { diff --git a/modules/lang-painless/src/main/resources/org/elasticsearch/painless/org.elasticsearch.txt b/modules/lang-painless/src/main/resources/org/elasticsearch/painless/org.elasticsearch.txt index 7c08f76f45225..51a1b7cecb3f8 100644 --- a/modules/lang-painless/src/main/resources/org/elasticsearch/painless/org.elasticsearch.txt +++ b/modules/lang-painless/src/main/resources/org/elasticsearch/painless/org.elasticsearch.txt @@ -139,6 +139,7 @@ class org.elasticsearch.index.mapper.IpFieldMapper$IpFieldType$IpScriptDocValues # for testing. # currently FeatureTest exposes overloaded constructor, field load store, and overloaded static methods class org.elasticsearch.painless.FeatureTest only_fqn { + int z () (int,int) int getX() diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/BasicAPITests.java b/modules/lang-painless/src/test/java/org/elasticsearch/painless/BasicAPITests.java index 90f524f76deee..0b13694524b0c 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/BasicAPITests.java +++ b/modules/lang-painless/src/test/java/org/elasticsearch/painless/BasicAPITests.java @@ -124,4 +124,9 @@ public void testPrimitivesHaveMethods() { assertEquals("5", exec("int x = 5; return x.toString();")); assertEquals(0, exec("int x = 5; return x.compareTo(5);")); } + + public void testPublicMemberAccess() { + assertEquals(5, exec("org.elasticsearch.painless.FeatureTest ft = new org.elasticsearch.painless.FeatureTest();" + + "ft.z = 5; return ft.z;")); + } } From 5cac7eac2bfc9436059bfcdea2b21af3685b3f67 Mon Sep 17 00:00:00 2001 From: Jim Ferenczi Date: Wed, 10 Jan 2018 02:49:52 +0100 Subject: [PATCH 41/74] meta-plugin should install bin and config at the top level (#28162) This change modifies the installation for a meta plugin, the content of the config and bin directory inside each bundled plugins are now moved in the meta plugin directory. So instead of `$configDir/meta-plugin-name/bundled_plugin/name/` the content of the config for a bundled plugin is now in `$configDir/meta-plugin-name`. Same applies for the bin directory. --- .../plugins/InstallPluginCommand.java | 5 ++-- .../plugins/InstallPluginCommandTests.java | 28 +++++++++---------- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/InstallPluginCommand.java b/distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/InstallPluginCommand.java index 216eb46411ac2..6fdc7e62c155b 100644 --- a/distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/InstallPluginCommand.java +++ b/distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/InstallPluginCommand.java @@ -667,7 +667,7 @@ private void installMetaPlugin(Terminal terminal, boolean isBatch, Path tmpRoot, pluginInfos.add(info); Path tmpBinDir = plugin.resolve("bin"); if (Files.exists(tmpBinDir)) { - Path destBinDir = env.binFile().resolve(metaInfo.getName()).resolve(info.getName()); + Path destBinDir = env.binFile().resolve(metaInfo.getName()); deleteOnFailure.add(destBinDir); installBin(info, tmpBinDir, destBinDir); } @@ -676,7 +676,7 @@ private void installMetaPlugin(Terminal terminal, boolean isBatch, Path tmpRoot, if (Files.exists(tmpConfigDir)) { // some files may already exist, and we don't remove plugin config files on plugin removal, // so any installed config files are left on failure too - Path destConfigDir = env.configFile().resolve(metaInfo.getName()).resolve(info.getName()); + Path destConfigDir = env.configFile().resolve(metaInfo.getName()); installConfig(info, tmpConfigDir, destConfigDir); } } @@ -744,7 +744,6 @@ public FileVisitResult postVisitDirectory(final Path dir, final IOException exc) }); } - /** Copies the files from {@code tmpBinDir} into {@code destBinDir}, along with permissions from dest dirs parent. */ private void installBin(PluginInfo info, Path tmpBinDir, Path destBinDir) throws Exception { if (Files.isDirectory(tmpBinDir) == false) { diff --git a/distribution/tools/plugin-cli/src/test/java/org/elasticsearch/plugins/InstallPluginCommandTests.java b/distribution/tools/plugin-cli/src/test/java/org/elasticsearch/plugins/InstallPluginCommandTests.java index 9d05fe1e76654..993a231423e58 100644 --- a/distribution/tools/plugin-cli/src/test/java/org/elasticsearch/plugins/InstallPluginCommandTests.java +++ b/distribution/tools/plugin-cli/src/test/java/org/elasticsearch/plugins/InstallPluginCommandTests.java @@ -266,18 +266,17 @@ MockTerminal installPlugin(String pluginUrl, Path home, InstallPluginCommand com } void assertMetaPlugin(String metaPlugin, String name, Path original, Environment env) throws IOException { - assertPluginInternal(name, original, env, - env.pluginsFile().resolve(metaPlugin), env.configFile().resolve(metaPlugin), env.binFile().resolve(metaPlugin)); + assertPluginInternal(name, env.pluginsFile().resolve(metaPlugin)); + assertConfigAndBin(metaPlugin, original, env); } - void assertPlugin(String name, Path original, Environment env) throws IOException { - assertPluginInternal(name, original, env, - env.pluginsFile(), env.configFile(), env.binFile()); + assertPluginInternal(name, env.pluginsFile()); + assertConfigAndBin(name, original, env); + assertInstallCleaned(env); } - void assertPluginInternal(String name, Path original, Environment env, - Path pluginsFile, Path configFile, Path binFile) throws IOException { + void assertPluginInternal(String name, Path pluginsFile) throws IOException { Path got = pluginsFile.resolve(name); assertTrue("dir " + name + " exists", Files.exists(got)); @@ -294,17 +293,19 @@ void assertPluginInternal(String name, Path original, Environment env, PosixFilePermission.OTHERS_READ, PosixFilePermission.OTHERS_EXECUTE)); } - assertTrue("jar was copied", Files.exists(got.resolve("plugin.jar"))); assertFalse("bin was not copied", Files.exists(got.resolve("bin"))); assertFalse("config was not copied", Files.exists(got.resolve("config"))); + } + + void assertConfigAndBin(String name, Path original, Environment env) throws IOException { if (Files.exists(original.resolve("bin"))) { - Path binDir = binFile.resolve(name); + Path binDir = env.binFile().resolve(name); assertTrue("bin dir exists", Files.exists(binDir)); assertTrue("bin is a dir", Files.isDirectory(binDir)); PosixFileAttributes binAttributes = null; if (isPosix) { - binAttributes = Files.readAttributes(binFile, PosixFileAttributes.class); + binAttributes = Files.readAttributes(env.binFile(), PosixFileAttributes.class); } try (DirectoryStream stream = Files.newDirectoryStream(binDir)) { for (Path file : stream) { @@ -317,7 +318,7 @@ void assertPluginInternal(String name, Path original, Environment env, } } if (Files.exists(original.resolve("config"))) { - Path configDir = configFile.resolve(name); + Path configDir = env.configFile().resolve(name); assertTrue("config dir exists", Files.exists(configDir)); assertTrue("config is a dir", Files.isDirectory(configDir)); @@ -326,7 +327,7 @@ void assertPluginInternal(String name, Path original, Environment env, if (isPosix) { PosixFileAttributes configAttributes = - Files.getFileAttributeView(configFile, PosixFileAttributeView.class).readAttributes(); + Files.getFileAttributeView(env.configFile(), PosixFileAttributeView.class).readAttributes(); user = configAttributes.owner(); group = configAttributes.group(); @@ -351,7 +352,6 @@ void assertPluginInternal(String name, Path original, Environment env, } } } - assertInstallCleaned(env); } void assertInstallCleaned(Environment env) throws IOException { @@ -734,7 +734,7 @@ public void testExistingConfig() throws Exception { public void testExistingMetaConfig() throws Exception { Tuple env = createEnv(fs, temp); - Path envConfigDir = env.v2().configFile().resolve("my_plugins").resolve("fake"); + Path envConfigDir = env.v2().configFile().resolve("my_plugins"); Files.createDirectories(envConfigDir); Files.write(envConfigDir.resolve("custom.yml"), "existing config".getBytes(StandardCharsets.UTF_8)); Path metaDir = createPluginDir(temp); From ca6b15bf7cc00f64afafc0d79807bc004ac11293 Mon Sep 17 00:00:00 2001 From: Jim Ferenczi Date: Wed, 10 Jan 2018 14:31:07 +0100 Subject: [PATCH 42/74] [Tests] temporary disable meta plugin rest tests #28163 --- plugins/examples/meta-plugin/build.gradle | 7 +++++-- .../rest-api-spec/test/smoke_test_plugins/10_basic.yml | 5 +++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/plugins/examples/meta-plugin/build.gradle b/plugins/examples/meta-plugin/build.gradle index 3674837b0b2f9..a920c87764230 100644 --- a/plugins/examples/meta-plugin/build.gradle +++ b/plugins/examples/meta-plugin/build.gradle @@ -50,7 +50,10 @@ integTestCluster { distribution = 'zip' // Install the meta plugin before start. - setupCommand 'installMetaPlugin', - 'bin/elasticsearch-plugin', 'install', 'file:' + buildZip.archivePath + /** + * NORELEASE Tests fail on windows, see https://github.com/elastic/elasticsearch/pull/28163 + */ + //setupCommand 'installMetaPlugin', + // 'bin/elasticsearch-plugin', 'install', 'file:' + buildZip.archivePath } check.dependsOn integTest diff --git a/plugins/examples/meta-plugin/src/test/resources/rest-api-spec/test/smoke_test_plugins/10_basic.yml b/plugins/examples/meta-plugin/src/test/resources/rest-api-spec/test/smoke_test_plugins/10_basic.yml index 011a278ed8949..d3744aa52341f 100644 --- a/plugins/examples/meta-plugin/src/test/resources/rest-api-spec/test/smoke_test_plugins/10_basic.yml +++ b/plugins/examples/meta-plugin/src/test/resources/rest-api-spec/test/smoke_test_plugins/10_basic.yml @@ -10,5 +10,6 @@ - do: nodes.info: {} - - match: { nodes.$master.plugins.0.name: dummy-plugin1 } - - match: { nodes.$master.plugins.1.name: dummy-plugin2 } +# NORELEASE Tests fail on windows, see https://github.com/elastic/elasticsearch/pull/28163 +# - match: { nodes.$master.plugins.0.name: dummy-plugin1 } +# - match: { nodes.$master.plugins.1.name: dummy-plugin2 } From fcf4114adcad731726eb6fa10da5eb14deb3b2f9 Mon Sep 17 00:00:00 2001 From: Jim Ferenczi Date: Wed, 10 Jan 2018 14:59:37 +0100 Subject: [PATCH 43/74] Make sure that we don't detect files as maven coordinate when installing a plugin (#28163) * This change makes sure that we don't detect a file path containing a ':' as a maven coordinate (e.g.: `file:C:\path\to\zip`) * restore test muted on master --- .../elasticsearch/plugins/InstallPluginCommand.java | 4 ++-- .../plugins/InstallPluginCommandTests.java | 12 ++++++++++++ plugins/examples/meta-plugin/build.gradle | 7 ++----- .../test/smoke_test_plugins/10_basic.yml | 5 ++--- 4 files changed, 18 insertions(+), 10 deletions(-) diff --git a/distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/InstallPluginCommand.java b/distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/InstallPluginCommand.java index 6fdc7e62c155b..a8b7db48a7c1c 100644 --- a/distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/InstallPluginCommand.java +++ b/distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/InstallPluginCommand.java @@ -232,14 +232,14 @@ private Path download(Terminal terminal, String pluginId, Path tmpDir) throws Ex // now try as maven coordinates, a valid URL would only have a colon and slash String[] coordinates = pluginId.split(":"); - if (coordinates.length == 3 && pluginId.contains("/") == false) { + if (coordinates.length == 3 && pluginId.contains("/") == false && pluginId.startsWith("file:") == false) { String mavenUrl = getMavenUrl(terminal, coordinates, Platforms.PLATFORM_NAME); terminal.println("-> Downloading " + pluginId + " from maven central"); return downloadZipAndChecksum(terminal, mavenUrl, tmpDir, true); } // fall back to plain old URL - if (pluginId.contains(":/") == false) { + if (pluginId.contains(":") == false) { // definitely not a valid url, so assume it is a plugin name List plugins = checkMisspelledPlugin(pluginId); String msg = "Unknown plugin " + pluginId; diff --git a/distribution/tools/plugin-cli/src/test/java/org/elasticsearch/plugins/InstallPluginCommandTests.java b/distribution/tools/plugin-cli/src/test/java/org/elasticsearch/plugins/InstallPluginCommandTests.java index 993a231423e58..db5a6a16a9d34 100644 --- a/distribution/tools/plugin-cli/src/test/java/org/elasticsearch/plugins/InstallPluginCommandTests.java +++ b/distribution/tools/plugin-cli/src/test/java/org/elasticsearch/plugins/InstallPluginCommandTests.java @@ -22,6 +22,7 @@ import com.carrotsearch.randomizedtesting.annotations.ParametersFactory; import com.google.common.jimfs.Configuration; import com.google.common.jimfs.Jimfs; +import org.apache.lucene.util.IOUtils; import org.apache.lucene.util.LuceneTestCase; import org.elasticsearch.Version; import org.elasticsearch.cli.ExitCodes; @@ -44,6 +45,7 @@ import org.junit.Before; import java.io.BufferedReader; +import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; import java.io.StringReader; @@ -430,6 +432,16 @@ public void testMalformedUrlNotMaven() throws Exception { assertTrue(e.getMessage(), e.getMessage().contains("no protocol")); } + public void testFileNotMaven() throws Exception { + Tuple env = createEnv(fs, temp); + String dir = randomAlphaOfLength(10) + ":" + randomAlphaOfLength(5) + "\\" + randomAlphaOfLength(5); + Exception e = expectThrows(Exception.class, + // has two colons, so it appears similar to maven coordinates + () -> installPlugin("file:" + dir, env.v1())); + assertFalse(e.getMessage(), e.getMessage().contains("maven.org")); + assertTrue(e.getMessage(), e.getMessage().contains(dir)); + } + public void testUnknownPlugin() throws Exception { Tuple env = createEnv(fs, temp); UserException e = expectThrows(UserException.class, () -> installPlugin("foo", env.v1())); diff --git a/plugins/examples/meta-plugin/build.gradle b/plugins/examples/meta-plugin/build.gradle index a920c87764230..3674837b0b2f9 100644 --- a/plugins/examples/meta-plugin/build.gradle +++ b/plugins/examples/meta-plugin/build.gradle @@ -50,10 +50,7 @@ integTestCluster { distribution = 'zip' // Install the meta plugin before start. - /** - * NORELEASE Tests fail on windows, see https://github.com/elastic/elasticsearch/pull/28163 - */ - //setupCommand 'installMetaPlugin', - // 'bin/elasticsearch-plugin', 'install', 'file:' + buildZip.archivePath + setupCommand 'installMetaPlugin', + 'bin/elasticsearch-plugin', 'install', 'file:' + buildZip.archivePath } check.dependsOn integTest diff --git a/plugins/examples/meta-plugin/src/test/resources/rest-api-spec/test/smoke_test_plugins/10_basic.yml b/plugins/examples/meta-plugin/src/test/resources/rest-api-spec/test/smoke_test_plugins/10_basic.yml index d3744aa52341f..011a278ed8949 100644 --- a/plugins/examples/meta-plugin/src/test/resources/rest-api-spec/test/smoke_test_plugins/10_basic.yml +++ b/plugins/examples/meta-plugin/src/test/resources/rest-api-spec/test/smoke_test_plugins/10_basic.yml @@ -10,6 +10,5 @@ - do: nodes.info: {} -# NORELEASE Tests fail on windows, see https://github.com/elastic/elasticsearch/pull/28163 -# - match: { nodes.$master.plugins.0.name: dummy-plugin1 } -# - match: { nodes.$master.plugins.1.name: dummy-plugin2 } + - match: { nodes.$master.plugins.0.name: dummy-plugin1 } + - match: { nodes.$master.plugins.1.name: dummy-plugin2 } From 73f6857dfff1fd8a31f4b0838c7e8b7a04f4baa0 Mon Sep 17 00:00:00 2001 From: Martijn van Groningen Date: Wed, 10 Jan 2018 15:14:13 +0100 Subject: [PATCH 44/74] test: ensure we endup with a single segment Closes #28127 --- .../org/elasticsearch/percolator/CandidateQueryTests.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/percolator/src/test/java/org/elasticsearch/percolator/CandidateQueryTests.java b/modules/percolator/src/test/java/org/elasticsearch/percolator/CandidateQueryTests.java index fea5bd893a910..93b2eb9d5550f 100644 --- a/modules/percolator/src/test/java/org/elasticsearch/percolator/CandidateQueryTests.java +++ b/modules/percolator/src/test/java/org/elasticsearch/percolator/CandidateQueryTests.java @@ -555,18 +555,20 @@ public void testPercolateSmallAndLargeDocument() throws Exception { try (RAMDirectory directory = new RAMDirectory()) { try (IndexWriter iw = new IndexWriter(directory, newIndexWriterConfig())) { + List documents = new ArrayList<>(); Document document = new Document(); document.add(new StringField("field", "value1", Field.Store.NO)); document.add(new StringField("field", "value2", Field.Store.NO)); - iw.addDocument(document); + documents.add(document); document = new Document(); document.add(new StringField("field", "value5", Field.Store.NO)); document.add(new StringField("field", "value6", Field.Store.NO)); - iw.addDocument(document); + documents.add(document); document = new Document(); document.add(new StringField("field", "value3", Field.Store.NO)); document.add(new StringField("field", "value4", Field.Store.NO)); - iw.addDocument(document); + documents.add(document); + iw.addDocuments(documents); // IW#addDocuments(...) ensures we end up with a single segment } try (IndexReader ir = DirectoryReader.open(directory)){ IndexSearcher percolateSearcher = new IndexSearcher(ir); From 4182e9e3bb881b9bdb8ec67c7d96db65594852c1 Mon Sep 17 00:00:00 2001 From: Martijn van Groningen Date: Wed, 10 Jan 2018 18:03:14 +0100 Subject: [PATCH 45/74] docs: Replaces indexed script java api docs with stored script api docs Closes #28144 --- docs/java-api/admin/cluster/index.asciidoc | 1 + .../admin/cluster/stored-scripts.asciidoc | 29 +++++++++++++++ docs/java-api/index.asciidoc | 2 -- docs/java-api/indexed-scripts.asciidoc | 36 ------------------- 4 files changed, 30 insertions(+), 38 deletions(-) create mode 100644 docs/java-api/admin/cluster/stored-scripts.asciidoc delete mode 100644 docs/java-api/indexed-scripts.asciidoc diff --git a/docs/java-api/admin/cluster/index.asciidoc b/docs/java-api/admin/cluster/index.asciidoc index e5525e18a490f..4e1850a34fe47 100644 --- a/docs/java-api/admin/cluster/index.asciidoc +++ b/docs/java-api/admin/cluster/index.asciidoc @@ -13,3 +13,4 @@ In the rest of this guide, we will use `client.admin().cluster()`. include::health.asciidoc[] +include::stored-scripts.asciidoc[] diff --git a/docs/java-api/admin/cluster/stored-scripts.asciidoc b/docs/java-api/admin/cluster/stored-scripts.asciidoc new file mode 100644 index 0000000000000..5ebf89e92be55 --- /dev/null +++ b/docs/java-api/admin/cluster/stored-scripts.asciidoc @@ -0,0 +1,29 @@ +[[stored-scripts]] +==== Stored Scripts API + +The stored script API allows one to interact with scripts and templates +stored in Elasticsearch. It can be used to create, update, get, +and delete stored scripts and templates. + +[source,java] +-------------------------------------------------- +PutStoredScriptResponse response = client.admin().cluster().preparePutStoredScript() + .setId("script1") + .setContent(new BytesArray("{\"script\": {\"lang\": \"painless\", \"source\": \"_score * doc['my_numeric_field'].value\"} }"), XContentType.JSON) + .get(); + +GetStoredScriptResponse response = client().admin().cluster().prepareGetStoredScript() + .setId("script1") + .get(); + +DeleteStoredScriptResponse response = client().admin().cluster().prepareDeleteStoredScript() + .setId("script1") + .get(); +-------------------------------------------------- + +To store templates simply use "mustache" for the scriptLang. + +===== Script Language + +The put stored script API allows one to set the language of the stored script. +If one is not provided the default scripting language will be used. diff --git a/docs/java-api/index.asciidoc b/docs/java-api/index.asciidoc index 251efff5f8f01..5d53a3c7f1b6d 100644 --- a/docs/java-api/index.asciidoc +++ b/docs/java-api/index.asciidoc @@ -196,6 +196,4 @@ include::aggs.asciidoc[] include::query-dsl.asciidoc[] -include::indexed-scripts.asciidoc[] - include::admin/index.asciidoc[] diff --git a/docs/java-api/indexed-scripts.asciidoc b/docs/java-api/indexed-scripts.asciidoc deleted file mode 100644 index f1877bba1f881..0000000000000 --- a/docs/java-api/indexed-scripts.asciidoc +++ /dev/null @@ -1,36 +0,0 @@ -[[indexed-scripts]] -== Indexed Scripts API - -The indexed script API allows one to interact with scripts and templates -stored in an Elasticsearch index. It can be used to create, update, get, -and delete indexed scripts and templates. - -[source,java] --------------------------------------------------- -PutIndexedScriptResponse = client.preparePutIndexedScript() - .setScriptLang("painless") - .setId("script1") - .setSource("script", "_score * doc['my_numeric_field'].value") - .execute() - .actionGet(); - -GetIndexedScriptResponse = client.prepareGetIndexedScript() - .setScriptLang("painless") - .setId("script1") - .execute() - .actionGet(); - -DeleteIndexedScriptResponse = client.prepareDeleteIndexedScript() - .setScriptLang("painless") - .setId("script1") - .execute() - .actionGet(); --------------------------------------------------- - -To store templates simply use "mustache" for the scriptLang. - -=== Script Language - -The API allows one to set the language of the indexed script being -interacted with. If one is not provided the default scripting language -will be used. From caa63ada6bdf7b80fbd2c283aebdd9fe798dde1d Mon Sep 17 00:00:00 2001 From: Mayya Sharipova Date: Wed, 10 Jan 2018 12:08:35 -0500 Subject: [PATCH 46/74] Fix environment variable substitutions in list setting (#28106) Since Elasticsearch 6.1.0 environment variable substitutions in lists do not work. Environment variables in a list setting were not resolved, because settings with a list type were skipped during variables resolution. This commit fixes by processing list settings as well. Closes #27926 --- .../elasticsearch/common/settings/Settings.java | 17 ++++++++++++++--- .../common/settings/SettingsTests.java | 10 ++++++++++ 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/org/elasticsearch/common/settings/Settings.java b/core/src/main/java/org/elasticsearch/common/settings/Settings.java index 0a0a01c3fe39a..c9a4c0f796b9f 100644 --- a/core/src/main/java/org/elasticsearch/common/settings/Settings.java +++ b/core/src/main/java/org/elasticsearch/common/settings/Settings.java @@ -64,6 +64,7 @@ import java.util.NoSuchElementException; import java.util.Set; import java.util.TreeMap; +import java.util.ListIterator; import java.util.concurrent.TimeUnit; import java.util.function.Function; import java.util.function.Predicate; @@ -414,7 +415,7 @@ public List getAsList(String key, List defaultValue, Boolean com final Object valueFromPrefix = settings.get(key); if (valueFromPrefix != null) { if (valueFromPrefix instanceof List) { - return ((List) valueFromPrefix); // it's already unmodifiable since the builder puts it as a such + return Collections.unmodifiableList((List) valueFromPrefix); } else if (commaDelimited) { String[] strings = Strings.splitStringByCommaToArray(get(key)); if (strings.length > 0) { @@ -1042,7 +1043,7 @@ public Builder putList(String setting, String... values) { */ public Builder putList(String setting, List values) { remove(setting); - map.put(setting, Collections.unmodifiableList(new ArrayList<>(values))); + map.put(setting, new ArrayList<>(values)); return this; } @@ -1210,10 +1211,20 @@ public boolean shouldRemoveMissingPlaceholder(String placeholderName) { Iterator> entryItr = map.entrySet().iterator(); while (entryItr.hasNext()) { Map.Entry entry = entryItr.next(); - if (entry.getValue() == null || entry.getValue() instanceof List) { + if (entry.getValue() == null) { // a null value obviously can't be replaced continue; } + if (entry.getValue() instanceof List) { + final ListIterator li = ((List) entry.getValue()).listIterator(); + while (li.hasNext()) { + final String settingValueRaw = li.next(); + final String settingValueResolved = propertyPlaceholder.replacePlaceholders(settingValueRaw, placeholderResolver); + li.set(settingValueResolved); + } + continue; + } + String value = propertyPlaceholder.replacePlaceholders(Settings.toString(entry.getValue()), placeholderResolver); // if the values exists and has length, we should maintain it in the map // otherwise, the replace process resolved into removing it diff --git a/core/src/test/java/org/elasticsearch/common/settings/SettingsTests.java b/core/src/test/java/org/elasticsearch/common/settings/SettingsTests.java index 039de112fac36..52502acb61fe4 100644 --- a/core/src/test/java/org/elasticsearch/common/settings/SettingsTests.java +++ b/core/src/test/java/org/elasticsearch/common/settings/SettingsTests.java @@ -68,6 +68,16 @@ public void testReplacePropertiesPlaceholderSystemProperty() { assertThat(settings.get("setting1"), equalTo(value)); } + public void testReplacePropertiesPlaceholderSystemPropertyList() { + final String hostname = randomAlphaOfLength(16); + final String hostip = randomAlphaOfLength(16); + final Settings settings = Settings.builder() + .putList("setting1", "${HOSTNAME}", "${HOSTIP}") + .replacePropertyPlaceholders(name -> name.equals("HOSTNAME") ? hostname : name.equals("HOSTIP") ? hostip : null) + .build(); + assertThat(settings.getAsList("setting1"), contains(hostname, hostip)); + } + public void testReplacePropertiesPlaceholderSystemVariablesHaveNoEffect() { final String value = System.getProperty("java.home"); assertNotNull(value); From 6c963379d9b4593609b33e7142efa67c21ab81cb Mon Sep 17 00:00:00 2001 From: kel Date: Thu, 11 Jan 2018 02:10:06 +0800 Subject: [PATCH 47/74] Ignore null value for range field (#27845) (#28116) Currently when adding a document with a `null` value for a range field, the range field mapper raises an error. Instead we should ignore null like we do eg. with numbers or geo points. Closes #27845 --- .../elasticsearch/index/mapper/RangeFieldMapper.java | 4 +++- .../index/mapper/RangeFieldMapperTests.java | 9 +++++++++ .../resources/rest-api-spec/test/range/10_basic.yml | 12 ++++++++++++ 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/org/elasticsearch/index/mapper/RangeFieldMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/RangeFieldMapper.java index 0f0b064e52391..9a00ddebe83ba 100644 --- a/core/src/main/java/org/elasticsearch/index/mapper/RangeFieldMapper.java +++ b/core/src/main/java/org/elasticsearch/index/mapper/RangeFieldMapper.java @@ -357,7 +357,9 @@ protected void parseCreateField(ParseContext context, List field } else { XContentParser parser = context.parser(); final XContentParser.Token start = parser.currentToken(); - if (start == XContentParser.Token.START_OBJECT) { + if (start == XContentParser.Token.VALUE_NULL) { + return; + } else if (start == XContentParser.Token.START_OBJECT) { RangeFieldType fieldType = fieldType(); RangeType rangeType = fieldType.rangeType; String fieldName = null; diff --git a/core/src/test/java/org/elasticsearch/index/mapper/RangeFieldMapperTests.java b/core/src/test/java/org/elasticsearch/index/mapper/RangeFieldMapperTests.java index eea71525c705c..4b705f97a31ba 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/RangeFieldMapperTests.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/RangeFieldMapperTests.java @@ -363,6 +363,15 @@ protected void doTestNullValue(String type) throws IOException { + InetAddresses.toAddrString(InetAddresses.forString("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff")); } assertThat(storedField.stringValue(), containsString(strVal)); + + // test null range + doc = mapper.parse(SourceToParse.source("test", "type", "1", XContentFactory.jsonBuilder() + .startObject() + .nullField("field") + .endObject() + .bytes(), + XContentType.JSON)); + assertNull(doc.rootDoc().get("field")); } public void testNoBounds() throws Exception { diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/range/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/range/10_basic.yml index 4bf6e3e2b4a4d..56e2e91b4ade3 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/range/10_basic.yml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/range/10_basic.yml @@ -45,6 +45,12 @@ setup: id: 3 body: { "integer_range" : { "gte": 4, "lte": 5 } } + - do: + index: + index: test + type: doc + id: 4 + body: { "integer_range" : null } - do: indices.refresh: {} @@ -79,6 +85,12 @@ setup: - match: { hits.total: 0 } + - do: + search: + body: { "query" : { "match_all": {} } } + + - match: { hits.total: 4 } + --- "Long range": From 9d7799d356c384bee9425feaf1590f4c8845a141 Mon Sep 17 00:00:00 2001 From: Tyler Smalley Date: Wed, 10 Jan 2018 10:23:06 -0800 Subject: [PATCH 48/74] [Docs] Remove Kerberos/SPNEGO Shield plugin (#28019) Plugin has not been updated in over two years and requires Shield and ES 2.3.1 --- docs/plugins/security.asciidoc | 3 --- 1 file changed, 3 deletions(-) diff --git a/docs/plugins/security.asciidoc b/docs/plugins/security.asciidoc index d113c12bfc25a..1b6262211303f 100644 --- a/docs/plugins/security.asciidoc +++ b/docs/plugins/security.asciidoc @@ -20,8 +20,5 @@ today, X-Pack provides peace of mind when it comes to protecting your data. The following plugins have been contributed by our community: -* https://github.com/codecentric/elasticsearch-shield-kerberos-realm[Kerberos/SPNEGO Realm]: - Custom Shield realm to Authenticate HTTP and Transport requests via Kerberos/SPNEGO (by codecentric AG) - * https://github.com/sscarduzio/elasticsearch-readonlyrest-plugin[Readonly REST]: High performance access control for Elasticsearch native REST API (by Simone Scarduzio) From e92acefba0bf1dbc9a8842d75dd7c611dde9b133 Mon Sep 17 00:00:00 2001 From: Andrew Banchich Date: Thu, 11 Jan 2018 04:57:46 -0500 Subject: [PATCH 49/74] [Docs] Improvements in script-fields.asciidoc (#28174) --- docs/reference/search/request/script-fields.asciidoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/reference/search/request/script-fields.asciidoc b/docs/reference/search/request/script-fields.asciidoc index 403cad9c5dd01..24e9c2a017fcb 100644 --- a/docs/reference/search/request/script-fields.asciidoc +++ b/docs/reference/search/request/script-fields.asciidoc @@ -65,8 +65,8 @@ It's important to understand the difference between using the doc keyword, will cause the terms for that field to be loaded to memory (cached), which will result in faster execution, but more memory consumption. Also, the `doc[...]` notation only allows for simple valued -fields (can't return a json object from it) and make sense only on -non-analyzed or single term based fields. However, using `doc` is +fields (you can't return a json object from it) and makes sense only for +non-analyzed or single term based fields. However, using `doc` is still the recommended way to access values from the document, if at all possible, because `_source` must be loaded and parsed every time it's used. Using `_source` is very slow. From 3c032f84f4f12524e5754947b13eb2132c805394 Mon Sep 17 00:00:00 2001 From: Combalgorythm Date: Thu, 11 Jan 2018 12:59:30 +0100 Subject: [PATCH 50/74] Modifies the JavaAPI docs related to AggregationBuilder 1."AggregationBuilder" replaces "AggregatorBuilder" in docs/java-api/aggregations/bucket/iprange-aggregation.asciidoc 2."GeoBoundsAggregationBuilder" replaces "GeoBoundsBuilder" in docs/java-api/aggregations/metrics/geobounds-aggregation.asciidoc Closes #28143 --- .../java-api/aggregations/bucket/iprange-aggregation.asciidoc | 4 ++-- .../aggregations/metrics/geobounds-aggregation.asciidoc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/java-api/aggregations/bucket/iprange-aggregation.asciidoc b/docs/java-api/aggregations/bucket/iprange-aggregation.asciidoc index 7c1909298db86..a2c07df1b26e7 100644 --- a/docs/java-api/aggregations/bucket/iprange-aggregation.asciidoc +++ b/docs/java-api/aggregations/bucket/iprange-aggregation.asciidoc @@ -12,7 +12,7 @@ Here is an example on how to create the aggregation request: [source,java] -------------------------------------------------- -AggregatorBuilder aggregation = +AggregationBuilder aggregation = AggregationBuilders .ipRange("agg") .field("ip") @@ -25,7 +25,7 @@ Note that you could also use ip masks as ranges: [source,java] -------------------------------------------------- -AggregatorBuilder aggregation = +AggregationBuilder aggregation = AggregationBuilders .ipRange("agg") .field("ip") diff --git a/docs/java-api/aggregations/metrics/geobounds-aggregation.asciidoc b/docs/java-api/aggregations/metrics/geobounds-aggregation.asciidoc index ecffabbd58388..571a61f12e7cc 100644 --- a/docs/java-api/aggregations/metrics/geobounds-aggregation.asciidoc +++ b/docs/java-api/aggregations/metrics/geobounds-aggregation.asciidoc @@ -12,7 +12,7 @@ Here is an example on how to create the aggregation request: [source,java] -------------------------------------------------- -GeoBoundsBuilder aggregation = +GeoBoundsAggregationBuilder aggregation = GeoBoundsAggregationBuilder .geoBounds("agg") .field("address.location") From 87c841d17875505293bb1cd5985fdfdf566c9d89 Mon Sep 17 00:00:00 2001 From: Jim Ferenczi Date: Thu, 11 Jan 2018 13:26:11 +0100 Subject: [PATCH 51/74] Include all sentences smaller than fragment_size in the unified highlighter (#28132) The unified highlighter selects a single sentence per fragment from the offset of the first highlighted term. This change modifies this selection and allows more than one sentence in a single fragment. The expansion is done forward (on the right of the matching offset), sentences are added to the current fragment iff the overall size of the fragment is smaller than the maximum length (fragment_size). We should also add a way to expand the left context with the surrounding sentences but this is currently avoided because the unified highlighter in Lucene uses only the first offset that matches the query to derive the start and end offset of the next fragment. If we expand on the left we could split multiple terms that would be grouped otherwise. Breaking this limitation implies some changes in the core of the unified highlighter. Closes #28089 --- .../BoundedBreakIteratorScanner.java | 24 +++- .../CustomUnifiedHighlighterTests.java | 35 ++++++ .../highlight/HighlighterSearchIT.java | 109 +++++++++++------- 3 files changed, 125 insertions(+), 43 deletions(-) diff --git a/core/src/main/java/org/apache/lucene/search/uhighlight/BoundedBreakIteratorScanner.java b/core/src/main/java/org/apache/lucene/search/uhighlight/BoundedBreakIteratorScanner.java index 1cd5fb9340d7f..cd40046f73809 100644 --- a/core/src/main/java/org/apache/lucene/search/uhighlight/BoundedBreakIteratorScanner.java +++ b/core/src/main/java/org/apache/lucene/search/uhighlight/BoundedBreakIteratorScanner.java @@ -23,15 +23,23 @@ import java.util.Locale; /** - * A custom break iterator that scans text to find break-delimited passages bounded by - * a provided maximum length. This class delegates the boundary search to a first level - * break iterator. When this break iterator finds a passage greater than the maximum length + * A custom break iterator that is used to find break-delimited passages bounded by + * a provided maximum length in the {@link UnifiedHighlighter} context. + * This class uses a {@link BreakIterator} to find the last break after the provided offset + * that would create a passage smaller than maxLen. + * If the {@link BreakIterator} cannot find a passage smaller than the maximum length, * a secondary break iterator is used to re-split the passage at the first boundary after * maximum length. + * * This is useful to split passages created by {@link BreakIterator}s like `sentence` that * can create big outliers on semi-structured text. * + * * WARNING: This break iterator is designed to work with the {@link UnifiedHighlighter}. + * + * TODO: We should be able to create passages incrementally, starting from the offset of the first match and expanding or not + * depending on the offsets of subsequent matches. This is currently impossible because {@link FieldHighlighter} uses + * only the first matching offset to derive the start and end of each passage. **/ public class BoundedBreakIteratorScanner extends BreakIterator { private final BreakIterator mainBreak; @@ -93,7 +101,15 @@ public int preceding(int offset) { innerEnd = windowEnd; } else { windowStart = innerStart = mainBreak.preceding(offset); - windowEnd = innerEnd = mainBreak.following(offset-1); + windowEnd = innerEnd = mainBreak.following(offset - 1); + // expand to next break until we reach maxLen + while (innerEnd - innerStart < maxLen) { + int newEnd = mainBreak.following(innerEnd); + if (newEnd == DONE || (newEnd - innerStart) > maxLen) { + break; + } + windowEnd = innerEnd = newEnd; + } } if (innerEnd - innerStart > maxLen) { diff --git a/core/src/test/java/org/apache/lucene/search/uhighlight/CustomUnifiedHighlighterTests.java b/core/src/test/java/org/apache/lucene/search/uhighlight/CustomUnifiedHighlighterTests.java index 6e5947d7beb6f..a577b5f7aff85 100644 --- a/core/src/test/java/org/apache/lucene/search/uhighlight/CustomUnifiedHighlighterTests.java +++ b/core/src/test/java/org/apache/lucene/search/uhighlight/CustomUnifiedHighlighterTests.java @@ -184,6 +184,20 @@ public void testSentenceBoundedBreakIterator() throws Exception { BoundedBreakIteratorScanner.getSentence(Locale.ROOT, 10), 0, outputs); } + public void testSmallSentenceBoundedBreakIterator() throws Exception { + final String[] inputs = { + "A short sentence. Followed by a bigger sentence that should be truncated. And a last short sentence." + }; + final String[] outputs = { + "A short sentence.", + "Followed by a bigger sentence", + "And a last short sentence" + }; + TermQuery query = new TermQuery(new Term("text", "sentence")); + assertHighlightOneDoc("text", inputs, new StandardAnalyzer(), query, Locale.ROOT, + BoundedBreakIteratorScanner.getSentence(Locale.ROOT, 20), 0, outputs); + } + public void testRepeat() throws Exception { final String[] inputs = { "Fun fun fun fun fun fun fun fun fun fun" @@ -205,4 +219,25 @@ public void testRepeat() throws Exception { assertHighlightOneDoc("text", inputs, new StandardAnalyzer(), query, Locale.ROOT, BoundedBreakIteratorScanner.getSentence(Locale.ROOT, 10), 0, outputs); } + + public void testGroupSentences() throws Exception { + final String[] inputs = { + "Two words. Followed by many words in a big sentence. One. Two. Three. And more words." + }; + final String[] outputs = { + "Two words.", + "Followed by many words", + "One. Two. Three.", + "And more words.", + }; + BooleanQuery query = new BooleanQuery.Builder() + .add(new TermQuery(new Term("text", "one")), BooleanClause.Occur.SHOULD) + .add(new TermQuery(new Term("text", "two")), BooleanClause.Occur.SHOULD) + .add(new TermQuery(new Term("text", "three")), BooleanClause.Occur.SHOULD) + .add(new TermQuery(new Term("text", "words")), BooleanClause.Occur.SHOULD) + .build(); + assertHighlightOneDoc("text", inputs, new StandardAnalyzer(), query, Locale.ROOT, + BoundedBreakIteratorScanner.getSentence(Locale.ROOT, 20), 0, outputs); + } + } diff --git a/core/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/HighlighterSearchIT.java b/core/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/HighlighterSearchIT.java index 5861e7684363f..cc23deda2d856 100644 --- a/core/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/HighlighterSearchIT.java +++ b/core/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/HighlighterSearchIT.java @@ -397,7 +397,7 @@ public void testSourceLookupHighlightingUsingPostingsHighlighter() throws Except for (int i = 0; i < indexRequestBuilders.length; i++) { assertHighlight(search, i, "title", 0, - equalTo("This is a test on the highlighting bug present in elasticsearch.")); + equalTo("This is a test on the highlighting bug present in elasticsearch. Hopefully it works.")); assertHighlight(search, i, "title", 1, 2, equalTo("This is the second bug to perform highlighting on.")); } @@ -491,7 +491,8 @@ public void testHighlightingOnWildcardFields() throws Exception { SearchResponse searchResponse = client().search(searchRequest("test").source(source)).actionGet(); - assertHighlight(searchResponse, 0, "field-postings", 0, 1, equalTo("This is the first test sentence.")); + assertHighlight(searchResponse, 0, "field-postings", 0, 1, + equalTo("This is the first test sentence. Here is the second one.")); assertHighlight(searchResponse, 0, "field-fvh", 0, 1, equalTo("This is the test with term_vectors")); assertHighlight(searchResponse, 0, "field-plain", 0, 1, equalTo("This is the test for the plain highlighter")); } @@ -1386,7 +1387,8 @@ public void testPhrasePrefix() throws IOException { .highlighter(highlight().field("field0").order("score").preTags("").postTags("")); searchResponse = client().search(searchRequest("first_test_index").source(source)).actionGet(); - assertHighlight(searchResponse, 0, "field0", 0, 1, equalTo("The quick brown fox jumps over the lazy dog")); + assertHighlight(searchResponse, 0, "field0", 0, 1, + equalTo("The quick brown fox jumps over the lazy dog")); logger.info("--> highlighting and searching on field1"); source = searchSource() @@ -1438,7 +1440,8 @@ public void testPhrasePrefix() throws IOException { searchResponse = client().search(searchRequest("second_test_index").source(source)).actionGet(); - assertHighlight(searchResponse, 0, "field3", 0, 1, equalTo("The quick brown fox jumps over the lazy dog")); + assertHighlight(searchResponse, 0, "field3", 0, 1, + equalTo("The quick brown fox jumps over the lazy dog")); logger.info("--> highlighting and searching on field4"); source = searchSource().postFilter(termQuery("type", "type2")).query(matchPhrasePrefixQuery("field4", "the fast bro")) @@ -1453,7 +1456,8 @@ public void testPhrasePrefix() throws IOException { equalTo("The quick brown fox jumps over the lazy dog"))); logger.info("--> highlighting and searching on field4"); - source = searchSource().postFilter(termQuery("type", "type2")).query(matchPhrasePrefixQuery("field4", "a fast quick blue ca")) + source = searchSource().postFilter(termQuery("type", "type2")) + .query(matchPhrasePrefixQuery("field4", "a fast quick blue ca")) .highlighter(highlight().field("field4").order("score").preTags("").postTags("")); searchResponse = client().search(searchRequest("second_test_index").source(source)).actionGet(); @@ -1887,33 +1891,42 @@ public void testHighlightNoMatchSizeNumberOfFragments() throws IOException { .highlighterType("plain") .noMatchSize(20); SearchResponse response = client().prepareSearch("test").highlighter(new HighlightBuilder().field(field)).get(); - assertHighlight(response, 0, "text", 0, 1, equalTo("This is the first")); + assertHighlight(response, 0, "text", 0, 1, + equalTo("This is the first")); field.highlighterType("fvh"); response = client().prepareSearch("test").highlighter(new HighlightBuilder().field(field)).get(); - assertHighlight(response, 0, "text", 0, 1, equalTo("This is the first sentence")); + assertHighlight(response, 0, "text", 0, 1, + equalTo("This is the first sentence")); field.highlighterType("unified"); response = client().prepareSearch("test").highlighter(new HighlightBuilder().field(field)).get(); - assertHighlight(response, 0, "text", 0, 1, equalTo("This is the first sentence")); + assertHighlight(response, 0, "text", 0, 1, + equalTo("This is the first sentence")); //if there's a match we only return the values with matches (whole value as number_of_fragments == 0) MatchQueryBuilder queryBuilder = QueryBuilders.matchQuery("text", "third fifth"); field.highlighterType("plain"); response = client().prepareSearch("test").setQuery(queryBuilder).highlighter(new HighlightBuilder().field(field)).get(); - assertHighlight(response, 0, "text", 0, 2, equalTo("This is the third sentence. This is the fourth sentence.")); - assertHighlight(response, 0, "text", 1, 2, equalTo("This is the fifth sentence")); + assertHighlight(response, 0, "text", 0, 2, + equalTo("This is the third sentence. This is the fourth sentence.")); + assertHighlight(response, 0, "text", 1, 2, + equalTo("This is the fifth sentence")); field.highlighterType("fvh"); response = client().prepareSearch("test").setQuery(queryBuilder).highlighter(new HighlightBuilder().field(field)).get(); - assertHighlight(response, 0, "text", 0, 2, equalTo("This is the third sentence. This is the fourth sentence.")); - assertHighlight(response, 0, "text", 1, 2, equalTo("This is the fifth sentence")); + assertHighlight(response, 0, "text", 0, 2, + equalTo("This is the third sentence. This is the fourth sentence.")); + assertHighlight(response, 0, "text", 1, 2, + equalTo("This is the fifth sentence")); field.highlighterType("unified"); response = client().prepareSearch("test").setQuery(queryBuilder).highlighter(new HighlightBuilder().field(field)).get(); - assertHighlight(response, 0, "text", 0, 2, equalTo("This is the third sentence. This is the fourth sentence.")); - assertHighlight(response, 0, "text", 1, 2, equalTo("This is the fifth sentence")); + assertHighlight(response, 0, "text", 0, 2, + equalTo("This is the third sentence. This is the fourth sentence.")); + assertHighlight(response, 0, "text", 1, 2, + equalTo("This is the fifth sentence")); } public void testPostingsHighlighter() throws Exception { @@ -1989,7 +2002,8 @@ public void testPostingsHighlighterMultipleFields() throws Exception { new HighlightBuilder().field(new Field("field1").preTags("<1>").postTags("") .requireFieldMatch(true))) .get(); - assertHighlight(response, 0, "field1", 0, 1, equalTo("The quick brown <1>fox.")); + assertHighlight(response, 0, "field1", 0, 1, + equalTo("The quick brown <1>fox. Second sentence.")); } public void testPostingsHighlighterNumberOfFragments() throws Exception { @@ -2012,9 +2026,12 @@ public void testPostingsHighlighterNumberOfFragments() throws Exception { SearchResponse searchResponse = client().search(searchRequest("test").source(source)).actionGet(); - assertHighlight(searchResponse, 0, "field1", 0, equalTo("The quick brown fox jumps over the lazy dog.")); - assertHighlight(searchResponse, 0, "field1", 1, equalTo("The lazy red fox jumps over the quick dog.")); - assertHighlight(searchResponse, 0, "field1", 2, 3, equalTo("The quick brown dog jumps over the lazy fox.")); + assertThat(searchResponse.getHits().getHits().length, equalTo(1)); + assertHighlight(searchResponse, 0, "field1", 0, 2, + equalTo("The quick brown fox jumps over the lazy dog." + + " The lazy red fox jumps over the quick dog.")); + assertHighlight(searchResponse, 0, "field1", 1, 2, + equalTo("The quick brown dog jumps over the lazy fox.")); client().prepareIndex("test", "type1", "2") .setSource("field1", new String[]{ @@ -2033,14 +2050,17 @@ public void testPostingsHighlighterNumberOfFragments() throws Exception { for (SearchHit searchHit : searchResponse.getHits()) { if ("1".equals(searchHit.getId())) { - assertHighlight(searchHit, "field1", 0, 1, equalTo("The quick brown fox jumps over the lazy dog. " + assertHighlight(searchHit, "field1", 0, 1, + equalTo("The quick brown fox jumps over the lazy dog. " + "The lazy red fox jumps over the quick dog. " + "The quick brown dog jumps over the lazy fox.")); } else if ("2".equals(searchHit.getId())) { assertHighlight(searchHit, "field1", 0, 3, equalTo("The quick brown fox jumps over the lazy dog. Second sentence not finished")); - assertHighlight(searchHit, "field1", 1, 3, equalTo("The lazy red fox jumps over the quick dog.")); - assertHighlight(searchHit, "field1", 2, 3, equalTo("The quick brown dog jumps over the lazy fox.")); + assertHighlight(searchHit, "field1", 1, 3, + equalTo("The lazy red fox jumps over the quick dog.")); + assertHighlight(searchHit, "field1", 2, 3, + equalTo("The quick brown dog jumps over the lazy fox.")); } else { fail("Only hits with id 1 and 2 are returned"); } @@ -2083,7 +2103,8 @@ public void testMultiMatchQueryHighlight() throws IOException { logger.info("Running multi-match type: [{}] highlight with type: [{}]", matchQueryType, highlighterType); SearchResponse searchResponse = client().search(searchRequest("test").source(source)).actionGet(); assertHitCount(searchResponse, 1L); - assertHighlight(searchResponse, 0, "field1", 0, anyOf(equalTo("The quick brown fox jumps over"), + assertHighlight(searchResponse, 0, "field1", 0, + anyOf(equalTo("The quick brown fox jumps over"), equalTo("The quick brown fox jumps over"))); } } @@ -2112,13 +2133,15 @@ public void testPostingsHighlighterOrderByScore() throws Exception { Map highlightFieldMap = searchResponse.getHits().getAt(0).getHighlightFields(); assertThat(highlightFieldMap.size(), equalTo(1)); HighlightField field1 = highlightFieldMap.get("field1"); - assertThat(field1.fragments().length, equalTo(5)); + assertThat(field1.fragments().length, equalTo(4)); assertThat(field1.fragments()[0].string(), equalTo("This sentence contains three sentence occurrences (sentence).")); - assertThat(field1.fragments()[1].string(), equalTo("This sentence contains two sentence matches.")); - assertThat(field1.fragments()[2].string(), equalTo("This is the second value's first sentence.")); - assertThat(field1.fragments()[3].string(), equalTo("This sentence contains one match, not that short.")); - assertThat(field1.fragments()[4].string(), + assertThat(field1.fragments()[1].string(), + equalTo("This sentence contains one match, not that short. " + + "This sentence contains two sentence matches.")); + assertThat(field1.fragments()[2].string(), + equalTo("This is the second value's first sentence. This one contains no matches.")); + assertThat(field1.fragments()[3].string(), equalTo("One sentence match here and scored lower since the text is quite long, not that appealing.")); } @@ -2139,7 +2162,7 @@ public void testPostingsHighlighterEscapeHtml() throws Exception { for (int i = 0; i < indexRequestBuilders.length; i++) { assertHighlight(searchResponse, i, "title", 0, 1, - equalTo("This is a html escaping highlighting test for *&?")); + equalTo("This is a html escaping highlighting test for *&? elasticsearch")); } } @@ -2173,7 +2196,7 @@ public void testPostingsHighlighterMultiMapperWithStore() throws Exception { assertHitCount(searchResponse, 1L); SearchHit hit = searchResponse.getHits().getAt(0); //stopwords are not highlighted since not indexed - assertHighlight(hit, "title", 0, 1, equalTo("this is a test .")); + assertHighlight(hit, "title", 0, 1, equalTo("this is a test . Second sentence.")); // search on title.key and highlight on title searchResponse = client().prepareSearch() @@ -2183,7 +2206,7 @@ public void testPostingsHighlighterMultiMapperWithStore() throws Exception { //stopwords are now highlighted since we used only whitespace analyzer here assertHighlight(searchResponse, 0, "title.key", 0, 1, - equalTo("this is a test .")); + equalTo("this is a test . Second sentence.")); } public void testPostingsHighlighterMultiMapperFromSource() throws Exception { @@ -2258,7 +2281,8 @@ public void testPostingsHighlighterBoostingQuery() throws IOException { .highlighter(highlight().field("field2").preTags("").postTags("")); SearchResponse searchResponse = client().search(searchRequest("test").source(source)).actionGet(); - assertHighlight(searchResponse, 0, "field2", 0, 1, equalTo("The quick brown fox jumps over the lazy dog!")); + assertHighlight(searchResponse, 0, "field2", 0, 1, + equalTo("The quick brown fox jumps over the lazy dog! Second sentence.")); } public void testPostingsHighlighterCommonTermsQuery() throws IOException { @@ -2275,7 +2299,8 @@ public void testPostingsHighlighterCommonTermsQuery() throws IOException { SearchResponse searchResponse = client().search(searchRequest("test").source(source)).actionGet(); assertHitCount(searchResponse, 1L); - assertHighlight(searchResponse, 0, "field2", 0, 1, equalTo("The quick brown fox jumps over the lazy dog!")); + assertHighlight(searchResponse, 0, "field2", 0, 1, + equalTo("The quick brown fox jumps over the lazy dog! Second sentence.")); } private static XContentBuilder type1PostingsffsetsMapping() throws IOException { @@ -2299,7 +2324,8 @@ public void testPostingsHighlighterPrefixQuery() throws Exception { SearchSourceBuilder source = searchSource().query(prefixQuery("field2", "qui")) .highlighter(highlight().field("field2")); SearchResponse searchResponse = client().prepareSearch("test").setSource(source).get(); - assertHighlight(searchResponse, 0, "field2", 0, 1, equalTo("The quick brown fox jumps over the lazy dog!")); + assertHighlight(searchResponse, 0, "field2", 0, 1, + equalTo("The quick brown fox jumps over the lazy dog! Second sentence.")); } public void testPostingsHighlighterFuzzyQuery() throws Exception { @@ -2315,7 +2341,8 @@ public void testPostingsHighlighterFuzzyQuery() throws Exception { .highlighter(highlight().field("field2")); SearchResponse searchResponse = client().prepareSearch("test").setSource(source).get(); - assertHighlight(searchResponse, 0, "field2", 0, 1, equalTo("The quick brown fox jumps over the lazy dog!")); + assertHighlight(searchResponse, 0, "field2", 0, 1, + equalTo("The quick brown fox jumps over the lazy dog! Second sentence.")); } public void testPostingsHighlighterRegexpQuery() throws Exception { @@ -2331,7 +2358,8 @@ public void testPostingsHighlighterRegexpQuery() throws Exception { .highlighter(highlight().field("field2")); SearchResponse searchResponse = client().prepareSearch("test").setSource(source).get(); - assertHighlight(searchResponse, 0, "field2", 0, 1, equalTo("The quick brown fox jumps over the lazy dog!")); + assertHighlight(searchResponse, 0, "field2", 0, 1, + equalTo("The quick brown fox jumps over the lazy dog! Second sentence.")); } public void testPostingsHighlighterWildcardQuery() throws Exception { @@ -2347,14 +2375,16 @@ public void testPostingsHighlighterWildcardQuery() throws Exception { .highlighter(highlight().field("field2")); SearchResponse searchResponse = client().prepareSearch("test").setSource(source).get(); - assertHighlight(searchResponse, 0, "field2", 0, 1, equalTo("The quick brown fox jumps over the lazy dog!")); + assertHighlight(searchResponse, 0, "field2", 0, 1, + equalTo("The quick brown fox jumps over the lazy dog! Second sentence.")); source = searchSource().query(wildcardQuery("field2", "qu*k")) .highlighter(highlight().field("field2")); searchResponse = client().prepareSearch("test").setSource(source).get(); assertHitCount(searchResponse, 1L); - assertHighlight(searchResponse, 0, "field2", 0, 1, equalTo("The quick brown fox jumps over the lazy dog!")); + assertHighlight(searchResponse, 0, "field2", 0, 1, + equalTo("The quick brown fox jumps over the lazy dog! Second sentence.")); } public void testPostingsHighlighterTermRangeQuery() throws Exception { @@ -2384,7 +2414,8 @@ public void testPostingsHighlighterQueryString() throws Exception { SearchSourceBuilder source = searchSource().query(queryStringQuery("qui*").defaultField("field2")) .highlighter(highlight().field("field2")); SearchResponse searchResponse = client().prepareSearch("test").setSource(source).get(); - assertHighlight(searchResponse, 0, "field2", 0, 1, equalTo("The quick brown fox jumps over the lazy dog!")); + assertHighlight(searchResponse, 0, "field2", 0, 1, + equalTo("The quick brown fox jumps over the lazy dog! Second sentence.")); } public void testPostingsHighlighterRegexpQueryWithinConstantScoreQuery() throws Exception { @@ -2479,7 +2510,7 @@ public void testPostingsHighlighterManyDocs() throws Exception { assertThat(searchResponse.getHits().getHits().length, equalTo(COUNT)); for (SearchHit hit : searchResponse.getHits()) { String prefix = prefixes.get(hit.getId()); - assertHighlight(hit, "field1", 0, 1, equalTo("Sentence " + prefix + " test.")); + assertHighlight(hit, "field1", 0, 1, equalTo("Sentence " + prefix + " test. Sentence two.")); } } From 228f7ffcdf96ca5ac2d3cf12b99869d81fd5f05e Mon Sep 17 00:00:00 2001 From: Yu Date: Thu, 11 Jan 2018 14:40:04 +0100 Subject: [PATCH 52/74] Add scroll parameter to _reindex API (#28041) Be able to change scroll timeout in _reindex API (by default: 5m) --- .../reindex/AbstractBulkByScrollRequest.java | 18 ++++++++++++++++- docs/reference/docs/delete-by-query.asciidoc | 7 +++++-- docs/reference/docs/reindex.asciidoc | 8 +++++--- docs/reference/docs/update-by-query.asciidoc | 7 +++++-- .../index/reindex/RestReindexAction.java | 3 +++ .../index/reindex/RestReindexActionTests.java | 20 +++++++++++++++++++ 6 files changed, 55 insertions(+), 8 deletions(-) diff --git a/core/src/main/java/org/elasticsearch/index/reindex/AbstractBulkByScrollRequest.java b/core/src/main/java/org/elasticsearch/index/reindex/AbstractBulkByScrollRequest.java index 62dbd5b131234..9d2c221fcb24d 100644 --- a/core/src/main/java/org/elasticsearch/index/reindex/AbstractBulkByScrollRequest.java +++ b/core/src/main/java/org/elasticsearch/index/reindex/AbstractBulkByScrollRequest.java @@ -28,6 +28,7 @@ import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.unit.TimeValue; +import org.elasticsearch.search.Scroll; import org.elasticsearch.search.builder.SearchSourceBuilder; import org.elasticsearch.tasks.Task; import org.elasticsearch.tasks.TaskId; @@ -42,7 +43,7 @@ public abstract class AbstractBulkByScrollRequest> extends ActionRequest { public static final int SIZE_ALL_MATCHES = -1; - private static final TimeValue DEFAULT_SCROLL_TIMEOUT = timeValueMinutes(5); + static final TimeValue DEFAULT_SCROLL_TIMEOUT = timeValueMinutes(5); static final int DEFAULT_SCROLL_SIZE = 1000; public static final int AUTO_SLICES = 0; @@ -341,6 +342,21 @@ public boolean getShouldStoreResult() { return shouldStoreResult; } + /** + * Set scroll timeout for {@link SearchRequest} + */ + public Self setScroll(TimeValue keepAlive) { + searchRequest.scroll(new Scroll(keepAlive)); + return self(); + } + + /** + * Get scroll timeout + */ + public TimeValue getScrollTime() { + return searchRequest.scroll().keepAlive(); + } + /** * The number of slices this task should be divided into. Defaults to 1 meaning the task isn't sliced into subtasks. */ diff --git a/docs/reference/docs/delete-by-query.asciidoc b/docs/reference/docs/delete-by-query.asciidoc index cbcbc29e1657e..7f92de5328118 100644 --- a/docs/reference/docs/delete-by-query.asciidoc +++ b/docs/reference/docs/delete-by-query.asciidoc @@ -142,7 +142,8 @@ POST twitter/_delete_by_query?scroll_size=5000 === URL Parameters In addition to the standard parameters like `pretty`, the Delete By Query API -also supports `refresh`, `wait_for_completion`, `wait_for_active_shards`, and `timeout`. +also supports `refresh`, `wait_for_completion`, `wait_for_active_shards`, `timeout` +and `scroll`. Sending the `refresh` will refresh all shards involved in the delete by query once the request completes. This is different than the Delete API's `refresh` @@ -161,7 +162,9 @@ Elasticsearch can reclaim the space it uses. before proceeding with the request. See <> for details. `timeout` controls how long each write request waits for unavailable shards to become available. Both work exactly how they work in the -<>. +<>. As `_delete_by_query` uses scroll search, you can also specify +the `scroll` parameter to control how long it keeps the "search context" alive, +eg `?scroll=10m`, by default it's 5 minutes. `requests_per_second` can be set to any positive decimal number (`1.4`, `6`, `1000`, etc) and throttles rate at which `_delete_by_query` issues batches of diff --git a/docs/reference/docs/reindex.asciidoc b/docs/reference/docs/reindex.asciidoc index 54631195fe150..557706efa1456 100644 --- a/docs/reference/docs/reindex.asciidoc +++ b/docs/reference/docs/reindex.asciidoc @@ -512,8 +512,8 @@ POST _reindex === URL Parameters In addition to the standard parameters like `pretty`, the Reindex API also -supports `refresh`, `wait_for_completion`, `wait_for_active_shards`, `timeout`, and -`requests_per_second`. +supports `refresh`, `wait_for_completion`, `wait_for_active_shards`, `timeout`, +`scroll` and `requests_per_second`. Sending the `refresh` url parameter will cause all indexes to which the request wrote to be refreshed. This is different than the Index API's `refresh` @@ -531,7 +531,9 @@ Elasticsearch can reclaim the space it uses. before proceeding with the reindexing. See <> for details. `timeout` controls how long each write request waits for unavailable shards to become available. Both work exactly how they work in the -<>. +<>. As `_reindex` uses scroll search, you can also specify +the `scroll` parameter to control how long it keeps the "search context" alive, +eg `?scroll=10m`, by default it's 5 minutes. `requests_per_second` can be set to any positive decimal number (`1.4`, `6`, `1000`, etc) and throttles rate at which reindex issues batches of index diff --git a/docs/reference/docs/update-by-query.asciidoc b/docs/reference/docs/update-by-query.asciidoc index 55044dffed9af..a8b12c6bd6b84 100644 --- a/docs/reference/docs/update-by-query.asciidoc +++ b/docs/reference/docs/update-by-query.asciidoc @@ -200,7 +200,8 @@ POST twitter/_update_by_query?pipeline=set-foo === URL Parameters In addition to the standard parameters like `pretty`, the Update By Query API -also supports `refresh`, `wait_for_completion`, `wait_for_active_shards`, and `timeout`. +also supports `refresh`, `wait_for_completion`, `wait_for_active_shards`, `timeout` +and `scroll`. Sending the `refresh` will update all shards in the index being updated when the request completes. This is different than the Index API's `refresh` @@ -218,7 +219,9 @@ Elasticsearch can reclaim the space it uses. before proceeding with the request. See <> for details. `timeout` controls how long each write request waits for unavailable shards to become available. Both work exactly how they work in the -<>. +<>. As `_update_by_query` uses scroll search, you can also specify +the `scroll` parameter to control how long it keeps the "search context" alive, +eg `?scroll=10m`, by default it's 5 minutes. `requests_per_second` can be set to any positive decimal number (`1.4`, `6`, `1000`, etc) and throttles rate at which `_update_by_query` issues batches of diff --git a/modules/reindex/src/main/java/org/elasticsearch/index/reindex/RestReindexAction.java b/modules/reindex/src/main/java/org/elasticsearch/index/reindex/RestReindexAction.java index 50365948f0bfd..90f4afbe440ae 100644 --- a/modules/reindex/src/main/java/org/elasticsearch/index/reindex/RestReindexAction.java +++ b/modules/reindex/src/main/java/org/elasticsearch/index/reindex/RestReindexAction.java @@ -119,6 +119,9 @@ protected ReindexRequest buildRequest(RestRequest request) throws IOException { try (XContentParser parser = request.contentParser()) { PARSER.parse(parser, internal, null); } + if (request.hasParam("scroll")) { + internal.setScroll(parseTimeValue(request.param("scroll"), "scroll")); + } return internal; } diff --git a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/RestReindexActionTests.java b/modules/reindex/src/test/java/org/elasticsearch/index/reindex/RestReindexActionTests.java index ffb609843f3b4..9215459c1ce93 100644 --- a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/RestReindexActionTests.java +++ b/modules/reindex/src/test/java/org/elasticsearch/index/reindex/RestReindexActionTests.java @@ -21,10 +21,12 @@ import org.elasticsearch.action.index.IndexRequest; import org.elasticsearch.action.search.SearchRequest; +import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; +import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.common.xcontent.json.JsonXContent; import org.elasticsearch.rest.RestController; import org.elasticsearch.test.ESTestCase; @@ -150,6 +152,24 @@ public void testPipelineQueryParameterIsError() throws IOException { assertEquals("_reindex doesn't support [pipeline] as a query parmaeter. Specify it in the [dest] object instead.", e.getMessage()); } + public void testSetScrollTimeout() throws IOException { + { + RestReindexAction action = new RestReindexAction(Settings.EMPTY, mock(RestController.class)); + FakeRestRequest.Builder requestBuilder = new FakeRestRequest.Builder(xContentRegistry()); + requestBuilder.withContent(new BytesArray("{}"), XContentType.JSON); + ReindexRequest request = action.buildRequest(requestBuilder.build()); + assertEquals(AbstractBulkByScrollRequest.DEFAULT_SCROLL_TIMEOUT, request.getScrollTime()); + } + { + RestReindexAction action = new RestReindexAction(Settings.EMPTY, mock(RestController.class)); + FakeRestRequest.Builder requestBuilder = new FakeRestRequest.Builder(xContentRegistry()); + requestBuilder.withParams(singletonMap("scroll", "10m")); + requestBuilder.withContent(new BytesArray("{}"), XContentType.JSON); + ReindexRequest request = action.buildRequest(requestBuilder.build()); + assertEquals("10m", request.getScrollTime().toString()); + } + } + private RemoteInfo buildRemoteInfoHostTestCase(String hostInRest) throws IOException { Map remote = new HashMap<>(); remote.put("host", hostInRest); From 39ff7b5a3f0d596977e3ab66842ef12ad745c964 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20B=C3=BCscher?= Date: Thu, 11 Jan 2018 15:52:11 +0100 Subject: [PATCH 53/74] [Docs] Correct response json in rank-eval.asciidoc --- docs/reference/search/rank-eval.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/reference/search/rank-eval.asciidoc b/docs/reference/search/rank-eval.asciidoc index 82a2df27d8001..6e834d5e60cba 100644 --- a/docs/reference/search/rank-eval.asciidoc +++ b/docs/reference/search/rank-eval.asciidoc @@ -287,7 +287,7 @@ that shows potential errors of individual queries. The response has the followin "docs_retrieved": 10 } }, - "my_query_id2 : { [...]} + "my_query_id2" : { [...] } }, "failures": { [...] } } From 626c3d1fda05381ccd8cfe92e8a5edcc497a1e6a Mon Sep 17 00:00:00 2001 From: Nhat Nguyen Date: Thu, 11 Jan 2018 10:39:12 -0500 Subject: [PATCH 54/74] Primary send safe commit in file-based recovery (#28038) Today a primary shard transfers the most recent commit point to a replica shard in a file-based recovery. However, the most recent commit may not be a "safe" commit; this causes a replica shard not having a safe commit point until it can retain a safe commit by itself. This commits collapses the snapshot deletion policy into the combined deletion policy and modifies the peer recovery source to send a safe commit. Relates #10708 --- .../index/engine/CombinedDeletionPolicy.java | 109 ++++++++++++++++-- .../elasticsearch/index/engine/Engine.java | 13 +-- .../index/engine/InternalEngine.java | 19 ++- .../elasticsearch/index/shard/IndexShard.java | 7 +- .../index/shard/LocalShardSnapshot.java | 2 +- .../org/elasticsearch/index/store/Store.java | 4 +- .../recovery/RecoverySourceHandler.java | 2 +- .../snapshots/SnapshotShardsService.java | 2 +- .../engine/CombinedDeletionPolicyTests.java | 86 ++++++++++---- .../index/engine/InternalEngineTests.java | 37 +++++- .../index/shard/IndexShardTests.java | 35 ------ .../recovery/RecoverySourceHandlerTests.java | 2 +- .../indices/recovery/RecoveryTests.java | 30 +++++ .../index/shard/IndexShardTestCase.java | 2 +- 14 files changed, 257 insertions(+), 93 deletions(-) diff --git a/core/src/main/java/org/elasticsearch/index/engine/CombinedDeletionPolicy.java b/core/src/main/java/org/elasticsearch/index/engine/CombinedDeletionPolicy.java index d603a40b5d3ff..6a61843c263e4 100644 --- a/core/src/main/java/org/elasticsearch/index/engine/CombinedDeletionPolicy.java +++ b/core/src/main/java/org/elasticsearch/index/engine/CombinedDeletionPolicy.java @@ -19,14 +19,17 @@ package org.elasticsearch.index.engine; +import com.carrotsearch.hppc.ObjectIntHashMap; import org.apache.lucene.index.IndexCommit; import org.apache.lucene.index.IndexDeletionPolicy; +import org.apache.lucene.store.Directory; import org.elasticsearch.index.seqno.SequenceNumbers; import org.elasticsearch.index.translog.Translog; import org.elasticsearch.index.translog.TranslogDeletionPolicy; import java.io.IOException; import java.nio.file.Path; +import java.util.Collection; import java.util.List; import java.util.Map; import java.util.function.LongSupplier; @@ -42,12 +45,16 @@ public final class CombinedDeletionPolicy extends IndexDeletionPolicy { private final TranslogDeletionPolicy translogDeletionPolicy; private final EngineConfig.OpenMode openMode; private final LongSupplier globalCheckpointSupplier; + private final ObjectIntHashMap snapshottedCommits; // Number of snapshots held against each commit point. + private IndexCommit safeCommit; // the most recent safe commit point - its max_seqno at most the persisted global checkpoint. + private IndexCommit lastCommit; // the most recent commit point CombinedDeletionPolicy(EngineConfig.OpenMode openMode, TranslogDeletionPolicy translogDeletionPolicy, LongSupplier globalCheckpointSupplier) { this.openMode = openMode; this.translogDeletionPolicy = translogDeletionPolicy; this.globalCheckpointSupplier = globalCheckpointSupplier; + this.snapshottedCommits = new ObjectIntHashMap<>(); } @Override @@ -70,18 +77,22 @@ public void onInit(List commits) throws IOException { } @Override - public void onCommit(List commits) throws IOException { + public synchronized void onCommit(List commits) throws IOException { final int keptPosition = indexOfKeptCommits(commits, globalCheckpointSupplier.getAsLong()); + lastCommit = commits.get(commits.size() - 1); + safeCommit = commits.get(keptPosition); for (int i = 0; i < keptPosition; i++) { - commits.get(i).delete(); + if (snapshottedCommits.containsKey(commits.get(i)) == false) { + commits.get(i).delete(); + } } - updateTranslogDeletionPolicy(commits.get(keptPosition), commits.get(commits.size() - 1)); + updateTranslogDeletionPolicy(); } - private void updateTranslogDeletionPolicy(final IndexCommit minRequiredCommit, final IndexCommit lastCommit) throws IOException { - assert minRequiredCommit.isDeleted() == false : "The minimum required commit must not be deleted"; - final long minRequiredGen = Long.parseLong(minRequiredCommit.getUserData().get(Translog.TRANSLOG_GENERATION_KEY)); - + private void updateTranslogDeletionPolicy() throws IOException { + assert Thread.holdsLock(this); + assert safeCommit.isDeleted() == false : "The safe commit must not be deleted"; + final long minRequiredGen = Long.parseLong(safeCommit.getUserData().get(Translog.TRANSLOG_GENERATION_KEY)); assert lastCommit.isDeleted() == false : "The last commit must not be deleted"; final long lastGen = Long.parseLong(lastCommit.getUserData().get(Translog.TRANSLOG_GENERATION_KEY)); @@ -90,6 +101,34 @@ private void updateTranslogDeletionPolicy(final IndexCommit minRequiredCommit, f translogDeletionPolicy.setMinTranslogGenerationForRecovery(minRequiredGen); } + /** + * Captures the most recent commit point {@link #lastCommit} or the most recent safe commit point {@link #safeCommit}. + * Index files of the capturing commit point won't be released until the commit reference is closed. + * + * @param acquiringSafeCommit captures the most recent safe commit point if true; otherwise captures the most recent commit point. + */ + synchronized IndexCommit acquireIndexCommit(boolean acquiringSafeCommit) { + assert safeCommit != null : "Safe commit is not initialized yet"; + assert lastCommit != null : "Last commit is not initialized yet"; + final IndexCommit snapshotting = acquiringSafeCommit ? safeCommit : lastCommit; + snapshottedCommits.addTo(snapshotting, 1); // increase refCount + return new SnapshotIndexCommit(snapshotting); + } + + /** + * Releases an index commit that acquired by {@link #acquireIndexCommit(boolean)}. + */ + synchronized void releaseCommit(final IndexCommit snapshotCommit) { + final IndexCommit releasingCommit = ((SnapshotIndexCommit) snapshotCommit).delegate; + assert snapshottedCommits.containsKey(releasingCommit) : "Release non-snapshotted commit;" + + "snapshotted commits [" + snapshottedCommits + "], releasing commit [" + releasingCommit + "]"; + final int refCount = snapshottedCommits.addTo(releasingCommit, -1); // release refCount + assert refCount >= 0 : "Number of snapshots can not be negative [" + refCount + "]"; + if (refCount == 0) { + snapshottedCommits.remove(releasingCommit); + } + } + /** * Find a safe commit point from a list of existing commits based on the supplied global checkpoint. * The max sequence number of a safe commit point should be at most the global checkpoint. @@ -139,4 +178,60 @@ private static int indexOfKeptCommits(List commits, long */ return 0; } + + /** + * A wrapper of an index commit that prevents it from being deleted. + */ + private static class SnapshotIndexCommit extends IndexCommit { + private final IndexCommit delegate; + + SnapshotIndexCommit(IndexCommit delegate) { + this.delegate = delegate; + } + + @Override + public String getSegmentsFileName() { + return delegate.getSegmentsFileName(); + } + + @Override + public Collection getFileNames() throws IOException { + return delegate.getFileNames(); + } + + @Override + public Directory getDirectory() { + return delegate.getDirectory(); + } + + @Override + public void delete() { + throw new UnsupportedOperationException("A snapshot commit does not support deletion"); + } + + @Override + public boolean isDeleted() { + return delegate.isDeleted(); + } + + @Override + public int getSegmentCount() { + return delegate.getSegmentCount(); + } + + @Override + public long getGeneration() { + return delegate.getGeneration(); + } + + @Override + public Map getUserData() throws IOException { + return delegate.getUserData(); + } + + @Override + public String toString() { + return "SnapshotIndexCommit{" + delegate + "}"; + } + } } diff --git a/core/src/main/java/org/elasticsearch/index/engine/Engine.java b/core/src/main/java/org/elasticsearch/index/engine/Engine.java index 6d37502bd604a..5de7062ab18ee 100644 --- a/core/src/main/java/org/elasticsearch/index/engine/Engine.java +++ b/core/src/main/java/org/elasticsearch/index/engine/Engine.java @@ -32,7 +32,6 @@ import org.apache.lucene.index.SegmentCommitInfo; import org.apache.lucene.index.SegmentInfos; import org.apache.lucene.index.SegmentReader; -import org.apache.lucene.index.SnapshotDeletionPolicy; import org.apache.lucene.index.Term; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.ReferenceManager; @@ -92,7 +91,6 @@ import java.util.concurrent.locks.ReentrantLock; import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.function.BiFunction; -import java.util.stream.Collectors; public abstract class Engine implements Closeable { @@ -568,7 +566,7 @@ public CommitStats commitStats() { * @return the sequence number service */ public abstract LocalCheckpointTracker getLocalCheckpointTracker(); - + /** * Global stats on segments. */ @@ -859,9 +857,10 @@ public void forceMerge(boolean flush) throws IOException { * Snapshots the index and returns a handle to it. If needed will try and "commit" the * lucene index to make sure we have a "fresh" copy of the files to snapshot. * + * @param safeCommit indicates whether the engine should acquire the most recent safe commit, or the most recent commit. * @param flushFirst indicates whether the engine should flush before returning the snapshot */ - public abstract IndexCommitRef acquireIndexCommit(boolean flushFirst) throws EngineException; + public abstract IndexCommitRef acquireIndexCommit(boolean safeCommit, boolean flushFirst) throws EngineException; /** * fail engine due to some error. the engine will also be closed. @@ -1437,9 +1436,9 @@ public static class IndexCommitRef implements Closeable { private final CheckedRunnable onClose; private final IndexCommit indexCommit; - IndexCommitRef(SnapshotDeletionPolicy deletionPolicy) throws IOException { - indexCommit = deletionPolicy.snapshot(); - onClose = () -> deletionPolicy.release(indexCommit); + IndexCommitRef(IndexCommit indexCommit, CheckedRunnable onClose) { + this.indexCommit = indexCommit; + this.onClose = onClose; } @Override diff --git a/core/src/main/java/org/elasticsearch/index/engine/InternalEngine.java b/core/src/main/java/org/elasticsearch/index/engine/InternalEngine.java index a0d1fa92a2efc..77b8275277079 100644 --- a/core/src/main/java/org/elasticsearch/index/engine/InternalEngine.java +++ b/core/src/main/java/org/elasticsearch/index/engine/InternalEngine.java @@ -125,7 +125,7 @@ public class InternalEngine extends Engine { private final String uidField; - private final SnapshotDeletionPolicy snapshotDeletionPolicy; + private final CombinedDeletionPolicy combinedDeletionPolicy; // How many callers are currently requesting index throttling. Currently there are only two situations where we do this: when merges // are falling behind and when writing indexing buffer to disk is too slow. When this is 0, there is no throttling, else we throttling @@ -184,9 +184,8 @@ public InternalEngine(EngineConfig engineConfig) { assert openMode != EngineConfig.OpenMode.OPEN_INDEX_AND_TRANSLOG || startingCommit != null : "Starting commit should be non-null; mode [" + openMode + "]; startingCommit [" + startingCommit + "]"; this.localCheckpointTracker = createLocalCheckpointTracker(localCheckpointTrackerSupplier, startingCommit); - this.snapshotDeletionPolicy = new SnapshotDeletionPolicy( - new CombinedDeletionPolicy(openMode, translogDeletionPolicy, translog::getLastSyncedGlobalCheckpoint) - ); + this.combinedDeletionPolicy = new CombinedDeletionPolicy(openMode, translogDeletionPolicy, + translog::getLastSyncedGlobalCheckpoint); writer = createWriter(openMode == EngineConfig.OpenMode.CREATE_INDEX_AND_TRANSLOG, startingCommit); updateMaxUnsafeAutoIdTimestampFromWriter(writer); assert engineConfig.getForceNewHistoryUUID() == false @@ -1644,7 +1643,7 @@ public void forceMerge(final boolean flush, int maxNumSegments, boolean onlyExpu } @Override - public IndexCommitRef acquireIndexCommit(final boolean flushFirst) throws EngineException { + public IndexCommitRef acquireIndexCommit(final boolean safeCommit, final boolean flushFirst) throws EngineException { // we have to flush outside of the readlock otherwise we might have a problem upgrading // the to a write lock when we fail the engine in this operation if (flushFirst) { @@ -1652,12 +1651,8 @@ public IndexCommitRef acquireIndexCommit(final boolean flushFirst) throws Engine flush(false, true); logger.trace("finish flush for snapshot"); } - try (ReleasableLock lock = readLock.acquire()) { - logger.trace("pulling snapshot"); - return new IndexCommitRef(snapshotDeletionPolicy); - } catch (IOException e) { - throw new SnapshotFailedEngineException(shardId, e); - } + final IndexCommit snapshotCommit = combinedDeletionPolicy.acquireIndexCommit(safeCommit); + return new Engine.IndexCommitRef(snapshotCommit, () -> combinedDeletionPolicy.releaseCommit(snapshotCommit)); } private boolean failOnTragicEvent(AlreadyClosedException ex) { @@ -1828,7 +1823,7 @@ private IndexWriterConfig getIndexWriterConfig(boolean create, IndexCommit start iwc.setCommitOnClose(false); // we by default don't commit on close iwc.setOpenMode(create ? IndexWriterConfig.OpenMode.CREATE : IndexWriterConfig.OpenMode.APPEND); iwc.setIndexCommit(startingCommit); - iwc.setIndexDeletionPolicy(snapshotDeletionPolicy); + iwc.setIndexDeletionPolicy(combinedDeletionPolicy); // with tests.verbose, lucene sets this up: plumb to align with filesystem stream boolean verbose = false; try { diff --git a/core/src/main/java/org/elasticsearch/index/shard/IndexShard.java b/core/src/main/java/org/elasticsearch/index/shard/IndexShard.java index f5eba1b4f62b4..4c6c6a17c234d 100644 --- a/core/src/main/java/org/elasticsearch/index/shard/IndexShard.java +++ b/core/src/main/java/org/elasticsearch/index/shard/IndexShard.java @@ -1085,13 +1085,14 @@ public org.apache.lucene.util.Version minimumCompatibleVersion() { * Creates a new {@link IndexCommit} snapshot form the currently running engine. All resources referenced by this * commit won't be freed until the commit / snapshot is closed. * + * @param safeCommit true capture the most recent safe commit point; otherwise the most recent commit point. * @param flushFirst true if the index should first be flushed to disk / a low level lucene commit should be executed */ - public Engine.IndexCommitRef acquireIndexCommit(boolean flushFirst) throws EngineException { + public Engine.IndexCommitRef acquireIndexCommit(boolean safeCommit, boolean flushFirst) throws EngineException { IndexShardState state = this.state; // one time volatile read // we allow snapshot on closed index shard, since we want to do one after we close the shard and before we close the engine if (state == IndexShardState.STARTED || state == IndexShardState.RELOCATED || state == IndexShardState.CLOSED) { - return getEngine().acquireIndexCommit(flushFirst); + return getEngine().acquireIndexCommit(safeCommit, flushFirst); } else { throw new IllegalIndexShardStateException(shardId, state, "snapshot is not allowed"); } @@ -1125,7 +1126,7 @@ public Store.MetadataSnapshot snapshotStoreMetadata() throws IOException { return store.getMetadata(null, true); } } - indexCommit = engine.acquireIndexCommit(false); + indexCommit = engine.acquireIndexCommit(false, false); return store.getMetadata(indexCommit.getIndexCommit()); } finally { store.decRef(); diff --git a/core/src/main/java/org/elasticsearch/index/shard/LocalShardSnapshot.java b/core/src/main/java/org/elasticsearch/index/shard/LocalShardSnapshot.java index e156e988c8700..f8f92fbb5fa8b 100644 --- a/core/src/main/java/org/elasticsearch/index/shard/LocalShardSnapshot.java +++ b/core/src/main/java/org/elasticsearch/index/shard/LocalShardSnapshot.java @@ -48,7 +48,7 @@ final class LocalShardSnapshot implements Closeable { store.incRef(); boolean success = false; try { - indexCommit = shard.acquireIndexCommit(true); + indexCommit = shard.acquireIndexCommit(false, true); success = true; } finally { if (success == false) { diff --git a/core/src/main/java/org/elasticsearch/index/store/Store.java b/core/src/main/java/org/elasticsearch/index/store/Store.java index 41878c46011a3..dab39c26a3c5b 100644 --- a/core/src/main/java/org/elasticsearch/index/store/Store.java +++ b/core/src/main/java/org/elasticsearch/index/store/Store.java @@ -246,7 +246,7 @@ final void ensureOpen() { * * {@link #readMetadataSnapshot(Path, ShardId, NodeEnvironment.ShardLocker, Logger)} to read a meta data while locking * {@link IndexShard#snapshotStoreMetadata()} to safely read from an existing shard - * {@link IndexShard#acquireIndexCommit(boolean)} to get an {@link IndexCommit} which is safe to use but has to be freed + * {@link IndexShard#acquireIndexCommit(boolean, boolean)} to get an {@link IndexCommit} which is safe to use but has to be freed * @param commit the index commit to read the snapshot from or null if the latest snapshot should be read from the * directory * @throws CorruptIndexException if the lucene index is corrupted. This can be caused by a checksum mismatch or an @@ -270,7 +270,7 @@ public MetadataSnapshot getMetadata(IndexCommit commit) throws IOException { * * {@link #readMetadataSnapshot(Path, ShardId, NodeEnvironment.ShardLocker, Logger)} to read a meta data while locking * {@link IndexShard#snapshotStoreMetadata()} to safely read from an existing shard - * {@link IndexShard#acquireIndexCommit(boolean)} to get an {@link IndexCommit} which is safe to use but has to be freed + * {@link IndexShard#acquireIndexCommit(boolean, boolean)} to get an {@link IndexCommit} which is safe to use but has to be freed * * @param commit the index commit to read the snapshot from or null if the latest snapshot should be read from the * directory diff --git a/core/src/main/java/org/elasticsearch/indices/recovery/RecoverySourceHandler.java b/core/src/main/java/org/elasticsearch/indices/recovery/RecoverySourceHandler.java index 4ebce1c0b4bee..7afe6c977da21 100644 --- a/core/src/main/java/org/elasticsearch/indices/recovery/RecoverySourceHandler.java +++ b/core/src/main/java/org/elasticsearch/indices/recovery/RecoverySourceHandler.java @@ -159,7 +159,7 @@ public RecoveryResponse recoverToTarget() throws IOException { } else { final Engine.IndexCommitRef phase1Snapshot; try { - phase1Snapshot = shard.acquireIndexCommit(false); + phase1Snapshot = shard.acquireIndexCommit(true, false); } catch (final Exception e) { throw new RecoveryEngineException(shard.shardId(), 1, "snapshot failed", e); } diff --git a/core/src/main/java/org/elasticsearch/snapshots/SnapshotShardsService.java b/core/src/main/java/org/elasticsearch/snapshots/SnapshotShardsService.java index 35e0b10fd8769..7e2a7aab27743 100644 --- a/core/src/main/java/org/elasticsearch/snapshots/SnapshotShardsService.java +++ b/core/src/main/java/org/elasticsearch/snapshots/SnapshotShardsService.java @@ -390,7 +390,7 @@ private void snapshot(final IndexShard indexShard, final Snapshot snapshot, fina final Repository repository = snapshotsService.getRepositoriesService().repository(snapshot.getRepository()); try { // we flush first to make sure we get the latest writes snapshotted - try (Engine.IndexCommitRef snapshotRef = indexShard.acquireIndexCommit(true)) { + try (Engine.IndexCommitRef snapshotRef = indexShard.acquireIndexCommit(false, true)) { repository.snapshotShard(indexShard, snapshot.getSnapshotId(), indexId, snapshotRef.getIndexCommit(), snapshotStatus); if (logger.isDebugEnabled()) { final IndexShardSnapshotStatus.Copy lastSnapshotStatus = snapshotStatus.asCopy(); diff --git a/core/src/test/java/org/elasticsearch/index/engine/CombinedDeletionPolicyTests.java b/core/src/test/java/org/elasticsearch/index/engine/CombinedDeletionPolicyTests.java index 0fc6195161a0a..ca75c70137b5a 100644 --- a/core/src/test/java/org/elasticsearch/index/engine/CombinedDeletionPolicyTests.java +++ b/core/src/test/java/org/elasticsearch/index/engine/CombinedDeletionPolicyTests.java @@ -21,7 +21,7 @@ import com.carrotsearch.hppc.LongArrayList; import org.apache.lucene.index.IndexCommit; -import org.apache.lucene.index.SnapshotDeletionPolicy; +import org.apache.lucene.store.Directory; import org.elasticsearch.index.seqno.SequenceNumbers; import org.elasticsearch.index.translog.Translog; import org.elasticsearch.index.translog.TranslogDeletionPolicy; @@ -34,14 +34,15 @@ import java.util.List; import java.util.Map; import java.util.UUID; +import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicLong; import static java.util.Collections.singletonList; import static org.elasticsearch.index.engine.EngineConfig.OpenMode.OPEN_INDEX_AND_TRANSLOG; import static org.elasticsearch.index.engine.EngineConfig.OpenMode.OPEN_INDEX_CREATE_TRANSLOG; import static org.elasticsearch.index.translog.TranslogDeletionPolicies.createTranslogDeletionPolicy; -import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.equalTo; +import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; @@ -88,29 +89,64 @@ public void testKeepCommitsAfterGlobalCheckpoint() throws Exception { assertThat(translogPolicy.getTranslogGenerationOfLastCommit(), equalTo(lastTranslogGen)); } - public void testIgnoreSnapshottingCommits() throws Exception { + public void testAcquireIndexCommit() throws Exception { final AtomicLong globalCheckpoint = new AtomicLong(); final UUID translogUUID = UUID.randomUUID(); TranslogDeletionPolicy translogPolicy = createTranslogDeletionPolicy(); CombinedDeletionPolicy indexPolicy = new CombinedDeletionPolicy(OPEN_INDEX_AND_TRANSLOG, translogPolicy, globalCheckpoint::get); - - long firstMaxSeqNo = randomLongBetween(0, Long.MAX_VALUE - 1); - long secondMaxSeqNo = randomLongBetween(firstMaxSeqNo + 1, Long.MAX_VALUE); - - long lastTranslogGen = randomNonNegativeLong(); - final IndexCommit firstCommit = mockIndexCommit(firstMaxSeqNo, translogUUID, randomLongBetween(0, lastTranslogGen)); - final IndexCommit secondCommit = mockIndexCommit(secondMaxSeqNo, translogUUID, lastTranslogGen); - SnapshotDeletionPolicy snapshotDeletionPolicy = new SnapshotDeletionPolicy(indexPolicy); - - snapshotDeletionPolicy.onInit(Arrays.asList(firstCommit)); - snapshotDeletionPolicy.snapshot(); - assertThat(snapshotDeletionPolicy.getSnapshots(), contains(firstCommit)); - - // SnapshotPolicy prevents the first commit from deleting, but CombinedPolicy does not retain its translog. - globalCheckpoint.set(randomLongBetween(secondMaxSeqNo, Long.MAX_VALUE)); - snapshotDeletionPolicy.onCommit(Arrays.asList(firstCommit, secondCommit)); - verify(firstCommit, never()).delete(); - verify(secondCommit, never()).delete(); + long lastMaxSeqNo = between(1, 1000); + long lastTranslogGen = between(1, 20); + int safeIndex = 0; + List commitList = new ArrayList<>(); + List snapshottingCommits = new ArrayList<>(); + final int iters = between(10, 100); + for (int i = 0; i < iters; i++) { + int newCommits = between(1, 10); + for (int n = 0; n < newCommits; n++) { + lastMaxSeqNo += between(1, 1000); + lastTranslogGen += between(1, 20); + commitList.add(mockIndexCommit(lastMaxSeqNo, translogUUID, lastTranslogGen)); + } + // Advance the global checkpoint to between [safeIndex, safeIndex + 1) + safeIndex = randomIntBetween(safeIndex, commitList.size() - 1); + long lower = Math.max(globalCheckpoint.get(), + Long.parseLong(commitList.get(safeIndex).getUserData().get(SequenceNumbers.MAX_SEQ_NO))); + long upper = safeIndex == commitList.size() - 1 ? lastMaxSeqNo : + Long.parseLong(commitList.get(safeIndex + 1).getUserData().get(SequenceNumbers.MAX_SEQ_NO)) - 1; + globalCheckpoint.set(randomLongBetween(lower, upper)); + indexPolicy.onCommit(commitList); + // Captures and releases some commits + int captures = between(0, 5); + for (int n = 0; n < captures; n++) { + boolean safe = randomBoolean(); + final IndexCommit snapshot = indexPolicy.acquireIndexCommit(safe); + expectThrows(UnsupportedOperationException.class, snapshot::delete); + snapshottingCommits.add(snapshot); + if (safe) { + assertThat(snapshot.getUserData(), equalTo(commitList.get(safeIndex).getUserData())); + } else { + assertThat(snapshot.getUserData(), equalTo(commitList.get(commitList.size() - 1).getUserData())); + } + } + randomSubsetOf(snapshottingCommits).forEach(snapshot -> { + snapshottingCommits.remove(snapshot); + indexPolicy.releaseCommit(snapshot); + }); + // Snapshotting commits must not be deleted. + snapshottingCommits.forEach(snapshot -> assertThat(snapshot.isDeleted(), equalTo(false))); + // We don't need to retain translog for snapshotting commits. + assertThat(translogPolicy.getMinTranslogGenerationForRecovery(), + equalTo(Long.parseLong(commitList.get(safeIndex).getUserData().get(Translog.TRANSLOG_GENERATION_KEY)))); + assertThat(translogPolicy.getTranslogGenerationOfLastCommit(), + equalTo(Long.parseLong(commitList.get(commitList.size() - 1).getUserData().get(Translog.TRANSLOG_GENERATION_KEY)))); + } + snapshottingCommits.forEach(indexPolicy::releaseCommit); + globalCheckpoint.set(randomLongBetween(lastMaxSeqNo, Long.MAX_VALUE)); + indexPolicy.onCommit(commitList); + for (int i = 0; i < commitList.size() - 1; i++) { + assertThat(commitList.get(i).isDeleted(), equalTo(true)); + } + assertThat(commitList.get(commitList.size() - 1).isDeleted(), equalTo(false)); assertThat(translogPolicy.getMinTranslogGenerationForRecovery(), equalTo(lastTranslogGen)); assertThat(translogPolicy.getTranslogGenerationOfLastCommit(), equalTo(lastTranslogGen)); } @@ -180,8 +216,16 @@ IndexCommit mockIndexCommit(long maxSeqNo, UUID translogUUID, long translogGen) userData.put(SequenceNumbers.MAX_SEQ_NO, Long.toString(maxSeqNo)); userData.put(Translog.TRANSLOG_UUID_KEY, translogUUID.toString()); userData.put(Translog.TRANSLOG_GENERATION_KEY, Long.toString(translogGen)); + final AtomicBoolean deleted = new AtomicBoolean(); final IndexCommit commit = mock(IndexCommit.class); + final Directory directory = mock(Directory.class); when(commit.getUserData()).thenReturn(userData); + when(commit.getDirectory()).thenReturn(directory); + when(commit.isDeleted()).thenAnswer(args -> deleted.get()); + doAnswer(arg -> { + deleted.set(true); + return null; + }).when(commit).delete(); return commit; } diff --git a/core/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java b/core/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java index f20aaedaff75e..9755304d2f1eb 100644 --- a/core/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java +++ b/core/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java @@ -167,6 +167,7 @@ import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.greaterThanOrEqualTo; import static org.hamcrest.Matchers.hasKey; +import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.lessThanOrEqualTo; import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.notNullValue; @@ -2115,7 +2116,7 @@ public void testConcurrentWritesAndCommits() throws Exception { boolean doneIndexing; do { doneIndexing = doneLatch.await(sleepTime, TimeUnit.MILLISECONDS); - commits.add(engine.acquireIndexCommit(true)); + commits.add(engine.acquireIndexCommit(false, true)); if (commits.size() > commitLimit) { // don't keep on piling up too many commits IOUtils.close(commits.remove(randomIntBetween(0, commits.size()-1))); // we increase the wait time to make sure we eventually if things are slow wait for threads to finish. @@ -4319,4 +4320,38 @@ public void testConcurrentAppendUpdateAndRefresh() throws InterruptedException, assertEquals(totalNumDocs, searcher.reader().numDocs()); } } + + public void testAcquireIndexCommit() throws Exception { + IOUtils.close(engine, store); + store = createStore(); + final AtomicLong globalCheckpoint = new AtomicLong(); + try (InternalEngine engine = createEngine(store, createTempDir(), globalCheckpoint::get)) { + int numDocs = between(1, 20); + for (int i = 0; i < numDocs; i++) { + index(engine, i); + } + final boolean inSync = randomBoolean(); + if (inSync) { + globalCheckpoint.set(numDocs - 1); + } + final boolean flushFirst = randomBoolean(); + final boolean safeCommit = randomBoolean(); + Engine.IndexCommitRef commit = engine.acquireIndexCommit(safeCommit, flushFirst); + int moreDocs = between(1, 20); + for (int i = 0; i < moreDocs; i++) { + index(engine, numDocs + i); + } + globalCheckpoint.set(numDocs + moreDocs - 1); + engine.flush(); + // check that we can still read the commit that we captured + try (IndexReader reader = DirectoryReader.open(commit.getIndexCommit())) { + assertThat(reader.numDocs(), equalTo(flushFirst && (safeCommit == false || inSync) ? numDocs : 0)); + } + assertThat(DirectoryReader.listCommits(engine.store.directory()), hasSize(2)); + commit.close(); + // check it's clean up + engine.flush(true, true); + assertThat(DirectoryReader.listCommits(engine.store.directory()), hasSize(1)); + } + } } diff --git a/core/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java b/core/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java index 972a278ba5d45..48887aa4c11c7 100644 --- a/core/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java +++ b/core/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java @@ -1045,41 +1045,6 @@ public void onFailure(Exception e) { closeShards(indexShard); } - public void testAcquireIndexCommit() throws Exception { - boolean isPrimary = randomBoolean(); - final IndexShard shard = newStartedShard(isPrimary); - int numDocs = randomInt(20); - for (int i = 0; i < numDocs; i++) { - indexDoc(shard, "type", "id_" + i); - } - final boolean flushFirst = randomBoolean(); - Engine.IndexCommitRef commit = shard.acquireIndexCommit(flushFirst); - int moreDocs = randomInt(20); - for (int i = 0; i < moreDocs; i++) { - indexDoc(shard, "type", "id_" + numDocs + i); - } - flushShard(shard); - // check that we can still read the commit that we captured - try (IndexReader reader = DirectoryReader.open(commit.getIndexCommit())) { - assertThat(reader.numDocs(), equalTo(flushFirst ? numDocs : 0)); - } - commit.close(); - // Make the global checkpoint in sync with the local checkpoint. - if (isPrimary) { - final String allocationId = shard.shardRouting.allocationId().getId(); - shard.updateLocalCheckpointForShard(allocationId, numDocs + moreDocs - 1); - shard.updateGlobalCheckpointForShard(allocationId, shard.getLocalCheckpoint()); - } else { - shard.updateGlobalCheckpointOnReplica(numDocs + moreDocs - 1, "test"); - } - flushShard(shard, true); - - // check it's clean up - assertThat(DirectoryReader.listCommits(shard.store().directory()), hasSize(1)); - - closeShards(shard); - } - /*** * test one can snapshot the store at various lifecycle stages */ diff --git a/core/src/test/java/org/elasticsearch/indices/recovery/RecoverySourceHandlerTests.java b/core/src/test/java/org/elasticsearch/indices/recovery/RecoverySourceHandlerTests.java index cf5f24d2a6e18..4963c1b74a53f 100644 --- a/core/src/test/java/org/elasticsearch/indices/recovery/RecoverySourceHandlerTests.java +++ b/core/src/test/java/org/elasticsearch/indices/recovery/RecoverySourceHandlerTests.java @@ -396,7 +396,7 @@ public void testThrowExceptionOnPrimaryRelocatedBeforePhase1Started() throws IOE when(shard.seqNoStats()).thenReturn(mock(SeqNoStats.class)); when(shard.segmentStats(anyBoolean())).thenReturn(mock(SegmentsStats.class)); when(shard.state()).thenReturn(IndexShardState.RELOCATED); - when(shard.acquireIndexCommit(anyBoolean())).thenReturn(mock(Engine.IndexCommitRef.class)); + when(shard.acquireIndexCommit(anyBoolean(), anyBoolean())).thenReturn(mock(Engine.IndexCommitRef.class)); doAnswer(invocation -> { ((ActionListener)invocation.getArguments()[0]).onResponse(() -> {}); return null; diff --git a/core/src/test/java/org/elasticsearch/indices/recovery/RecoveryTests.java b/core/src/test/java/org/elasticsearch/indices/recovery/RecoveryTests.java index 4a449463b5e8c..85dc3a5fc3906 100644 --- a/core/src/test/java/org/elasticsearch/indices/recovery/RecoveryTests.java +++ b/core/src/test/java/org/elasticsearch/indices/recovery/RecoveryTests.java @@ -19,6 +19,8 @@ package org.elasticsearch.indices.recovery; +import org.apache.lucene.index.DirectoryReader; +import org.apache.lucene.index.IndexCommit; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.NoMergePolicy; @@ -27,6 +29,7 @@ import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.common.UUIDs; import org.elasticsearch.common.bytes.BytesArray; +import org.elasticsearch.common.lucene.uid.Versions; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.util.BigArrays; import org.elasticsearch.common.xcontent.XContentType; @@ -36,11 +39,13 @@ import org.elasticsearch.index.mapper.SourceToParse; import org.elasticsearch.index.replication.ESIndexLevelReplicationTestCase; import org.elasticsearch.index.replication.RecoveryDuringReplicationTests; +import org.elasticsearch.index.seqno.SequenceNumbers; import org.elasticsearch.index.shard.IndexShard; import org.elasticsearch.index.translog.Translog; import org.elasticsearch.index.translog.TranslogConfig; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.concurrent.CountDownLatch; import java.util.concurrent.Future; @@ -48,6 +53,7 @@ import static org.elasticsearch.index.translog.TranslogDeletionPolicies.createTranslogDeletionPolicy; import static org.hamcrest.Matchers.empty; import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.lessThanOrEqualTo; import static org.hamcrest.Matchers.not; public class RecoveryTests extends ESIndexLevelReplicationTestCase { @@ -241,4 +247,28 @@ public void testPeerRecoveryPersistGlobalCheckpoint() throws Exception { assertThat(replica.getTranslog().getLastSyncedGlobalCheckpoint(), equalTo(numDocs - 1)); } } + + public void testPeerRecoverySendSafeCommitInFileBased() throws Exception { + IndexShard primaryShard = newStartedShard(true); + int numDocs = between(1, 100); + long globalCheckpoint = 0; + for (int i = 0; i < numDocs; i++) { + primaryShard.applyIndexOperationOnPrimary(Versions.MATCH_ANY, VersionType.INTERNAL, + SourceToParse.source(primaryShard.shardId().getIndexName(), "test", Integer.toString(i), new BytesArray("{}"), + XContentType.JSON), IndexRequest.UNSET_AUTO_GENERATED_TIMESTAMP, false, getMappingUpdater(primaryShard, "test")); + if (randomBoolean()) { + globalCheckpoint = randomLongBetween(globalCheckpoint, i); + primaryShard.updateLocalCheckpointForShard(primaryShard.routingEntry().allocationId().getId(), globalCheckpoint); + primaryShard.updateGlobalCheckpointForShard(primaryShard.routingEntry().allocationId().getId(), globalCheckpoint); + primaryShard.flush(new FlushRequest()); + } + } + IndexShard replicaShard = newShard(primaryShard.shardId(), false); + updateMappings(replicaShard, primaryShard.indexSettings().getIndexMetaData()); + recoverReplica(replicaShard, primaryShard); + List commits = DirectoryReader.listCommits(replicaShard.store().directory()); + long maxSeqNo = Long.parseLong(commits.get(0).getUserData().get(SequenceNumbers.MAX_SEQ_NO)); + assertThat(maxSeqNo, lessThanOrEqualTo(globalCheckpoint)); + closeShards(primaryShard, replicaShard); + } } diff --git a/test/framework/src/main/java/org/elasticsearch/index/shard/IndexShardTestCase.java b/test/framework/src/main/java/org/elasticsearch/index/shard/IndexShardTestCase.java index 4737befa30e45..cd55c1126eb1c 100644 --- a/test/framework/src/main/java/org/elasticsearch/index/shard/IndexShardTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/index/shard/IndexShardTestCase.java @@ -620,7 +620,7 @@ protected void snapshotShard(final IndexShard shard, final Snapshot snapshot, final Repository repository) throws IOException { final IndexShardSnapshotStatus snapshotStatus = IndexShardSnapshotStatus.newInitializing(); - try (Engine.IndexCommitRef indexCommitRef = shard.acquireIndexCommit(true)) { + try (Engine.IndexCommitRef indexCommitRef = shard.acquireIndexCommit(false, true)) { Index index = shard.shardId().getIndex(); IndexId indexId = new IndexId(index.getName(), index.getUUID()); From 52d627b66f0142e38ed9b318d94ede71c1b9df3c Mon Sep 17 00:00:00 2001 From: Yannick Welsch Date: Thu, 11 Jan 2018 16:42:12 +0100 Subject: [PATCH 55/74] [TEST] Do not call RandomizedTest.scaledRandomIntBetween from multiple threads KeyedLockTests calls RandomizedTest.scaledRandomIntBetween from multiple threads which uses RandomizedTest.isNightly() whereas that method is not concurrency-safe (see implementation of GroupEvaluator.isGroupEnabled) --- .../elasticsearch/common/util/concurrent/KeyedLockTests.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/test/java/org/elasticsearch/common/util/concurrent/KeyedLockTests.java b/core/src/test/java/org/elasticsearch/common/util/concurrent/KeyedLockTests.java index 4d8fc8d3ecccb..fdce390fa05e8 100644 --- a/core/src/test/java/org/elasticsearch/common/util/concurrent/KeyedLockTests.java +++ b/core/src/test/java/org/elasticsearch/common/util/concurrent/KeyedLockTests.java @@ -116,6 +116,7 @@ public static class AcquireAndReleaseThread extends Thread { String[] names; ConcurrentHashMap counter; ConcurrentHashMap safeCounter; + final int numRuns = scaledRandomIntBetween(5000, 50000); public AcquireAndReleaseThread(CountDownLatch startLatch, KeyedLock connectionLock, String[] names, ConcurrentHashMap counter, ConcurrentHashMap safeCounter) { @@ -133,7 +134,6 @@ public void run() { } catch (InterruptedException e) { throw new RuntimeException(e); } - int numRuns = scaledRandomIntBetween(5000, 50000); for (int i = 0; i < numRuns; i++) { String curName = names[randomInt(names.length - 1)]; assert connectionLock.isHeldByCurrentThread(curName) == false; From 7d0eb3292b8f8ba27ef50dbbf38783dc68c70728 Mon Sep 17 00:00:00 2001 From: Martijn van Groningen Date: Thu, 11 Jan 2018 17:31:10 +0100 Subject: [PATCH 56/74] upgraded jna from 4.4.0-1 to 4.5.1 (#28183) Closes #28172 --- buildSrc/build.gradle | 2 +- buildSrc/version.properties | 2 +- core/licenses/jna-4.4.0-1.jar.sha1 | 1 - core/licenses/jna-4.5.1.jar.sha1 | 1 + 4 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 core/licenses/jna-4.4.0-1.jar.sha1 create mode 100644 core/licenses/jna-4.5.1.jar.sha1 diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index b021bab6338b3..6bc461e1b598c 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -96,7 +96,7 @@ dependencies { compile 'com.perforce:p4java:2012.3.551082' // THIS IS SUPPOSED TO BE OPTIONAL IN THE FUTURE.... compile 'de.thetaphi:forbiddenapis:2.4.1' compile 'org.apache.rat:apache-rat:0.11' - compile "org.elasticsearch:jna:4.4.0-1" + compile "org.elasticsearch:jna:4.5.1" } // Gradle 2.14+ removed ProgressLogger(-Factory) classes from the public APIs diff --git a/buildSrc/version.properties b/buildSrc/version.properties index 59cbddfe41c6b..7419a8b131a8b 100644 --- a/buildSrc/version.properties +++ b/buildSrc/version.properties @@ -11,7 +11,7 @@ log4j = 2.9.1 slf4j = 1.6.2 # when updating the JNA version, also update the version in buildSrc/build.gradle -jna = 4.4.0-1 +jna = 4.5.1 # test dependencies randomizedrunner = 2.5.2 diff --git a/core/licenses/jna-4.4.0-1.jar.sha1 b/core/licenses/jna-4.4.0-1.jar.sha1 deleted file mode 100644 index 6b564834b5733..0000000000000 --- a/core/licenses/jna-4.4.0-1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c9dfcec6f07ee4b1d7a6c09a7eaa9dd4fb6d2c79 \ No newline at end of file diff --git a/core/licenses/jna-4.5.1.jar.sha1 b/core/licenses/jna-4.5.1.jar.sha1 new file mode 100644 index 0000000000000..f03d0d1fc7e33 --- /dev/null +++ b/core/licenses/jna-4.5.1.jar.sha1 @@ -0,0 +1 @@ +da10908ae23dc59b19dc258e63aea1c44621dc3a \ No newline at end of file From 99f88f15c5febbca2d13b5b5fda27b844153bf1a Mon Sep 17 00:00:00 2001 From: Tim Brooks Date: Thu, 11 Jan 2018 11:30:43 -0700 Subject: [PATCH 57/74] Rename core module to server (#28180) This is related to #27933. It renames the core module to server. This is the first step towards introducing an elasticsearch-core jar. --- build.gradle | 10 +- .../gradle/precommit/PrecommitTasks.groovy | 2 +- .../resources/checkstyle_suppressions.xml | 1412 ++++++++--------- ...ignatures.txt => es-server-signatures.txt} | 0 buildSrc/version.properties | 6 +- client/rest/build.gradle | 6 +- client/sniffer/build.gradle | 8 +- client/test/build.gradle | 2 +- distribution/build.gradle | 10 +- docs/build.gradle | 4 +- {core => server}/build.gradle | 8 +- {core => server}/cli/build.gradle | 2 +- .../cli/licenses/jopt-simple-5.0.2.jar.sha1 | 0 .../cli/licenses/jopt-simple-LICENSE.txt | 0 .../cli/licenses/jopt-simple-NOTICE.txt | 0 .../java/org/elasticsearch/cli/Command.java | 0 .../java/org/elasticsearch/cli/ExitCodes.java | 0 .../org/elasticsearch/cli/MultiCommand.java | 0 .../elasticsearch/cli/SuppressForbidden.java | 0 .../java/org/elasticsearch/cli/Terminal.java | 0 .../org/elasticsearch/cli/UserException.java | 0 .../licenses/HdrHistogram-2.1.9.jar.sha1 | 0 .../licenses/HdrHistogram-LICENSE.txt | 0 .../licenses/HdrHistogram-NOTICE.txt | 0 .../licenses/apache-log4j-extras-DEPENDENCIES | 0 {core => server}/licenses/hppc-0.7.1.jar.sha1 | 0 {core => server}/licenses/hppc-LICENSE.txt | 0 {core => server}/licenses/hppc-NOTICE.txt | 0 {core => server}/licenses/jackson-LICENSE | 0 {core => server}/licenses/jackson-NOTICE | 0 .../licenses/jackson-core-2.8.10.jar.sha1 | 0 .../jackson-dataformat-cbor-2.8.10.jar.sha1 | 0 .../jackson-dataformat-smile-2.8.10.jar.sha1 | 0 .../jackson-dataformat-yaml-2.8.10.jar.sha1 | 0 {core => server}/licenses/jna-4.5.1.jar.sha1 | 0 {core => server}/licenses/jna-LICENSE.txt | 0 {core => server}/licenses/jna-NOTICE.txt | 0 .../licenses/joda-time-2.9.5.jar.sha1 | 0 .../licenses/joda-time-LICENSE.txt | 0 .../licenses/joda-time-NOTICE.txt | 0 {core => server}/licenses/jts-1.13.jar.sha1 | 0 {core => server}/licenses/jts-LICENSE.txt | 0 {core => server}/licenses/jts-NOTICE.txt | 0 .../licenses/log4j-1.2-api-2.9.1.jar.sha1 | 0 {core => server}/licenses/log4j-LICENSE.txt | 0 {core => server}/licenses/log4j-NOTICE.txt | 0 .../licenses/log4j-api-2.9.1.jar.sha1 | 0 .../licenses/log4j-api-LICENSE.txt | 0 .../licenses/log4j-api-NOTICE.txt | 0 .../licenses/log4j-core-2.9.1.jar.sha1 | 0 .../licenses/log4j-core-LICENSE.txt | 0 .../licenses/log4j-core-NOTICE.txt | 0 {core => server}/licenses/lucene-LICENSE.txt | 0 {core => server}/licenses/lucene-NOTICE.txt | 0 .../lucene-analyzers-common-7.2.0.jar.sha1 | 0 .../lucene-backward-codecs-7.2.0.jar.sha1 | 0 .../licenses/lucene-core-7.2.0.jar.sha1 | 0 .../licenses/lucene-grouping-7.2.0.jar.sha1 | 0 .../lucene-highlighter-7.2.0.jar.sha1 | 0 .../licenses/lucene-join-7.2.0.jar.sha1 | 0 .../licenses/lucene-memory-7.2.0.jar.sha1 | 0 .../licenses/lucene-misc-7.2.0.jar.sha1 | 0 .../licenses/lucene-queries-7.2.0.jar.sha1 | 0 .../lucene-queryparser-7.2.0.jar.sha1 | 0 .../licenses/lucene-sandbox-7.2.0.jar.sha1 | 0 .../licenses/lucene-spatial-7.2.0.jar.sha1 | 0 .../lucene-spatial-extras-7.2.0.jar.sha1 | 0 .../licenses/lucene-spatial3d-7.2.0.jar.sha1 | 0 .../licenses/lucene-suggest-7.2.0.jar.sha1 | 0 .../licenses/securesm-1.2.jar.sha1 | 0 .../licenses/securesm-LICENSE.txt | 0 {core => server}/licenses/securesm-NOTICE.txt | 0 .../licenses/snakeyaml-1.17.jar.sha1 | 0 .../licenses/snakeyaml-LICENSE.txt | 0 .../licenses/snakeyaml-NOTICE.txt | 0 .../licenses/spatial4j-0.6.jar.sha1 | 0 {core => server}/licenses/spatial4j-ABOUT.txt | 0 .../licenses/spatial4j-LICENSE.txt | 0 .../licenses/spatial4j-NOTICE.txt | 0 .../licenses/t-digest-3.0.jar.sha1 | 0 .../licenses/t-digest-LICENSE.txt | 0 {core => server}/licenses/t-digest-NOTICE.txt | 0 .../src/main/eclipse-build.gradle | 0 .../DeDuplicatingTokenFilter.java | 0 .../miscellaneous/DisableGraphAttribute.java | 0 .../DisableGraphAttributeImpl.java | 0 .../DuplicateByteSequenceSpotter.java | 0 .../DuplicateSequenceAttribute.java | 0 .../DuplicateSequenceAttributeImpl.java | 0 .../apache/lucene/document/BinaryRange.java | 0 .../apache/lucene/index/OneMergeHelper.java | 0 .../queries/BinaryDocValuesRangeQuery.java | 0 .../lucene/queries/BlendedTermQuery.java | 0 .../queries/ExtendedCommonTermsQuery.java | 0 .../apache/lucene/queries/MinDocQuery.java | 0 .../queries/SearchAfterSortedDocQuery.java | 0 .../queryparser/classic/XQueryParser.java | 0 .../search/grouping/CollapseTopFieldDocs.java | 0 .../grouping/CollapsingDocValuesSource.java | 0 .../grouping/CollapsingTopDocsCollector.java | 0 .../BoundedBreakIteratorScanner.java | 0 .../uhighlight/CustomFieldHighlighter.java | 0 .../uhighlight/CustomPassageFormatter.java | 0 .../uhighlight/CustomUnifiedHighlighter.java | 0 .../lucene/search/uhighlight/Snippet.java | 0 .../vectorhighlight/CustomFieldQuery.java | 0 .../java/org/elasticsearch/Assertions.java | 0 .../main/java/org/elasticsearch/Build.java | 0 .../ElasticsearchCorruptionException.java | 0 .../elasticsearch/ElasticsearchException.java | 0 .../ElasticsearchGenerationException.java | 0 .../ElasticsearchParseException.java | 0 .../ElasticsearchSecurityException.java | 0 .../ElasticsearchStatusException.java | 0 .../ElasticsearchTimeoutException.java | 0 .../ElasticsearchWrapperException.java | 0 .../org/elasticsearch/ExceptionsHelper.java | 0 .../ResourceAlreadyExistsException.java | 0 .../ResourceNotFoundException.java | 0 .../org/elasticsearch/SpecialPermission.java | 0 .../main/java/org/elasticsearch/Version.java | 0 .../java/org/elasticsearch/action/Action.java | 0 .../elasticsearch/action/ActionFuture.java | 0 .../elasticsearch/action/ActionListener.java | 0 .../action/ActionListenerResponseHandler.java | 0 .../elasticsearch/action/ActionModule.java | 0 .../elasticsearch/action/ActionRequest.java | 0 .../action/ActionRequestBuilder.java | 0 .../ActionRequestValidationException.java | 0 .../elasticsearch/action/ActionResponse.java | 0 .../elasticsearch/action/ActionRunnable.java | 0 .../elasticsearch/action/AliasesRequest.java | 0 .../action/CompositeIndicesRequest.java | 0 .../elasticsearch/action/DocWriteRequest.java | 0 .../action/DocWriteResponse.java | 0 .../action/FailedNodeException.java | 0 .../elasticsearch/action/GenericAction.java | 0 .../elasticsearch/action/IndicesRequest.java | 0 .../action/LatchedActionListener.java | 0 .../action/ListenableActionFuture.java | 0 .../NoShardAvailableActionException.java | 0 .../action/NoSuchNodeException.java | 0 .../action/NotifyOnceListener.java | 0 .../elasticsearch/action/OriginalIndices.java | 0 .../action/PrimaryMissingActionException.java | 0 .../elasticsearch/action/RealtimeRequest.java | 0 .../action/RoutingMissingException.java | 0 .../action/ShardOperationFailedException.java | 0 .../action/TaskOperationFailure.java | 0 .../elasticsearch/action/ThreadingModel.java | 0 .../action/TimestampParsingException.java | 0 .../action/TransportActionNodeProxy.java | 0 .../action/UnavailableShardsException.java | 0 .../elasticsearch/action/ValidateActions.java | 0 .../ClusterAllocationExplainAction.java | 0 .../ClusterAllocationExplainRequest.java | 0 ...lusterAllocationExplainRequestBuilder.java | 0 .../ClusterAllocationExplainResponse.java | 0 .../ClusterAllocationExplanation.java | 0 ...ansportClusterAllocationExplainAction.java | 0 .../cluster/health/ClusterHealthAction.java | 0 .../cluster/health/ClusterHealthRequest.java | 0 .../health/ClusterHealthRequestBuilder.java | 0 .../cluster/health/ClusterHealthResponse.java | 0 .../health/TransportClusterHealthAction.java | 0 .../node/hotthreads/NodeHotThreads.java | 0 .../hotthreads/NodesHotThreadsAction.java | 0 .../hotthreads/NodesHotThreadsRequest.java | 0 .../NodesHotThreadsRequestBuilder.java | 0 .../hotthreads/NodesHotThreadsResponse.java | 0 .../TransportNodesHotThreadsAction.java | 0 .../admin/cluster/node/info/NodeInfo.java | 0 .../cluster/node/info/NodesInfoAction.java | 0 .../cluster/node/info/NodesInfoRequest.java | 0 .../node/info/NodesInfoRequestBuilder.java | 0 .../cluster/node/info/NodesInfoResponse.java | 0 .../cluster/node/info/PluginsAndModules.java | 0 .../node/info/TransportNodesInfoAction.java | 0 .../node/liveness/LivenessRequest.java | 0 .../node/liveness/LivenessResponse.java | 0 .../liveness/TransportLivenessAction.java | 0 .../admin/cluster/node/stats/NodeStats.java | 0 .../cluster/node/stats/NodesStatsAction.java | 0 .../cluster/node/stats/NodesStatsRequest.java | 0 .../node/stats/NodesStatsRequestBuilder.java | 0 .../node/stats/NodesStatsResponse.java | 0 .../node/stats/TransportNodesStatsAction.java | 0 .../node/tasks/cancel/CancelTasksAction.java | 0 .../node/tasks/cancel/CancelTasksRequest.java | 0 .../cancel/CancelTasksRequestBuilder.java | 0 .../tasks/cancel/CancelTasksResponse.java | 0 .../cancel/TransportCancelTasksAction.java | 0 .../cluster/node/tasks/get/GetTaskAction.java | 0 .../node/tasks/get/GetTaskRequest.java | 0 .../node/tasks/get/GetTaskRequestBuilder.java | 0 .../node/tasks/get/GetTaskResponse.java | 0 .../tasks/get/TransportGetTaskAction.java | 0 .../node/tasks/list/ListTasksAction.java | 0 .../node/tasks/list/ListTasksRequest.java | 0 .../tasks/list/ListTasksRequestBuilder.java | 0 .../node/tasks/list/ListTasksResponse.java | 0 .../cluster/node/tasks/list/TaskGroup.java | 0 .../tasks/list/TransportListTasksAction.java | 0 .../admin/cluster/node/usage/NodeUsage.java | 0 .../cluster/node/usage/NodesUsageAction.java | 0 .../cluster/node/usage/NodesUsageRequest.java | 0 .../node/usage/NodesUsageRequestBuilder.java | 0 .../node/usage/NodesUsageResponse.java | 0 .../node/usage/TransportNodesUsageAction.java | 0 .../cluster/remote/RemoteInfoAction.java | 0 .../cluster/remote/RemoteInfoRequest.java | 0 .../remote/RemoteInfoRequestBuilder.java | 0 .../cluster/remote/RemoteInfoResponse.java | 0 .../remote/TransportRemoteInfoAction.java | 0 .../delete/DeleteRepositoryAction.java | 0 .../delete/DeleteRepositoryRequest.java | 0 .../DeleteRepositoryRequestBuilder.java | 0 .../delete/DeleteRepositoryResponse.java | 0 .../TransportDeleteRepositoryAction.java | 0 .../get/GetRepositoriesAction.java | 0 .../get/GetRepositoriesRequest.java | 0 .../get/GetRepositoriesRequestBuilder.java | 0 .../get/GetRepositoriesResponse.java | 0 .../get/TransportGetRepositoriesAction.java | 0 .../repositories/put/PutRepositoryAction.java | 0 .../put/PutRepositoryRequest.java | 0 .../put/PutRepositoryRequestBuilder.java | 0 .../put/PutRepositoryResponse.java | 0 .../put/TransportPutRepositoryAction.java | 0 .../TransportVerifyRepositoryAction.java | 0 .../verify/VerifyRepositoryAction.java | 0 .../verify/VerifyRepositoryRequest.java | 0 .../VerifyRepositoryRequestBuilder.java | 0 .../verify/VerifyRepositoryResponse.java | 0 .../cluster/reroute/ClusterRerouteAction.java | 0 .../reroute/ClusterRerouteRequest.java | 0 .../reroute/ClusterRerouteRequestBuilder.java | 0 .../reroute/ClusterRerouteResponse.java | 0 .../TransportClusterRerouteAction.java | 0 .../settings/ClusterUpdateSettingsAction.java | 0 .../ClusterUpdateSettingsRequest.java | 0 .../ClusterUpdateSettingsRequestBuilder.java | 0 .../ClusterUpdateSettingsResponse.java | 0 .../cluster/settings/SettingsUpdater.java | 0 .../TransportClusterUpdateSettingsAction.java | 0 .../shards/ClusterSearchShardsAction.java | 0 .../shards/ClusterSearchShardsGroup.java | 0 .../shards/ClusterSearchShardsRequest.java | 0 .../ClusterSearchShardsRequestBuilder.java | 0 .../shards/ClusterSearchShardsResponse.java | 0 .../TransportClusterSearchShardsAction.java | 0 .../create/CreateSnapshotAction.java | 0 .../create/CreateSnapshotRequest.java | 0 .../create/CreateSnapshotRequestBuilder.java | 0 .../create/CreateSnapshotResponse.java | 0 .../create/TransportCreateSnapshotAction.java | 0 .../delete/DeleteSnapshotAction.java | 0 .../delete/DeleteSnapshotRequest.java | 0 .../delete/DeleteSnapshotRequestBuilder.java | 0 .../delete/DeleteSnapshotResponse.java | 0 .../delete/TransportDeleteSnapshotAction.java | 0 .../snapshots/get/GetSnapshotsAction.java | 0 .../snapshots/get/GetSnapshotsRequest.java | 0 .../get/GetSnapshotsRequestBuilder.java | 0 .../snapshots/get/GetSnapshotsResponse.java | 0 .../get/TransportGetSnapshotsAction.java | 0 .../restore/RestoreSnapshotAction.java | 0 .../restore/RestoreSnapshotRequest.java | 0 .../RestoreSnapshotRequestBuilder.java | 0 .../restore/RestoreSnapshotResponse.java | 0 .../TransportRestoreSnapshotAction.java | 0 .../status/SnapshotIndexShardStage.java | 0 .../status/SnapshotIndexShardStatus.java | 0 .../snapshots/status/SnapshotIndexStatus.java | 0 .../snapshots/status/SnapshotShardsStats.java | 0 .../snapshots/status/SnapshotStats.java | 0 .../snapshots/status/SnapshotStatus.java | 0 .../status/SnapshotsStatusAction.java | 0 .../status/SnapshotsStatusRequest.java | 0 .../status/SnapshotsStatusRequestBuilder.java | 0 .../status/SnapshotsStatusResponse.java | 0 .../status/TransportNodesSnapshotsStatus.java | 0 .../TransportSnapshotsStatusAction.java | 0 .../cluster/state/ClusterStateAction.java | 0 .../cluster/state/ClusterStateRequest.java | 0 .../state/ClusterStateRequestBuilder.java | 0 .../cluster/state/ClusterStateResponse.java | 0 .../state/TransportClusterStateAction.java | 0 .../cluster/stats/ClusterStatsAction.java | 0 .../cluster/stats/ClusterStatsIndices.java | 0 .../stats/ClusterStatsNodeResponse.java | 0 .../cluster/stats/ClusterStatsNodes.java | 0 .../cluster/stats/ClusterStatsRequest.java | 0 .../stats/ClusterStatsRequestBuilder.java | 0 .../cluster/stats/ClusterStatsResponse.java | 0 .../stats/TransportClusterStatsAction.java | 0 .../DeleteStoredScriptAction.java | 0 .../DeleteStoredScriptRequest.java | 0 .../DeleteStoredScriptRequestBuilder.java | 0 .../DeleteStoredScriptResponse.java | 0 .../storedscripts/GetStoredScriptAction.java | 0 .../storedscripts/GetStoredScriptRequest.java | 0 .../GetStoredScriptRequestBuilder.java | 0 .../GetStoredScriptResponse.java | 0 .../storedscripts/PutStoredScriptAction.java | 0 .../storedscripts/PutStoredScriptRequest.java | 0 .../PutStoredScriptRequestBuilder.java | 0 .../PutStoredScriptResponse.java | 0 .../TransportDeleteStoredScriptAction.java | 0 .../TransportGetStoredScriptAction.java | 0 .../TransportPutStoredScriptAction.java | 0 .../tasks/PendingClusterTasksAction.java | 0 .../tasks/PendingClusterTasksRequest.java | 0 .../PendingClusterTasksRequestBuilder.java | 0 .../tasks/PendingClusterTasksResponse.java | 0 .../TransportPendingClusterTasksAction.java | 0 .../action/admin/indices/alias/Alias.java | 0 .../indices/alias/IndicesAliasesAction.java | 0 ...dicesAliasesClusterStateUpdateRequest.java | 0 .../indices/alias/IndicesAliasesRequest.java | 0 .../alias/IndicesAliasesRequestBuilder.java | 0 .../indices/alias/IndicesAliasesResponse.java | 0 .../alias/TransportIndicesAliasesAction.java | 0 .../alias/exists/AliasesExistAction.java | 0 .../exists/AliasesExistRequestBuilder.java | 0 .../alias/exists/AliasesExistResponse.java | 0 .../exists/TransportAliasesExistAction.java | 0 .../alias/get/BaseAliasesRequestBuilder.java | 0 .../indices/alias/get/GetAliasesAction.java | 0 .../indices/alias/get/GetAliasesRequest.java | 0 .../alias/get/GetAliasesRequestBuilder.java | 0 .../indices/alias/get/GetAliasesResponse.java | 0 .../alias/get/TransportGetAliasesAction.java | 0 .../admin/indices/analyze/AnalyzeAction.java | 0 .../admin/indices/analyze/AnalyzeRequest.java | 0 .../analyze/AnalyzeRequestBuilder.java | 0 .../indices/analyze/AnalyzeResponse.java | 0 .../analyze/DetailAnalyzeResponse.java | 0 .../analyze/TransportAnalyzeAction.java | 0 .../cache/clear/ClearIndicesCacheAction.java | 0 .../cache/clear/ClearIndicesCacheRequest.java | 0 .../ClearIndicesCacheRequestBuilder.java | 0 .../clear/ClearIndicesCacheResponse.java | 0 .../TransportClearIndicesCacheAction.java | 0 .../admin/indices/close/CloseIndexAction.java | 0 .../CloseIndexClusterStateUpdateRequest.java | 0 .../indices/close/CloseIndexRequest.java | 0 .../close/CloseIndexRequestBuilder.java | 0 .../indices/close/CloseIndexResponse.java | 0 .../close/TransportCloseIndexAction.java | 0 .../indices/create/CreateIndexAction.java | 0 .../CreateIndexClusterStateUpdateRequest.java | 0 .../indices/create/CreateIndexRequest.java | 0 .../create/CreateIndexRequestBuilder.java | 0 .../indices/create/CreateIndexResponse.java | 0 .../create/TransportCreateIndexAction.java | 0 .../admin/indices/create/package-info.java | 0 .../indices/delete/DeleteIndexAction.java | 0 .../DeleteIndexClusterStateUpdateRequest.java | 0 .../indices/delete/DeleteIndexRequest.java | 0 .../delete/DeleteIndexRequestBuilder.java | 0 .../indices/delete/DeleteIndexResponse.java | 0 .../delete/TransportDeleteIndexAction.java | 0 .../admin/indices/delete/package-info.java | 0 .../exists/indices/IndicesExistsAction.java | 0 .../exists/indices/IndicesExistsRequest.java | 0 .../indices/IndicesExistsRequestBuilder.java | 0 .../exists/indices/IndicesExistsResponse.java | 0 .../indices/TransportIndicesExistsAction.java | 0 .../types/TransportTypesExistsAction.java | 0 .../exists/types/TypesExistsAction.java | 0 .../exists/types/TypesExistsRequest.java | 0 .../types/TypesExistsRequestBuilder.java | 0 .../exists/types/TypesExistsResponse.java | 0 .../admin/indices/flush/FlushAction.java | 0 .../admin/indices/flush/FlushRequest.java | 0 .../indices/flush/FlushRequestBuilder.java | 0 .../admin/indices/flush/FlushResponse.java | 0 .../indices/flush/ShardFlushRequest.java | 0 .../indices/flush/SyncedFlushAction.java | 0 .../indices/flush/SyncedFlushRequest.java | 0 .../flush/SyncedFlushRequestBuilder.java | 0 .../indices/flush/SyncedFlushResponse.java | 0 .../indices/flush/TransportFlushAction.java | 0 .../flush/TransportShardFlushAction.java | 0 .../flush/TransportSyncedFlushAction.java | 0 .../admin/indices/flush/package-info.java | 0 .../indices/forcemerge/ForceMergeAction.java | 0 .../indices/forcemerge/ForceMergeRequest.java | 0 .../forcemerge/ForceMergeRequestBuilder.java | 0 .../forcemerge/ForceMergeResponse.java | 0 .../forcemerge/TransportForceMergeAction.java | 0 .../indices/forcemerge/package-info.java | 0 .../admin/indices/get/GetIndexAction.java | 0 .../admin/indices/get/GetIndexRequest.java | 0 .../indices/get/GetIndexRequestBuilder.java | 0 .../admin/indices/get/GetIndexResponse.java | 0 .../indices/get/TransportGetIndexAction.java | 0 .../mapping/get/GetFieldMappingsAction.java | 0 .../get/GetFieldMappingsIndexRequest.java | 0 .../mapping/get/GetFieldMappingsRequest.java | 0 .../get/GetFieldMappingsRequestBuilder.java | 0 .../mapping/get/GetFieldMappingsResponse.java | 0 .../mapping/get/GetMappingsAction.java | 0 .../mapping/get/GetMappingsRequest.java | 0 .../get/GetMappingsRequestBuilder.java | 0 .../mapping/get/GetMappingsResponse.java | 0 .../get/TransportGetFieldMappingsAction.java | 0 .../TransportGetFieldMappingsIndexAction.java | 0 .../get/TransportGetMappingsAction.java | 0 .../admin/indices/mapping/package-info.java | 0 .../indices/mapping/put/PutMappingAction.java | 0 .../PutMappingClusterStateUpdateRequest.java | 0 .../mapping/put/PutMappingRequest.java | 0 .../mapping/put/PutMappingRequestBuilder.java | 0 .../mapping/put/PutMappingResponse.java | 0 .../put/TransportPutMappingAction.java | 0 .../indices/mapping/put/package-info.java | 0 .../admin/indices/open/OpenIndexAction.java | 0 .../OpenIndexClusterStateUpdateRequest.java | 0 .../admin/indices/open/OpenIndexRequest.java | 0 .../indices/open/OpenIndexRequestBuilder.java | 0 .../admin/indices/open/OpenIndexResponse.java | 0 .../open/TransportOpenIndexAction.java | 0 .../action/admin/indices/package-info.java | 0 .../indices/recovery/RecoveryAction.java | 0 .../indices/recovery/RecoveryRequest.java | 0 .../recovery/RecoveryRequestBuilder.java | 0 .../indices/recovery/RecoveryResponse.java | 0 .../recovery/TransportRecoveryAction.java | 0 .../admin/indices/refresh/RefreshAction.java | 0 .../admin/indices/refresh/RefreshRequest.java | 0 .../refresh/RefreshRequestBuilder.java | 0 .../indices/refresh/RefreshResponse.java | 0 .../refresh/TransportRefreshAction.java | 0 .../refresh/TransportShardRefreshAction.java | 0 .../admin/indices/refresh/package-info.java | 0 .../admin/indices/rollover/Condition.java | 0 .../indices/rollover/MaxAgeCondition.java | 0 .../indices/rollover/MaxDocsCondition.java | 0 .../indices/rollover/MaxSizeCondition.java | 0 .../indices/rollover/RolloverAction.java | 0 .../indices/rollover/RolloverRequest.java | 0 .../rollover/RolloverRequestBuilder.java | 0 .../indices/rollover/RolloverResponse.java | 0 .../rollover/TransportRolloverAction.java | 0 .../admin/indices/segments/IndexSegments.java | 0 .../indices/segments/IndexShardSegments.java | 0 .../segments/IndicesSegmentResponse.java | 0 .../segments/IndicesSegmentsAction.java | 0 .../segments/IndicesSegmentsRequest.java | 0 .../IndicesSegmentsRequestBuilder.java | 0 .../admin/indices/segments/ShardSegments.java | 0 .../TransportIndicesSegmentsAction.java | 0 .../settings/get/GetSettingsAction.java | 0 .../settings/get/GetSettingsRequest.java | 0 .../get/GetSettingsRequestBuilder.java | 0 .../settings/get/GetSettingsResponse.java | 0 .../get/TransportGetSettingsAction.java | 0 .../put/TransportUpdateSettingsAction.java | 0 .../settings/put/UpdateSettingsAction.java | 0 ...dateSettingsClusterStateUpdateRequest.java | 0 .../settings/put/UpdateSettingsRequest.java | 0 .../put/UpdateSettingsRequestBuilder.java | 0 .../settings/put/UpdateSettingsResponse.java | 0 .../IndicesShardStoreRequestBuilder.java | 0 .../shards/IndicesShardStoresAction.java | 0 .../shards/IndicesShardStoresRequest.java | 0 .../shards/IndicesShardStoresResponse.java | 0 .../TransportIndicesShardStoresAction.java | 0 .../admin/indices/shrink/ResizeAction.java | 0 .../admin/indices/shrink/ResizeRequest.java | 0 .../indices/shrink/ResizeRequestBuilder.java | 0 .../admin/indices/shrink/ResizeResponse.java | 0 .../admin/indices/shrink/ResizeType.java | 0 .../admin/indices/shrink/ShrinkAction.java | 0 .../indices/shrink/TransportResizeAction.java | 0 .../indices/shrink/TransportShrinkAction.java | 0 .../admin/indices/stats/CommonStats.java | 0 .../admin/indices/stats/CommonStatsFlags.java | 0 .../admin/indices/stats/IndexShardStats.java | 0 .../admin/indices/stats/IndexStats.java | 0 .../indices/stats/IndicesStatsAction.java | 0 .../indices/stats/IndicesStatsRequest.java | 0 .../stats/IndicesStatsRequestBuilder.java | 0 .../indices/stats/IndicesStatsResponse.java | 0 .../admin/indices/stats/ShardStats.java | 0 .../stats/TransportIndicesStatsAction.java | 0 .../delete/DeleteIndexTemplateAction.java | 0 .../delete/DeleteIndexTemplateRequest.java | 0 .../DeleteIndexTemplateRequestBuilder.java | 0 .../delete/DeleteIndexTemplateResponse.java | 0 .../TransportDeleteIndexTemplateAction.java | 0 .../template/get/GetIndexTemplatesAction.java | 0 .../get/GetIndexTemplatesRequest.java | 0 .../get/GetIndexTemplatesRequestBuilder.java | 0 .../get/GetIndexTemplatesResponse.java | 0 .../get/TransportGetIndexTemplatesAction.java | 0 .../template/put/PutIndexTemplateAction.java | 0 .../template/put/PutIndexTemplateRequest.java | 0 .../put/PutIndexTemplateRequestBuilder.java | 0 .../put/PutIndexTemplateResponse.java | 0 .../put/TransportPutIndexTemplateAction.java | 0 .../upgrade/get/IndexShardUpgradeStatus.java | 0 .../upgrade/get/IndexUpgradeStatus.java | 0 .../upgrade/get/ShardUpgradeStatus.java | 0 .../get/TransportUpgradeStatusAction.java | 0 .../upgrade/get/UpgradeStatusAction.java | 0 .../upgrade/get/UpgradeStatusRequest.java | 0 .../get/UpgradeStatusRequestBuilder.java | 0 .../upgrade/get/UpgradeStatusResponse.java | 0 .../upgrade/post/ShardUpgradeRequest.java | 0 .../upgrade/post/ShardUpgradeResult.java | 0 .../upgrade/post/TransportUpgradeAction.java | 0 .../post/TransportUpgradeSettingsAction.java | 0 .../indices/upgrade/post/UpgradeAction.java | 0 .../indices/upgrade/post/UpgradeRequest.java | 0 .../upgrade/post/UpgradeRequestBuilder.java | 0 .../indices/upgrade/post/UpgradeResponse.java | 0 .../upgrade/post/UpgradeSettingsAction.java | 0 ...radeSettingsClusterStateUpdateRequest.java | 0 .../upgrade/post/UpgradeSettingsRequest.java | 0 .../post/UpgradeSettingsRequestBuilder.java | 0 .../upgrade/post/UpgradeSettingsResponse.java | 0 .../validate/query/QueryExplanation.java | 0 .../query/ShardValidateQueryRequest.java | 0 .../query/ShardValidateQueryResponse.java | 0 .../query/TransportValidateQueryAction.java | 0 .../validate/query/ValidateQueryAction.java | 0 .../validate/query/ValidateQueryRequest.java | 0 .../query/ValidateQueryRequestBuilder.java | 0 .../validate/query/ValidateQueryResponse.java | 0 .../indices/validate/query/package-info.java | 0 .../action/admin/package-info.java | 0 .../action/bulk/BackoffPolicy.java | 0 .../elasticsearch/action/bulk/BulkAction.java | 0 .../action/bulk/BulkItemRequest.java | 0 .../action/bulk/BulkItemResponse.java | 0 .../action/bulk/BulkItemResultHolder.java | 0 .../action/bulk/BulkProcessor.java | 0 .../action/bulk/BulkRequest.java | 0 .../action/bulk/BulkRequestBuilder.java | 0 .../action/bulk/BulkRequestHandler.java | 0 .../action/bulk/BulkResponse.java | 0 .../action/bulk/BulkShardRequest.java | 0 .../action/bulk/BulkShardResponse.java | 0 .../action/bulk/MappingUpdatePerformer.java | 0 .../org/elasticsearch/action/bulk/Retry.java | 0 .../action/bulk/TransportBulkAction.java | 0 .../action/bulk/TransportShardBulkAction.java | 0 .../TransportSingleItemBulkWriteAction.java | 0 .../action/delete/DeleteAction.java | 0 .../action/delete/DeleteRequest.java | 0 .../action/delete/DeleteRequestBuilder.java | 0 .../action/delete/DeleteResponse.java | 0 .../action/delete/TransportDeleteAction.java | 0 .../action/delete/package-info.java | 0 .../action/explain/ExplainAction.java | 0 .../action/explain/ExplainRequest.java | 0 .../action/explain/ExplainRequestBuilder.java | 0 .../action/explain/ExplainResponse.java | 0 .../explain/TransportExplainAction.java | 0 .../action/explain/package-info.java | 0 .../action/fieldcaps/FieldCapabilities.java | 0 .../fieldcaps/FieldCapabilitiesAction.java | 0 .../FieldCapabilitiesIndexRequest.java | 0 .../FieldCapabilitiesIndexResponse.java | 0 .../fieldcaps/FieldCapabilitiesRequest.java | 0 .../FieldCapabilitiesRequestBuilder.java | 0 .../fieldcaps/FieldCapabilitiesResponse.java | 0 .../TransportFieldCapabilitiesAction.java | 0 ...TransportFieldCapabilitiesIndexAction.java | 0 .../elasticsearch/action/get/GetAction.java | 0 .../elasticsearch/action/get/GetRequest.java | 0 .../action/get/GetRequestBuilder.java | 0 .../elasticsearch/action/get/GetResponse.java | 0 .../action/get/MultiGetAction.java | 0 .../action/get/MultiGetItemResponse.java | 0 .../action/get/MultiGetRequest.java | 0 .../action/get/MultiGetRequestBuilder.java | 0 .../action/get/MultiGetResponse.java | 0 .../action/get/MultiGetShardRequest.java | 0 .../action/get/MultiGetShardResponse.java | 0 .../action/get/TransportGetAction.java | 0 .../action/get/TransportMultiGetAction.java | 0 .../get/TransportShardMultiGetAction.java | 0 .../action/get/package-info.java | 0 .../action/index/IndexAction.java | 0 .../action/index/IndexRequest.java | 0 .../action/index/IndexRequestBuilder.java | 0 .../action/index/IndexResponse.java | 0 .../action/index/TransportIndexAction.java | 0 .../action/index/package-info.java | 0 .../action/ingest/DeletePipelineAction.java | 0 .../action/ingest/DeletePipelineRequest.java | 0 .../ingest/DeletePipelineRequestBuilder.java | 0 .../ingest/DeletePipelineTransportAction.java | 0 .../action/ingest/GetPipelineAction.java | 0 .../action/ingest/GetPipelineRequest.java | 0 .../ingest/GetPipelineRequestBuilder.java | 0 .../action/ingest/GetPipelineResponse.java | 0 .../ingest/GetPipelineTransportAction.java | 0 .../action/ingest/IngestActionForwarder.java | 0 .../action/ingest/PutPipelineAction.java | 0 .../action/ingest/PutPipelineRequest.java | 0 .../ingest/PutPipelineRequestBuilder.java | 0 .../ingest/PutPipelineTransportAction.java | 0 .../ingest/SimulateDocumentBaseResult.java | 0 .../action/ingest/SimulateDocumentResult.java | 0 .../ingest/SimulateDocumentVerboseResult.java | 0 .../ingest/SimulateExecutionService.java | 0 .../action/ingest/SimulatePipelineAction.java | 0 .../ingest/SimulatePipelineRequest.java | 0 .../SimulatePipelineRequestBuilder.java | 0 .../ingest/SimulatePipelineResponse.java | 0 .../SimulatePipelineTransportAction.java | 0 .../ingest/SimulateProcessorResult.java | 0 .../ingest/TrackingResultProcessor.java | 0 .../action/ingest/WritePipelineResponse.java | 0 .../ingest/WriteableIngestDocument.java | 0 .../elasticsearch/action/main/MainAction.java | 0 .../action/main/MainRequest.java | 0 .../action/main/MainRequestBuilder.java | 0 .../action/main/MainResponse.java | 0 .../action/main/TransportMainAction.java | 0 .../elasticsearch/action/package-info.java | 0 .../resync/ResyncReplicationRequest.java | 0 .../resync/ResyncReplicationResponse.java | 0 .../TransportResyncReplicationAction.java | 0 .../search/AbstractSearchAsyncAction.java | 0 .../search/CanMatchPreFilterSearchPhase.java | 0 .../action/search/ClearScrollAction.java | 0 .../action/search/ClearScrollController.java | 0 .../action/search/ClearScrollRequest.java | 0 .../search/ClearScrollRequestBuilder.java | 0 .../action/search/ClearScrollResponse.java | 0 .../action/search/CountedCollector.java | 0 .../action/search/DfsQueryPhase.java | 0 .../action/search/ExpandSearchPhase.java | 0 .../action/search/FetchSearchPhase.java | 0 .../action/search/InitialSearchPhase.java | 0 .../action/search/MultiSearchAction.java | 0 .../action/search/MultiSearchRequest.java | 0 .../search/MultiSearchRequestBuilder.java | 0 .../action/search/MultiSearchResponse.java | 0 .../action/search/ParsedScrollId.java | 0 .../search/ReduceSearchPhaseException.java | 0 .../action/search/ScrollIdForNode.java | 0 .../action/search/SearchAction.java | 0 .../action/search/SearchActionListener.java | 0 .../SearchDfsQueryThenFetchAsyncAction.java | 0 .../search/SearchExecutionStatsCollector.java | 0 .../action/search/SearchPhase.java | 0 .../action/search/SearchPhaseContext.java | 0 .../action/search/SearchPhaseController.java | 0 .../search/SearchPhaseExecutionException.java | 0 .../SearchQueryThenFetchAsyncAction.java | 0 .../action/search/SearchRequest.java | 0 .../action/search/SearchRequestBuilder.java | 0 .../action/search/SearchResponse.java | 0 .../action/search/SearchResponseSections.java | 0 .../action/search/SearchScrollAction.java | 0 .../search/SearchScrollAsyncAction.java | 0 .../SearchScrollQueryAndFetchAsyncAction.java | 0 ...SearchScrollQueryThenFetchAsyncAction.java | 0 .../action/search/SearchScrollRequest.java | 0 .../search/SearchScrollRequestBuilder.java | 0 .../action/search/SearchShardIterator.java | 0 .../action/search/SearchTask.java | 0 .../action/search/SearchTransportService.java | 0 .../action/search/SearchType.java | 0 .../action/search/ShardSearchFailure.java | 0 .../search/TransportClearScrollAction.java | 0 .../search/TransportMultiSearchAction.java | 0 .../action/search/TransportSearchAction.java | 0 .../action/search/TransportSearchHelper.java | 0 .../search/TransportSearchScrollAction.java | 0 .../action/search/package-info.java | 0 .../action/support/ActionFilter.java | 0 .../action/support/ActionFilterChain.java | 0 .../action/support/ActionFilters.java | 0 .../action/support/ActiveShardCount.java | 0 .../action/support/ActiveShardsObserver.java | 0 .../action/support/AdapterActionFuture.java | 0 .../action/support/AutoCreateIndex.java | 0 .../ContextPreservingActionListener.java | 0 .../DefaultShardOperationFailedException.java | 0 .../support/DelegatingActionListener.java | 0 .../action/support/DestructiveOperations.java | 0 .../action/support/GroupedActionListener.java | 0 .../support/HandledTransportAction.java | 0 .../action/support/IndicesOptions.java | 0 .../action/support/PlainActionFuture.java | 0 .../support/PlainListenableActionFuture.java | 0 .../support/ThreadedActionListener.java | 0 .../action/support/TransportAction.java | 0 .../action/support/TransportActions.java | 0 .../action/support/WriteRequest.java | 0 .../action/support/WriteRequestBuilder.java | 0 .../action/support/WriteResponse.java | 0 .../BroadcastOperationRequestBuilder.java | 0 .../support/broadcast/BroadcastRequest.java | 0 .../support/broadcast/BroadcastResponse.java | 0 ...roadcastShardOperationFailedException.java | 0 .../broadcast/BroadcastShardRequest.java | 0 .../broadcast/BroadcastShardResponse.java | 0 .../broadcast/TransportBroadcastAction.java | 0 .../node/TransportBroadcastByNodeAction.java | 0 .../support/master/AcknowledgedRequest.java | 0 .../master/AcknowledgedRequestBuilder.java | 0 .../support/master/AcknowledgedResponse.java | 0 .../MasterNodeOperationRequestBuilder.java | 0 ...MasterNodeReadOperationRequestBuilder.java | 0 .../support/master/MasterNodeReadRequest.java | 0 .../support/master/MasterNodeRequest.java | 0 .../master/TransportMasterNodeAction.java | 0 .../master/TransportMasterNodeReadAction.java | 0 .../master/info/ClusterInfoRequest.java | 0 .../info/ClusterInfoRequestBuilder.java | 0 .../info/TransportClusterInfoAction.java | 0 .../action/support/nodes/BaseNodeRequest.java | 0 .../support/nodes/BaseNodeResponse.java | 0 .../support/nodes/BaseNodesRequest.java | 0 .../support/nodes/BaseNodesResponse.java | 0 .../nodes/NodesOperationRequestBuilder.java | 0 .../support/nodes/TransportNodesAction.java | 0 .../replication/BasicReplicationRequest.java | 0 .../replication/ReplicatedWriteRequest.java | 0 .../replication/ReplicationOperation.java | 0 .../replication/ReplicationRequest.java | 0 .../ReplicationRequestBuilder.java | 0 .../replication/ReplicationResponse.java | 0 .../support/replication/ReplicationTask.java | 0 .../TransportBroadcastReplicationAction.java | 0 .../TransportReplicationAction.java | 0 .../replication/TransportWriteAction.java | 0 .../InstanceShardOperationRequest.java | 0 .../InstanceShardOperationRequestBuilder.java | 0 ...ransportInstanceSingleOperationAction.java | 0 .../SingleShardOperationRequestBuilder.java | 0 .../single/shard/SingleShardRequest.java | 0 .../shard/TransportSingleShardAction.java | 0 .../support/tasks/BaseTasksRequest.java | 0 .../support/tasks/BaseTasksResponse.java | 0 .../support/tasks/TasksRequestBuilder.java | 0 .../support/tasks/TransportTasksAction.java | 0 .../termvectors/MultiTermVectorsAction.java | 0 .../MultiTermVectorsItemResponse.java | 0 .../termvectors/MultiTermVectorsRequest.java | 0 .../MultiTermVectorsRequestBuilder.java | 0 .../termvectors/MultiTermVectorsResponse.java | 0 .../MultiTermVectorsShardRequest.java | 0 .../MultiTermVectorsShardResponse.java | 0 .../action/termvectors/TermVectorsAction.java | 0 .../action/termvectors/TermVectorsFields.java | 0 .../action/termvectors/TermVectorsFilter.java | 0 .../termvectors/TermVectorsRequest.java | 0 .../TermVectorsRequestBuilder.java | 0 .../termvectors/TermVectorsResponse.java | 0 .../action/termvectors/TermVectorsWriter.java | 0 .../TransportMultiTermVectorsAction.java | 0 .../TransportShardMultiTermsVectorAction.java | 0 .../TransportTermVectorsAction.java | 0 .../action/termvectors/package-info.java | 0 .../action/update/TransportUpdateAction.java | 0 .../action/update/UpdateAction.java | 0 .../action/update/UpdateHelper.java | 0 .../action/update/UpdateRequest.java | 0 .../action/update/UpdateRequestBuilder.java | 0 .../action/update/UpdateResponse.java | 0 .../elasticsearch/bootstrap/Bootstrap.java | 0 .../bootstrap/BootstrapCheck.java | 0 .../bootstrap/BootstrapChecks.java | 0 .../bootstrap/BootstrapContext.java | 0 .../bootstrap/BootstrapException.java | 0 .../bootstrap/BootstrapInfo.java | 0 .../bootstrap/BootstrapSettings.java | 0 .../bootstrap/ConsoleCtrlHandler.java | 0 .../org/elasticsearch/bootstrap/ESPolicy.java | 0 .../bootstrap/Elasticsearch.java | 0 ...ElasticsearchUncaughtExceptionHandler.java | 0 .../bootstrap/FilePermissionUtils.java | 0 .../elasticsearch/bootstrap/JNACLibrary.java | 0 .../bootstrap/JNAKernel32Library.java | 0 .../elasticsearch/bootstrap/JNANatives.java | 0 .../org/elasticsearch/bootstrap/JarHell.java | 0 .../elasticsearch/bootstrap/JavaVersion.java | 0 .../org/elasticsearch/bootstrap/Natives.java | 0 .../org/elasticsearch/bootstrap/Security.java | 0 .../org/elasticsearch/bootstrap/Spawner.java | 0 .../bootstrap/StartupException.java | 0 .../bootstrap/SystemCallFilter.java | 0 .../cli/CommandLoggingConfigurator.java | 0 .../cli/EnvironmentAwareCommand.java | 0 .../cli/LoggingAwareCommand.java | 0 .../cli/LoggingAwareMultiCommand.java | 0 .../org/elasticsearch/client/AdminClient.java | 0 .../java/org/elasticsearch/client/Client.java | 0 .../client/ClusterAdminClient.java | 0 .../client/ElasticsearchClient.java | 0 .../elasticsearch/client/FilterClient.java | 0 .../client/IndicesAdminClient.java | 0 .../client/ParentTaskAssigningClient.java | 0 .../org/elasticsearch/client/Requests.java | 0 .../elasticsearch/client/node/NodeClient.java | 0 .../elasticsearch/client/package-info.java | 0 .../client/support/AbstractClient.java | 0 .../transport/NoNodeAvailableException.java | 0 .../client/transport/TransportClient.java | 0 .../TransportClientNodesService.java | 0 .../transport/TransportProxyClient.java | 0 .../cluster/AbstractDiffable.java | 0 .../cluster/AbstractNamedDiffable.java | 0 .../AckedClusterStateTaskListener.java | 0 .../cluster/AckedClusterStateUpdateTask.java | 0 .../cluster/ClusterChangedEvent.java | 0 .../elasticsearch/cluster/ClusterInfo.java | 0 .../cluster/ClusterInfoService.java | 0 .../elasticsearch/cluster/ClusterModule.java | 0 .../elasticsearch/cluster/ClusterName.java | 0 .../elasticsearch/cluster/ClusterState.java | 0 .../cluster/ClusterStateApplier.java | 0 .../cluster/ClusterStateListener.java | 0 .../cluster/ClusterStateObserver.java | 0 .../cluster/ClusterStateTaskConfig.java | 0 .../cluster/ClusterStateTaskExecutor.java | 0 .../cluster/ClusterStateTaskListener.java | 0 .../cluster/ClusterStateUpdateTask.java | 0 .../java/org/elasticsearch/cluster/Diff.java | 0 .../org/elasticsearch/cluster/Diffable.java | 0 .../elasticsearch/cluster/DiffableUtils.java | 0 .../org/elasticsearch/cluster/DiskUsage.java | 0 .../cluster/EmptyClusterInfoService.java | 0 ...ompatibleClusterStateVersionException.java | 0 .../cluster/InternalClusterInfoService.java | 0 .../cluster/LocalClusterUpdateTask.java | 0 .../cluster/LocalNodeMasterListener.java | 0 .../cluster/MasterNodeChangePredicate.java | 0 .../cluster/MergableCustomMetaData.java | 0 .../org/elasticsearch/cluster/NamedDiff.java | 0 .../elasticsearch/cluster/NamedDiffable.java | 0 .../cluster/NamedDiffableValueSerializer.java | 0 .../cluster/NodeConnectionsService.java | 0 .../cluster/NotMasterException.java | 0 .../cluster/RestoreInProgress.java | 0 .../cluster/SnapshotDeletionsInProgress.java | 0 .../cluster/SnapshotsInProgress.java | 0 .../cluster/TimeoutClusterStateListener.java | 0 .../cluster/ack/AckedRequest.java | 0 .../ack/ClusterStateUpdateRequest.java | 0 .../ack/ClusterStateUpdateResponse.java | 0 ...CreateIndexClusterStateUpdateResponse.java | 0 .../ack/IndicesClusterStateUpdateRequest.java | 0 .../OpenIndexClusterStateUpdateResponse.java | 0 .../action/index/MappingUpdatedAction.java | 0 .../index/NodeMappingRefreshAction.java | 0 .../action/shard/ShardStateAction.java | 0 .../cluster/block/ClusterBlock.java | 0 .../cluster/block/ClusterBlockException.java | 0 .../cluster/block/ClusterBlockLevel.java | 0 .../cluster/block/ClusterBlocks.java | 0 .../cluster/health/ClusterHealthStatus.java | 0 .../cluster/health/ClusterIndexHealth.java | 0 .../cluster/health/ClusterShardHealth.java | 0 .../cluster/health/ClusterStateHealth.java | 0 .../cluster/metadata/AliasAction.java | 0 .../cluster/metadata/AliasMetaData.java | 0 .../cluster/metadata/AliasOrIndex.java | 0 .../cluster/metadata/AliasValidator.java | 0 .../cluster/metadata/AutoExpandReplicas.java | 0 .../ClusterNameExpressionResolver.java | 0 .../cluster/metadata/IndexGraveyard.java | 0 .../cluster/metadata/IndexMetaData.java | 0 .../metadata/IndexNameExpressionResolver.java | 0 .../cluster/metadata/IndexTemplateFilter.java | 0 .../metadata/IndexTemplateMetaData.java | 0 .../cluster/metadata/MappingMetaData.java | 0 .../cluster/metadata/MetaData.java | 0 .../metadata/MetaDataCreateIndexService.java | 0 .../metadata/MetaDataDeleteIndexService.java | 0 .../metadata/MetaDataIndexAliasesService.java | 0 .../metadata/MetaDataIndexStateService.java | 0 .../MetaDataIndexTemplateService.java | 0 .../metadata/MetaDataIndexUpgradeService.java | 0 .../metadata/MetaDataMappingService.java | 0 .../MetaDataUpdateSettingsService.java | 0 .../ProcessClusterEventTimeoutException.java | 0 .../metadata/RepositoriesMetaData.java | 0 .../cluster/metadata/RepositoryMetaData.java | 0 .../metadata/TemplateUpgradeService.java | 0 .../cluster/node/DiscoveryNode.java | 0 .../cluster/node/DiscoveryNodeFilters.java | 0 .../cluster/node/DiscoveryNodes.java | 0 .../cluster/routing/AllocationId.java | 0 .../routing/DelayedAllocationService.java | 0 .../cluster/routing/GroupShardsIterator.java | 0 .../IllegalShardRoutingStateException.java | 0 .../cluster/routing/IndexRoutingTable.java | 0 .../routing/IndexShardRoutingTable.java | 0 .../cluster/routing/Murmur3HashFunction.java | 0 .../cluster/routing/OperationRouting.java | 0 .../cluster/routing/PlainShardIterator.java | 0 .../cluster/routing/PlainShardsIterator.java | 0 .../cluster/routing/Preference.java | 0 .../cluster/routing/RecoverySource.java | 0 .../routing/RotationShardShuffler.java | 0 .../routing/RoutingChangesObserver.java | 0 .../cluster/routing/RoutingException.java | 0 .../cluster/routing/RoutingNode.java | 0 .../cluster/routing/RoutingNodes.java | 0 .../cluster/routing/RoutingService.java | 0 .../cluster/routing/RoutingTable.java | 0 .../cluster/routing/ShardIterator.java | 0 .../cluster/routing/ShardRouting.java | 0 .../cluster/routing/ShardRoutingState.java | 0 .../cluster/routing/ShardShuffler.java | 0 .../cluster/routing/ShardsIterator.java | 0 .../cluster/routing/UnassignedInfo.java | 0 .../AbstractAllocationDecision.java | 0 .../AllocateUnassignedDecision.java | 0 .../allocation/AllocationDecision.java | 0 .../routing/allocation/AllocationService.java | 0 .../allocation/DiskThresholdMonitor.java | 0 .../allocation/DiskThresholdSettings.java | 0 .../routing/allocation/FailedShard.java | 0 .../allocation/IndexMetaDataUpdater.java | 0 .../routing/allocation/MoveDecision.java | 0 .../allocation/NodeAllocationResult.java | 0 .../allocation/RerouteExplanation.java | 0 .../routing/allocation/RoutingAllocation.java | 0 .../allocation/RoutingExplanations.java | 0 .../RoutingNodesChangedObserver.java | 0 .../allocation/ShardAllocationDecision.java | 0 .../routing/allocation/StaleShard.java | 0 .../allocator/BalancedShardsAllocator.java | 0 .../allocation/allocator/ShardsAllocator.java | 0 .../AbstractAllocateAllocationCommand.java | 0 ...AllocateEmptyPrimaryAllocationCommand.java | 0 .../AllocateReplicaAllocationCommand.java | 0 ...AllocateStalePrimaryAllocationCommand.java | 0 .../allocation/command/AllocationCommand.java | 0 .../command/AllocationCommands.java | 0 .../command/BasePrimaryAllocationCommand.java | 0 .../command/CancelAllocationCommand.java | 0 .../command/MoveAllocationCommand.java | 0 .../allocation/decider/AllocationDecider.java | 0 .../decider/AllocationDeciders.java | 0 .../decider/AwarenessAllocationDecider.java | 0 .../ClusterRebalanceAllocationDecider.java | 0 .../ConcurrentRebalanceAllocationDecider.java | 0 .../routing/allocation/decider/Decision.java | 0 .../decider/DiskThresholdDecider.java | 0 .../decider/EnableAllocationDecider.java | 0 .../decider/FilterAllocationDecider.java | 0 .../decider/MaxRetryAllocationDecider.java | 0 .../decider/NodeVersionAllocationDecider.java | 0 ...alanceOnlyWhenActiveAllocationDecider.java | 0 ...caAfterPrimaryActiveAllocationDecider.java | 0 .../decider/ResizeAllocationDecider.java | 0 .../RestoreInProgressAllocationDecider.java | 0 .../decider/SameShardAllocationDecider.java | 0 .../decider/ShardsLimitAllocationDecider.java | 0 .../SnapshotInProgressAllocationDecider.java | 0 .../decider/ThrottlingAllocationDecider.java | 0 .../cluster/service/ClusterApplier.java | 0 .../service/ClusterApplierService.java | 0 .../cluster/service/ClusterService.java | 0 .../cluster/service/MasterService.java | 0 .../cluster/service/PendingClusterTask.java | 0 .../service/SourcePrioritizedRunnable.java | 0 .../cluster/service/TaskBatcher.java | 0 .../org/elasticsearch/common/Booleans.java | 0 .../common/CheckedBiConsumer.java | 0 .../elasticsearch/common/CheckedConsumer.java | 0 .../elasticsearch/common/CheckedFunction.java | 0 .../elasticsearch/common/CheckedRunnable.java | 0 .../elasticsearch/common/CheckedSupplier.java | 0 .../org/elasticsearch/common/Classes.java | 0 .../org/elasticsearch/common/Explicit.java | 0 .../ExponentiallyWeightedMovingAverage.java | 0 .../common/FieldMemoryStats.java | 0 .../common/LegacyTimeBasedUUIDGenerator.java | 0 .../common/MacAddressProvider.java | 0 .../elasticsearch/common/NamedRegistry.java | 0 .../org/elasticsearch/common/Nullable.java | 0 .../org/elasticsearch/common/Numbers.java | 0 .../org/elasticsearch/common/ParseField.java | 0 .../common/ParsingException.java | 0 .../org/elasticsearch/common/PidFile.java | 0 .../org/elasticsearch/common/Priority.java | 0 .../common/RandomBasedUUIDGenerator.java | 0 .../org/elasticsearch/common/Randomness.java | 0 .../common/SecureRandomHolder.java | 0 .../org/elasticsearch/common/StopWatch.java | 0 .../org/elasticsearch/common/Strings.java | 0 .../common/SuppressForbidden.java | 0 .../common/SuppressLoggerChecks.java | 0 .../java/org/elasticsearch/common/Table.java | 0 .../common/TimeBasedUUIDGenerator.java | 0 .../org/elasticsearch/common/TriFunction.java | 0 .../elasticsearch/common/UUIDGenerator.java | 0 .../java/org/elasticsearch/common/UUIDs.java | 0 .../common/ValidationException.java | 0 .../common/blobstore/BlobContainer.java | 0 .../common/blobstore/BlobMetaData.java | 0 .../common/blobstore/BlobPath.java | 0 .../common/blobstore/BlobStore.java | 0 .../common/blobstore/BlobStoreException.java | 0 .../common/blobstore/fs/FsBlobContainer.java | 0 .../common/blobstore/fs/FsBlobStore.java | 0 .../support/AbstractBlobContainer.java | 0 .../blobstore/support/PlainBlobMetaData.java | 0 .../breaker/ChildMemoryCircuitBreaker.java | 0 .../common/breaker/CircuitBreaker.java | 0 .../breaker/CircuitBreakingException.java | 0 .../common/breaker/MemoryCircuitBreaker.java | 0 .../common/breaker/NoopCircuitBreaker.java | 0 .../common/bytes/ByteBufferReference.java | 0 .../common/bytes/BytesArray.java | 0 .../common/bytes/BytesReference.java | 0 .../bytes/BytesReferenceStreamInput.java | 0 .../common/bytes/CompositeBytesReference.java | 0 .../common/bytes/PagedBytesReference.java | 0 .../bytes/ReleasablePagedBytesReference.java | 0 .../org/elasticsearch/common/cache/Cache.java | 0 .../common/cache/CacheBuilder.java | 0 .../common/cache/CacheLoader.java | 0 .../common/cache/RemovalListener.java | 0 .../common/cache/RemovalNotification.java | 0 .../common/collect/CopyOnWriteHashMap.java | 0 .../common/collect/EvictingQueue.java | 0 .../common/collect/HppcMaps.java | 0 .../common/collect/ImmutableOpenIntMap.java | 0 .../common/collect/ImmutableOpenMap.java | 0 .../common/collect/Iterators.java | 0 .../common/collect/MapBuilder.java | 0 .../elasticsearch/common/collect/Tuple.java | 0 .../common/component/AbstractComponent.java | 0 .../component/AbstractLifecycleComponent.java | 0 .../common/component/Lifecycle.java | 0 .../common/component/LifecycleComponent.java | 0 .../common/component/LifecycleListener.java | 0 .../common/compress/CompressedXContent.java | 0 .../common/compress/Compressor.java | 0 .../common/compress/CompressorFactory.java | 0 .../common/compress/DeflateCompressor.java | 0 .../compress/NotCompressedException.java | 0 .../common/compress/NotXContentException.java | 0 .../common/document/DocumentField.java | 0 .../elasticsearch/common/geo/GeoDistance.java | 0 .../common/geo/GeoHashUtils.java | 0 .../elasticsearch/common/geo/GeoPoint.java | 0 .../common/geo/GeoShapeType.java | 0 .../elasticsearch/common/geo/GeoUtils.java | 0 .../common/geo/ShapeRelation.java | 0 .../common/geo/ShapesAvailability.java | 0 .../common/geo/SpatialStrategy.java | 0 .../common/geo/XShapeCollection.java | 0 .../common/geo/builders/CircleBuilder.java | 0 .../geo/builders/CoordinatesBuilder.java | 0 .../common/geo/builders/EnvelopeBuilder.java | 0 .../builders/GeometryCollectionBuilder.java | 0 .../geo/builders/LineStringBuilder.java | 0 .../geo/builders/MultiLineStringBuilder.java | 0 .../geo/builders/MultiPointBuilder.java | 0 .../geo/builders/MultiPolygonBuilder.java | 0 .../common/geo/builders/PointBuilder.java | 0 .../common/geo/builders/PolygonBuilder.java | 0 .../common/geo/builders/ShapeBuilder.java | 0 .../common/geo/parsers/CoordinateNode.java | 0 .../common/geo/parsers/GeoJsonParser.java | 0 .../common/geo/parsers/GeoWKTParser.java | 0 .../common/geo/parsers/ShapeParser.java | 0 .../common/hash/MessageDigests.java | 0 .../common/hash/MurmurHash3.java | 0 .../common/inject/AbstractModule.java | 0 .../common/inject/AbstractProcessor.java | 0 .../elasticsearch/common/inject/Binder.java | 0 .../elasticsearch/common/inject/Binding.java | 0 .../common/inject/BindingAnnotation.java | 0 .../common/inject/BindingProcessor.java | 0 .../common/inject/BoundProviderFactory.java | 0 .../common/inject/ConfigurationException.java | 0 .../common/inject/ConstantFactory.java | 0 .../common/inject/ConstructionProxy.java | 0 .../inject/ConstructionProxyFactory.java | 0 .../common/inject/ConstructorBindingImpl.java | 0 .../common/inject/ConstructorInjector.java | 0 .../inject/ConstructorInjectorStore.java | 0 .../common/inject/ContextualCallable.java | 0 .../common/inject/CreationException.java | 0 .../DefaultConstructionProxyFactory.java | 0 .../common/inject/DeferredLookups.java | 0 .../common/inject/EncounterImpl.java | 0 .../elasticsearch/common/inject/Exposed.java | 0 .../common/inject/ExposedKeyFactory.java | 0 .../common/inject/FactoryProxy.java | 0 .../elasticsearch/common/inject/Guice.java | 0 .../common/inject/ImplementedBy.java | 0 .../common/inject/InheritingState.java | 0 .../common/inject/Initializable.java | 0 .../common/inject/Initializables.java | 0 .../common/inject/Initializer.java | 0 .../elasticsearch/common/inject/Inject.java | 0 .../inject/InjectionRequestProcessor.java | 0 .../elasticsearch/common/inject/Injector.java | 0 .../common/inject/InjectorBuilder.java | 0 .../common/inject/InjectorImpl.java | 0 .../common/inject/InjectorShell.java | 0 .../InternalFactoryToProviderAdapter.java | 0 .../org/elasticsearch/common/inject/Key.java | 0 .../common/inject/LookupProcessor.java | 0 .../elasticsearch/common/inject/Lookups.java | 0 .../common/inject/MembersInjector.java | 0 .../common/inject/MembersInjectorImpl.java | 0 .../common/inject/MembersInjectorStore.java | 0 .../common/inject/MessageProcessor.java | 0 .../elasticsearch/common/inject/Module.java | 0 .../common/inject/ModulesBuilder.java | 0 .../common/inject/OutOfScopeException.java | 0 .../common/inject/PreProcessModule.java | 0 .../common/inject/PrivateBinder.java | 0 .../inject/PrivateElementProcessor.java | 0 .../common/inject/PrivateModule.java | 0 .../common/inject/ProvidedBy.java | 0 .../elasticsearch/common/inject/Provider.java | 0 .../ProviderToInternalFactoryAdapter.java | 0 .../elasticsearch/common/inject/Provides.java | 0 .../common/inject/ProvisionException.java | 0 .../common/inject/Reflection.java | 0 .../elasticsearch/common/inject/Scope.java | 0 .../common/inject/ScopeAnnotation.java | 0 .../common/inject/ScopeBindingProcessor.java | 0 .../elasticsearch/common/inject/Scopes.java | 0 .../common/inject/SingleFieldInjector.java | 0 .../common/inject/SingleMemberInjector.java | 0 .../common/inject/SingleMethodInjector.java | 0 .../inject/SingleParameterInjector.java | 0 .../common/inject/Singleton.java | 0 .../elasticsearch/common/inject/Stage.java | 0 .../elasticsearch/common/inject/State.java | 0 .../inject/TypeConverterBindingProcessor.java | 0 .../inject/TypeListenerBindingProcessor.java | 0 .../common/inject/TypeLiteral.java | 0 .../common/inject/WeakKeySet.java | 0 .../inject/assistedinject/Assisted.java | 0 .../assistedinject/AssistedConstructor.java | 0 .../inject/assistedinject/AssistedInject.java | 0 .../assistedinject/FactoryProvider.java | 0 .../inject/assistedinject/Parameter.java | 0 .../assistedinject/ParameterListKey.java | 0 .../inject/assistedinject/package-info.java | 0 .../binder/AnnotatedBindingBuilder.java | 0 .../AnnotatedConstantBindingBuilder.java | 0 .../binder/AnnotatedElementBuilder.java | 0 .../inject/binder/ConstantBindingBuilder.java | 0 .../inject/binder/LinkedBindingBuilder.java | 0 .../inject/binder/ScopedBindingBuilder.java | 0 .../common/inject/binder/package-info.java | 0 .../internal/AbstractBindingBuilder.java | 0 .../common/inject/internal/Annotations.java | 0 .../inject/internal/BindingBuilder.java | 0 .../common/inject/internal/BindingImpl.java | 0 .../internal/ConstantBindingBuilderImpl.java | 0 .../inject/internal/ConstructionContext.java | 0 .../common/inject/internal/ErrorHandler.java | 0 .../common/inject/internal/Errors.java | 0 .../inject/internal/ErrorsException.java | 0 .../inject/internal/ExpirationTimer.java | 0 .../inject/internal/ExposedBindingImpl.java | 0 .../inject/internal/ExposureBuilder.java | 0 .../common/inject/internal/FailableCache.java | 0 .../inject/internal/InstanceBindingImpl.java | 0 .../inject/internal/InternalContext.java | 0 .../inject/internal/InternalFactory.java | 0 .../common/inject/internal/Join.java | 0 .../inject/internal/LinkedBindingImpl.java | 0 .../internal/LinkedProviderBindingImpl.java | 0 .../inject/internal/MatcherAndConverter.java | 0 .../common/inject/internal/MoreTypes.java | 0 .../common/inject/internal/Nullability.java | 0 .../common/inject/internal/Nullable.java | 0 .../inject/internal/PrivateElementsImpl.java | 0 .../internal/ProviderInstanceBindingImpl.java | 0 .../inject/internal/ProviderMethod.java | 0 .../internal/ProviderMethodsModule.java | 0 .../common/inject/internal/Scoping.java | 0 .../inject/internal/SourceProvider.java | 0 .../inject/internal/StackTraceElements.java | 0 .../common/inject/internal/Stopwatch.java | 0 .../common/inject/internal/Strings.java | 0 .../inject/internal/ToStringBuilder.java | 0 .../inject/internal/UniqueAnnotations.java | 0 .../internal/UntargettedBindingImpl.java | 0 .../common/inject/internal/package-info.java | 0 .../inject/matcher/AbstractMatcher.java | 0 .../common/inject/matcher/Matcher.java | 0 .../common/inject/matcher/Matchers.java | 0 .../common/inject/matcher/package-info.java | 0 .../common/inject/multibindings/Element.java | 0 .../inject/multibindings/MapBinder.java | 0 .../inject/multibindings/Multibinder.java | 0 .../inject/multibindings/RealElement.java | 0 .../inject/multibindings/package-info.java | 0 .../common/inject/name/Named.java | 0 .../common/inject/name/NamedImpl.java | 0 .../common/inject/name/Names.java | 0 .../common/inject/name/package-info.java | 0 .../common/inject/package-info.java | 0 .../inject/spi/BindingScopingVisitor.java | 0 .../inject/spi/BindingTargetVisitor.java | 0 .../common/inject/spi/ConstructorBinding.java | 0 .../inject/spi/ConvertedConstantBinding.java | 0 .../spi/DefaultBindingScopingVisitor.java | 0 .../spi/DefaultBindingTargetVisitor.java | 0 .../inject/spi/DefaultElementVisitor.java | 0 .../common/inject/spi/Dependency.java | 0 .../common/inject/spi/Element.java | 0 .../common/inject/spi/ElementVisitor.java | 0 .../common/inject/spi/Elements.java | 0 .../common/inject/spi/ExposedBinding.java | 0 .../common/inject/spi/HasDependencies.java | 0 .../common/inject/spi/InjectionListener.java | 0 .../common/inject/spi/InjectionPoint.java | 0 .../common/inject/spi/InjectionRequest.java | 0 .../common/inject/spi/InstanceBinding.java | 0 .../common/inject/spi/LinkedKeyBinding.java | 0 .../inject/spi/MembersInjectorLookup.java | 0 .../common/inject/spi/Message.java | 0 .../common/inject/spi/PrivateElements.java | 0 .../common/inject/spi/ProviderBinding.java | 0 .../inject/spi/ProviderInstanceBinding.java | 0 .../common/inject/spi/ProviderKeyBinding.java | 0 .../common/inject/spi/ProviderLookup.java | 0 .../inject/spi/ProviderWithDependencies.java | 0 .../common/inject/spi/ScopeBinding.java | 0 .../inject/spi/StaticInjectionRequest.java | 0 .../common/inject/spi/TypeConverter.java | 0 .../inject/spi/TypeConverterBinding.java | 0 .../common/inject/spi/TypeEncounter.java | 0 .../common/inject/spi/TypeListener.java | 0 .../inject/spi/TypeListenerBinding.java | 0 .../common/inject/spi/UntargettedBinding.java | 0 .../common/inject/spi/package-info.java | 0 .../common/inject/util/Modules.java | 0 .../common/inject/util/Providers.java | 0 .../common/inject/util/Types.java | 0 .../common/inject/util/package-info.java | 0 .../org/elasticsearch/common/io/Channels.java | 0 .../common/io/FastCharArrayReader.java | 0 .../common/io/FastCharArrayWriter.java | 0 .../common/io/FastStringReader.java | 0 .../common/io/FileSystemUtils.java | 0 .../elasticsearch/common/io/PathUtils.java | 0 .../org/elasticsearch/common/io/Streams.java | 0 .../common/io/UTF8StreamWriter.java | 0 .../io/stream/ByteBufferStreamInput.java | 0 .../common/io/stream/BytesStream.java | 0 .../common/io/stream/BytesStreamOutput.java | 0 .../io/stream/DataOutputStreamOutput.java | 0 .../common/io/stream/FilterStreamInput.java | 0 .../io/stream/InputStreamStreamInput.java | 0 .../common/io/stream/NamedWriteable.java | 0 .../NamedWriteableAwareStreamInput.java | 0 .../io/stream/NamedWriteableRegistry.java | 0 .../NotSerializableExceptionWrapper.java | 0 .../io/stream/OutputStreamStreamOutput.java | 0 .../stream/ReleasableBytesStreamOutput.java | 0 .../common/io/stream/StreamInput.java | 0 .../common/io/stream/StreamOutput.java | 0 .../common/io/stream/Streamable.java | 0 .../common/io/stream/Writeable.java | 0 .../common/io/stream/package-info.java | 0 .../common/joda/DateMathParser.java | 0 .../common/joda/FormatDateTimeFormatter.java | 0 .../org/elasticsearch/common/joda/Joda.java | 0 .../common/lease/Releasable.java | 0 .../common/lease/Releasables.java | 0 .../common/logging/DeprecationLogger.java | 0 .../common/logging/ESLoggerFactory.java | 0 .../common/logging/LogConfigurator.java | 0 .../common/logging/LoggerMessageFormat.java | 0 .../elasticsearch/common/logging/Loggers.java | 0 .../common/logging/PrefixLogger.java | 0 .../common/lucene/BytesRefs.java | 0 .../common/lucene/LoggerInfoStream.java | 0 .../elasticsearch/common/lucene/Lucene.java | 0 .../common/lucene/MinimumScoreCollector.java | 0 .../common/lucene/ScorerAware.java | 0 .../common/lucene/ShardCoreKeyMap.java | 0 .../index/ElasticsearchDirectoryReader.java | 0 .../lucene/index/ElasticsearchLeafReader.java | 0 .../lucene/index/FilterableTermsEnum.java | 0 .../common/lucene/index/FreqTermsEnum.java | 0 .../lucene/search/FilteredCollector.java | 0 .../lucene/search/MoreLikeThisQuery.java | 0 .../lucene/search/MultiPhrasePrefixQuery.java | 0 .../common/lucene/search/Queries.java | 0 .../common/lucene/search/XMoreLikeThis.java | 0 .../search/function/CombineFunction.java | 0 .../function/FieldValueFactorFunction.java | 0 .../search/function/FunctionScoreQuery.java | 0 .../search/function/LeafScoreFunction.java | 0 .../search/function/MinScoreScorer.java | 0 .../search/function/RandomScoreFunction.java | 0 .../lucene/search/function/ScoreFunction.java | 0 .../search/function/ScriptScoreFunction.java | 0 .../search/function/WeightFactorFunction.java | 0 .../lucene/store/ByteArrayIndexInput.java | 0 .../lucene/store/FilterIndexOutput.java | 0 .../lucene/store/IndexOutputOutputStream.java | 0 .../lucene/store/InputStreamIndexInput.java | 0 .../uid/PerThreadIDVersionAndSeqNoLookup.java | 0 .../common/lucene/uid/Versions.java | 0 .../lucene/uid/VersionsAndSeqNoResolver.java | 0 .../common/metrics/CounterMetric.java | 0 .../common/metrics/MeanMetric.java | 0 .../elasticsearch/common/metrics/Metric.java | 0 .../elasticsearch/common/network/Cidrs.java | 0 .../common/network/IfConfig.java | 0 .../common/network/InetAddresses.java | 0 .../common/network/NetworkAddress.java | 0 .../common/network/NetworkModule.java | 0 .../common/network/NetworkService.java | 0 .../common/network/NetworkUtils.java | 0 .../elasticsearch/common/path/PathTrie.java | 0 .../common/recycler/AbstractRecycler.java | 0 .../common/recycler/AbstractRecyclerC.java | 0 .../recycler/ConcurrentDequeRecycler.java | 0 .../common/recycler/DequeRecycler.java | 0 .../common/recycler/FilterRecycler.java | 0 .../common/recycler/NoneRecycler.java | 0 .../common/recycler/Recycler.java | 0 .../common/recycler/Recyclers.java | 0 .../org/elasticsearch/common/regex/Regex.java | 0 .../common/rounding/DateTimeUnit.java | 0 .../common/rounding/Rounding.java | 0 .../settings/AbstractScopedSettings.java | 0 .../settings/AddFileKeyStoreCommand.java | 0 .../settings/AddStringKeyStoreCommand.java | 0 .../common/settings/ClusterSettings.java | 0 .../settings/CreateKeyStoreCommand.java | 0 .../common/settings/IndexScopedSettings.java | 0 .../common/settings/KeyStoreCli.java | 0 .../common/settings/KeyStoreWrapper.java | 0 .../common/settings/ListKeyStoreCommand.java | 0 .../settings/NoClassSettingsException.java | 0 .../common/settings/PropertyPlaceholder.java | 0 .../RemoveSettingKeyStoreCommand.java | 0 .../common/settings/SecureSetting.java | 0 .../common/settings/SecureSettings.java | 0 .../common/settings/SecureString.java | 0 .../common/settings/Setting.java | 0 .../common/settings/Settings.java | 0 .../common/settings/SettingsException.java | 0 .../common/settings/SettingsFilter.java | 0 .../common/settings/SettingsModule.java | 0 .../common/settings/package-info.java | 0 .../org/elasticsearch/common/text/Text.java | 0 .../transport/BoundTransportAddress.java | 0 .../transport/NetworkExceptionHelper.java | 0 .../common/transport/PortsRange.java | 0 .../common/transport/TransportAddress.java | 0 .../common/unit/ByteSizeUnit.java | 0 .../common/unit/ByteSizeValue.java | 0 .../common/unit/DistanceUnit.java | 0 .../elasticsearch/common/unit/Fuzziness.java | 0 .../common/unit/MemorySizeValue.java | 0 .../elasticsearch/common/unit/RatioValue.java | 0 .../elasticsearch/common/unit/SizeUnit.java | 0 .../elasticsearch/common/unit/SizeValue.java | 0 .../elasticsearch/common/unit/TimeValue.java | 0 .../common/util/AbstractArray.java | 0 .../common/util/AbstractBigArray.java | 0 .../common/util/AbstractHash.java | 0 .../common/util/AbstractPagedHashMap.java | 0 .../elasticsearch/common/util/ArrayUtils.java | 0 .../elasticsearch/common/util/BigArray.java | 0 .../elasticsearch/common/util/BigArrays.java | 0 .../common/util/BigByteArray.java | 0 .../common/util/BigDoubleArray.java | 0 .../common/util/BigFloatArray.java | 0 .../common/util/BigIntArray.java | 0 .../common/util/BigLongArray.java | 0 .../common/util/BigObjectArray.java | 0 .../elasticsearch/common/util/ByteArray.java | 0 .../elasticsearch/common/util/ByteUtils.java | 0 .../common/util/BytesRefHash.java | 0 .../common/util/CancellableThreads.java | 0 .../common/util/CollectionUtils.java | 0 .../common/util/Comparators.java | 0 .../common/util/DoubleArray.java | 0 .../elasticsearch/common/util/FloatArray.java | 0 .../common/util/IndexFolderUpgrader.java | 0 .../elasticsearch/common/util/IntArray.java | 0 .../common/util/LocaleUtils.java | 0 .../elasticsearch/common/util/LongArray.java | 0 .../elasticsearch/common/util/LongHash.java | 0 .../common/util/LongObjectPagedHashMap.java | 0 .../common/util/ObjectArray.java | 0 .../common/util/PageCacheRecycler.java | 0 .../common/util/SingleObjectCache.java | 0 .../elasticsearch/common/util/URIPattern.java | 0 .../concurrent/AbstractLifecycleRunnable.java | 0 .../util/concurrent/AbstractRefCounted.java | 0 .../util/concurrent/AbstractRunnable.java | 0 .../util/concurrent/AsyncIOProcessor.java | 0 .../common/util/concurrent/AtomicArray.java | 0 .../common/util/concurrent/BaseFuture.java | 0 .../concurrent/ConcurrentCollections.java | 0 .../concurrent/ConcurrentHashMapLong.java | 0 .../util/concurrent/ConcurrentMapLong.java | 0 .../common/util/concurrent/CountDown.java | 0 .../common/util/concurrent/EsAbortPolicy.java | 0 .../common/util/concurrent/EsExecutors.java | 0 .../EsRejectedExecutionException.java | 0 .../util/concurrent/EsThreadPoolExecutor.java | 0 .../common/util/concurrent/FutureUtils.java | 0 .../common/util/concurrent/KeyedLock.java | 0 .../util/concurrent/LoggingRunnable.java | 0 .../util/concurrent/PrioritizedCallable.java | 0 .../PrioritizedEsThreadPoolExecutor.java | 0 .../util/concurrent/PrioritizedRunnable.java | 0 .../QueueResizingEsThreadPoolExecutor.java | 0 .../common/util/concurrent/RefCounted.java | 0 .../util/concurrent/ReleasableLock.java | 0 .../concurrent/ResizableBlockingQueue.java | 0 .../util/concurrent/SizeBlockingQueue.java | 0 .../common/util/concurrent/ThreadBarrier.java | 0 .../common/util/concurrent/ThreadContext.java | 0 .../common/util/concurrent/TimedRunnable.java | 0 .../UncategorizedExecutionException.java | 0 .../concurrent/XRejectedExecutionHandler.java | 0 .../common/util/iterable/Iterables.java | 0 .../elasticsearch/common/util/set/Sets.java | 0 .../common/xcontent/AbstractObjectParser.java | 0 .../xcontent/ConstructingObjectParser.java | 0 .../common/xcontent/ContextParser.java | 0 .../xcontent/NamedXContentRegistry.java | 0 .../common/xcontent/ObjectParser.java | 0 .../common/xcontent/ParseFieldRegistry.java | 0 .../xcontent/StatusToXContentObject.java | 0 .../common/xcontent/ToXContent.java | 0 .../common/xcontent/ToXContentFragment.java | 0 .../common/xcontent/ToXContentObject.java | 0 .../common/xcontent/XContent.java | 0 .../common/xcontent/XContentBuilder.java | 0 .../common/xcontent/XContentFactory.java | 0 .../common/xcontent/XContentGenerator.java | 0 .../common/xcontent/XContentHelper.java | 0 .../common/xcontent/XContentLocation.java | 0 .../common/xcontent/XContentParser.java | 0 .../common/xcontent/XContentParserUtils.java | 0 .../common/xcontent/XContentType.java | 0 .../common/xcontent/cbor/CborXContent.java | 0 .../xcontent/cbor/CborXContentGenerator.java | 0 .../xcontent/cbor/CborXContentParser.java | 0 .../common/xcontent/json/JsonXContent.java | 0 .../xcontent/json/JsonXContentGenerator.java | 0 .../xcontent/json/JsonXContentParser.java | 0 .../common/xcontent/smile/SmileXContent.java | 0 .../smile/SmileXContentGenerator.java | 0 .../xcontent/smile/SmileXContentParser.java | 0 .../support/AbstractXContentParser.java | 0 .../xcontent/support/XContentMapValues.java | 0 .../support/filtering/FilterPath.java | 0 .../filtering/FilterPathBasedFilter.java | 0 .../common/xcontent/yaml/YamlXContent.java | 0 .../xcontent/yaml/YamlXContentGenerator.java | 0 .../xcontent/yaml/YamlXContentParser.java | 0 ...AckClusterStatePublishResponseHandler.java | 0 ...ingClusterStatePublishResponseHandler.java | 0 .../elasticsearch/discovery/Discovery.java | 0 .../discovery/DiscoveryModule.java | 0 .../discovery/DiscoverySettings.java | 0 .../discovery/DiscoveryStats.java | 0 .../MasterNotDiscoveredException.java | 0 .../discovery/single/SingleNodeDiscovery.java | 0 .../discovery/zen/ElectMasterService.java | 0 .../discovery/zen/FaultDetection.java | 0 .../discovery/zen/MasterFaultDetection.java | 0 .../discovery/zen/MembershipAction.java | 0 .../discovery/zen/NodeJoinController.java | 0 .../discovery/zen/NodesFaultDetection.java | 0 .../zen/PendingClusterStateStats.java | 0 .../zen/PendingClusterStatesQueue.java | 0 .../discovery/zen/PingContextProvider.java | 0 .../zen/PublishClusterStateAction.java | 0 .../zen/PublishClusterStateStats.java | 0 .../discovery/zen/UnicastHostsProvider.java | 0 .../discovery/zen/UnicastZenPing.java | 0 .../discovery/zen/ZenDiscovery.java | 0 .../elasticsearch/discovery/zen/ZenPing.java | 0 .../org/elasticsearch/env/ESFileStore.java | 0 .../org/elasticsearch/env/Environment.java | 0 .../elasticsearch/env/NodeEnvironment.java | 0 .../org/elasticsearch/env/NodeMetaData.java | 0 .../java/org/elasticsearch/env/ShardLock.java | 0 .../env/ShardLockObtainFailedException.java | 0 .../gateway/AsyncShardFetch.java | 0 .../gateway/BaseGatewayShardAllocator.java | 0 .../gateway/CorruptStateException.java | 0 .../gateway/DanglingIndicesState.java | 0 .../org/elasticsearch/gateway/Gateway.java | 0 .../gateway/GatewayAllocator.java | 0 .../gateway/GatewayException.java | 0 .../gateway/GatewayMetaState.java | 0 .../elasticsearch/gateway/GatewayModule.java | 0 .../elasticsearch/gateway/GatewayService.java | 0 .../gateway/LocalAllocateDangledIndices.java | 0 .../gateway/MetaDataStateFormat.java | 0 .../gateway/MetaStateService.java | 0 .../gateway/PrimaryShardAllocator.java | 0 .../gateway/PriorityComparator.java | 0 .../gateway/ReplicaShardAllocator.java | 0 .../TransportNodesListGatewayMetaState.java | 0 ...ransportNodesListGatewayStartedShards.java | 0 .../elasticsearch/http/BindHttpException.java | 0 .../org/elasticsearch/http/HttpException.java | 0 .../java/org/elasticsearch/http/HttpInfo.java | 0 .../http/HttpServerTransport.java | 0 .../org/elasticsearch/http/HttpStats.java | 0 .../http/HttpTransportSettings.java | 0 .../index/AbstractIndexComponent.java | 0 .../index/CompositeIndexEventListener.java | 0 .../java/org/elasticsearch/index/Index.java | 0 .../elasticsearch/index/IndexComponent.java | 0 .../org/elasticsearch/index/IndexModule.java | 0 .../index/IndexNotFoundException.java | 0 .../org/elasticsearch/index/IndexService.java | 0 .../elasticsearch/index/IndexSettings.java | 0 .../elasticsearch/index/IndexSortConfig.java | 0 .../org/elasticsearch/index/IndexWarmer.java | 0 .../elasticsearch/index/IndexingSlowLog.java | 0 .../index/MergePolicyConfig.java | 0 .../index/MergeSchedulerConfig.java | 0 .../elasticsearch/index/SearchSlowLog.java | 0 .../org/elasticsearch/index/SlowLogLevel.java | 0 .../org/elasticsearch/index/VersionType.java | 0 .../analysis/AbstractCharFilterFactory.java | 0 .../AbstractIndexAnalyzerProvider.java | 0 .../analysis/AbstractTokenFilterFactory.java | 0 .../analysis/AbstractTokenizerFactory.java | 0 .../index/analysis/Analysis.java | 0 .../index/analysis/AnalysisRegistry.java | 0 .../index/analysis/AnalyzerProvider.java | 0 .../index/analysis/AnalyzerScope.java | 0 .../analysis/ArabicAnalyzerProvider.java | 0 .../analysis/ArmenianAnalyzerProvider.java | 0 .../analysis/BasqueAnalyzerProvider.java | 0 .../analysis/BengaliAnalyzerProvider.java | 0 .../analysis/BrazilianAnalyzerProvider.java | 0 .../analysis/BulgarianAnalyzerProvider.java | 0 .../analysis/CatalanAnalyzerProvider.java | 0 .../index/analysis/CharFilterFactory.java | 0 .../index/analysis/CharMatcher.java | 0 .../analysis/ChineseAnalyzerProvider.java | 0 .../index/analysis/CjkAnalyzerProvider.java | 0 .../analysis/ClassicTokenizerFactory.java | 0 .../index/analysis/CustomAnalyzer.java | 0 .../analysis/CustomAnalyzerProvider.java | 0 .../analysis/CustomNormalizerProvider.java | 0 .../index/analysis/CzechAnalyzerProvider.java | 0 .../analysis/DanishAnalyzerProvider.java | 0 .../index/analysis/DutchAnalyzerProvider.java | 0 .../analysis/EdgeNGramTokenizerFactory.java | 0 .../analysis/EnglishAnalyzerProvider.java | 0 .../index/analysis/FieldNameAnalyzer.java | 0 .../index/analysis/FingerprintAnalyzer.java | 0 .../analysis/FingerprintAnalyzerProvider.java | 0 .../analysis/FinnishAnalyzerProvider.java | 0 .../analysis/FrenchAnalyzerProvider.java | 0 .../analysis/GalicianAnalyzerProvider.java | 0 .../analysis/GermanAnalyzerProvider.java | 0 .../index/analysis/GreekAnalyzerProvider.java | 0 .../index/analysis/HindiAnalyzerProvider.java | 0 .../analysis/HungarianAnalyzerProvider.java | 0 .../analysis/HunspellTokenFilterFactory.java | 0 .../index/analysis/IndexAnalyzers.java | 0 .../analysis/IndonesianAnalyzerProvider.java | 0 .../index/analysis/IrishAnalyzerProvider.java | 0 .../analysis/ItalianAnalyzerProvider.java | 0 .../analysis/KeywordAnalyzerProvider.java | 0 .../analysis/KeywordTokenizerFactory.java | 0 .../analysis/LatvianAnalyzerProvider.java | 0 .../analysis/LetterTokenizerFactory.java | 0 .../analysis/LithuanianAnalyzerProvider.java | 0 .../analysis/LowerCaseTokenizerFactory.java | 0 .../analysis/MultiTermAwareComponent.java | 0 .../index/analysis/NGramTokenizerFactory.java | 0 .../index/analysis/NamedAnalyzer.java | 0 .../analysis/NorwegianAnalyzerProvider.java | 0 .../PathHierarchyTokenizerFactory.java | 0 .../index/analysis/PatternAnalyzer.java | 0 .../analysis/PatternAnalyzerProvider.java | 0 .../analysis/PatternTokenizerFactory.java | 0 .../analysis/PersianAnalyzerProvider.java | 0 .../analysis/PortugueseAnalyzerProvider.java | 0 .../analysis/PreBuiltAnalyzerProvider.java | 0 .../PreBuiltAnalyzerProviderFactory.java | 0 .../PreConfiguredAnalysisComponent.java | 0 .../analysis/PreConfiguredCharFilter.java | 0 .../analysis/PreConfiguredTokenFilter.java | 0 .../analysis/PreConfiguredTokenizer.java | 0 .../analysis/RomanianAnalyzerProvider.java | 0 .../analysis/RussianAnalyzerProvider.java | 0 .../analysis/ShingleTokenFilterFactory.java | 0 .../analysis/SimpleAnalyzerProvider.java | 0 .../index/analysis/SnowballAnalyzer.java | 0 .../analysis/SnowballAnalyzerProvider.java | 0 .../analysis/SoraniAnalyzerProvider.java | 0 .../SoraniNormalizationFilterFactory.java | 0 .../analysis/SpanishAnalyzerProvider.java | 0 .../analysis/StandardAnalyzerProvider.java | 0 .../analysis/StandardHtmlStripAnalyzer.java | 0 .../StandardHtmlStripAnalyzerProvider.java | 0 .../analysis/StandardTokenFilterFactory.java | 0 .../analysis/StandardTokenizerFactory.java | 0 .../index/analysis/StopAnalyzerProvider.java | 0 .../analysis/StopTokenFilterFactory.java | 0 .../analysis/SwedishAnalyzerProvider.java | 0 .../SynonymGraphTokenFilterFactory.java | 0 .../analysis/SynonymTokenFilterFactory.java | 0 .../index/analysis/ThaiAnalyzerProvider.java | 0 .../index/analysis/ThaiTokenizerFactory.java | 0 .../index/analysis/TokenFilterFactory.java | 0 .../index/analysis/TokenizerFactory.java | 0 .../analysis/TurkishAnalyzerProvider.java | 0 .../UAX29URLEmailTokenizerFactory.java | 0 .../analysis/WhitespaceAnalyzerProvider.java | 0 .../analysis/WhitespaceTokenizerFactory.java | 0 .../elasticsearch/index/cache/IndexCache.java | 0 .../index/cache/bitset/BitsetFilterCache.java | 0 .../cache/bitset/ShardBitsetFilterCache.java | 0 .../index/cache/query/DisabledQueryCache.java | 0 .../index/cache/query/IndexQueryCache.java | 0 .../index/cache/query/QueryCache.java | 0 .../index/cache/query/QueryCacheStats.java | 0 .../cache/request/RequestCacheStats.java | 0 .../cache/request/ShardRequestCache.java | 0 .../index/codec/CodecService.java | 0 .../PerFieldMappingPostingFormatCodec.java | 0 .../index/engine/CombinedDeletionPolicy.java | 0 .../index/engine/CommitStats.java | 0 .../index/engine/DeleteVersionValue.java | 0 .../engine/DocumentMissingException.java | 0 .../DocumentSourceMissingException.java | 0 ...ElasticsearchConcurrentMergeScheduler.java | 0 .../elasticsearch/index/engine/Engine.java | 0 .../index/engine/EngineConfig.java | 0 .../EngineCreationFailureException.java | 0 .../index/engine/EngineException.java | 0 .../index/engine/EngineFactory.java | 0 .../index/engine/EngineSearcher.java | 0 .../index/engine/EngineSearcherFactory.java | 0 .../engine/FlushFailedEngineException.java | 0 .../index/engine/InternalEngine.java | 0 .../index/engine/InternalEngineFactory.java | 0 .../index/engine/LiveVersionMap.java | 0 .../engine/RamAccountingSearcherFactory.java | 0 .../index/engine/RecoveryCounter.java | 0 .../index/engine/RecoveryEngineException.java | 0 .../engine/RefreshFailedEngineException.java | 0 .../elasticsearch/index/engine/Segment.java | 0 .../index/engine/SegmentsStats.java | 0 .../engine/SnapshotFailedEngineException.java | 0 .../VersionConflictEngineException.java | 0 .../index/engine/VersionValue.java | 0 .../fielddata/AbstractBinaryDocValues.java | 0 .../fielddata/AbstractNumericDocValues.java | 0 .../fielddata/AbstractSortedDocValues.java | 0 .../AbstractSortedNumericDocValues.java | 0 .../fielddata/AbstractSortedSetDocValues.java | 0 .../AbstractSortingNumericDocValues.java | 0 .../index/fielddata/AtomicFieldData.java | 0 .../fielddata/AtomicGeoPointFieldData.java | 0 .../fielddata/AtomicNumericFieldData.java | 0 .../fielddata/AtomicOrdinalsFieldData.java | 0 .../index/fielddata/FieldData.java | 0 .../index/fielddata/FieldDataStats.java | 0 .../index/fielddata/GeoPointValues.java | 0 .../index/fielddata/IndexFieldData.java | 0 .../index/fielddata/IndexFieldDataCache.java | 0 .../fielddata/IndexFieldDataService.java | 0 .../fielddata/IndexGeoPointFieldData.java | 0 .../fielddata/IndexNumericFieldData.java | 0 .../fielddata/IndexOrdinalsFieldData.java | 0 .../index/fielddata/MultiGeoPointValues.java | 0 .../index/fielddata/NumericDoubleValues.java | 0 .../fielddata/RamAccountingTermsEnum.java | 0 .../index/fielddata/ScriptDocValues.java | 0 .../index/fielddata/ShardFieldData.java | 0 .../SingletonMultiGeoPointValues.java | 0 .../SingletonSortedBinaryDocValues.java | 0 .../SingletonSortedNumericDoubleValues.java | 0 .../SortableLongBitsNumericDocValues.java | 0 ...ortableLongBitsSortedNumericDocValues.java | 0 ...SortableLongBitsToNumericDoubleValues.java | 0 ...leLongBitsToSortedNumericDoubleValues.java | 0 .../fielddata/SortedBinaryDocValues.java | 0 .../fielddata/SortedNumericDoubleValues.java | 0 .../fielddata/SortingBinaryDocValues.java | 0 .../fielddata/SortingNumericDocValues.java | 0 .../fielddata/SortingNumericDoubleValues.java | 0 .../index/fielddata/UidIndexFieldData.java | 0 .../BytesRefFieldComparatorSource.java | 0 .../DoubleValuesComparatorSource.java | 0 .../FloatValuesComparatorSource.java | 0 .../LongValuesComparatorSource.java | 0 .../ordinals/GlobalOrdinalMapping.java | 0 .../ordinals/GlobalOrdinalsBuilder.java | 0 .../GlobalOrdinalsIndexFieldData.java | 0 .../fielddata/ordinals/MultiOrdinals.java | 0 .../index/fielddata/ordinals/Ordinals.java | 0 .../fielddata/ordinals/OrdinalsBuilder.java | 0 .../ordinals/SinglePackedOrdinals.java | 0 .../AbstractAtomicGeoPointFieldData.java | 0 .../AbstractAtomicOrdinalsFieldData.java | 0 .../plain/AbstractIndexFieldData.java | 0 .../plain/AbstractIndexOrdinalsFieldData.java | 0 .../AbstractLatLonPointDVIndexFieldData.java | 0 .../plain/AtomicDoubleFieldData.java | 0 .../fielddata/plain/AtomicLongFieldData.java | 0 .../plain/BinaryDVAtomicFieldData.java | 0 .../plain/BinaryDVIndexFieldData.java | 0 .../plain/BytesBinaryDVAtomicFieldData.java | 0 .../plain/BytesBinaryDVIndexFieldData.java | 0 .../plain/ConstantIndexFieldData.java | 0 .../plain/DocValuesIndexFieldData.java | 0 .../plain/LatLonPointDVAtomicFieldData.java | 0 .../plain/NonEstimatingEstimator.java | 0 .../plain/PagedBytesAtomicFieldData.java | 0 .../plain/PagedBytesIndexFieldData.java | 0 .../plain/SortedNumericDVIndexFieldData.java | 0 .../SortedSetDVBytesAtomicFieldData.java | 0 .../SortedSetDVOrdinalsIndexFieldData.java | 0 .../fieldvisitor/CustomFieldsVisitor.java | 0 .../index/fieldvisitor/FieldsVisitor.java | 0 .../fieldvisitor/SingleFieldsVisitor.java | 0 .../elasticsearch/index/flush/FlushStats.java | 0 .../elasticsearch/index/get/GetResult.java | 0 .../org/elasticsearch/index/get/GetStats.java | 0 .../index/get/ShardGetService.java | 0 .../index/mapper/ArrayValueMapperParser.java | 0 .../index/mapper/BinaryFieldMapper.java | 0 .../index/mapper/BinaryRangeUtil.java | 0 .../index/mapper/BooleanFieldMapper.java | 0 .../index/mapper/CompletionFieldMapper.java | 0 .../index/mapper/ContentPath.java | 0 .../index/mapper/CustomDocValuesField.java | 0 .../index/mapper/DateFieldMapper.java | 0 .../index/mapper/DocumentFieldMappers.java | 0 .../index/mapper/DocumentMapper.java | 0 .../index/mapper/DocumentMapperForType.java | 0 .../index/mapper/DocumentMapperParser.java | 0 .../index/mapper/DocumentParser.java | 0 .../index/mapper/DynamicTemplate.java | 0 .../index/mapper/EnabledAttributeMapper.java | 0 .../index/mapper/FieldMapper.java | 0 .../index/mapper/FieldNamesFieldMapper.java | 0 .../index/mapper/FieldTypeLookup.java | 0 .../index/mapper/GeoPointFieldMapper.java | 0 .../index/mapper/GeoShapeFieldMapper.java | 0 .../index/mapper/IdFieldMapper.java | 0 .../index/mapper/IndexFieldMapper.java | 0 .../index/mapper/IpFieldMapper.java | 0 .../index/mapper/KeywordFieldMapper.java | 0 .../index/mapper/MappedFieldType.java | 0 .../elasticsearch/index/mapper/Mapper.java | 0 .../index/mapper/MapperException.java | 0 .../index/mapper/MapperParsingException.java | 0 .../index/mapper/MapperService.java | 0 .../index/mapper/MapperUtils.java | 0 .../elasticsearch/index/mapper/Mapping.java | 0 .../index/mapper/MetadataFieldMapper.java | 0 .../index/mapper/NumberFieldMapper.java | 0 .../index/mapper/ObjectMapper.java | 0 .../index/mapper/ParentFieldMapper.java | 0 .../index/mapper/ParseContext.java | 0 .../index/mapper/ParsedDocument.java | 0 .../index/mapper/RangeFieldMapper.java | 0 .../index/mapper/RootObjectMapper.java | 0 .../index/mapper/RoutingFieldMapper.java | 0 .../index/mapper/SeqNoFieldMapper.java | 0 .../index/mapper/SimpleMappedFieldType.java | 0 .../index/mapper/SourceFieldMapper.java | 0 .../index/mapper/SourceToParse.java | 0 .../mapper/StrictDynamicMappingException.java | 0 .../index/mapper/StringFieldType.java | 0 .../index/mapper/TermBasedFieldType.java | 0 .../index/mapper/TextFieldMapper.java | 0 .../index/mapper/TypeFieldMapper.java | 0 .../index/mapper/TypeParsers.java | 0 .../org/elasticsearch/index/mapper/Uid.java | 0 .../index/mapper/UidFieldMapper.java | 0 .../index/mapper/VersionFieldMapper.java | 0 .../elasticsearch/index/merge/MergeStats.java | 0 .../index/merge/OnGoingMerge.java | 0 .../index/query/AbstractQueryBuilder.java | 0 .../index/query/BaseTermQueryBuilder.java | 0 .../index/query/BoolQueryBuilder.java | 0 .../index/query/BoostingQueryBuilder.java | 0 .../index/query/CommonTermsQueryBuilder.java | 0 .../query/ConstantScoreQueryBuilder.java | 0 .../index/query/DisMaxQueryBuilder.java | 0 .../index/query/ExistsQueryBuilder.java | 0 .../query/FieldMaskingSpanQueryBuilder.java | 0 .../index/query/FuzzyQueryBuilder.java | 0 .../query/GeoBoundingBoxQueryBuilder.java | 0 .../index/query/GeoDistanceQueryBuilder.java | 0 .../index/query/GeoExecType.java | 0 .../index/query/GeoPolygonQueryBuilder.java | 0 .../index/query/GeoShapeQueryBuilder.java | 0 .../index/query/GeoValidationMethod.java | 0 .../index/query/IdsQueryBuilder.java | 0 .../index/query/InnerHitBuilder.java | 0 .../index/query/InnerHitContextBuilder.java | 0 .../index/query/MatchAllQueryBuilder.java | 0 .../index/query/MatchNoneQueryBuilder.java | 0 .../query/MatchPhrasePrefixQueryBuilder.java | 0 .../index/query/MatchPhraseQueryBuilder.java | 0 .../index/query/MatchQueryBuilder.java | 0 .../index/query/MoreLikeThisQueryBuilder.java | 0 .../index/query/MultiMatchQueryBuilder.java | 0 .../index/query/MultiTermQueryBuilder.java | 0 .../index/query/NestedQueryBuilder.java | 0 .../elasticsearch/index/query/Operator.java | 0 .../index/query/ParsedQuery.java | 0 .../index/query/PrefixQueryBuilder.java | 0 .../index/query/QueryBuilder.java | 0 .../index/query/QueryBuilders.java | 0 .../index/query/QueryParser.java | 0 .../index/query/QueryRewriteContext.java | 0 .../index/query/QueryShardContext.java | 0 .../index/query/QueryShardException.java | 0 .../index/query/QueryStringQueryBuilder.java | 0 .../index/query/QueryValidationException.java | 0 .../index/query/RangeQueryBuilder.java | 0 .../elasticsearch/index/query/RegexpFlag.java | 0 .../index/query/RegexpQueryBuilder.java | 0 .../index/query/Rewriteable.java | 0 .../index/query/ScriptQueryBuilder.java | 0 .../index/query/SimpleQueryStringBuilder.java | 0 .../index/query/SimpleQueryStringFlag.java | 0 .../query/SpanContainingQueryBuilder.java | 0 .../index/query/SpanFirstQueryBuilder.java | 0 .../query/SpanMultiTermQueryBuilder.java | 0 .../index/query/SpanNearQueryBuilder.java | 0 .../index/query/SpanNotQueryBuilder.java | 0 .../index/query/SpanOrQueryBuilder.java | 0 .../index/query/SpanQueryBuilder.java | 0 .../index/query/SpanTermQueryBuilder.java | 0 .../index/query/SpanWithinQueryBuilder.java | 0 .../index/query/TermQueryBuilder.java | 0 .../index/query/TermsQueryBuilder.java | 0 .../index/query/TermsSetQueryBuilder.java | 0 .../index/query/TypeQueryBuilder.java | 0 .../index/query/WildcardQueryBuilder.java | 0 .../index/query/WrapperQueryBuilder.java | 0 .../query/functionscore/DecayFunction.java | 0 .../functionscore/DecayFunctionBuilder.java | 0 .../functionscore/DecayFunctionParser.java | 0 .../ExponentialDecayFunctionBuilder.java | 0 .../FieldValueFactorFunctionBuilder.java | 0 .../FunctionScoreQueryBuilder.java | 0 .../GaussDecayFunctionBuilder.java | 0 .../LinearDecayFunctionBuilder.java | 0 .../RandomScoreFunctionBuilder.java | 0 .../functionscore/ScoreFunctionBuilder.java | 0 .../functionscore/ScoreFunctionBuilders.java | 0 .../functionscore/ScoreFunctionParser.java | 0 .../ScriptScoreFunctionBuilder.java | 0 .../query/functionscore/WeightBuilder.java | 0 .../index/query/support/NestedScope.java | 0 .../index/query/support/QueryParsers.java | 0 .../index/recovery/RecoveryStats.java | 0 .../index/refresh/RefreshStats.java | 0 .../reindex/AbstractBulkByScrollRequest.java | 0 .../AbstractBulkByScrollRequestBuilder.java | 0 .../AbstractBulkIndexByScrollRequest.java | 0 ...stractBulkIndexByScrollRequestBuilder.java | 0 .../index/reindex/BulkByScrollResponse.java | 0 .../index/reindex/BulkByScrollTask.java | 0 .../reindex/ClientScrollableHitSource.java | 0 .../index/reindex/DeleteByQueryAction.java | 0 .../index/reindex/DeleteByQueryRequest.java | 0 .../reindex/DeleteByQueryRequestBuilder.java | 0 .../reindex/LeaderBulkByScrollTaskState.java | 0 .../index/reindex/ReindexAction.java | 0 .../index/reindex/ReindexRequest.java | 0 .../index/reindex/ReindexRequestBuilder.java | 0 .../index/reindex/RemoteInfo.java | 0 .../index/reindex/ScrollableHitSource.java | 0 .../index/reindex/SuccessfullyProcessed.java | 0 .../index/reindex/UpdateByQueryAction.java | 0 .../index/reindex/UpdateByQueryRequest.java | 0 .../reindex/UpdateByQueryRequestBuilder.java | 0 .../reindex/WorkerBulkByScrollTaskState.java | 0 .../search/ESToParentBlockJoinQuery.java | 0 .../index/search/MatchQuery.java | 0 .../index/search/MultiMatchQuery.java | 0 .../index/search/NestedHelper.java | 0 .../index/search/QueryParserHelper.java | 0 .../index/search/QueryStringQueryParser.java | 0 .../search/SimpleQueryStringQueryParser.java | 0 .../index/search/stats/SearchStats.java | 0 .../index/search/stats/ShardSearchStats.java | 0 .../index/seqno/CountedBitSet.java | 0 .../seqno/GlobalCheckpointSyncAction.java | 0 .../index/seqno/GlobalCheckpointTracker.java | 0 .../index/seqno/LocalCheckpointTracker.java | 0 .../elasticsearch/index/seqno/SeqNoStats.java | 0 .../index/seqno/SequenceNumbers.java | 0 .../index/settings/IndexDynamicSettings.java | 0 .../shard/AbstractIndexShardComponent.java | 0 .../elasticsearch/index/shard/DocsStats.java | 0 .../index/shard/ElasticsearchMergePolicy.java | 0 .../IllegalIndexShardStateException.java | 0 .../index/shard/IndexEventListener.java | 0 .../index/shard/IndexSearcherWrapper.java | 0 .../elasticsearch/index/shard/IndexShard.java | 0 .../shard/IndexShardClosedException.java | 0 .../index/shard/IndexShardComponent.java | 0 .../IndexShardNotRecoveringException.java | 0 .../shard/IndexShardNotStartedException.java | 0 .../shard/IndexShardOperationPermits.java | 0 .../shard/IndexShardRecoveringException.java | 0 .../shard/IndexShardRecoveryException.java | 0 .../shard/IndexShardRelocatedException.java | 0 .../shard/IndexShardStartedException.java | 0 .../index/shard/IndexShardState.java | 0 .../shard/IndexingOperationListener.java | 0 .../index/shard/IndexingStats.java | 0 .../index/shard/InternalIndexingStats.java | 0 .../index/shard/LocalShardSnapshot.java | 0 .../index/shard/PrimaryReplicaSyncer.java | 0 .../index/shard/RefreshListeners.java | 0 .../index/shard/ReplicationGroup.java | 0 .../index/shard/SearchOperationListener.java | 0 .../elasticsearch/index/shard/ShardId.java | 0 .../index/shard/ShardNotFoundException.java | 0 .../elasticsearch/index/shard/ShardPath.java | 0 .../index/shard/ShardSplittingQuery.java | 0 .../index/shard/ShardStateMetaData.java | 0 .../elasticsearch/index/shard/ShardUtils.java | 0 .../index/shard/StoreRecovery.java | 0 .../AbstractSimilarityProvider.java | 0 .../similarity/BM25SimilarityProvider.java | 0 .../similarity/BooleanSimilarityProvider.java | 0 .../similarity/ClassicSimilarityProvider.java | 0 .../similarity/DFISimilarityProvider.java | 0 .../similarity/DFRSimilarityProvider.java | 0 .../similarity/IBSimilarityProvider.java | 0 .../LMDirichletSimilarityProvider.java | 0 .../LMJelinekMercerSimilarityProvider.java | 0 .../index/similarity/ScriptedSimilarity.java | 0 .../ScriptedSimilarityProvider.java | 0 .../index/similarity/SimilarityProvider.java | 0 .../index/similarity/SimilarityService.java | 0 .../snapshots/IndexShardRestoreException.java | 0 .../IndexShardRestoreFailedException.java | 0 .../IndexShardSnapshotException.java | 0 .../IndexShardSnapshotFailedException.java | 0 .../snapshots/IndexShardSnapshotStatus.java | 0 .../BlobStoreIndexShardSnapshot.java | 0 .../BlobStoreIndexShardSnapshots.java | 0 .../blobstore/RateLimitingInputStream.java | 0 .../blobstore/SlicedInputStream.java | 0 .../snapshots/blobstore/SnapshotFiles.java | 0 .../index/store/DirectoryService.java | 0 .../index/store/DirectoryUtils.java | 0 .../index/store/FsDirectoryService.java | 0 .../elasticsearch/index/store/IndexStore.java | 0 .../org/elasticsearch/index/store/Store.java | 0 .../index/store/StoreFileMetaData.java | 0 .../elasticsearch/index/store/StoreStats.java | 0 .../index/store/VerifyingIndexOutput.java | 0 .../index/termvectors/TermVectorsService.java | 0 .../index/translog/BaseTranslogReader.java | 0 .../translog/BufferedChecksumStreamInput.java | 0 .../BufferedChecksumStreamOutput.java | 0 .../index/translog/ChannelFactory.java | 0 .../index/translog/Checkpoint.java | 0 .../index/translog/MultiSnapshot.java | 0 .../index/translog/Translog.java | 0 .../index/translog/TranslogConfig.java | 0 .../translog/TranslogCorruptedException.java | 0 .../translog/TranslogDeletionPolicy.java | 0 .../index/translog/TranslogException.java | 0 .../index/translog/TranslogReader.java | 0 .../index/translog/TranslogSnapshot.java | 0 .../index/translog/TranslogStats.java | 0 .../index/translog/TranslogToolCli.java | 0 .../index/translog/TranslogWriter.java | 0 .../translog/TruncateTranslogCommand.java | 0 .../translog/TruncatedTranslogException.java | 0 .../index/warmer/ShardIndexWarmerService.java | 0 .../index/warmer/WarmerStats.java | 0 .../AbstractIndexShardCacheEntity.java | 0 .../indices/AliasFilterParsingException.java | 0 .../indices/IndexClosedException.java | 0 .../indices/IndexCreationException.java | 0 ...ndexPrimaryShardNotAllocatedException.java | 0 .../IndexTemplateMissingException.java | 0 .../indices/IndexingMemoryController.java | 0 .../elasticsearch/indices/IndicesModule.java | 0 .../indices/IndicesQueryCache.java | 0 .../indices/IndicesRequestCache.java | 0 .../elasticsearch/indices/IndicesService.java | 0 .../indices/InvalidAliasNameException.java | 0 .../indices/InvalidIndexNameException.java | 0 .../InvalidIndexTemplateException.java | 0 .../indices/InvalidTypeNameException.java | 0 .../indices/NodeIndicesStats.java | 0 .../elasticsearch/indices/TermsLookup.java | 0 .../indices/TypeMissingException.java | 0 .../indices/analysis/AnalysisModule.java | 0 .../indices/analysis/HunspellService.java | 0 .../indices/analysis/PreBuiltAnalyzers.java | 0 .../analysis/PreBuiltCacheFactory.java | 0 .../indices/analysis/PreBuiltTokenizers.java | 0 .../breaker/AllCircuitBreakerStats.java | 0 .../indices/breaker/BreakerSettings.java | 0 .../breaker/CircuitBreakerService.java | 0 .../indices/breaker/CircuitBreakerStats.java | 0 .../HierarchyCircuitBreakerService.java | 0 .../breaker/NoneCircuitBreakerService.java | 0 .../cluster/IndicesClusterStateService.java | 0 .../cache/IndicesFieldDataCache.java | 0 .../cache/IndicesFieldDataCacheListener.java | 0 .../flush/ShardsSyncedFlushResult.java | 0 .../indices/flush/SyncedFlushService.java | 0 .../indices/mapper/MapperRegistry.java | 0 .../recovery/DelayRecoveryException.java | 0 .../recovery/PeerRecoverySourceService.java | 0 .../recovery/PeerRecoveryTargetService.java | 0 .../RecoverFilesRecoveryException.java | 0 .../recovery/RecoveriesCollection.java | 0 .../recovery/RecoveryCleanFilesRequest.java | 0 .../recovery/RecoveryFailedException.java | 0 .../recovery/RecoveryFileChunkRequest.java | 0 .../recovery/RecoveryFilesInfoRequest.java | 0 .../RecoveryFinalizeRecoveryRequest.java | 0 .../RecoveryHandoffPrimaryContextRequest.java | 0 ...ryPrepareForTranslogOperationsRequest.java | 0 .../indices/recovery/RecoveryResponse.java | 0 .../indices/recovery/RecoverySettings.java | 0 .../recovery/RecoverySourceHandler.java | 0 .../indices/recovery/RecoveryState.java | 0 .../indices/recovery/RecoveryTarget.java | 0 .../recovery/RecoveryTargetHandler.java | 0 .../RecoveryTranslogOperationsRequest.java | 0 .../RecoveryTranslogOperationsResponse.java | 0 .../RecoveryWaitForClusterStateRequest.java | 0 .../recovery/RemoteRecoveryTargetHandler.java | 0 .../recovery/StartRecoveryRequest.java | 0 .../indices/store/IndicesStore.java | 0 .../TransportNodesListShardStoreMetaData.java | 0 .../ingest/AbstractProcessor.java | 0 .../ingest/CompoundProcessor.java | 0 .../ingest/ConfigurationUtils.java | 0 .../elasticsearch/ingest/IngestDocument.java | 0 .../org/elasticsearch/ingest/IngestInfo.java | 0 .../elasticsearch/ingest/IngestMetadata.java | 0 .../elasticsearch/ingest/IngestService.java | 0 .../org/elasticsearch/ingest/IngestStats.java | 0 .../org/elasticsearch/ingest/Pipeline.java | 0 .../ingest/PipelineConfiguration.java | 0 .../ingest/PipelineExecutionService.java | 0 .../elasticsearch/ingest/PipelineStore.java | 0 .../org/elasticsearch/ingest/Processor.java | 0 .../elasticsearch/ingest/ProcessorInfo.java | 0 .../org/elasticsearch/ingest/ValueSource.java | 0 .../elasticsearch/monitor/MonitorService.java | 0 .../org/elasticsearch/monitor/Probes.java | 0 .../org/elasticsearch/monitor/fs/FsInfo.java | 0 .../org/elasticsearch/monitor/fs/FsProbe.java | 0 .../elasticsearch/monitor/fs/FsService.java | 0 .../monitor/jvm/DeadlockAnalyzer.java | 0 .../elasticsearch/monitor/jvm/GcNames.java | 0 .../elasticsearch/monitor/jvm/HotThreads.java | 0 .../monitor/jvm/JvmGcMonitorService.java | 0 .../elasticsearch/monitor/jvm/JvmInfo.java | 0 .../elasticsearch/monitor/jvm/JvmService.java | 0 .../elasticsearch/monitor/jvm/JvmStats.java | 0 .../elasticsearch/monitor/os/DummyOsInfo.java | 0 .../org/elasticsearch/monitor/os/OsInfo.java | 0 .../org/elasticsearch/monitor/os/OsProbe.java | 0 .../elasticsearch/monitor/os/OsService.java | 0 .../org/elasticsearch/monitor/os/OsStats.java | 0 .../elasticsearch/monitor/package-info.java | 0 .../monitor/process/ProcessInfo.java | 0 .../monitor/process/ProcessProbe.java | 0 .../monitor/process/ProcessService.java | 0 .../monitor/process/ProcessStats.java | 0 .../node/AdaptiveSelectionStats.java | 0 .../node/InternalSettingsPreparer.java | 0 .../java/org/elasticsearch/node/Node.java | 0 .../node/NodeClosedException.java | 0 .../org/elasticsearch/node/NodeService.java | 0 .../node/NodeValidationException.java | 0 .../node/ResponseCollectorService.java | 0 .../org/elasticsearch/node/package-info.java | 0 .../java/org/elasticsearch/package-info.java | 0 .../elasticsearch/plugins/ActionPlugin.java | 0 .../elasticsearch/plugins/AnalysisPlugin.java | 0 .../elasticsearch/plugins/ClusterPlugin.java | 0 .../plugins/DiscoveryPlugin.java | 0 .../plugins/ExtensiblePlugin.java | 0 .../elasticsearch/plugins/IngestPlugin.java | 0 .../elasticsearch/plugins/MapperPlugin.java | 0 .../plugins/MetaDataUpgrader.java | 0 .../elasticsearch/plugins/MetaPluginInfo.java | 0 .../elasticsearch/plugins/NetworkPlugin.java | 0 .../org/elasticsearch/plugins/Platforms.java | 0 .../org/elasticsearch/plugins/Plugin.java | 0 .../org/elasticsearch/plugins/PluginInfo.java | 0 .../plugins/PluginLoaderIndirection.java | 0 .../elasticsearch/plugins/PluginSecurity.java | 0 .../elasticsearch/plugins/PluginsService.java | 0 .../plugins/RepositoryPlugin.java | 0 .../elasticsearch/plugins/ScriptPlugin.java | 0 .../elasticsearch/plugins/SearchPlugin.java | 0 .../elasticsearch/plugins/package-info.java | 0 .../plugins/spi/NamedXContentProvider.java | 0 .../plugins/spi/package-info.java | 0 .../elasticsearch/repositories/IndexId.java | 0 .../repositories/RepositoriesModule.java | 0 .../repositories/RepositoriesService.java | 0 .../repositories/Repository.java | 0 .../repositories/RepositoryData.java | 0 .../repositories/RepositoryException.java | 0 .../RepositoryMissingException.java | 0 .../RepositoryVerificationException.java | 0 .../repositories/VerificationFailure.java | 0 .../VerifyNodeRepositoryAction.java | 0 .../blobstore/BlobStoreFormat.java | 0 .../blobstore/BlobStoreRepository.java | 0 .../blobstore/ChecksumBlobStoreFormat.java | 0 .../repositories/fs/FsRepository.java | 0 .../repositories/package-info.java | 0 .../rest/AbstractRestChannel.java | 0 .../elasticsearch/rest/BaseRestHandler.java | 0 .../elasticsearch/rest/BytesRestResponse.java | 0 .../rest/DeprecationRestHandler.java | 0 .../elasticsearch/rest/MethodHandlers.java | 0 .../org/elasticsearch/rest/RestChannel.java | 0 .../elasticsearch/rest/RestController.java | 0 .../org/elasticsearch/rest/RestHandler.java | 0 .../org/elasticsearch/rest/RestRequest.java | 0 .../org/elasticsearch/rest/RestResponse.java | 0 .../org/elasticsearch/rest/RestStatus.java | 0 .../org/elasticsearch/rest/RestUtils.java | 0 .../rest/action/AcknowledgedRestListener.java | 0 .../rest/action/RestActionListener.java | 0 .../rest/action/RestActions.java | 0 .../rest/action/RestBuilderListener.java | 0 .../action/RestFieldCapabilitiesAction.java | 0 .../rest/action/RestMainAction.java | 0 .../rest/action/RestResponseListener.java | 0 .../action/RestStatusToXContentListener.java | 0 .../rest/action/RestToXContentListener.java | 0 .../admin/cluster/RestCancelTasksAction.java | 0 .../RestClusterAllocationExplainAction.java | 0 .../cluster/RestClusterGetSettingsAction.java | 0 .../cluster/RestClusterHealthAction.java | 0 .../cluster/RestClusterRerouteAction.java | 0 .../RestClusterSearchShardsAction.java | 0 .../admin/cluster/RestClusterStateAction.java | 0 .../admin/cluster/RestClusterStatsAction.java | 0 .../RestClusterUpdateSettingsAction.java | 0 .../cluster/RestCreateSnapshotAction.java | 0 .../cluster/RestDeleteRepositoryAction.java | 0 .../cluster/RestDeleteSnapshotAction.java | 0 .../cluster/RestDeleteStoredScriptAction.java | 0 .../cluster/RestGetRepositoriesAction.java | 0 .../admin/cluster/RestGetSnapshotsAction.java | 0 .../cluster/RestGetStoredScriptAction.java | 0 .../admin/cluster/RestGetTaskAction.java | 0 .../admin/cluster/RestListTasksAction.java | 0 .../cluster/RestNodesHotThreadsAction.java | 0 .../admin/cluster/RestNodesInfoAction.java | 0 .../admin/cluster/RestNodesStatsAction.java | 0 .../admin/cluster/RestNodesUsageAction.java | 0 .../RestPendingClusterTasksAction.java | 0 .../cluster/RestPutRepositoryAction.java | 0 .../cluster/RestPutStoredScriptAction.java | 0 .../cluster/RestRemoteClusterInfoAction.java | 0 .../cluster/RestRestoreSnapshotAction.java | 0 .../cluster/RestSnapshotsStatusAction.java | 0 .../cluster/RestVerifyRepositoryAction.java | 0 .../action/admin/cluster/package-info.java | 0 .../indices/AliasesNotFoundException.java | 0 .../admin/indices/RestAnalyzeAction.java | 0 .../indices/RestClearIndicesCacheAction.java | 0 .../admin/indices/RestCloseIndexAction.java | 0 .../admin/indices/RestCreateIndexAction.java | 0 .../admin/indices/RestDeleteIndexAction.java | 0 .../RestDeleteIndexTemplateAction.java | 0 .../action/admin/indices/RestFlushAction.java | 0 .../admin/indices/RestForceMergeAction.java | 0 .../admin/indices/RestGetAliasesAction.java | 0 .../indices/RestGetAllAliasesAction.java | 0 .../indices/RestGetAllMappingsAction.java | 0 .../indices/RestGetAllSettingsAction.java | 0 .../indices/RestGetFieldMappingAction.java | 0 .../indices/RestGetIndexTemplateAction.java | 0 .../admin/indices/RestGetIndicesAction.java | 0 .../admin/indices/RestGetMappingAction.java | 0 .../admin/indices/RestGetSettingsAction.java | 0 .../indices/RestIndexDeleteAliasesAction.java | 0 .../indices/RestIndexPutAliasAction.java | 0 .../indices/RestIndicesAliasesAction.java | 0 .../indices/RestIndicesSegmentsAction.java | 0 .../indices/RestIndicesShardStoresAction.java | 0 .../admin/indices/RestIndicesStatsAction.java | 0 .../admin/indices/RestOpenIndexAction.java | 0 .../indices/RestPutIndexTemplateAction.java | 0 .../admin/indices/RestPutMappingAction.java | 0 .../admin/indices/RestRecoveryAction.java | 0 .../admin/indices/RestRefreshAction.java | 0 .../indices/RestRolloverIndexAction.java | 0 .../admin/indices/RestShrinkIndexAction.java | 0 .../admin/indices/RestSplitIndexAction.java | 0 .../admin/indices/RestSyncedFlushAction.java | 0 .../indices/RestUpdateSettingsAction.java | 0 .../admin/indices/RestUpgradeAction.java | 0 .../indices/RestValidateQueryAction.java | 0 .../action/admin/indices/package-info.java | 0 .../rest/action/cat/AbstractCatAction.java | 0 .../rest/action/cat/RestAliasAction.java | 0 .../rest/action/cat/RestAllocationAction.java | 0 .../rest/action/cat/RestCatAction.java | 0 .../rest/action/cat/RestCountAction.java | 0 .../rest/action/cat/RestFielddataAction.java | 0 .../rest/action/cat/RestHealthAction.java | 0 .../rest/action/cat/RestIndicesAction.java | 0 .../rest/action/cat/RestMasterAction.java | 0 .../rest/action/cat/RestNodeAttrsAction.java | 0 .../rest/action/cat/RestNodesAction.java | 0 .../cat/RestPendingClusterTasksAction.java | 0 .../rest/action/cat/RestPluginsAction.java | 0 .../rest/action/cat/RestRecoveryAction.java | 0 .../action/cat/RestRepositoriesAction.java | 0 .../rest/action/cat/RestSegmentsAction.java | 0 .../rest/action/cat/RestShardsAction.java | 0 .../rest/action/cat/RestSnapshotAction.java | 0 .../rest/action/cat/RestTable.java | 0 .../rest/action/cat/RestTasksAction.java | 0 .../rest/action/cat/RestTemplatesAction.java | 0 .../rest/action/cat/RestThreadPoolAction.java | 0 .../rest/action/cat/package-info.java | 0 .../rest/action/document/RestBulkAction.java | 0 .../rest/action/document/RestCountAction.java | 0 .../action/document/RestDeleteAction.java | 0 .../rest/action/document/RestGetAction.java | 0 .../action/document/RestGetSourceAction.java | 0 .../rest/action/document/RestIndexAction.java | 0 .../action/document/RestMultiGetAction.java | 0 .../document/RestMultiTermVectorsAction.java | 0 .../document/RestTermVectorsAction.java | 0 .../action/document/RestUpdateAction.java | 0 .../rest/action/document/package-info.java | 0 .../ingest/RestDeletePipelineAction.java | 0 .../action/ingest/RestGetPipelineAction.java | 0 .../action/ingest/RestPutPipelineAction.java | 0 .../ingest/RestSimulatePipelineAction.java | 0 .../rest/action/ingest/package-info.java | 0 .../rest/action/package-info.java | 0 .../action/search/RestClearScrollAction.java | 0 .../rest/action/search/RestExplainAction.java | 0 .../action/search/RestMultiSearchAction.java | 0 .../rest/action/search/RestSearchAction.java | 0 .../action/search/RestSearchScrollAction.java | 0 .../rest/action/search/package-info.java | 0 .../org/elasticsearch/rest/package-info.java | 0 .../elasticsearch/script/ClassPermission.java | 0 .../script/ExecutableScript.java | 0 .../script/ExplainableSearchScript.java | 0 .../elasticsearch/script/FilterScript.java | 0 .../script/GeneralScriptException.java | 0 .../elasticsearch/script/ScoreAccessor.java | 0 .../java/org/elasticsearch/script/Script.java | 0 .../elasticsearch/script/ScriptContext.java | 0 .../elasticsearch/script/ScriptEngine.java | 0 .../elasticsearch/script/ScriptException.java | 0 .../elasticsearch/script/ScriptMetaData.java | 0 .../elasticsearch/script/ScriptMetrics.java | 0 .../elasticsearch/script/ScriptModule.java | 0 .../elasticsearch/script/ScriptService.java | 0 .../org/elasticsearch/script/ScriptStats.java | 0 .../org/elasticsearch/script/ScriptType.java | 0 .../elasticsearch/script/SearchScript.java | 0 .../script/SimilarityScript.java | 0 .../script/SimilarityWeightScript.java | 0 .../script/StoredScriptSource.java | 0 .../elasticsearch/script/TemplateScript.java | 0 .../elasticsearch/script/package-info.java | 0 .../search/DefaultSearchContext.java | 0 .../elasticsearch/search/DocValueFormat.java | 0 .../elasticsearch/search/MultiValueMode.java | 0 .../java/org/elasticsearch/search/Scroll.java | 0 .../search/SearchContextException.java | 0 .../search/SearchContextMissingException.java | 0 .../elasticsearch/search/SearchException.java | 0 .../search/SearchExtBuilder.java | 0 .../org/elasticsearch/search/SearchHit.java | 0 .../org/elasticsearch/search/SearchHits.java | 0 .../elasticsearch/search/SearchModule.java | 0 .../search/SearchParseException.java | 0 .../org/elasticsearch/search/SearchPhase.java | 0 .../search/SearchPhaseResult.java | 0 .../elasticsearch/search/SearchService.java | 0 .../search/SearchShardTarget.java | 0 .../search/SearchSortValues.java | 0 .../AbstractAggregationBuilder.java | 0 .../search/aggregations/Aggregation.java | 0 .../aggregations/AggregationBuilder.java | 0 .../aggregations/AggregationBuilders.java | 0 .../AggregationExecutionException.java | 0 .../AggregationInitializationException.java | 0 .../search/aggregations/AggregationPhase.java | 0 .../search/aggregations/Aggregations.java | 0 .../search/aggregations/Aggregator.java | 0 .../search/aggregations/AggregatorBase.java | 0 .../aggregations/AggregatorFactories.java | 0 .../aggregations/AggregatorFactory.java | 0 .../aggregations/BaseAggregationBuilder.java | 0 .../search/aggregations/BucketCollector.java | 0 .../search/aggregations/BucketOrder.java | 0 .../search/aggregations/HasAggregations.java | 0 .../aggregations/InternalAggregation.java | 0 .../aggregations/InternalAggregations.java | 0 .../InternalMultiBucketAggregation.java | 0 .../search/aggregations/InternalOrder.java | 0 .../InvalidAggregationPathException.java | 0 .../search/aggregations/KeyComparable.java | 0 .../aggregations/LeafBucketCollector.java | 0 .../aggregations/LeafBucketCollectorBase.java | 0 .../MultiBucketConsumerService.java | 0 .../aggregations/NonCollectingAggregator.java | 0 .../aggregations/ParsedAggregation.java | 0 .../ParsedMultiBucketAggregation.java | 0 .../PipelineAggregationBuilder.java | 0 .../SearchContextAggregations.java | 0 .../bucket/BestBucketsDeferringCollector.java | 0 .../aggregations/bucket/BucketUtils.java | 0 .../bucket/BucketsAggregator.java | 0 .../bucket/DeferableBucketAggregator.java | 0 .../bucket/DeferringBucketCollector.java | 0 .../InternalSingleBucketAggregation.java | 0 .../bucket/MultiBucketAggregationBuilder.java | 0 .../bucket/MultiBucketsAggregation.java | 0 .../bucket/ParsedSingleBucketAggregation.java | 0 .../bucket/SingleBucketAggregation.java | 0 .../bucket/SingleBucketAggregator.java | 0 .../bucket/adjacency/AdjacencyMatrix.java | 0 .../AdjacencyMatrixAggregationBuilder.java | 0 .../adjacency/AdjacencyMatrixAggregator.java | 0 .../AdjacencyMatrixAggregatorFactory.java | 0 .../adjacency/InternalAdjacencyMatrix.java | 0 .../adjacency/ParsedAdjacencyMatrix.java | 0 .../composite/CompositeAggregation.java | 0 .../CompositeAggregationBuilder.java | 0 .../CompositeAggregationFactory.java | 0 .../composite/CompositeAggregationPlugin.java | 0 .../bucket/composite/CompositeAggregator.java | 0 .../bucket/composite/CompositeKey.java | 0 .../composite/CompositeValuesComparator.java | 0 .../composite/CompositeValuesSource.java | 0 .../CompositeValuesSourceBuilder.java | 0 .../CompositeValuesSourceConfig.java | 0 .../CompositeValuesSourceParserHelper.java | 0 .../DateHistogramValuesSourceBuilder.java | 0 .../composite/HistogramValuesSource.java | 0 .../HistogramValuesSourceBuilder.java | 0 .../bucket/composite/InternalComposite.java | 0 .../bucket/composite/ParsedComposite.java | 0 .../composite/RoundingValuesSource.java | 0 .../composite/TermsValuesSourceBuilder.java | 0 .../aggregations/bucket/filter/Filter.java | 0 .../filter/FilterAggregationBuilder.java | 0 .../bucket/filter/FilterAggregator.java | 0 .../filter/FilterAggregatorFactory.java | 0 .../aggregations/bucket/filter/Filters.java | 0 .../filter/FiltersAggregationBuilder.java | 0 .../bucket/filter/FiltersAggregator.java | 0 .../filter/FiltersAggregatorFactory.java | 0 .../bucket/filter/InternalFilter.java | 0 .../bucket/filter/InternalFilters.java | 0 .../bucket/filter/ParsedFilter.java | 0 .../bucket/filter/ParsedFilters.java | 0 .../geogrid/GeoGridAggregationBuilder.java | 0 .../bucket/geogrid/GeoHashGrid.java | 0 .../bucket/geogrid/GeoHashGridAggregator.java | 0 .../geogrid/GeoHashGridAggregatorFactory.java | 0 .../bucket/geogrid/GeoHashGridParams.java | 0 .../bucket/geogrid/InternalGeoHashGrid.java | 0 .../bucket/geogrid/ParsedGeoHashGrid.java | 0 .../aggregations/bucket/global/Global.java | 0 .../global/GlobalAggregationBuilder.java | 0 .../bucket/global/GlobalAggregator.java | 0 .../global/GlobalAggregatorFactory.java | 0 .../bucket/global/InternalGlobal.java | 0 .../bucket/global/ParsedGlobal.java | 0 .../DateHistogramAggregationBuilder.java | 0 .../histogram/DateHistogramAggregator.java | 0 .../DateHistogramAggregatorFactory.java | 0 .../histogram/DateHistogramInterval.java | 0 .../bucket/histogram/ExtendedBounds.java | 0 .../bucket/histogram/Histogram.java | 0 .../HistogramAggregationBuilder.java | 0 .../bucket/histogram/HistogramAggregator.java | 0 .../histogram/HistogramAggregatorFactory.java | 0 .../bucket/histogram/HistogramFactory.java | 0 .../histogram/InternalDateHistogram.java | 0 .../bucket/histogram/InternalHistogram.java | 0 .../bucket/histogram/ParsedDateHistogram.java | 0 .../bucket/histogram/ParsedHistogram.java | 0 .../bucket/missing/InternalMissing.java | 0 .../aggregations/bucket/missing/Missing.java | 0 .../missing/MissingAggregationBuilder.java | 0 .../bucket/missing/MissingAggregator.java | 0 .../missing/MissingAggregatorFactory.java | 0 .../bucket/missing/ParsedMissing.java | 0 .../bucket/nested/InternalNested.java | 0 .../bucket/nested/InternalReverseNested.java | 0 .../aggregations/bucket/nested/Nested.java | 0 .../nested/NestedAggregationBuilder.java | 0 .../bucket/nested/NestedAggregator.java | 0 .../nested/NestedAggregatorFactory.java | 0 .../bucket/nested/ParsedNested.java | 0 .../bucket/nested/ParsedReverseNested.java | 0 .../bucket/nested/ReverseNested.java | 0 .../ReverseNestedAggregationBuilder.java | 0 .../nested/ReverseNestedAggregator.java | 0 .../ReverseNestedAggregatorFactory.java | 0 .../search/aggregations/bucket/package-info | 0 .../range/AbstractRangeAggregatorFactory.java | 0 .../bucket/range/AbstractRangeBuilder.java | 0 .../bucket/range/BinaryRangeAggregator.java | 0 .../range/BinaryRangeAggregatorFactory.java | 0 .../range/DateRangeAggregationBuilder.java | 0 .../range/DateRangeAggregatorFactory.java | 0 .../range/GeoDistanceAggregationBuilder.java | 0 .../GeoDistanceRangeAggregatorFactory.java | 0 .../bucket/range/InternalBinaryRange.java | 0 .../bucket/range/InternalDateRange.java | 0 .../bucket/range/InternalGeoDistance.java | 0 .../bucket/range/InternalRange.java | 0 .../range/IpRangeAggregationBuilder.java | 0 .../bucket/range/ParsedBinaryRange.java | 0 .../bucket/range/ParsedDateRange.java | 0 .../bucket/range/ParsedGeoDistance.java | 0 .../bucket/range/ParsedRange.java | 0 .../aggregations/bucket/range/Range.java | 0 .../bucket/range/RangeAggregationBuilder.java | 0 .../bucket/range/RangeAggregator.java | 0 .../bucket/range/RangeAggregatorFactory.java | 0 .../sampler/BestDocsDeferringCollector.java | 0 .../DiversifiedAggregationBuilder.java | 0 .../sampler/DiversifiedAggregatorFactory.java | 0 ...DiversifiedBytesHashSamplerAggregator.java | 0 .../DiversifiedMapSamplerAggregator.java | 0 .../DiversifiedNumericSamplerAggregator.java | 0 .../DiversifiedOrdinalsSamplerAggregator.java | 0 .../bucket/sampler/InternalSampler.java | 0 .../bucket/sampler/ParsedSampler.java | 0 .../aggregations/bucket/sampler/Sampler.java | 0 .../sampler/SamplerAggregationBuilder.java | 0 .../bucket/sampler/SamplerAggregator.java | 0 .../sampler/SamplerAggregatorFactory.java | 0 .../bucket/sampler/UnmappedSampler.java | 0 .../BucketSignificancePriorityQueue.java | 0 ...balOrdinalsSignificantTermsAggregator.java | 0 .../InternalMappedSignificantTerms.java | 0 .../significant/InternalSignificantTerms.java | 0 .../ParsedSignificantLongTerms.java | 0 .../ParsedSignificantStringTerms.java | 0 .../significant/ParsedSignificantTerms.java | 0 .../significant/SignificantLongTerms.java | 0 .../SignificantLongTermsAggregator.java | 0 .../significant/SignificantStringTerms.java | 0 .../SignificantStringTermsAggregator.java | 0 .../bucket/significant/SignificantTerms.java | 0 .../SignificantTermsAggregationBuilder.java | 0 .../SignificantTermsAggregatorFactory.java | 0 .../SignificantTextAggregationBuilder.java | 0 .../SignificantTextAggregator.java | 0 .../SignificantTextAggregatorFactory.java | 0 .../significant/UnmappedSignificantTerms.java | 0 .../significant/heuristics/ChiSquare.java | 0 .../bucket/significant/heuristics/GND.java | 0 .../significant/heuristics/JLHScore.java | 0 .../heuristics/MutualInformation.java | 0 .../heuristics/NXYSignificanceHeuristic.java | 0 .../heuristics/PercentageScore.java | 0 .../heuristics/ScriptHeuristic.java | 0 .../heuristics/SignificanceHeuristic.java | 0 .../SignificanceHeuristicBuilder.java | 0 .../SignificanceHeuristicParser.java | 0 .../terms/AbstractStringTermsAggregator.java | 0 .../bucket/terms/BucketPriorityQueue.java | 0 .../bucket/terms/DoubleTerms.java | 0 .../bucket/terms/DoubleTermsAggregator.java | 0 .../GlobalOrdinalsStringTermsAggregator.java | 0 .../bucket/terms/IncludeExclude.java | 0 .../bucket/terms/InternalMappedTerms.java | 0 .../bucket/terms/InternalTerms.java | 0 .../aggregations/bucket/terms/LongTerms.java | 0 .../bucket/terms/LongTermsAggregator.java | 0 .../bucket/terms/ParsedDoubleTerms.java | 0 .../bucket/terms/ParsedLongTerms.java | 0 .../bucket/terms/ParsedStringTerms.java | 0 .../bucket/terms/ParsedTerms.java | 0 .../bucket/terms/StringTerms.java | 0 .../bucket/terms/StringTermsAggregator.java | 0 .../aggregations/bucket/terms/Terms.java | 0 .../bucket/terms/TermsAggregationBuilder.java | 0 .../bucket/terms/TermsAggregator.java | 0 .../bucket/terms/TermsAggregatorFactory.java | 0 .../bucket/terms/UnmappedTerms.java | 0 .../InternalNumericMetricsAggregation.java | 0 .../metrics/MetricsAggregator.java | 0 .../metrics/NumericMetricsAggregation.java | 0 .../metrics/NumericMetricsAggregator.java | 0 ...dSingleValueNumericMetricsAggregation.java | 0 .../search/aggregations/metrics/avg/Avg.java | 0 .../metrics/avg/AvgAggregationBuilder.java | 0 .../metrics/avg/AvgAggregator.java | 0 .../metrics/avg/AvgAggregatorFactory.java | 0 .../aggregations/metrics/avg/InternalAvg.java | 0 .../aggregations/metrics/avg/ParsedAvg.java | 0 .../metrics/cardinality/Cardinality.java | 0 .../CardinalityAggregationBuilder.java | 0 .../cardinality/CardinalityAggregator.java | 0 .../CardinalityAggregatorFactory.java | 0 .../cardinality/HyperLogLogPlusPlus.java | 0 .../cardinality/InternalCardinality.java | 0 .../cardinality/ParsedCardinality.java | 0 .../metrics/geobounds/GeoBounds.java | 0 .../GeoBoundsAggregationBuilder.java | 0 .../geobounds/GeoBoundsAggregator.java | 0 .../geobounds/GeoBoundsAggregatorFactory.java | 0 .../metrics/geobounds/InternalGeoBounds.java | 0 .../metrics/geobounds/ParsedGeoBounds.java | 0 .../metrics/geocentroid/GeoCentroid.java | 0 .../GeoCentroidAggregationBuilder.java | 0 .../geocentroid/GeoCentroidAggregator.java | 0 .../GeoCentroidAggregatorFactory.java | 0 .../geocentroid/InternalGeoCentroid.java | 0 .../geocentroid/ParsedGeoCentroid.java | 0 .../aggregations/metrics/max/InternalMax.java | 0 .../search/aggregations/metrics/max/Max.java | 0 .../metrics/max/MaxAggregationBuilder.java | 0 .../metrics/max/MaxAggregator.java | 0 .../metrics/max/MaxAggregatorFactory.java | 0 .../aggregations/metrics/max/ParsedMax.java | 0 .../aggregations/metrics/min/InternalMin.java | 0 .../search/aggregations/metrics/min/Min.java | 0 .../metrics/min/MinAggregationBuilder.java | 0 .../metrics/min/MinAggregator.java | 0 .../metrics/min/MinAggregatorFactory.java | 0 .../aggregations/metrics/min/ParsedMin.java | 0 .../aggregations/metrics/package-info.java | 0 .../percentiles/ParsedPercentileRanks.java | 0 .../percentiles/ParsedPercentiles.java | 0 .../metrics/percentiles/Percentile.java | 0 .../metrics/percentiles/PercentileRanks.java | 0 .../PercentileRanksAggregationBuilder.java | 0 .../metrics/percentiles/Percentiles.java | 0 .../PercentilesAggregationBuilder.java | 0 .../percentiles/PercentilesMethod.java | 0 .../hdr/AbstractHDRPercentilesAggregator.java | 0 .../hdr/AbstractInternalHDRPercentiles.java | 0 .../hdr/HDRPercentileRanksAggregator.java | 0 .../HDRPercentileRanksAggregatorFactory.java | 0 .../hdr/HDRPercentilesAggregator.java | 0 .../hdr/HDRPercentilesAggregatorFactory.java | 0 .../hdr/InternalHDRPercentileRanks.java | 0 .../hdr/InternalHDRPercentiles.java | 0 .../hdr/ParsedHDRPercentileRanks.java | 0 .../percentiles/hdr/ParsedHDRPercentiles.java | 0 .../AbstractInternalTDigestPercentiles.java | 0 .../AbstractTDigestPercentilesAggregator.java | 0 .../InternalTDigestPercentileRanks.java | 0 .../tdigest/InternalTDigestPercentiles.java | 0 .../tdigest/ParsedTDigestPercentileRanks.java | 0 .../tdigest/ParsedTDigestPercentiles.java | 0 .../TDigestPercentileRanksAggregator.java | 0 ...igestPercentileRanksAggregatorFactory.java | 0 .../tdigest/TDigestPercentilesAggregator.java | 0 .../TDigestPercentilesAggregatorFactory.java | 0 .../percentiles/tdigest/TDigestState.java | 0 .../scripted/InternalScriptedMetric.java | 0 .../scripted/ParsedScriptedMetric.java | 0 .../metrics/scripted/ScriptedMetric.java | 0 .../ScriptedMetricAggregationBuilder.java | 0 .../scripted/ScriptedMetricAggregator.java | 0 .../ScriptedMetricAggregatorFactory.java | 0 .../metrics/stats/InternalStats.java | 0 .../metrics/stats/ParsedStats.java | 0 .../aggregations/metrics/stats/Stats.java | 0 .../stats/StatsAggregationBuilder.java | 0 .../metrics/stats/StatsAggregator.java | 0 .../metrics/stats/StatsAggregatorFactory.java | 0 .../metrics/stats/extended/ExtendedStats.java | 0 .../ExtendedStatsAggregationBuilder.java | 0 .../extended/ExtendedStatsAggregator.java | 0 .../ExtendedStatsAggregatorFactory.java | 0 .../stats/extended/InternalExtendedStats.java | 0 .../stats/extended/ParsedExtendedStats.java | 0 .../aggregations/metrics/sum/InternalSum.java | 0 .../aggregations/metrics/sum/ParsedSum.java | 0 .../search/aggregations/metrics/sum/Sum.java | 0 .../metrics/sum/SumAggregationBuilder.java | 0 .../metrics/sum/SumAggregator.java | 0 .../metrics/sum/SumAggregatorFactory.java | 0 .../metrics/tophits/InternalTopHits.java | 0 .../metrics/tophits/ParsedTopHits.java | 0 .../aggregations/metrics/tophits/TopHits.java | 0 .../tophits/TopHitsAggregationBuilder.java | 0 .../metrics/tophits/TopHitsAggregator.java | 0 .../tophits/TopHitsAggregatorFactory.java | 0 .../valuecount/InternalValueCount.java | 0 .../metrics/valuecount/ParsedValueCount.java | 0 .../metrics/valuecount/ValueCount.java | 0 .../ValueCountAggregationBuilder.java | 0 .../valuecount/ValueCountAggregator.java | 0 .../ValueCountAggregatorFactory.java | 0 .../search/aggregations/package-info.java | 0 .../AbstractPipelineAggregationBuilder.java | 0 .../aggregations/pipeline/BucketHelpers.java | 0 .../pipeline/InternalSimpleValue.java | 0 .../pipeline/ParsedSimpleValue.java | 0 .../pipeline/PipelineAggregator.java | 0 .../pipeline/PipelineAggregatorBuilders.java | 0 .../pipeline/SiblingPipelineAggregator.java | 0 .../aggregations/pipeline/SimpleValue.java | 0 .../bucketmetrics/BucketMetricValue.java | 0 .../bucketmetrics/BucketMetricsParser.java | 0 ...cketMetricsPipelineAggregationBuilder.java | 0 .../BucketMetricsPipelineAggregator.java | 0 .../InternalBucketMetricValue.java | 0 .../ParsedBucketMetricValue.java | 0 .../AvgBucketPipelineAggregationBuilder.java | 0 .../avg/AvgBucketPipelineAggregator.java | 0 .../MaxBucketPipelineAggregationBuilder.java | 0 .../max/MaxBucketPipelineAggregator.java | 0 .../MinBucketPipelineAggregationBuilder.java | 0 .../min/MinBucketPipelineAggregator.java | 0 .../percentile/InternalPercentilesBucket.java | 0 .../percentile/ParsedPercentilesBucket.java | 0 .../percentile/PercentilesBucket.java | 0 ...tilesBucketPipelineAggregationBuilder.java | 0 .../PercentilesBucketPipelineAggregator.java | 0 .../stats/InternalStatsBucket.java | 0 .../stats/ParsedStatsBucket.java | 0 .../bucketmetrics/stats/StatsBucket.java | 0 ...StatsBucketPipelineAggregationBuilder.java | 0 .../stats/StatsBucketPipelineAggregator.java | 0 .../stats/extended/ExtendedStatsBucket.java | 0 .../extended/ExtendedStatsBucketParser.java | 0 ...StatsBucketPipelineAggregationBuilder.java | 0 ...ExtendedStatsBucketPipelineAggregator.java | 0 .../extended/InternalExtendedStatsBucket.java | 0 .../extended/ParsedExtendedStatsBucket.java | 0 .../SumBucketPipelineAggregationBuilder.java | 0 .../sum/SumBucketPipelineAggregator.java | 0 ...ucketScriptPipelineAggregationBuilder.java | 0 .../BucketScriptPipelineAggregator.java | 0 ...ketSelectorPipelineAggregationBuilder.java | 0 .../BucketSelectorPipelineAggregator.java | 0 .../BucketSortPipelineAggregationBuilder.java | 0 .../BucketSortPipelineAggregator.java | 0 ...mulativeSumPipelineAggregationBuilder.java | 0 .../CumulativeSumPipelineAggregator.java | 0 .../pipeline/derivative/Derivative.java | 0 .../DerivativePipelineAggregationBuilder.java | 0 .../DerivativePipelineAggregator.java | 0 .../derivative/InternalDerivative.java | 0 .../pipeline/derivative/ParsedDerivative.java | 0 .../MovAvgPipelineAggregationBuilder.java | 0 .../movavg/MovAvgPipelineAggregator.java | 0 .../movavg/SimulatedAnealingMinimizer.java | 0 .../pipeline/movavg/models/EwmaModel.java | 0 .../movavg/models/HoltLinearModel.java | 0 .../movavg/models/HoltWintersModel.java | 0 .../pipeline/movavg/models/LinearModel.java | 0 .../pipeline/movavg/models/MovAvgModel.java | 0 .../movavg/models/MovAvgModelBuilder.java | 0 .../pipeline/movavg/models/SimpleModel.java | 0 .../SerialDiffPipelineAggregationBuilder.java | 0 .../SerialDiffPipelineAggregator.java | 0 .../aggregations/support/AggregationPath.java | 0 .../aggregations/support/FieldContext.java | 0 .../aggregations/support/MissingValues.java | 0 .../aggregations/support/ValueType.java | 0 .../aggregations/support/ValuesSource.java | 0 .../ValuesSourceAggregationBuilder.java | 0 .../ValuesSourceAggregatorFactory.java | 0 .../support/ValuesSourceConfig.java | 0 .../support/ValuesSourceParserHelper.java | 0 .../support/ValuesSourceType.java | 0 .../support/values/ScriptBytesValues.java | 0 .../support/values/ScriptDoubleValues.java | 0 .../support/values/ScriptLongValues.java | 0 .../search/builder/SearchSourceBuilder.java | 0 .../builder/SearchSourceBuilderException.java | 0 .../search/collapse/CollapseBuilder.java | 0 .../search/collapse/CollapseContext.java | 0 .../search/dfs/AggregatedDfs.java | 0 .../elasticsearch/search/dfs/DfsPhase.java | 0 .../dfs/DfsPhaseExecutionException.java | 0 .../search/dfs/DfsSearchResult.java | 0 .../search/fetch/FetchPhase.java | 0 .../fetch/FetchPhaseExecutionException.java | 0 .../search/fetch/FetchSearchResult.java | 0 .../search/fetch/FetchSubPhase.java | 0 .../search/fetch/QueryFetchSearchResult.java | 0 .../fetch/ScrollQueryFetchSearchResult.java | 0 .../search/fetch/ShardFetchRequest.java | 0 .../search/fetch/ShardFetchSearchRequest.java | 0 .../search/fetch/StoredFieldsContext.java | 0 .../search/fetch/package-info.java | 0 .../fetch/subphase/DocValueFieldsContext.java | 0 .../subphase/DocValueFieldsFetchSubPhase.java | 0 .../fetch/subphase/ExplainFetchSubPhase.java | 0 .../fetch/subphase/FetchSourceContext.java | 0 .../fetch/subphase/FetchSourceSubPhase.java | 0 .../fetch/subphase/InnerHitsContext.java | 0 .../subphase/InnerHitsFetchSubPhase.java | 0 .../subphase/MatchedQueriesFetchSubPhase.java | 0 .../subphase/ParentFieldSubFetchPhase.java | 0 .../fetch/subphase/ScriptFieldsContext.java | 0 .../subphase/ScriptFieldsFetchSubPhase.java | 0 .../fetch/subphase/VersionFetchSubPhase.java | 0 .../highlight/AbstractHighlighterBuilder.java | 0 .../subphase/highlight/CustomQueryScorer.java | 0 .../highlight/FastVectorHighlighter.java | 0 .../highlight/FragmentBuilderHelper.java | 0 .../subphase/highlight/HighlightBuilder.java | 0 .../subphase/highlight/HighlightField.java | 0 .../subphase/highlight/HighlightPhase.java | 0 .../subphase/highlight/HighlightUtils.java | 0 .../fetch/subphase/highlight/Highlighter.java | 0 .../highlight/HighlighterContext.java | 0 .../subphase/highlight/PlainHighlighter.java | 0 .../highlight/SearchContextHighlight.java | 0 .../highlight/SimpleFragmentsBuilder.java | 0 .../SourceScoreOrderFragmentsBuilder.java | 0 .../SourceSimpleFragmentsBuilder.java | 0 .../highlight/UnifiedHighlighter.java | 0 .../subphase/highlight/package-info.java | 0 .../search/fetch/subphase/package-info.java | 0 .../search/internal/AliasFilter.java | 0 .../internal/CancellableBulkScorer.java | 0 .../search/internal/ContextIndexSearcher.java | 0 .../internal/FilteredSearchContext.java | 0 .../internal/InternalScrollSearchRequest.java | 0 .../internal/InternalSearchResponse.java | 0 .../search/internal/ScrollContext.java | 0 .../search/internal/SearchContext.java | 0 .../internal/ShardSearchLocalRequest.java | 0 .../search/internal/ShardSearchRequest.java | 0 .../internal/ShardSearchTransportRequest.java | 0 .../search/internal/SubSearchContext.java | 0 .../search/lookup/DocLookup.java | 0 .../search/lookup/FieldLookup.java | 0 .../search/lookup/FieldsLookup.java | 0 .../search/lookup/LeafDocLookup.java | 0 .../search/lookup/LeafFieldsLookup.java | 0 .../search/lookup/LeafSearchLookup.java | 0 .../search/lookup/SearchLookup.java | 0 .../search/lookup/SourceLookup.java | 0 .../profile/AbstractInternalProfileTree.java | 0 .../profile/AbstractProfileBreakdown.java | 0 .../search/profile/AbstractProfiler.java | 0 .../search/profile/ProfileResult.java | 0 .../search/profile/ProfileShardResult.java | 0 .../search/profile/Profilers.java | 0 .../profile/SearchProfileShardResults.java | 0 .../elasticsearch/search/profile/Timer.java | 0 .../AggregationProfileBreakdown.java | 0 .../AggregationProfileShardResult.java | 0 .../aggregation/AggregationProfiler.java | 0 .../aggregation/AggregationTimingType.java | 0 .../InternalAggregationProfileTree.java | 0 .../aggregation/ProfilingAggregator.java | 0 .../ProfilingLeafBucketCollector.java | 0 .../profile/aggregation/package-info.java | 0 .../search/profile/package-info.java | 0 .../search/profile/query/CollectorResult.java | 0 .../query/InternalProfileCollector.java | 0 .../query/InternalQueryProfileTree.java | 0 .../profile/query/ProfileCollector.java | 0 .../search/profile/query/ProfileScorer.java | 0 .../search/profile/query/ProfileWeight.java | 0 .../profile/query/QueryProfileBreakdown.java | 0 .../query/QueryProfileShardResult.java | 0 .../search/profile/query/QueryProfiler.java | 0 .../search/profile/query/QueryTimingType.java | 0 .../search/profile/query/package-info.java | 0 .../search/query/CancellableCollector.java | 0 .../query/EarlyTerminatingCollector.java | 0 .../search/query/QueryCollectorContext.java | 0 .../search/query/QueryPhase.java | 0 .../query/QueryPhaseExecutionException.java | 0 .../search/query/QuerySearchRequest.java | 0 .../search/query/QuerySearchResult.java | 0 .../search/query/ScrollQuerySearchResult.java | 0 .../search/query/TopDocsCollectorContext.java | 0 .../search/rescore/QueryRescoreMode.java | 0 .../search/rescore/QueryRescorer.java | 0 .../search/rescore/QueryRescorerBuilder.java | 0 .../search/rescore/RescoreContext.java | 0 .../search/rescore/RescorePhase.java | 0 .../search/rescore/Rescorer.java | 0 .../search/rescore/RescorerBuilder.java | 0 .../searchafter/SearchAfterBuilder.java | 0 .../search/slice/DocValuesSliceQuery.java | 0 .../search/slice/SliceBuilder.java | 0 .../search/slice/SliceQuery.java | 0 .../search/slice/TermsSliceQuery.java | 0 .../search/sort/FieldSortBuilder.java | 0 .../search/sort/GeoDistanceSortBuilder.java | 0 .../search/sort/NestedSortBuilder.java | 0 .../search/sort/ScoreSortBuilder.java | 0 .../search/sort/ScriptSortBuilder.java | 0 .../search/sort/SortAndFormats.java | 0 .../search/sort/SortBuilder.java | 0 .../search/sort/SortBuilders.java | 0 .../search/sort/SortFieldAndFormat.java | 0 .../elasticsearch/search/sort/SortMode.java | 0 .../elasticsearch/search/sort/SortOrder.java | 0 .../suggest/DirectSpellcheckerSettings.java | 0 .../elasticsearch/search/suggest/SortBy.java | 0 .../elasticsearch/search/suggest/Suggest.java | 0 .../search/suggest/SuggestBuilder.java | 0 .../search/suggest/SuggestBuilders.java | 0 .../search/suggest/SuggestPhase.java | 0 .../search/suggest/Suggester.java | 0 .../search/suggest/SuggestionBuilder.java | 0 .../suggest/SuggestionSearchContext.java | 0 .../completion/CompletionFieldStats.java | 0 .../suggest/completion/CompletionStats.java | 0 .../completion/CompletionSuggester.java | 0 .../completion/CompletionSuggestion.java | 0 .../CompletionSuggestionBuilder.java | 0 .../CompletionSuggestionContext.java | 0 .../suggest/completion/FuzzyOptions.java | 0 .../suggest/completion/RegexOptions.java | 0 .../context/CategoryContextMapping.java | 0 .../context/CategoryQueryContext.java | 0 .../completion/context/ContextBuilder.java | 0 .../completion/context/ContextMapping.java | 0 .../completion/context/ContextMappings.java | 0 .../completion/context/GeoContextMapping.java | 0 .../completion/context/GeoQueryContext.java | 0 .../completion/context/package-info.java | 0 .../suggest/completion/package-info.java | 0 .../search/suggest/package-info.java | 0 .../suggest/phrase/CandidateGenerator.java | 0 .../suggest/phrase/CandidateScorer.java | 0 .../search/suggest/phrase/Correction.java | 0 .../phrase/DirectCandidateGenerator.java | 0 .../DirectCandidateGeneratorBuilder.java | 0 .../search/suggest/phrase/Laplace.java | 0 .../search/suggest/phrase/LaplaceScorer.java | 0 .../phrase/LinearInterpolatingScorer.java | 0 .../suggest/phrase/LinearInterpolation.java | 0 .../MultiCandidateGeneratorWrapper.java | 0 .../phrase/NoisyChannelSpellChecker.java | 0 .../suggest/phrase/PhraseSuggester.java | 0 .../suggest/phrase/PhraseSuggestion.java | 0 .../phrase/PhraseSuggestionBuilder.java | 0 .../phrase/PhraseSuggestionContext.java | 0 .../search/suggest/phrase/SmoothingModel.java | 0 .../search/suggest/phrase/StupidBackoff.java | 0 .../suggest/phrase/StupidBackoffScorer.java | 0 .../search/suggest/phrase/WordScorer.java | 0 .../search/suggest/phrase/package-info.java | 0 .../search/suggest/term/TermSuggester.java | 0 .../search/suggest/term/TermSuggestion.java | 0 .../suggest/term/TermSuggestionBuilder.java | 0 .../suggest/term/TermSuggestionContext.java | 0 .../search/suggest/term/package-info.java | 0 .../ConcurrentSnapshotExecutionException.java | 0 .../InvalidSnapshotNameException.java | 0 .../elasticsearch/snapshots/RestoreInfo.java | 0 .../snapshots/RestoreService.java | 0 .../org/elasticsearch/snapshots/Snapshot.java | 0 .../snapshots/SnapshotCreationException.java | 0 .../snapshots/SnapshotException.java | 0 .../elasticsearch/snapshots/SnapshotId.java | 0 .../elasticsearch/snapshots/SnapshotInfo.java | 0 .../snapshots/SnapshotMissingException.java | 0 .../snapshots/SnapshotRestoreException.java | 0 .../snapshots/SnapshotShardFailure.java | 0 .../snapshots/SnapshotShardsService.java | 0 .../snapshots/SnapshotState.java | 0 .../snapshots/SnapshotUtils.java | 0 .../snapshots/SnapshotsService.java | 0 .../elasticsearch/tasks/CancellableTask.java | 0 .../tasks/LoggingTaskListener.java | 0 .../elasticsearch/tasks/RawTaskStatus.java | 0 .../java/org/elasticsearch/tasks/Task.java | 0 .../elasticsearch/tasks/TaskAwareRequest.java | 0 .../tasks/TaskCancelledException.java | 0 .../java/org/elasticsearch/tasks/TaskId.java | 0 .../org/elasticsearch/tasks/TaskInfo.java | 0 .../org/elasticsearch/tasks/TaskListener.java | 0 .../org/elasticsearch/tasks/TaskManager.java | 0 .../org/elasticsearch/tasks/TaskResult.java | 0 .../tasks/TaskResultsService.java | 0 .../org/elasticsearch/tasks/package-info.java | 0 .../AutoQueueAdjustingExecutorBuilder.java | 0 .../threadpool/ExecutorBuilder.java | 0 .../threadpool/FixedExecutorBuilder.java | 0 .../threadpool/ScalingExecutorBuilder.java | 0 .../elasticsearch/threadpool/Scheduler.java | 0 .../elasticsearch/threadpool/ThreadPool.java | 0 .../threadpool/ThreadPoolInfo.java | 0 .../threadpool/ThreadPoolStats.java | 0 .../ActionNotFoundTransportException.java | 0 .../transport/ActionTransportException.java | 0 .../transport/BindTransportException.java | 0 .../transport/BytesTransportRequest.java | 0 .../CompressibleBytesOutputStream.java | 0 .../transport/ConnectTransportException.java | 0 .../transport/ConnectionProfile.java | 0 .../EmptyTransportResponseHandler.java | 0 .../FutureTransportResponseHandler.java | 0 .../transport/NodeDisconnectedException.java | 0 .../transport/NodeNotConnectedException.java | 0 .../NodeShouldNotConnectException.java | 0 .../NotSerializableTransportException.java | 0 .../transport/PlainTransportFuture.java | 0 .../ReceiveTimeoutTransportException.java | 0 .../transport/RemoteClusterAware.java | 0 .../transport/RemoteClusterConnection.java | 0 .../transport/RemoteClusterService.java | 0 .../transport/RemoteConnectionInfo.java | 0 .../transport/RemoteTransportException.java | 0 .../transport/RequestHandlerRegistry.java | 0 ...ponseHandlerFailureTransportException.java | 0 .../SendRequestTransportException.java | 0 .../TaskAwareTransportRequestHandler.java | 0 .../transport/TaskTransportChannel.java | 0 .../elasticsearch/transport/TcpChannel.java | 0 .../elasticsearch/transport/TcpHeader.java | 0 .../elasticsearch/transport/TcpTransport.java | 0 .../transport/TcpTransportChannel.java | 0 .../elasticsearch/transport/Transport.java | 0 .../transport/TransportActionProxy.java | 0 .../transport/TransportChannel.java | 0 .../TransportChannelResponseHandler.java | 0 .../TransportConnectionListener.java | 0 .../transport/TransportException.java | 0 .../transport/TransportFuture.java | 0 .../transport/TransportInfo.java | 0 .../transport/TransportInterceptor.java | 0 .../transport/TransportMessage.java | 0 .../transport/TransportRequest.java | 0 .../transport/TransportRequestHandler.java | 0 .../transport/TransportRequestOptions.java | 0 .../transport/TransportResponse.java | 0 .../transport/TransportResponseHandler.java | 0 .../transport/TransportResponseOptions.java | 0 .../TransportSerializationException.java | 0 .../transport/TransportService.java | 0 .../transport/TransportStats.java | 0 .../transport/TransportStatus.java | 0 .../elasticsearch/transport/Transports.java | 0 .../org/elasticsearch/usage/UsageService.java | 0 .../watcher/AbstractResourceWatcher.java | 0 .../watcher/FileChangesListener.java | 0 .../elasticsearch/watcher/FileWatcher.java | 0 .../watcher/ResourceWatcher.java | 0 .../watcher/ResourceWatcherService.java | 0 .../elasticsearch/watcher/WatcherHandle.java | 0 .../time/format/StrictISODateTimeFormat.java | 0 .../services/org.apache.lucene.codecs.Codec | 0 .../org.apache.lucene.codecs.DocValuesFormat | 0 .../org.apache.lucene.codecs.PostingsFormat | 0 .../src/main/resources/config/favicon.ico | Bin .../elasticsearch/bootstrap/security.policy | 0 .../bootstrap/test-framework.policy | 0 .../elasticsearch/bootstrap/untrusted.policy | 0 .../index/mapper/default-mapping.json | 0 .../index/mapper/script-mapping.json | 0 .../tasks/task-index-mapping.json | 0 .../src/test/eclipse-build.gradle | 2 +- .../DeDuplicatingTokenFilterTests.java | 0 .../TruncateTokenFilterTests.java | 0 .../CollapsingTopDocsCollectorTests.java | 0 ...ndomBinaryDocValuesRangeQueryTestCase.java | 0 .../BinaryDocValuesRangeQueryTests.java | 0 .../lucene/queries/BlendedTermQueryTests.java | 0 ...eRandomBinaryDocValuesRangeQueryTests.java | 0 ...tRandomBinaryDocValuesRangeQueryTests.java | 0 ...sRandomBinaryDocValuesRangeQueryTests.java | 0 ...rRandomBinaryDocValuesRangeQueryTests.java | 0 ...gRandomBinaryDocValuesRangeQueryTests.java | 0 .../lucene/queries/MinDocQueryTests.java | 0 .../SearchAfterSortedDocQueryTests.java | 0 .../apache/lucene/search/QueriesTests.java | 0 .../BoundedBreakIteratorScannerTests.java | 0 .../CustomPassageFormatterTests.java | 0 .../CustomUnifiedHighlighterTests.java | 0 .../java/org/elasticsearch/BuildTests.java | 0 .../ElasticsearchExceptionTests.java | 0 .../ExceptionSerializationTests.java | 0 .../elasticsearch/SpecialPermissionTests.java | 0 .../java/org/elasticsearch/VersionTests.java | 0 .../action/ActionListenerTests.java | 0 .../action/ActionModuleTests.java | 0 .../action/DocWriteResponseTests.java | 0 .../action/ExplainRequestTests.java | 0 .../action/IndicesRequestIT.java | 0 .../action/ListenerActionIT.java | 0 .../action/NotifyOnceListenerTests.java | 0 .../action/OriginalIndicesTests.java | 0 .../action/RejectionActionIT.java | 0 .../ShardValidateQueryRequestTests.java | 0 .../action/admin/HotThreadsIT.java | 0 .../ClusterAllocationExplainActionTests.java | 0 .../ClusterAllocationExplainIT.java | 0 .../ClusterAllocationExplainRequestTests.java | 0 .../ClusterAllocationExplanationTests.java | 0 .../health/ClusterHealthRequestTests.java | 0 .../health/ClusterHealthResponsesTests.java | 0 .../TransportClusterHealthActionTests.java | 0 .../cluster/node/stats/NodeStatsTests.java | 0 .../node/tasks/CancellableTasksTests.java | 0 .../tasks/RecordingTaskManagerListener.java | 0 .../node/tasks/TaskManagerTestCase.java | 0 .../admin/cluster/node/tasks/TaskTests.java | 0 .../admin/cluster/node/tasks/TasksIT.java | 0 .../cluster/node/tasks/TestTaskPlugin.java | 0 .../node/tasks/TransportTasksActionTests.java | 0 .../repositories/RepositoryBlocksIT.java | 0 .../reroute/ClusterRerouteRequestTests.java | 0 .../cluster/reroute/ClusterRerouteTests.java | 0 .../settings/SettingsUpdaterTests.java | 0 .../ClusterSearchShardsRequestTests.java | 0 .../ClusterSearchShardsResponseTests.java | 0 .../cluster/snapshots/SnapshotBlocksIT.java | 0 .../snapshots/status/SnapshotStatusTests.java | 0 .../state/ClusterStateRequestTests.java | 0 .../admin/cluster/stats/ClusterStatsIT.java | 0 .../cluster/stats/ClusterStatsNodesTests.java | 0 .../GetStoredScriptRequestTests.java | 0 .../PutStoredScriptRequestTests.java | 0 .../cluster/tasks/PendingTasksBlocksIT.java | 0 .../indices/TransportAnalyzeActionTests.java | 0 .../indices/alias/AliasActionsTests.java | 0 .../indices/analyze/AnalyzeRequestTests.java | 0 .../clear/ClearIndicesCacheBlocksIT.java | 0 .../admin/indices/create/CreateIndexIT.java | 0 .../CreateIndexRequestBuilderTests.java | 0 .../create/CreateIndexRequestTests.java | 0 .../create/CreateIndexResponseTests.java | 0 .../admin/indices/create/ShrinkIndexIT.java | 0 .../admin/indices/create/SplitIndexIT.java | 0 .../indices/delete/DeleteIndexBlocksIT.java | 0 .../delete/DeleteIndexResponseTests.java | 0 .../admin/indices/exists/IndicesExistsIT.java | 0 .../admin/indices/flush/FlushBlocksIT.java | 0 .../indices/flush/SyncedFlushUnitTests.java | 0 .../forcemerge/ForceMergeBlocksIT.java | 0 .../action/admin/indices/get/GetIndexIT.java | 0 .../get/GetFieldMappingsResponseTests.java | 0 .../mapping/put/PutMappingRequestTests.java | 0 .../indices/open/OpenIndexResponseTests.java | 0 .../indices/refresh/RefreshBlocksIT.java | 0 .../indices/rollover/ConditionTests.java | 0 .../admin/indices/rollover/RolloverIT.java | 0 .../rollover/RolloverRequestTests.java | 0 .../TransportRolloverActionTests.java | 0 .../segments/IndicesSegmentsBlocksIT.java | 0 .../segments/IndicesSegmentsRequestTests.java | 0 .../shards/IndicesShardStoreRequestIT.java | 0 .../IndicesShardStoreResponseTests.java | 0 .../shrink/TransportResizeActionTests.java | 0 .../indices/stats/IndicesStatsBlocksIT.java | 0 .../stats/IndicesStatsResponseTests.java | 0 .../indices/stats/IndicesStatsTests.java | 0 .../MetaDataIndexTemplateServiceTests.java | 0 .../put/PutIndexTemplateRequestTests.java | 0 .../action/bulk/BackoffPolicyTests.java | 0 .../action/bulk/BulkIntegrationIT.java | 0 .../action/bulk/BulkItemResponseTests.java | 0 .../bulk/BulkProcessorClusterSettingsIT.java | 0 .../action/bulk/BulkProcessorIT.java | 0 .../action/bulk/BulkProcessorRetryIT.java | 0 .../action/bulk/BulkProcessorTests.java | 0 .../action/bulk/BulkRequestModifierTests.java | 0 .../action/bulk/BulkRequestTests.java | 0 .../action/bulk/BulkResponseTests.java | 0 .../action/bulk/BulkShardRequestTests.java | 0 .../action/bulk/BulkWithUpdatesIT.java | 0 .../elasticsearch/action/bulk/RetryTests.java | 0 ...ActionIndicesThatCannotBeCreatedTests.java | 0 .../bulk/TransportBulkActionIngestTests.java | 0 .../action/bulk/TransportBulkActionTests.java | 0 .../bulk/TransportBulkActionTookTests.java | 0 .../bulk/TransportShardBulkActionTests.java | 0 .../action/delete/DeleteResponseTests.java | 0 .../FieldCapabilitiesRequestTests.java | 0 .../FieldCapabilitiesResponseTests.java | 0 .../fieldcaps/FieldCapabilitiesTests.java | 0 .../action/get/GetResponseTests.java | 0 .../action/get/MultiGetRequestTests.java | 0 .../action/get/MultiGetShardRequestTests.java | 0 .../index/IndexRequestBuilderTests.java | 0 .../action/index/IndexRequestTests.java | 0 .../action/index/IndexResponseTests.java | 0 .../ingest/PutPipelineRequestTests.java | 0 .../SimulateDocumentSimpleResultTests.java | 0 .../ingest/SimulateExecutionServiceTests.java | 0 .../SimulatePipelineRequestParsingTests.java | 0 .../ingest/SimulatePipelineRequestTests.java | 0 .../ingest/SimulatePipelineResponseTests.java | 0 .../ingest/SimulateProcessorResultTests.java | 0 .../ingest/TrackingResultProcessorTests.java | 0 .../ingest/WritePipelineResponseTests.java | 0 .../ingest/WriteableIngestDocumentTests.java | 0 .../action/main/MainActionTests.java | 0 .../action/main/MainResponseTests.java | 0 .../resync/ResyncReplicationRequestTests.java | 0 .../AbstractSearchAsyncActionTests.java | 0 .../CanMatchPreFilterSearchPhaseTests.java | 0 .../search/ClearScrollControllerTests.java | 0 .../search/ClearScrollRequestTests.java | 0 .../action/search/CountedCollectorTests.java | 0 .../action/search/DfsQueryPhaseTests.java | 0 .../action/search/ExpandSearchPhaseTests.java | 0 .../action/search/FetchSearchPhaseTests.java | 0 .../action/search/MockSearchPhaseContext.java | 0 .../search/MultiSearchActionTookTests.java | 0 .../search/MultiSearchRequestTests.java | 0 .../search/MultiSearchResponseTests.java | 0 .../action/search/SearchAsyncActionTests.java | 0 .../search/SearchPhaseControllerTests.java | 0 .../SearchPhaseExecutionExceptionTests.java | 0 .../search/SearchRequestBuilderTests.java | 0 .../action/search/SearchResponseTests.java | 0 .../search/SearchScrollAsyncActionTests.java | 0 .../search/SearchScrollRequestTests.java | 0 .../search/ShardSearchFailureTests.java | 0 .../TransportMultiSearchActionTests.java | 0 .../search/TransportSearchActionTests.java | 0 .../search/TransportSearchHelperTests.java | 0 .../action/search/TransportSearchIT.java | 0 .../action/support/ActiveShardCountTests.java | 0 .../support/ActiveShardsObserverIT.java | 0 .../support/AdapterActionFutureTests.java | 0 .../action/support/AutoCreateIndexTests.java | 0 .../ContextPreservingActionListenerTests.java | 0 .../support/GroupedActionListenerTests.java | 0 .../action/support/IndicesOptionsTests.java | 0 .../support/ListenableActionFutureTests.java | 0 .../action/support/RefreshPolicyTests.java | 0 .../TransportActionFilterChainTests.java | 0 .../support/WaitActiveShardCountIT.java | 0 .../TransportBroadcastByNodeActionTests.java | 0 .../master/IndexingMasterFailoverIT.java | 0 .../TransportMasterNodeActionTests.java | 0 .../TransportMasterNodeActionUtils.java | 0 .../nodes/TransportNodesActionTests.java | 0 .../BroadcastReplicationTests.java | 0 .../ClusterStateCreationUtils.java | 0 .../ReplicationOperationTests.java | 0 .../replication/ReplicationResponseTests.java | 0 .../TransportReplicationActionTests.java | 0 .../TransportWriteActionTestHelper.java | 0 .../TransportWriteActionTests.java | 0 ...ortInstanceSingleOperationActionTests.java | 0 .../AbstractTermVectorsTestCase.java | 0 .../action/termvectors/GetTermVectorsIT.java | 0 .../termvectors/GetTermVectorsTests.java | 0 .../termvectors/MultiTermVectorsIT.java | 0 .../termvectors/TermVectorsUnitTests.java | 0 .../action/update/UpdateRequestTests.java | 0 .../action/update/UpdateResponseTests.java | 0 .../elasticsearch/aliases/IndexAliasesIT.java | 0 .../elasticsearch/blocks/SimpleBlocksIT.java | 0 .../bootstrap/BootstrapChecksTests.java | 0 .../bootstrap/BootstrapSettingsTests.java | 0 .../bootstrap/BootstrapTests.java | 0 .../bootstrap/ESPolicyTests.java | 0 .../bootstrap/ElasticsearchCliTests.java | 0 ...icsearchUncaughtExceptionHandlerTests.java | 0 .../bootstrap/JNANativesTests.java | 0 .../elasticsearch/bootstrap/JarHellTests.java | 0 .../bootstrap/JavaVersionTests.java | 0 .../bootstrap/MaxMapCountCheckTests.java | 0 .../bootstrap/SecurityTests.java | 0 .../broadcast/BroadcastActionsIT.java | 0 .../RecoveryWithUnsupportedIndicesIT.java | 0 .../bwcompat/RestoreBackwardsCompatIT.java | 0 .../org/elasticsearch/cli/CommandTests.java | 0 .../elasticsearch/cli/MultiCommandTests.java | 0 .../org/elasticsearch/cli/TerminalTests.java | 0 .../client/AbstractClientHeadersTestCase.java | 0 .../ParentTaskAssigningClientTests.java | 0 .../client/node/NodeClientHeadersTests.java | 0 .../client/node/NodeClientIT.java | 0 .../transport/FailAndRetryMockTransport.java | 0 .../client/transport/NodeDisconnectIT.java | 0 .../TransportClientHeadersTests.java | 0 .../client/transport/TransportClientIT.java | 0 .../TransportClientNodesServiceTests.java | 0 .../transport/TransportClientRetryIT.java | 0 .../transport/TransportClientTests.java | 0 .../cluster/ClusterChangedEventTests.java | 0 .../cluster/ClusterHealthIT.java | 0 .../cluster/ClusterInfoServiceIT.java | 0 .../cluster/ClusterInfoTests.java | 0 .../cluster/ClusterModuleTests.java | 0 .../cluster/ClusterStateDiffIT.java | 0 .../cluster/ClusterStateTests.java | 0 .../elasticsearch/cluster/DiskUsageTests.java | 0 .../cluster/GetClusterStateTests.java | 0 .../cluster/MinimumMasterNodesIT.java | 0 .../elasticsearch/cluster/NoMasterNodeIT.java | 0 .../cluster/NodeConnectionsServiceTests.java | 0 .../cluster/SimpleClusterStateIT.java | 0 .../cluster/SimpleDataNodesIT.java | 0 .../cluster/SnapshotsInProgressTests.java | 0 .../cluster/SpecificMasterNodesIT.java | 0 .../cluster/UpdateSettingsValidationIT.java | 0 .../ack/AckClusterUpdateSettingsIT.java | 0 .../org/elasticsearch/cluster/ack/AckIT.java | 0 ...rdFailedClusterStateTaskExecutorTests.java | 0 .../action/shard/ShardStateActionTests.java | 0 .../allocation/AwarenessAllocationIT.java | 0 .../cluster/allocation/ClusterRerouteIT.java | 0 .../allocation/FilteringAllocationIT.java | 0 .../allocation/SimpleAllocationIT.java | 0 .../cluster/block/ClusterBlockTests.java | 0 .../health/ClusterIndexHealthTests.java | 0 .../health/ClusterStateHealthTests.java | 0 .../cluster/metadata/AliasMetaDataTests.java | 0 .../cluster/metadata/AliasValidatorTests.java | 0 .../metadata/AutoExpandReplicasTests.java | 0 .../ClusterNameExpressionResolverTests.java | 0 .../DateMathExpressionResolverTests.java | 0 .../HumanReadableIndexSettingsTests.java | 0 .../metadata/IndexCreationTaskTests.java | 0 .../cluster/metadata/IndexGraveyardTests.java | 0 .../cluster/metadata/IndexMetaDataTests.java | 0 .../IndexNameExpressionResolverTests.java | 0 .../metadata/IndexTemplateMetaDataTests.java | 0 .../MetaDataCreateIndexServiceTests.java | 0 .../MetaDataDeleteIndexServiceTests.java | 0 .../MetaDataIndexAliasesServiceTests.java | 0 .../MetaDataIndexUpgradeServiceTests.java | 0 .../metadata/MetaDataMappingServiceTests.java | 0 .../cluster/metadata/MetaDataTests.java | 0 .../metadata/TemplateUpgradeServiceIT.java | 0 .../metadata/TemplateUpgradeServiceTests.java | 0 .../metadata/ToAndFromJsonMetaDataTests.java | 0 .../WildcardExpressionResolverTests.java | 0 .../node/DiscoveryNodeFiltersTests.java | 0 .../cluster/node/DiscoveryNodeTests.java | 0 .../cluster/node/DiscoveryNodesTests.java | 0 .../cluster/routing/AllocationIdTests.java | 0 .../cluster/routing/DelayedAllocationIT.java | 0 .../DelayedAllocationServiceTests.java | 0 .../routing/GroupShardsIteratorTests.java | 0 .../routing/OperationRoutingTests.java | 0 .../cluster/routing/PrimaryAllocationIT.java | 0 .../cluster/routing/PrimaryTermsTests.java | 0 .../routing/RandomShardRoutingMutator.java | 0 .../cluster/routing/RecoverySourceTests.java | 0 .../cluster/routing/RoutingServiceTests.java | 0 .../routing/RoutingTableGenerator.java | 0 .../cluster/routing/RoutingTableTests.java | 0 .../cluster/routing/ShardRoutingTests.java | 0 .../cluster/routing/UnassignedInfoTests.java | 0 .../allocation/AddIncrementallyTests.java | 0 .../AllocateUnassignedDecisionTests.java | 0 .../allocation/AllocationCommandsTests.java | 0 .../allocation/AllocationDecisionTests.java | 0 .../allocation/AllocationPriorityTests.java | 0 .../allocation/AwarenessAllocationTests.java | 0 .../allocation/BalanceConfigurationTests.java | 0 .../BalanceUnbalancedClusterTests.java | 0 .../allocation/BalancedSingleShardTests.java | 0 .../allocation/CatAllocationTestCase.java | 0 .../ClusterRebalanceRoutingTests.java | 0 .../ConcurrentRebalanceRoutingTests.java | 0 .../allocation/DeadNodesAllocationTests.java | 0 .../DecisionsImpactOnClusterHealthTests.java | 0 .../allocation/DiskThresholdMonitorTests.java | 0 .../DiskThresholdSettingsTests.java | 0 ...ReplicaAsPrimaryDuringRelocationTests.java | 0 .../ExpectedShardSizeAllocationTests.java | 0 .../allocation/FailedNodeRoutingTests.java | 0 .../allocation/FailedShardsRoutingTests.java | 0 .../allocation/FilterRoutingTests.java | 0 .../allocation/InSyncAllocationIdTests.java | 0 .../routing/allocation/IndexBalanceTests.java | 0 .../MaxRetryAllocationDeciderTests.java | 0 .../routing/allocation/MoveDecisionTests.java | 0 .../allocation/NodeAllocationResultTests.java | 0 .../NodeVersionAllocationDeciderTests.java | 0 ...alPrimariesToRelocatingPrimariesTests.java | 0 .../PreferPrimaryAllocationTests.java | 0 .../PrimaryElectionRoutingTests.java | 0 ...yNotRelocatedWhileBeingRecoveredTests.java | 0 .../RandomAllocationDeciderTests.java | 0 .../allocation/RebalanceAfterActiveTests.java | 0 .../ReplicaAllocatedAfterPrimaryTests.java | 0 .../ResizeAllocationDeciderTests.java | 0 .../RoutingNodesIntegrityTests.java | 0 .../routing/allocation/RoutingNodesUtils.java | 0 .../allocation/SameShardRoutingTests.java | 0 .../routing/allocation/ShardStateIT.java | 0 .../allocation/ShardVersioningTests.java | 0 .../ShardsLimitAllocationTests.java | 0 .../SingleShardNoReplicasRoutingTests.java | 0 .../SingleShardOneReplicaRoutingTests.java | 0 .../allocation/StartedShardsRoutingTests.java | 0 .../TenShardsOneReplicaRoutingTests.java | 0 .../allocation/ThrottlingAllocationTests.java | 0 .../UpdateNumberOfReplicasTests.java | 0 .../allocation/decider/DecisionTests.java | 0 .../decider/DiskThresholdDeciderTests.java | 0 .../DiskThresholdDeciderUnitTests.java | 0 .../decider/EnableAllocationTests.java | 0 .../decider/FilterAllocationDeciderTests.java | 0 .../allocation/decider/MockDiskUsagesIT.java | 0 ...storeInProgressAllocationDeciderTests.java | 0 .../UpdateShardAllocationSettingsIT.java | 0 .../murmur3/Murmur3HashFunctionTests.java | 0 .../ClusterSerializationTests.java | 0 .../ClusterStateToStringTests.java | 0 .../cluster/serialization/DiffableTests.java | 0 .../service/ClusterApplierServiceTests.java | 0 .../cluster/service/ClusterSerivceTests.java | 0 .../cluster/service/ClusterServiceIT.java | 0 .../cluster/service/MasterServiceTests.java | 0 .../cluster/service/TaskBatcherTests.java | 0 .../cluster/service/TaskExecutorTests.java | 0 .../cluster/settings/ClusterSettingsIT.java | 0 .../cluster/settings/SettingsFilteringIT.java | 0 .../cluster/shards/ClusterSearchShardsIT.java | 0 .../structure/RoutingIteratorTests.java | 0 .../elasticsearch/common/BooleansTests.java | 0 .../elasticsearch/common/ChannelsTests.java | 0 ...ponentiallyWeightedMovingAverageTests.java | 0 .../common/FieldMemoryStatsTests.java | 0 .../elasticsearch/common/NumbersTests.java | 0 .../elasticsearch/common/ParseFieldTests.java | 0 .../elasticsearch/common/PidFileTests.java | 0 .../elasticsearch/common/PriorityTests.java | 0 .../common/ReleasablesTests.java | 0 .../elasticsearch/common/StringsTests.java | 0 .../org/elasticsearch/common/TableTests.java | 0 .../org/elasticsearch/common/UUIDTests.java | 0 .../common/blobstore/BlobPathTests.java | 0 .../blobstore/FsBlobStoreContainerTests.java | 0 .../common/blobstore/FsBlobStoreTests.java | 0 .../breaker/MemoryCircuitBreakerTests.java | 0 .../bytes/ByteBufferReferenceTests.java | 0 .../common/bytes/BytesArrayTests.java | 0 .../bytes/CompositeBytesReferenceTests.java | 0 .../bytes/PagedBytesReferenceTests.java | 0 .../common/cache/CacheBuilderTests.java | 0 .../common/cache/CacheTests.java | 0 .../collect/CopyOnWriteHashMapTests.java | 0 .../common/collect/EvictingQueueTests.java | 0 .../common/collect/IteratorsTests.java | 0 .../common/compress/DeflateCompressTests.java | 0 .../DeflateCompressedXContentTests.java | 0 .../common/geo/BaseGeoParsingTestCase.java | 0 .../common/geo/GeoDistanceTests.java | 0 .../common/geo/GeoHashTests.java | 0 .../common/geo/GeoJsonShapeParserTests.java | 0 .../common/geo/GeoWKTShapeParserTests.java | 0 .../common/geo/ShapeBuilderTests.java | 0 .../common/geo/ShapeRelationTests.java | 0 .../common/geo/SpatialStrategyTests.java | 0 .../AbstractShapeBuilderTestCase.java | 0 .../geo/builders/CircleBuilderTests.java | 0 .../geo/builders/EnvelopeBuilderTests.java | 0 .../GeometryCollectionBuilderTests.java | 0 .../geo/builders/LineStringBuilderTests.java | 0 .../builders/MultiLineStringBuilderTests.java | 0 .../geo/builders/MultiPointBuilderTests.java | 0 .../builders/MultiPolygonBuilderTests.java | 0 .../geo/builders/PointBuilderTests.java | 0 .../geo/builders/PolygonBuilderTests.java | 0 .../common/hash/MessageDigestsTests.java | 0 .../common/hashing/MurmurHash3Tests.java | 0 .../common/hppc/HppcMapsTests.java | 0 .../common/io/FileSystemUtilsTests.java | 0 .../elasticsearch/common/io/StreamsTests.java | 0 .../stream/AbstractWriteableEnumTestCase.java | 0 .../common/io/stream/BytesStreamsTests.java | 0 .../stream/NamedWriteableRegistryTests.java | 0 .../ReleasableBytesStreamOutputTests.java | 0 .../common/io/stream/StreamTests.java | 0 .../common/joda/DateMathParserTests.java | 0 .../elasticsearch/common/joda/JodaTests.java | 0 .../logging/DeprecationLoggerTests.java | 0 .../common/lucene/LuceneTests.java | 0 .../common/lucene/ShardCoreKeyMapTests.java | 0 .../lucene/index/ESDirectoryReaderTests.java | 0 .../lucene/index/FreqTermsEnumTests.java | 0 .../search/MultiPhrasePrefixQueryTests.java | 0 .../search/function/MinScoreScorerTests.java | 0 .../morelikethis/MoreLikeThisQueryTests.java | 0 .../morelikethis/XMoreLikeThisTests.java | 0 .../store/ByteArrayIndexInputTests.java | 0 .../store/InputStreamIndexInputTests.java | 0 .../common/lucene/uid/VersionLookupTests.java | 0 .../common/lucene/uid/VersionsTests.java | 0 .../common/network/CidrsTests.java | 0 .../common/network/InetAddressesTests.java | 0 .../common/network/NetworkAddressTests.java | 0 .../common/network/NetworkModuleTests.java | 0 .../common/network/NetworkServiceTests.java | 0 .../common/network/NetworkUtilsTests.java | 0 .../common/path/PathTrieTests.java | 0 .../recycler/AbstractRecyclerTestCase.java | 0 .../recycler/ConcurrentRecyclerTests.java | 0 .../common/recycler/LockedRecyclerTests.java | 0 .../common/recycler/NoneRecyclerTests.java | 0 .../common/recycler/QueueRecyclerTests.java | 0 .../common/regex/RegexTests.java | 0 .../common/rounding/DateTimeUnitTests.java | 0 .../rounding/TimeZoneRoundingTests.java | 0 .../settings/AddFileKeyStoreCommandTests.java | 0 .../AddStringKeyStoreCommandTests.java | 0 .../settings/CreateKeyStoreCommandTests.java | 0 .../settings/KeyStoreCommandTestCase.java | 0 .../common/settings/KeyStoreWrapperTests.java | 0 .../settings/ListKeyStoreCommandTests.java | 0 .../settings/MemorySizeSettingsTests.java | 0 .../settings/PropertyPlaceholderTests.java | 0 .../RemoveSettingKeyStoreCommandTests.java | 0 .../common/settings/ScopedSettingsTests.java | 0 .../common/settings/SecureStringTests.java | 0 .../common/settings/SettingTests.java | 0 .../common/settings/SettingsFilterTests.java | 0 .../common/settings/SettingsModuleTests.java | 0 .../common/settings/SettingsTests.java | 0 .../transport/BoundTransportAddressTests.java | 0 .../common/unit/ByteSizeUnitTests.java | 0 .../common/unit/ByteSizeValueTests.java | 0 .../common/unit/DistanceUnitTests.java | 0 .../common/unit/FuzzinessTests.java | 0 .../common/unit/RatioValueTests.java | 0 .../common/unit/SizeValueTests.java | 0 .../common/unit/TimeValueTests.java | 0 .../common/util/ArrayUtilsTests.java | 0 .../common/util/BigArraysTests.java | 0 .../common/util/ByteUtilsTests.java | 0 .../common/util/BytesRefHashTests.java | 0 .../common/util/CancellableThreadsTests.java | 0 .../common/util/CollectionUtilsTests.java | 0 .../common/util/IndexFolderUpgraderTests.java | 0 .../common/util/LocaleUtilsTests.java | 0 .../common/util/LongHashTests.java | 0 .../common/util/LongObjectHashMapTests.java | 0 .../common/util/SingleObjectCacheTests.java | 0 .../common/util/URIPatternTests.java | 0 .../AbstractLifecycleRunnableTests.java | 0 .../concurrent/AbstractRunnableTests.java | 0 .../concurrent/AsyncIOProcessorTests.java | 0 .../util/concurrent/CountDownTests.java | 0 .../util/concurrent/EsExecutorsTests.java | 0 .../concurrent/EsThreadPoolExecutorTests.java | 0 .../util/concurrent/KeyedLockTests.java | 0 .../concurrent/PrioritizedExecutorsTests.java | 0 .../concurrent/PrioritizedRunnableTests.java | 0 ...ueueResizingEsThreadPoolExecutorTests.java | 0 .../util/concurrent/RefCountedTests.java | 0 .../ResizableBlockingQueueTests.java | 0 .../util/concurrent/ThreadContextTests.java | 0 .../util/concurrent/TimedRunnableTests.java | 0 .../common/util/iterable/IterablesTests.java | 0 .../common/util/set/SetsTests.java | 0 .../common/xcontent/BaseXContentTestCase.java | 0 .../ConstructingObjectParserTests.java | 0 .../common/xcontent/ObjectParserTests.java | 0 .../UnknownNamedObjectExceptionTests.java | 0 .../common/xcontent/XContentFactoryTests.java | 0 .../common/xcontent/XContentParserTests.java | 0 .../xcontent/XContentParserUtilsTests.java | 0 .../common/xcontent/XContentTypeTests.java | 0 .../builder/XContentBuilderTests.java | 0 .../cbor/CborXContentParserTests.java | 0 .../xcontent/cbor/CborXContentTests.java | 0 .../common/xcontent/cbor/JsonVsCborTests.java | 0 .../xcontent/json/JsonXContentTests.java | 0 .../xcontent/smile/JsonVsSmileTests.java | 0 .../xcontent/smile/SmileXContentTests.java | 0 .../support/AbstractFilteringTestCase.java | 0 .../xcontent/support/XContentHelperTests.java | 0 .../support/XContentMapValuesTests.java | 0 .../AbstractXContentFilteringTestCase.java | 0 .../filtering/CborXContentFilteringTests.java | 0 .../FilterPathGeneratorFilteringTests.java | 0 .../support/filtering/FilterPathTests.java | 0 .../filtering/JsonXContentFilteringTests.java | 0 .../SmileFilteringGeneratorTests.java | 0 .../YamlFilteringGeneratorTests.java | 0 .../xcontent/yaml/YamlXContentTests.java | 0 .../deps/jackson/JacksonLocationTests.java | 0 .../deps/joda/SimpleJodaTests.java | 0 .../deps/lucene/SimpleLuceneTests.java | 0 .../deps/lucene/VectorHighlighterTests.java | 0 .../discovery/AbstractDisruptionTestCase.java | 0 ...usterStatePublishResponseHandlerTests.java | 0 .../discovery/ClusterDisruptionIT.java | 0 .../discovery/DiscoveryDisruptionIT.java | 0 .../discovery/DiscoveryModuleTests.java | 0 .../discovery/MasterDisruptionIT.java | 0 .../discovery/SnapshotDisruptionIT.java | 0 .../discovery/ZenFaultDetectionTests.java | 0 .../single/SingleNodeDiscoveryIT.java | 0 .../single/SingleNodeDiscoveryTests.java | 0 .../zen/ElectMasterServiceTests.java | 0 .../discovery/zen/MembershipActionTests.java | 0 .../zen/NodeJoinControllerTests.java | 0 ...eRemovalClusterStateTaskExecutorTests.java | 0 .../zen/PendingClusterStatesQueueTests.java | 0 .../zen/PublishClusterStateActionTests.java | 0 .../discovery/zen/UnicastZenPingTests.java | 0 .../discovery/zen/ZenDiscoveryIT.java | 0 .../discovery/zen/ZenDiscoveryUnitTests.java | 0 .../discovery/zen/ZenPingTests.java | 0 .../AliasedIndexDocumentActionsIT.java | 0 .../document/DocumentActionsIT.java | 0 .../elasticsearch/document/ShardInfoIT.java | 0 .../elasticsearch/env/ESFileStoreTests.java | 0 .../elasticsearch/env/EnvironmentTests.java | 0 .../env/NodeEnvironmentTests.java | 0 .../explain/ExplainActionIT.java | 0 .../gateway/AsyncShardFetchTests.java | 0 .../gateway/DanglingIndicesStateTests.java | 0 .../gateway/GatewayIndexStateIT.java | 0 .../gateway/GatewayMetaStateTests.java | 0 .../gateway/GatewayServiceTests.java | 0 .../gateway/MetaDataStateFormatTests.java | 0 .../gateway/MetaDataWriteDataNodesIT.java | 0 .../gateway/MetaStateServiceTests.java | 0 .../gateway/PrimaryShardAllocatorTests.java | 0 .../gateway/PriorityComparatorTests.java | 0 .../gateway/QuorumGatewayIT.java | 0 .../gateway/RecoverAfterNodesIT.java | 0 .../gateway/RecoveryFromGatewayIT.java | 0 .../gateway/ReplicaShardAllocatorTests.java | 0 .../gateway/ReusePeerRecoverySharedTest.java | 0 .../org/elasticsearch/get/GetActionIT.java | 0 .../elasticsearch/index/IndexModuleTests.java | 0 .../index/IndexRequestBuilderIT.java | 0 .../index/IndexServiceTests.java | 0 .../index/IndexSettingsTests.java | 0 .../org/elasticsearch/index/IndexSortIT.java | 0 .../index/IndexSortSettingsTests.java | 0 .../org/elasticsearch/index/IndexTests.java | 0 .../index/IndexingSlowLogTests.java | 0 .../index/MergePolicySettingsTests.java | 0 .../index/MergeSchedulerSettingsTests.java | 0 .../index/SearchSlowLogTests.java | 0 .../index/SettingsListenerIT.java | 0 .../elasticsearch/index/VersionTypeTests.java | 0 .../index/WaitUntilRefreshIT.java | 0 .../index/analysis/AnalysisRegistryTests.java | 0 .../index/analysis/AnalysisTests.java | 0 .../index/analysis/CharMatcherTests.java | 0 .../analysis/CoreAnalysisFactoryTests.java | 0 .../index/analysis/CustomNormalizerTests.java | 0 .../analysis/FingerprintAnalyzerTests.java | 0 .../HunspellTokenFilterFactoryTests.java | 0 .../PathHierarchyTokenizerFactoryTests.java | 0 .../index/analysis/PatternAnalyzerTests.java | 0 .../index/analysis/PreBuiltAnalyzerTests.java | 0 .../ShingleTokenFilterFactoryTests.java | 0 .../index/analysis/SnowballAnalyzerTests.java | 0 .../index/analysis/StopAnalyzerTests.java | 0 .../index/analysis/StopTokenFilterTests.java | 0 .../WhitespaceTokenizerFactoryTests.java | 0 .../synonyms/SynonymsAnalysisTests.java | 0 .../cache/bitset/BitSetFilterCacheTests.java | 0 .../elasticsearch/index/codec/CodecTests.java | 0 .../engine/CombinedDeletionPolicyTests.java | 0 .../EngineSearcherTotalHitsMatcher.java | 0 .../index/engine/InternalEngineMergeIT.java | 0 .../engine/InternalEngineSettingsTests.java | 0 .../index/engine/InternalEngineTests.java | 0 .../index/engine/LiveVersionMapTests.java | 0 .../index/engine/SegmentTests.java | 0 .../index/engine/VersionValueTests.java | 0 .../AbstractFieldDataImplTestCase.java | 0 .../fielddata/AbstractFieldDataTestCase.java | 0 .../AbstractGeoFieldDataTestCase.java | 0 .../AbstractStringFieldDataTestCase.java | 0 .../fielddata/BinaryDVFieldDataTests.java | 0 .../index/fielddata/FieldDataCacheTests.java | 0 .../index/fielddata/FieldDataLoadingIT.java | 0 .../index/fielddata/FieldDataStatsTests.java | 0 .../index/fielddata/FieldDataTests.java | 0 .../index/fielddata/FilterFieldDataTests.java | 0 .../index/fielddata/GeoFieldDataTests.java | 0 .../fielddata/IndexFieldDataServiceTests.java | 0 .../NoOrdinalsStringFieldDataTests.java | 0 .../PagedBytesStringFieldDataTests.java | 0 .../fielddata/ScriptDocValuesDatesTests.java | 0 .../ScriptDocValuesGeoPointsTests.java | 0 .../fielddata/ScriptDocValuesLongsTests.java | 0 .../SortedSetDVStringFieldDataTests.java | 0 .../index/fielddata/UidFieldDataTests.java | 0 .../fieldcomparator/ReplaceMissingTests.java | 0 .../ordinals/MultiOrdinalsTests.java | 0 .../ordinals/SingleOrdinalsTests.java | 0 .../plain/HalfFloatFielddataTests.java | 0 .../FieldStatsProviderRefreshTests.java | 0 .../index/get/DocumentFieldTests.java | 0 .../index/get/GetResultTests.java | 0 .../index/mapper/AllFieldMapperTests.java | 0 .../index/mapper/BinaryFieldMapperTests.java | 0 .../index/mapper/BinaryFieldTypeTests.java | 0 .../index/mapper/BinaryRangeUtilTests.java | 0 .../index/mapper/BooleanFieldMapperTests.java | 0 .../index/mapper/BooleanFieldTypeTests.java | 0 .../index/mapper/CamelCaseFieldNameTests.java | 0 .../mapper/CompletionFieldMapperTests.java | 0 .../mapper/CompletionFieldTypeTests.java | 0 .../mapper/CopyToMapperIntegrationIT.java | 0 .../index/mapper/CopyToMapperTests.java | 0 .../index/mapper/DateFieldMapperTests.java | 0 .../index/mapper/DateFieldTypeTests.java | 0 .../mapper/DocumentFieldMapperTests.java | 0 .../mapper/DocumentMapperMergeTests.java | 0 .../mapper/DocumentMapperParserTests.java | 0 .../index/mapper/DocumentParserTests.java | 0 .../index/mapper/DoubleIndexingDocTests.java | 0 .../index/mapper/DynamicMappingIT.java | 0 .../index/mapper/DynamicMappingTests.java | 0 .../mapper/DynamicMappingVersionTests.java | 0 .../index/mapper/DynamicTemplateTests.java | 0 .../index/mapper/DynamicTemplatesTests.java | 0 .../mapper/ExternalFieldMapperTests.java | 0 .../index/mapper/ExternalMapper.java | 0 .../index/mapper/ExternalMapperPlugin.java | 0 .../index/mapper/ExternalMetadataMapper.java | 0 .../ExternalValuesMapperIntegrationIT.java | 0 .../index/mapper/FakeStringFieldMapper.java | 0 .../mapper/FieldFilterMapperPluginTests.java | 0 .../mapper/FieldNamesFieldMapperTests.java | 0 .../mapper/FieldNamesFieldTypeTests.java | 0 .../index/mapper/FieldTypeLookupTests.java | 0 .../GenericStoreDynamicTemplateTests.java | 0 .../mapper/GeoPointFieldMapperTests.java | 0 .../index/mapper/GeoPointFieldTypeTests.java | 0 .../mapper/GeoShapeFieldMapperTests.java | 0 .../index/mapper/GeoShapeFieldTypeTests.java | 0 .../index/mapper/IdFieldMapperTests.java | 0 .../index/mapper/IdFieldTypeTests.java | 0 .../index/mapper/IndexFieldMapperTests.java | 0 .../index/mapper/IndexFieldTypeTests.java | 0 .../index/mapper/IpFieldMapperTests.java | 0 .../index/mapper/IpFieldTypeTests.java | 0 .../index/mapper/IpRangeFieldMapperTests.java | 0 .../mapper/JavaMultiFieldMergeTests.java | 0 .../index/mapper/KeywordFieldMapperTests.java | 0 .../index/mapper/KeywordFieldTypeTests.java | 0 .../index/mapper/MapperServiceTests.java | 0 .../index/mapper/MapperTests.java | 0 .../mapper/MultiFieldCopyToMapperTests.java | 0 .../index/mapper/MultiFieldTests.java | 0 .../mapper/MultiFieldsIntegrationIT.java | 0 .../index/mapper/NestedObjectMapperTests.java | 0 .../mapper/NullValueObjectMappingTests.java | 0 .../index/mapper/NullValueTests.java | 0 .../index/mapper/NumberFieldMapperTests.java | 0 .../index/mapper/NumberFieldTypeTests.java | 0 .../index/mapper/ObjectMapperTests.java | 0 .../index/mapper/ParentFieldMapperTests.java | 0 .../index/mapper/ParentFieldTypeTests.java | 0 .../index/mapper/PathMapperTests.java | 0 .../mapper/PathMatchDynamicTemplateTests.java | 0 .../index/mapper/RangeFieldMapperTests.java | 0 ...angeFieldQueryStringQueryBuilderTests.java | 0 .../index/mapper/RangeFieldTypeTests.java | 0 .../index/mapper/RootObjectMapperTests.java | 0 .../index/mapper/RoutingFieldMapperTests.java | 0 .../index/mapper/RoutingFieldTypeTests.java | 0 .../index/mapper/SourceFieldMapperTests.java | 0 .../index/mapper/SourceFieldTypeTests.java | 0 .../mapper/StoredNumericValuesTests.java | 0 .../index/mapper/TextFieldMapperTests.java | 0 .../index/mapper/TextFieldTypeTests.java | 0 .../index/mapper/TypeFieldMapperTests.java | 0 .../index/mapper/TypeFieldTypeTests.java | 0 .../index/mapper/UidFieldMapperTests.java | 0 .../index/mapper/UidFieldTypeTests.java | 0 .../elasticsearch/index/mapper/UidTests.java | 0 .../mapper/UpdateMappingOnClusterIT.java | 0 .../index/mapper/UpdateMappingTests.java | 0 .../index/mapper/VersionFieldTypeTests.java | 0 .../index/mapper/package-info.java | 0 .../query/AbstractQueryBuilderTests.java | 0 .../query/AbstractTermQueryTestCase.java | 0 .../index/query/BoolQueryBuilderTests.java | 0 .../query/BoostingQueryBuilderTests.java | 0 .../index/query/CombineFunctionTests.java | 0 .../query/CommonTermsQueryBuilderTests.java | 0 .../query/CommonTermsQueryParserTests.java | 0 .../query/ConstantScoreQueryBuilderTests.java | 0 .../index/query/DisMaxQueryBuilderTests.java | 0 .../index/query/DisableGraphQueryTests.java | 0 .../index/query/ExistsQueryBuilderTests.java | 0 .../FieldMaskingSpanQueryBuilderTests.java | 0 .../index/query/FuzzyQueryBuilderTests.java | 0 .../GeoBoundingBoxQueryBuilderTests.java | 0 .../query/GeoDistanceQueryBuilderTests.java | 0 .../query/GeoPolygonQueryBuilderTests.java | 0 .../query/GeoShapeQueryBuilderTests.java | 0 .../index/query/IdsQueryBuilderTests.java | 0 .../index/query/InnerHitBuilderTests.java | 0 .../query/MatchAllQueryBuilderTests.java | 0 .../query/MatchNoneQueryBuilderTests.java | 0 .../MatchPhrasePrefixQueryBuilderTests.java | 0 .../query/MatchPhraseQueryBuilderTests.java | 0 .../index/query/MatchQueryBuilderTests.java | 0 .../index/query/MockRepeatAnalyzer.java | 0 .../query/MoreLikeThisQueryBuilderTests.java | 0 .../query/MultiMatchQueryBuilderTests.java | 0 .../index/query/NestedQueryBuilderTests.java | 0 .../index/query/OperatorTests.java | 0 .../index/query/PrefixQueryBuilderTests.java | 0 .../index/query/QueryShardContextTests.java | 0 .../query/QueryStringQueryBuilderTests.java | 0 .../index/query/RandomQueryBuilder.java | 0 .../index/query/RangeQueryBuilderTests.java | 0 .../index/query/RangeQueryRewriteTests.java | 0 .../index/query/RegexpQueryBuilderTests.java | 0 .../index/query/RewriteableTests.java | 0 .../index/query/ScoreModeTests.java | 0 .../index/query/ScriptQueryBuilderTests.java | 0 .../query/SimpleQueryStringBuilderTests.java | 0 .../SpanContainingQueryBuilderTests.java | 0 .../query/SpanFirstQueryBuilderTests.java | 0 .../query/SpanMultiTermQueryBuilderTests.java | 0 .../query/SpanNearQueryBuilderTests.java | 0 .../index/query/SpanNotQueryBuilderTests.java | 0 .../index/query/SpanOrQueryBuilderTests.java | 0 .../query/SpanTermQueryBuilderTests.java | 0 .../query/SpanWithinQueryBuilderTests.java | 0 .../index/query/TermQueryBuilderTests.java | 0 .../index/query/TermsQueryBuilderTests.java | 0 .../query/TermsSetQueryBuilderTests.java | 0 .../index/query/TypeQueryBuilderTests.java | 0 .../query/WildcardQueryBuilderTests.java | 0 .../index/query/WrapperQueryBuilderTests.java | 0 ...FieldValueFactorFunctionModifierTests.java | 0 .../FunctionScoreEquivalenceTests.java | 0 .../FunctionScoreQueryBuilderTests.java | 0 .../functionscore/FunctionScoreTests.java | 0 .../ScoreFunctionBuilderTests.java | 0 .../query/plugin/CustomQueryParserIT.java | 0 .../index/query/plugin/DummyQueryBuilder.java | 0 .../query/plugin/DummyQueryParserPlugin.java | 0 .../index/refresh/RefreshStatsTests.java | 0 .../AbstractBulkByScrollRequestTestCase.java | 0 .../reindex/BulkByScrollResponseTests.java | 0 .../reindex/BulkByScrollTaskStatusTests.java | 0 .../index/reindex/BulkByScrollTaskTests.java | 0 .../reindex/DeleteByQueryRequestTests.java | 0 .../LeaderBulkByScrollTaskStateTests.java | 0 .../index/reindex/ReindexRequestTests.java | 0 .../reindex/UpdateByQueryRequestTests.java | 0 .../WorkerBulkByScrollTaskStateTests.java | 0 .../ESIndexLevelReplicationTestCase.java | 0 .../IndexLevelReplicationTests.java | 0 .../RecoveryDuringReplicationTests.java | 0 .../search/ESToParentBlockJoinQueryTests.java | 0 .../index/search/MatchQueryIT.java | 0 .../index/search/MultiMatchQueryTests.java | 0 .../index/search/NestedHelperTests.java | 0 .../search/geo/GeoPointParsingTests.java | 0 .../index/search/geo/GeoUtilsTests.java | 0 .../AbstractNumberNestedSortingTestCase.java | 0 .../nested/DoubleNestedSortingTests.java | 0 .../nested/FloatNestedSortingTests.java | 0 .../search/nested/LongNestedSortingTests.java | 0 .../search/nested/NestedSortingTests.java | 0 .../index/seqno/CountedBitSetTests.java | 0 .../GlobalCheckpointSyncActionTests.java | 0 .../index/seqno/GlobalCheckpointSyncIT.java | 0 .../seqno/GlobalCheckpointTrackerTests.java | 0 .../seqno/LocalCheckpointTrackerTests.java | 0 .../index/seqno/SequenceNumbersTests.java | 0 .../index/shard/DocsStatsTests.java | 0 .../index/shard/EngineAccess.java | 0 .../shard/IndexSearcherWrapperTests.java | 0 .../index/shard/IndexShardIT.java | 0 .../IndexShardOperationPermitsTests.java | 0 .../index/shard/IndexShardTests.java | 0 .../shard/IndexingOperationListenerTests.java | 0 .../index/shard/NewPathForShardTests.java | 0 .../shard/PrimaryReplicaSyncerTests.java | 0 .../index/shard/RefreshListenersTests.java | 0 .../shard/SearchOperationListenerTests.java | 0 .../index/shard/ShardIdTests.java | 0 .../index/shard/ShardPathTests.java | 0 .../index/shard/ShardSplittingQueryTests.java | 0 .../index/shard/ShardUtilsTests.java | 0 .../index/shard/StoreRecoveryTests.java | 0 .../similarity/ScriptedSimilarityTests.java | 0 .../similarity/SimilarityServiceTests.java | 0 .../index/similarity/SimilarityTests.java | 0 .../snapshots/blobstore/FileInfoTests.java | 0 .../blobstore/SlicedInputStreamTests.java | 0 .../index/store/CorruptedFileIT.java | 0 .../index/store/CorruptedTranslogIT.java | 0 .../index/store/DirectoryUtilsTests.java | 0 .../index/store/ExceptionRetryIT.java | 0 .../index/store/FsDirectoryServiceTests.java | 0 .../index/store/IndexStoreTests.java | 0 .../elasticsearch/index/store/StoreTests.java | 0 .../suggest/stats/CompletionsStatsTests.java | 0 .../index/suggest/stats/SuggestStatsIT.java | 0 .../termvectors/TermVectorsServiceTests.java | 0 .../index/translog/MultiSnapshotTests.java | 0 .../index/translog/SnapshotMatchers.java | 0 .../index/translog/TestTranslog.java | 0 .../translog/TranslogDeletionPolicyTests.java | 0 .../index/translog/TranslogTests.java | 0 .../index/translog/TranslogVersionTests.java | 0 .../index/translog/TruncateTranslogIT.java | 0 .../elasticsearch/indexing/IndexActionIT.java | 0 .../IndexLifecycleActionIT.java | 0 ...DateMathIndexExpressionsIntegrationIT.java | 0 .../IndexingMemoryControllerTests.java | 0 .../indices/IndicesLifecycleListenerIT.java | 0 ...dicesLifecycleListenerSingleNodeTests.java | 0 .../indices/IndicesModuleTests.java | 0 .../indices/IndicesOptionsIntegrationIT.java | 0 .../indices/IndicesQueryCacheTests.java | 0 .../indices/IndicesRequestCacheIT.java | 0 .../indices/IndicesRequestCacheTests.java | 0 .../indices/IndicesServiceTests.java | 0 .../indices/NodeIndicesStatsTests.java | 0 .../indices/TermsLookupTests.java | 0 .../indices/analysis/AnalysisModuleTests.java | 0 .../PreBuiltAnalyzerIntegrationIT.java | 0 .../indices/analyze/AnalyzeActionIT.java | 0 .../indices/analyze/HunspellServiceTests.java | 0 ...actIndicesClusterStateServiceTestCase.java | 0 .../indices/cluster/ClusterStateChanges.java | 0 ...ClusterStateServiceRandomUpdatesTests.java | 0 .../exists/indices/IndicesExistsIT.java | 0 .../indices/exists/types/TypesExistsIT.java | 0 .../elasticsearch/indices/flush/FlushIT.java | 0 .../flush/SyncedFlushSingleNodeTests.java | 0 .../indices/flush/SyncedFlushUtil.java | 0 .../mapping/ConcurrentDynamicTemplateIT.java | 0 .../DedicatedMasterGetFieldMappingIT.java | 0 .../mapping/SimpleGetFieldMappingsIT.java | 0 .../indices/mapping/SimpleGetMappingsIT.java | 0 .../mapping/UpdateMappingIntegrationIT.java | 0 .../memory/breaker/CircuitBreakerNoopIT.java | 0 .../breaker/CircuitBreakerServiceIT.java | 0 .../breaker/CircuitBreakerUnitTests.java | 0 .../RandomExceptionCircuitBreakerIT.java | 0 .../recovery/IndexPrimaryRelocationIT.java | 0 .../indices/recovery/IndexRecoveryIT.java | 0 .../PeerRecoverySourceServiceTests.java | 0 .../PeerRecoveryTargetServiceTests.java | 0 .../RecoverySettingsDynamicUpdateTests.java | 0 .../recovery/RecoverySourceHandlerTests.java | 0 .../indices/recovery/RecoveryStatusTests.java | 0 .../indices/recovery/RecoveryTargetTests.java | 0 .../indices/recovery/RecoveryTests.java | 0 .../recovery/StartRecoveryRequestTests.java | 0 .../indices/settings/GetSettingsBlocksIT.java | 0 .../settings/UpdateNumberOfReplicasIT.java | 0 .../indices/settings/UpdateSettingsIT.java | 0 .../state/CloseIndexDisableCloseAllIT.java | 0 .../indices/state/OpenCloseIndexIT.java | 0 .../indices/state/RareClusterStateIT.java | 0 .../indices/state/SimpleIndexStateIT.java | 0 .../indices/stats/IndexStatsIT.java | 0 .../store/IndicesStoreIntegrationIT.java | 0 .../indices/store/IndicesStoreTests.java | 0 .../template/IndexTemplateBlocksIT.java | 0 .../template/SimpleIndexTemplateIT.java | 0 .../ingest/CompoundProcessorTests.java | 0 .../ingest/ConfigurationUtilsTests.java | 0 .../elasticsearch/ingest/IngestClientIT.java | 0 .../ingest/IngestDocumentTests.java | 0 .../ingest/IngestMetadataTests.java | 0 ...gestProcessorNotInstalledOnAllNodesIT.java | 0 .../ingest/IngestServiceTests.java | 0 .../ingest/IngestStatsTests.java | 0 .../ingest/PipelineConfigurationTests.java | 0 .../ingest/PipelineExecutionServiceTests.java | 0 .../ingest/PipelineFactoryTests.java | 0 .../ingest/PipelineStoreTests.java | 0 .../ingest/ValueSourceTests.java | 0 .../org/elasticsearch/mget/SimpleMgetIT.java | 0 .../monitor/fs/DeviceStatsTests.java | 0 .../monitor/fs/FsProbeTests.java | 0 .../jvm/JvmGcMonitorServiceSettingsTests.java | 0 .../monitor/jvm/JvmGcMonitorServiceTests.java | 0 .../monitor/jvm/JvmInfoTests.java | 0 .../monitor/jvm/JvmMonitorTests.java | 0 .../monitor/jvm/JvmStatsTests.java | 0 .../monitor/os/OsProbeTests.java | 0 .../monitor/os/OsStatsTests.java | 0 .../monitor/process/ProcessProbeTests.java | 0 .../node/InternalSettingsPreparerTests.java | 0 .../org/elasticsearch/node/NodeTests.java | 0 .../node/ResponseCollectorServiceTests.java | 0 .../node/service/NodeServiceTests.java | 0 .../nodesinfo/NodeInfoStreamingTests.java | 0 .../nodesinfo/SimpleNodesInfoIT.java | 0 .../DestructiveOperationsIT.java | 0 .../plugins/MetaPluginInfoTests.java | 0 .../plugins/PluginInfoTests.java | 0 .../plugins/PluginsServiceTests.java | 0 .../elasticsearch/plugins/PluginsTests.java | 0 .../spi/NamedXContentProviderTests.java | 0 .../recovery/FullRollingRestartIT.java | 0 .../recovery/RecoveriesCollectionTests.java | 0 .../recovery/RecoveryWhileUnderLoadIT.java | 0 .../elasticsearch/recovery/RelocationIT.java | 0 .../recovery/SimpleRecoveryIT.java | 0 .../recovery/TruncatedRecoveryIT.java | 0 .../repositories/IndexIdTests.java | 0 .../repositories/RepositoryDataTests.java | 0 .../BlobStoreRepositoryRestoreTests.java | 0 .../blobstore/BlobStoreRepositoryTests.java | 0 .../rest/BaseRestHandlerTests.java | 0 .../rest/BytesRestResponseTests.java | 0 .../rest/DeprecationRestHandlerTests.java | 0 .../rest/RestControllerTests.java | 0 .../rest/RestHttpResponseHeadersTests.java | 0 .../elasticsearch/rest/RestRequestTests.java | 0 .../elasticsearch/rest/RestUtilsTests.java | 0 .../rest/action/RestActionsTests.java | 0 .../rest/action/RestBuilderListenerTests.java | 0 .../rest/action/RestMainActionTests.java | 0 .../cluster/RestNodesStatsActionTests.java | 0 .../admin/indices/RestAnalyzeActionTests.java | 0 .../RestClearIndicesCacheActionTests.java | 0 .../indices/RestIndicesStatsActionTests.java | 0 .../action/cat/RestIndicesActionTests.java | 0 .../action/cat/RestRecoveryActionTests.java | 0 .../rest/action/cat/RestTableTests.java | 0 .../action/document/RestBulkActionTests.java | 0 .../action/document/RestIndexActionTests.java | 0 .../routing/AliasResolveRoutingIT.java | 0 .../elasticsearch/routing/AliasRoutingIT.java | 0 .../routing/PartitionedRoutingIT.java | 0 .../routing/SimpleRoutingIT.java | 0 .../script/ClassPermissionTests.java | 0 .../script/ScriptContextTests.java | 0 .../script/ScriptExceptionTests.java | 0 .../script/ScriptMetaDataTests.java | 0 .../script/ScriptServiceTests.java | 0 .../org/elasticsearch/script/ScriptTests.java | 0 .../script/StoredScriptSourceTests.java | 0 .../script/StoredScriptTests.java | 0 .../elasticsearch/script/StoredScriptsIT.java | 0 .../search/AbstractSearchTestCase.java | 0 .../search/ClearScrollResponseTests.java | 0 .../search/DefaultSearchContextTests.java | 0 .../search/DocValueFormatTests.java | 0 .../search/MultiValueModeTests.java | 0 .../search/NestedIdentityTests.java | 0 .../search/SearchCancellationIT.java | 0 .../search/SearchCancellationTests.java | 0 .../elasticsearch/search/SearchHitTests.java | 0 .../elasticsearch/search/SearchHitsTests.java | 0 .../search/SearchModuleTests.java | 0 .../search/SearchRequestTests.java | 0 .../search/SearchServiceTests.java | 0 .../search/SearchSortValuesTests.java | 0 .../elasticsearch/search/SearchTimeoutIT.java | 0 .../search/SearchWithRejectionsIT.java | 0 .../search/StressSearchServiceReaperIT.java | 0 .../AggregationCollectorTests.java | 0 .../AggregationTestScriptsPlugin.java | 0 .../AggregationsIntegrationIT.java | 0 .../aggregations/AggregationsTests.java | 0 .../AggregatorFactoriesTests.java | 0 .../BasePipelineAggregationTestCase.java | 0 .../search/aggregations/CombiIT.java | 0 .../search/aggregations/EquivalenceIT.java | 0 .../aggregations/FiltersAggsRewriteIT.java | 0 .../aggregations/InternalOrderTests.java | 0 .../search/aggregations/MetaDataIT.java | 0 .../search/aggregations/MissingValueIT.java | 0 .../MultiBucketAggregatorWrapperTests.java | 0 .../SubAggCollectionModeTests.java | 0 .../bucket/AdjacencyMatrixIT.java | 0 .../BestBucketsDeferringCollectorTests.java | 0 .../aggregations/bucket/BooleanTermsIT.java | 0 .../aggregations/bucket/BucketUtilsTests.java | 0 .../aggregations/bucket/DateHistogramIT.java | 0 .../bucket/DateHistogramOffsetIT.java | 0 .../bucket/DateHistogramTests.java | 0 .../aggregations/bucket/DateRangeIT.java | 0 .../aggregations/bucket/DateRangeTests.java | 0 .../bucket/DateScriptMocksPlugin.java | 0 .../bucket/DiversifiedSamplerIT.java | 0 .../aggregations/bucket/DoubleTermsIT.java | 0 .../search/aggregations/bucket/FilterIT.java | 0 .../aggregations/bucket/FilterTests.java | 0 .../search/aggregations/bucket/FiltersIT.java | 0 .../aggregations/bucket/FiltersTests.java | 0 .../aggregations/bucket/GeoDistanceIT.java | 0 .../bucket/GeoDistanceRangeTests.java | 0 .../aggregations/bucket/GeoHashGridIT.java | 0 .../aggregations/bucket/GeoHashGridTests.java | 0 .../bucket/GlobalAggregatorTests.java | 0 .../search/aggregations/bucket/GlobalIT.java | 0 .../aggregations/bucket/GlobalTests.java | 0 .../aggregations/bucket/HistogramIT.java | 0 .../aggregations/bucket/HistogramTests.java | 0 .../search/aggregations/bucket/IpRangeIT.java | 0 .../aggregations/bucket/IpRangeTests.java | 0 .../search/aggregations/bucket/IpTermsIT.java | 0 .../aggregations/bucket/LongTermsIT.java | 0 .../aggregations/bucket/MinDocCountIT.java | 0 .../search/aggregations/bucket/MissingIT.java | 0 .../aggregations/bucket/MissingTests.java | 0 .../aggregations/bucket/NaNSortingIT.java | 0 .../search/aggregations/bucket/NestedIT.java | 0 .../aggregations/bucket/ParentIdAggIT.java | 0 .../search/aggregations/bucket/RangeIT.java | 0 .../aggregations/bucket/RangeTests.java | 0 .../aggregations/bucket/ReverseNestedIT.java | 0 .../search/aggregations/bucket/SamplerIT.java | 0 .../aggregations/bucket/SamplerTests.java | 0 .../aggregations/bucket/ShardReduceIT.java | 0 .../aggregations/bucket/ShardSizeTermsIT.java | 0 .../bucket/ShardSizeTestCase.java | 0 .../SignificantTermsSignificanceScoreIT.java | 0 .../bucket/SignificantTermsTests.java | 0 .../bucket/SignificantTextTests.java | 0 .../bucket/TermsDocCountErrorIT.java | 0 .../bucket/TermsShardMinDocCountIT.java | 0 .../aggregations/bucket/TermsTests.java | 0 ...djacencyMatrixAggregationBuilderTests.java | 0 .../InternalAdjacencyMatrixTests.java | 0 .../CompositeAggregationBuilderTests.java | 0 .../composite/CompositeAggregatorTests.java | 0 .../composite/InternalCompositeTests.java | 0 .../bucket/filter/FilterAggregatorTests.java | 0 .../bucket/filter/FiltersAggregatorTests.java | 0 .../bucket/filter/InternalFilterTests.java | 0 .../bucket/filter/InternalFiltersTests.java | 0 .../geogrid/GeoHashGridAggregatorTests.java | 0 .../geogrid/GeoHashGridParserTests.java | 0 .../geogrid/InternalGeoHashGridTests.java | 0 .../bucket/global/InternalGlobalTests.java | 0 .../DateHistogramAggregatorTests.java | 0 .../bucket/histogram/ExtendedBoundsTests.java | 0 .../histogram/HistogramAggregatorTests.java | 0 .../histogram/InternalDateHistogramTests.java | 0 .../histogram/InternalHistogramTests.java | 0 .../bucket/missing/InternalMissingTests.java | 0 .../missing/MissingAggregatorTests.java | 0 .../bucket/nested/InternalNestedTests.java | 0 .../nested/InternalReverseNestedTests.java | 0 .../bucket/nested/NestedAggregatorTests.java | 0 .../bucket/nested/NestedTests.java | 0 .../nested/ReverseNestedAggregatorTests.java | 0 .../bucket/nested/ReverseNestedTests.java | 0 .../range/BinaryRangeAggregatorTests.java | 0 .../range/InternalBinaryRangeTests.java | 0 .../bucket/range/InternalDateRangeTests.java | 0 .../range/InternalGeoDistanceTests.java | 0 .../bucket/range/InternalRangeTestCase.java | 0 .../bucket/range/InternalRangeTests.java | 0 .../bucket/range/IpRangeAggregatorTests.java | 0 .../BestDocsDeferringCollectorTests.java | 0 .../DiversifiedAggregationBuilderTests.java | 0 .../sampler/DiversifiedSamplerTests.java | 0 .../bucket/sampler/InternalSamplerTests.java | 0 .../sampler/SamplerAggregatorTests.java | 0 .../InternalSignificantTermsTestCase.java | 0 .../SignificanceHeuristicTests.java | 0 .../SignificantLongTermsTests.java | 0 .../SignificantStringTermsTests.java | 0 .../SignificantTermsAggregatorTests.java | 0 .../SignificantTextAggregatorTests.java | 0 .../bucket/terms/DoubleTermsTests.java | 0 .../bucket/terms/InternalTermsTestCase.java | 0 .../bucket/terms/LongTermsTests.java | 0 .../bucket/terms/StringTermsIT.java | 0 .../bucket/terms/StringTermsTests.java | 0 .../terms/TermsAggregatorFactoryTests.java | 0 .../bucket/terms/TermsAggregatorTests.java | 0 .../metrics/AbstractGeoTestCase.java | 0 .../AbstractNumericMetricTestCase.java | 0 .../metrics/AdjacencyMatrixTests.java | 0 .../search/aggregations/metrics/AvgIT.java | 0 .../search/aggregations/metrics/AvgTests.java | 0 .../metrics/CardinalityAggregatorTests.java | 0 .../aggregations/metrics/CardinalityIT.java | 0 .../metrics/ExtendedStatsAggregatorTests.java | 0 .../aggregations/metrics/ExtendedStatsIT.java | 0 .../metrics/ExtendedStatsTests.java | 0 .../aggregations/metrics/GeoBoundsIT.java | 0 .../aggregations/metrics/GeoBoundsTests.java | 0 .../aggregations/metrics/GeoCentroidIT.java | 0 .../metrics/GeoCentroidTests.java | 0 .../metrics/HDRPercentileRanksIT.java | 0 .../metrics/HDRPercentilesIT.java | 0 .../metrics/InternalExtendedStatsTests.java | 0 .../metrics/InternalMaxTests.java | 0 .../metrics/InternalMinTests.java | 0 .../metrics/InternalStatsBucketTests.java | 0 .../metrics/InternalStatsTests.java | 0 .../metrics/InternalSumTests.java | 0 .../metrics/MaxAggregatorTests.java | 0 .../search/aggregations/metrics/MaxIT.java | 0 .../search/aggregations/metrics/MaxTests.java | 0 .../metrics/MetricAggScriptPlugin.java | 0 .../metrics/MinAggregatorTests.java | 0 .../search/aggregations/metrics/MinIT.java | 0 .../search/aggregations/metrics/MinTests.java | 0 .../metrics/PercentileRanksTests.java | 0 .../metrics/PercentilesTests.java | 0 .../metrics/ScriptedMetricIT.java | 0 .../metrics/ScriptedMetricTests.java | 0 .../metrics/StatsAggregatorTests.java | 0 .../search/aggregations/metrics/StatsIT.java | 0 .../aggregations/metrics/StatsTests.java | 0 .../metrics/SumAggregatorTests.java | 0 .../search/aggregations/metrics/SumIT.java | 0 .../search/aggregations/metrics/SumTests.java | 0 .../metrics/TDigestPercentileRanksIT.java | 0 .../metrics/TDigestPercentilesIT.java | 0 .../aggregations/metrics/TopHitsIT.java | 0 .../aggregations/metrics/TopHitsTests.java | 0 .../aggregations/metrics/ValueCountIT.java | 0 .../aggregations/metrics/ValueCountTests.java | 0 .../metrics/avg/AvgAggregatorTests.java | 0 .../metrics/avg/InternalAvgTests.java | 0 .../metrics/cardinality/CardinalityTests.java | 0 .../cardinality/HyperLogLogPlusPlusTests.java | 0 .../cardinality/InternalCardinalityTests.java | 0 .../geobounds/GeoBoundsAggregatorTests.java | 0 .../geobounds/InternalGeoBoundsTests.java | 0 .../GeoCentroidAggregatorTests.java | 0 .../geocentroid/InternalGeoCentroidTests.java | 0 .../AbstractPercentilesTestCase.java | 0 .../InternalPercentilesRanksTestCase.java | 0 .../InternalPercentilesTestCase.java | 0 .../percentiles/PercentilesMethodTests.java | 0 .../HDRPercentileRanksAggregatorTests.java | 0 .../hdr/HDRPercentilesAggregatorTests.java | 0 .../hdr/InternalHDRPercentilesRanksTests.java | 0 .../hdr/InternalHDRPercentilesTests.java | 0 .../InternalTDigestPercentilesRanksTests.java | 0 .../InternalTDigestPercentilesTests.java | 0 ...TDigestPercentileRanksAggregatorTests.java | 0 .../TDigestPercentilesAggregatorTests.java | 0 .../scripted/InternalScriptedMetricTests.java | 0 .../ScriptedMetricAggregatorTests.java | 0 .../metrics/tophits/InternalTopHitsTests.java | 0 .../tophits/TopHitsAggregatorTests.java | 0 .../valuecount/InternalValueCountTests.java | 0 .../valuecount/ValueCountAggregatorTests.java | 0 .../aggregations/pipeline/AvgBucketIT.java | 0 .../aggregations/pipeline/BucketScriptIT.java | 0 .../pipeline/BucketScriptTests.java | 0 .../pipeline/BucketSelectorIT.java | 0 .../pipeline/BucketSelectorTests.java | 0 .../pipeline/CumulativeSumIT.java | 0 .../pipeline/CumulativeSumTests.java | 0 .../pipeline/DateDerivativeIT.java | 0 .../aggregations/pipeline/DerivativeIT.java | 0 .../pipeline/DerivativeTests.java | 0 .../pipeline/ExtendedStatsBucketIT.java | 0 .../pipeline/InternalSimpleValueTests.java | 0 .../aggregations/pipeline/MaxBucketIT.java | 0 .../aggregations/pipeline/MinBucketIT.java | 0 .../pipeline/PercentilesBucketIT.java | 0 .../PipelineAggregationHelperTests.java | 0 .../pipeline/SerialDifferenceTests.java | 0 .../aggregations/pipeline/StatsBucketIT.java | 0 .../aggregations/pipeline/SumBucketIT.java | 0 .../AbstractBucketMetricsTestCase.java | 0 .../bucketmetrics/AvgBucketTests.java | 0 .../ExtendedStatsBucketTests.java | 0 .../InternalBucketMetricValueTests.java | 0 .../bucketmetrics/MaxBucketTests.java | 0 .../bucketmetrics/MinBucketTests.java | 0 .../bucketmetrics/PercentilesBucketTests.java | 0 .../bucketmetrics/StatsBucketTests.java | 0 .../bucketmetrics/SumBucketTests.java | 0 .../InternalPercentilesBucketTests.java | 0 .../InternalExtendedStatsBucketTests.java | 0 .../pipeline/bucketsort/BucketSortIT.java | 0 .../pipeline/bucketsort/BucketSortTests.java | 0 .../derivative/InternalDerivativeTests.java | 0 .../pipeline/moving/avg/MovAvgIT.java | 0 .../pipeline/moving/avg/MovAvgTests.java | 0 .../pipeline/moving/avg/MovAvgUnitTests.java | 0 .../pipeline/serialdiff/SerialDiffIT.java | 0 .../support/IncludeExcludeTests.java | 0 .../support/MissingValuesTests.java | 0 .../aggregations/support/PathTests.java | 0 .../support/ScriptValuesTests.java | 0 .../aggregations/support/ValueTypeTests.java | 0 .../support/ValuesSourceConfigTests.java | 0 .../basic/SearchWhileCreatingIndexIT.java | 0 .../search/basic/SearchWhileRelocatingIT.java | 0 .../basic/SearchWithRandomExceptionsIT.java | 0 .../basic/SearchWithRandomIOExceptionsIT.java | 0 .../basic/TransportSearchFailuresIT.java | 0 .../basic/TransportTwoNodesSearchIT.java | 0 .../builder/SearchSourceBuilderTests.java | 0 .../search/child/ParentFieldLoadingIT.java | 0 .../search/collapse/CollapseBuilderTests.java | 0 .../search/fetch/FetchSubPhasePluginIT.java | 0 .../subphase/FetchSourceSubPhaseTests.java | 0 .../search/fetch/subphase/InnerHitsIT.java | 0 .../fetch/subphase/MatchedQueriesIT.java | 0 .../ParentFieldSubFetchPhaseTests.java | 0 .../subphase/highlight/CustomHighlighter.java | 0 .../highlight/CustomHighlighterPlugin.java | 0 .../highlight/CustomHighlighterSearchIT.java | 0 .../highlight/HighlightBuilderTests.java | 0 .../highlight/HighlightFieldTests.java | 0 .../highlight/HighlighterSearchIT.java | 0 .../highlight/PlainHighlighterTests.java | 0 .../search/fields/SearchFieldsIT.java | 0 .../functionscore/DecayFunctionScoreIT.java | 0 .../functionscore/ExplainableScriptIT.java | 0 .../FunctionScoreFieldValueIT.java | 0 .../search/functionscore/FunctionScoreIT.java | 0 .../functionscore/FunctionScorePluginIT.java | 0 .../search/functionscore/QueryRescorerIT.java | 0 .../functionscore/RandomScoreFunctionIT.java | 0 .../search/geo/GeoBoundingBoxIT.java | 0 .../search/geo/GeoDistanceIT.java | 0 .../elasticsearch/search/geo/GeoFilterIT.java | 0 .../search/geo/GeoPolygonIT.java | 0 .../search/geo/GeoShapeIntegrationIT.java | 0 .../search/geo/GeoShapeQueryTests.java | 0 .../search/internal/AliasFilterTests.java | 0 .../search/internal/ScrollContextTests.java | 0 .../ShardSearchTransportRequestTests.java | 0 .../search/morelikethis/MoreLikeThisIT.java | 0 .../search/msearch/MultiSearchIT.java | 0 .../search/nested/SimpleNestedIT.java | 0 .../search/preference/SearchPreferenceIT.java | 0 .../search/profile/ProfileResultTests.java | 0 .../SearchProfileShardResultsTests.java | 0 .../search/profile/TimerTests.java | 0 .../AggregationProfileShardResultTests.java | 0 .../aggregation/AggregationProfilerIT.java | 0 .../profile/query/CollectorResultTests.java | 0 .../query/QueryProfileShardResultTests.java | 0 .../search/profile/query/QueryProfilerIT.java | 0 .../profile/query/QueryProfilerTests.java | 0 .../profile/query/RandomQueryGenerator.java | 0 .../elasticsearch/search/query/ExistsIT.java | 0 .../search/query/MultiMatchQueryIT.java | 0 .../search/query/QueryPhaseTests.java | 0 .../search/query/QueryStringIT.java | 0 .../search/query/SearchQueryIT.java | 0 .../search/query/SimpleQueryStringIT.java | 0 .../search/rescore/QueryRescoreModeTests.java | 0 .../rescore/QueryRescorerBuilderTests.java | 0 .../scriptfilter/ScriptQuerySearchIT.java | 0 .../search/scroll/DuelScrollIT.java | 0 .../scroll/RestClearScrollActionTests.java | 0 .../scroll/RestSearchScrollActionTests.java | 0 .../search/scroll/SearchScrollIT.java | 0 .../SearchScrollWithFailingNodesIT.java | 0 .../searchafter/SearchAfterBuilderTests.java | 0 .../search/searchafter/SearchAfterIT.java | 0 .../search/simple/SimpleSearchIT.java | 0 .../slice/DocValuesSliceQueryTests.java | 0 .../search/slice/SearchSliceIT.java | 0 .../search/slice/SliceBuilderTests.java | 0 .../search/slice/TermsSliceQueryTests.java | 0 .../search/sort/AbstractSortTestCase.java | 0 .../search/sort/FieldSortBuilderTests.java | 0 .../search/sort/FieldSortIT.java | 0 .../search/sort/GeoDistanceIT.java | 0 .../search/sort/GeoDistanceSortBuilderIT.java | 0 .../sort/GeoDistanceSortBuilderTests.java | 0 .../search/sort/NestedSortBuilderTests.java | 0 .../search/sort/ScoreSortBuilderTests.java | 0 .../search/sort/ScriptSortBuilderTests.java | 0 .../search/sort/SimpleSortIT.java | 0 .../search/sort/SortBuilderTests.java | 0 .../search/sort/SortModeTests.java | 0 .../search/sort/SortOrderTests.java | 0 .../search/source/MetadataFetchingIT.java | 0 .../search/source/SourceFetchingIT.java | 0 .../search/stats/SearchStatsIT.java | 0 .../search/stats/SearchStatsUnitTests.java | 0 .../AbstractSuggestionBuilderTestCase.java | 0 .../suggest/CompletionSuggestSearchIT.java | 0 .../CompletionSuggestionOptionTests.java | 0 .../ContextCompletionSuggestSearchIT.java | 0 .../search/suggest/CustomSuggester.java | 0 .../suggest/CustomSuggesterSearchIT.java | 0 .../search/suggest/SuggestBuilderTests.java | 0 .../search/suggest/SuggestSearchIT.java | 0 .../search/suggest/SuggestTests.java | 0 .../search/suggest/SuggestionEntryTests.java | 0 .../search/suggest/SuggestionOptionTests.java | 0 .../search/suggest/SuggestionTests.java | 0 .../suggest/TermSuggestionOptionTests.java | 0 .../CategoryContextMappingTests.java | 0 .../completion/CategoryQueryContextTests.java | 0 .../CompletionSuggesterBuilderTests.java | 0 .../completion/CompletionSuggestionTests.java | 0 .../suggest/completion/FuzzyOptionsTests.java | 0 .../completion/GeoContextMappingTests.java | 0 .../completion/GeoQueryContextTests.java | 0 .../completion/QueryContextTestCase.java | 0 .../suggest/completion/RegexOptionsTests.java | 0 .../phrase/DirectCandidateGeneratorTests.java | 0 .../suggest/phrase/LaplaceModelTests.java | 0 .../phrase/LinearInterpolationModelTests.java | 0 .../phrase/NoisyChannelSpellCheckerTests.java | 0 .../phrase/PhraseSuggestionBuilderTests.java | 0 .../phrase/SmoothingModelTestCase.java | 0 .../phrase/StupidBackoffModelTests.java | 0 .../search/suggest/term/SortByTests.java | 0 .../suggest/term/StringDistanceImplTests.java | 0 .../search/suggest/term/SuggestModeTests.java | 0 .../term/TermSuggestionBuilderTests.java | 0 .../similarity/SimilarityIT.java | 0 .../AbstractSnapshotIntegTestCase.java | 0 .../snapshots/BlobStoreFormatIT.java | 0 .../DedicatedClusterSnapshotRestoreIT.java | 0 .../snapshots/FsBlobStoreRepositoryIT.java | 0 .../MinThreadsSnapshotRestoreIT.java | 0 .../snapshots/RepositoriesIT.java | 0 ...epositoriesMetaDataSerializationTests.java | 0 .../SharedClusterSnapshotRestoreIT.java | 0 .../snapshots/SnapshotRequestsTests.java | 0 .../snapshots/SnapshotShardsServiceIT.java | 0 .../snapshots/SnapshotTests.java | 0 .../snapshots/SnapshotUtilsTests.java | 0 ...SnapshotsInProgressSerializationTests.java | 0 .../mockstore/BlobContainerWrapper.java | 0 .../snapshots/mockstore/BlobStoreWrapper.java | 0 .../snapshots/mockstore/MockRepository.java | 0 .../tasks/ListTasksResponseTests.java | 0 .../org/elasticsearch/tasks/TaskIdTests.java | 0 .../elasticsearch/tasks/TaskResultTests.java | 0 .../org/elasticsearch/test/NoopDiscovery.java | 0 .../test/geo/RandomGeoGenerator.java | 0 .../test/geo/RandomShapeGenerator.java | 0 .../test/hamcrest/DoubleMatcher.java | 0 .../hamcrest/ElasticsearchGeoAssertions.java | 0 .../SharedSignificantTermsTestMethods.java | 0 ...utoQueueAdjustingExecutorBuilderTests.java | 0 .../threadpool/ESThreadPoolTestCase.java | 0 .../threadpool/FixedThreadPoolTests.java | 0 .../threadpool/ScalingThreadPoolTests.java | 0 .../ScheduleWithFixedDelayTests.java | 0 .../threadpool/SimpleThreadPoolIT.java | 0 .../ThreadPoolSerializationTests.java | 0 .../threadpool/ThreadPoolStatsTests.java | 0 .../threadpool/ThreadPoolTests.java | 0 .../UpdateThreadPoolSettingsTests.java | 0 .../transport/ActionNamesIT.java | 0 .../CompressibleBytesOutputStreamTests.java | 0 .../transport/ConnectionProfileTests.java | 0 .../transport/PublishPortTests.java | 0 .../RemoteClusterConnectionTests.java | 0 .../transport/RemoteClusterServiceTests.java | 0 .../transport/TcpTransportTests.java | 0 .../transport/TransportActionProxyTests.java | 0 .../TransportServiceHandshakeTests.java | 0 .../org/elasticsearch/update/UpdateIT.java | 0 .../elasticsearch/update/UpdateNoopIT.java | 0 .../usage/UsageServiceTests.java | 0 .../validate/SimpleValidateQueryIT.java | 0 .../ConcurrentDocumentOperationIT.java | 0 .../versioning/SimpleVersioningIT.java | 0 .../watcher/FileWatcherTests.java | 0 .../watcher/ResourceWatcherServiceTests.java | 0 ...icsearch.plugins.spi.NamedXContentProvider | 0 .../test/resources/config/elasticsearch.json | 0 .../test/resources/config/elasticsearch.yml | 0 .../test/resources/config/garbage/garbage.yml | 0 .../analyze/conf_dir/hunspell/en_US/en_US.aff | 0 .../analyze/conf_dir/hunspell/en_US/en_US.dic | 0 .../conf_dir/hunspell/en_US_custom/en_US.aff | 0 .../conf_dir/hunspell/en_US_custom/en_US.dic | 0 .../hunspell/en_US_custom/settings.yml | 0 .../no_aff_conf_dir/hunspell/en_US/en_US.dic | 0 .../two_aff_conf_dir/hunspell/en_US/en_AU.aff | 0 .../two_aff_conf_dir/hunspell/en_US/en_US.aff | 0 .../two_aff_conf_dir/hunspell/en_US/en_US.dic | 0 .../indices/bwc/compressed-repo-1.7.4.zip | Bin .../indices/bwc/unsupported-0.20.6.zip | Bin .../indices/bwc/unsupported-0.90.0.Beta1.zip | Bin .../indices/bwc/unsupported-0.90.0.RC1.zip | Bin .../indices/bwc/unsupported-0.90.0.RC2.zip | Bin .../indices/bwc/unsupported-0.90.0.zip | Bin .../indices/bwc/unsupported-0.90.1.zip | Bin .../indices/bwc/unsupported-0.90.10.zip | Bin .../indices/bwc/unsupported-0.90.11.zip | Bin .../indices/bwc/unsupported-0.90.12.zip | Bin .../indices/bwc/unsupported-0.90.13.zip | Bin .../indices/bwc/unsupported-0.90.2.zip | Bin .../indices/bwc/unsupported-0.90.3.zip | Bin .../indices/bwc/unsupported-0.90.4.zip | Bin .../indices/bwc/unsupported-0.90.5.zip | Bin .../indices/bwc/unsupported-0.90.6.zip | Bin .../indices/bwc/unsupported-0.90.7.zip | Bin .../indices/bwc/unsupported-0.90.8.zip | Bin .../indices/bwc/unsupported-0.90.9.zip | Bin .../indices/bwc/unsupported-1.0.0.Beta1.zip | Bin .../indices/bwc/unsupported-1.0.0.Beta2.zip | Bin .../indices/bwc/unsupported-1.0.0.RC1.zip | Bin .../indices/bwc/unsupported-1.0.0.RC2.zip | Bin .../indices/bwc/unsupported-1.0.0.zip | Bin .../indices/bwc/unsupported-1.0.1.zip | Bin .../indices/bwc/unsupported-1.0.2.zip | Bin .../indices/bwc/unsupported-1.0.3.zip | Bin .../indices/bwc/unsupported-1.1.0.zip | Bin .../indices/bwc/unsupported-1.1.1.zip | Bin .../indices/bwc/unsupported-1.1.2.zip | Bin .../indices/bwc/unsupported-1.2.0.zip | Bin .../indices/bwc/unsupported-1.2.1.zip | Bin .../indices/bwc/unsupported-1.2.2.zip | Bin .../indices/bwc/unsupported-1.2.3.zip | Bin .../indices/bwc/unsupported-1.2.4.zip | Bin .../indices/bwc/unsupported-1.3.0.zip | Bin .../indices/bwc/unsupported-1.3.1.zip | Bin .../indices/bwc/unsupported-1.3.2.zip | Bin .../indices/bwc/unsupported-1.3.3.zip | Bin .../indices/bwc/unsupported-1.3.4.zip | Bin .../indices/bwc/unsupported-1.3.5.zip | Bin .../indices/bwc/unsupported-1.3.6.zip | Bin .../indices/bwc/unsupported-1.3.7.zip | Bin .../indices/bwc/unsupported-1.3.8.zip | Bin .../indices/bwc/unsupported-1.3.9.zip | Bin .../indices/bwc/unsupported-1.4.0.Beta1.zip | Bin .../indices/bwc/unsupported-1.4.0.zip | Bin .../indices/bwc/unsupported-1.4.1.zip | Bin .../indices/bwc/unsupported-1.4.2.zip | Bin .../indices/bwc/unsupported-1.4.3.zip | Bin .../indices/bwc/unsupported-1.4.4.zip | Bin .../indices/bwc/unsupported-1.4.5.zip | Bin .../indices/bwc/unsupported-1.5.0.zip | Bin .../indices/bwc/unsupported-1.5.1.zip | Bin .../indices/bwc/unsupported-1.5.2.zip | Bin .../indices/bwc/unsupported-1.6.0.zip | Bin .../indices/bwc/unsupported-1.6.1.zip | Bin .../indices/bwc/unsupported-1.6.2.zip | Bin .../indices/bwc/unsupported-1.7.0.zip | Bin .../indices/bwc/unsupported-1.7.1.zip | Bin .../indices/bwc/unsupported-1.7.2.zip | Bin .../indices/bwc/unsupported-1.7.3.zip | Bin .../indices/bwc/unsupported-1.7.4.zip | Bin .../indices/bwc/unsupported-1.7.5.zip | Bin .../indices/bwc/unsupported-2.0.0-beta1.zip | Bin .../indices/bwc/unsupported-2.0.0-beta2.zip | Bin .../indices/bwc/unsupported-2.0.0-rc1.zip | Bin .../indices/bwc/unsupported-2.0.0.zip | Bin .../indices/bwc/unsupported-2.0.1.zip | Bin .../indices/bwc/unsupported-2.0.2.zip | Bin .../indices/bwc/unsupported-2.1.0.zip | Bin .../indices/bwc/unsupported-2.1.1.zip | Bin .../indices/bwc/unsupported-2.1.2.zip | Bin .../indices/bwc/unsupported-2.2.0.zip | Bin .../indices/bwc/unsupported-2.2.1.zip | Bin .../indices/bwc/unsupported-2.2.2.zip | Bin .../indices/bwc/unsupported-2.3.0.zip | Bin .../indices/bwc/unsupported-2.3.1.zip | Bin .../indices/bwc/unsupported-2.3.2.zip | Bin .../indices/bwc/unsupported-2.3.3.zip | Bin .../indices/bwc/unsupported-2.3.4.zip | Bin .../indices/bwc/unsupported-2.3.5.zip | Bin .../indices/bwc/unsupported-2.4.0.zip | Bin .../indices/bwc/unsupported-2.4.1.zip | Bin .../indices/bwc/unsupported-2.4.2.zip | Bin .../indices/bwc/unsupported-2.4.3.zip | Bin .../indices/bwc/unsupported-2.4.5.zip | Bin .../indices/bwc/unsupportedrepo-0.20.6.zip | Bin .../bwc/unsupportedrepo-1.0.0.Beta2.zip | Bin .../indices/bwc/unsupportedrepo-1.0.0.RC1.zip | Bin .../indices/bwc/unsupportedrepo-1.0.0.RC2.zip | Bin .../indices/bwc/unsupportedrepo-1.0.0.zip | Bin .../indices/bwc/unsupportedrepo-1.0.1.zip | Bin .../indices/bwc/unsupportedrepo-1.0.2.zip | Bin .../indices/bwc/unsupportedrepo-1.0.3.zip | Bin .../indices/bwc/unsupportedrepo-1.1.0.zip | Bin .../indices/bwc/unsupportedrepo-1.1.1.zip | Bin .../indices/bwc/unsupportedrepo-1.1.2.zip | Bin .../indices/bwc/unsupportedrepo-1.2.0.zip | Bin .../indices/bwc/unsupportedrepo-1.2.1.zip | Bin .../indices/bwc/unsupportedrepo-1.2.2.zip | Bin .../indices/bwc/unsupportedrepo-1.2.3.zip | Bin .../indices/bwc/unsupportedrepo-1.2.4.zip | Bin .../indices/bwc/unsupportedrepo-1.3.0.zip | Bin .../indices/bwc/unsupportedrepo-1.3.1.zip | Bin .../indices/bwc/unsupportedrepo-1.3.2.zip | Bin .../indices/bwc/unsupportedrepo-1.3.3.zip | Bin .../indices/bwc/unsupportedrepo-1.3.4.zip | Bin .../indices/bwc/unsupportedrepo-1.3.5.zip | Bin .../indices/bwc/unsupportedrepo-1.3.6.zip | Bin .../indices/bwc/unsupportedrepo-1.3.7.zip | Bin .../indices/bwc/unsupportedrepo-1.3.8.zip | Bin .../indices/bwc/unsupportedrepo-1.3.9.zip | Bin .../bwc/unsupportedrepo-1.4.0.Beta1.zip | Bin .../indices/bwc/unsupportedrepo-1.4.0.zip | Bin .../indices/bwc/unsupportedrepo-1.4.1.zip | Bin .../indices/bwc/unsupportedrepo-1.4.2.zip | Bin .../indices/bwc/unsupportedrepo-1.4.3.zip | Bin .../indices/bwc/unsupportedrepo-1.4.4.zip | Bin .../indices/bwc/unsupportedrepo-1.4.5.zip | Bin .../indices/bwc/unsupportedrepo-1.5.0.zip | Bin .../indices/bwc/unsupportedrepo-1.5.1.zip | Bin .../indices/bwc/unsupportedrepo-1.5.2.zip | Bin .../indices/bwc/unsupportedrepo-1.6.0.zip | Bin .../indices/bwc/unsupportedrepo-1.6.1.zip | Bin .../indices/bwc/unsupportedrepo-1.6.2.zip | Bin .../indices/bwc/unsupportedrepo-1.7.0.zip | Bin .../indices/bwc/unsupportedrepo-1.7.1.zip | Bin .../indices/bwc/unsupportedrepo-1.7.2.zip | Bin .../indices/bwc/unsupportedrepo-1.7.3.zip | Bin .../indices/bwc/unsupportedrepo-1.7.4.zip | Bin .../indices/bwc/unsupportedrepo-1.7.5.zip | Bin .../bwc/unsupportedrepo-2.0.0-beta1.zip | Bin .../bwc/unsupportedrepo-2.0.0-beta2.zip | Bin .../indices/bwc/unsupportedrepo-2.0.0-rc1.zip | Bin .../indices/bwc/unsupportedrepo-2.0.0.zip | Bin .../indices/bwc/unsupportedrepo-2.0.1.zip | Bin .../indices/bwc/unsupportedrepo-2.0.2.zip | Bin .../indices/bwc/unsupportedrepo-2.1.0.zip | Bin .../indices/bwc/unsupportedrepo-2.1.1.zip | Bin .../indices/bwc/unsupportedrepo-2.1.2.zip | Bin .../indices/bwc/unsupportedrepo-2.2.0.zip | Bin .../indices/bwc/unsupportedrepo-2.2.1.zip | Bin .../indices/bwc/unsupportedrepo-2.2.2.zip | Bin .../indices/bwc/unsupportedrepo-2.3.0.zip | Bin .../indices/bwc/unsupportedrepo-2.3.1.zip | Bin .../indices/bwc/unsupportedrepo-2.3.2.zip | Bin .../indices/bwc/unsupportedrepo-2.3.3.zip | Bin .../indices/bwc/unsupportedrepo-2.3.4.zip | Bin .../indices/bwc/unsupportedrepo-2.3.5.zip | Bin .../indices/bwc/unsupportedrepo-2.4.0.zip | Bin .../indices/bwc/unsupportedrepo-2.4.1.zip | Bin .../indices/bwc/unsupportedrepo-2.4.2.zip | Bin .../indices/bwc/unsupportedrepo-2.4.3.zip | Bin .../indices/bwc/unsupportedrepo-2.4.5.zip | Bin .../elasticsearch/action/bulk/bulk-log.json | 0 .../action/bulk/simple-bulk.json | 0 .../action/bulk/simple-bulk10.json | 0 .../action/bulk/simple-bulk11.json | 0 .../action/bulk/simple-bulk2.json | 0 .../action/bulk/simple-bulk3.json | 0 .../action/bulk/simple-bulk4.json | 0 .../action/bulk/simple-bulk5.json | 0 .../action/bulk/simple-bulk6.json | 0 .../action/bulk/simple-bulk7.json | 0 .../action/bulk/simple-bulk8.json | 0 .../action/bulk/simple-bulk9.json | 0 .../fieldstats-index-constraints-request.json | 0 .../action/search/simple-msearch1.json | 0 .../action/search/simple-msearch2.json | 0 .../action/search/simple-msearch3.json | 0 .../action/search/simple-msearch4.json | 0 .../action/search/simple-msearch5.json | 0 .../action/termvectors/multiRequest1.json | 0 .../action/termvectors/multiRequest2.json | 0 .../action/termvectors/multiRequest3.json | 0 .../bootstrap/duplicate-classes.jar | Bin .../bootstrap/duplicate-xmlbeans-classes.jar | Bin .../cluster/routing/issue_9023.zip | Bin .../settings/loader/indentation-settings.yml | 0 ...-with-explicit-document-start-settings.yml | 0 .../common/settings/loader/test-settings.json | 0 .../common/settings/loader/test-settings.yml | 0 .../org/elasticsearch/gateway/global-3.st | Bin .../index/analysis/shingle_analysis.json | 0 .../index/analysis/shingle_analysis2.json | 0 .../elasticsearch/index/analysis/stop.json | 0 .../index/analysis/synonyms/synonyms.json | 0 .../index/analysis/synonyms/synonyms.txt | 0 .../analysis/synonyms/synonyms_wordnet.txt | 0 .../elasticsearch/index/analysis/test1.json | 0 .../elasticsearch/index/analysis/test1.yml | 0 .../genericstore/test-data.json | 0 .../genericstore/test-mapping.json | 0 .../dynamictemplate/pathmatch/test-data.json | 0 .../pathmatch/test-mapping.json | 0 .../dynamictemplate/simple/test-data.json | 0 .../dynamictemplate/simple/test-mapping.json | 0 .../mapper/multifield/merge/test-data.json | 0 .../multifield/merge/test-mapping1.json | 0 .../multifield/merge/test-mapping2.json | 0 .../multifield/merge/test-mapping3.json | 0 .../multifield/merge/test-mapping4.json | 0 .../mapper/multifield/merge/upgrade1.json | 0 .../mapper/multifield/merge/upgrade2.json | 0 .../mapper/multifield/merge/upgrade3.json | 0 .../index/mapper/multifield/test-data.json | 0 .../mapper/multifield/test-multi-fields.json | 0 .../index/mapper/path/test-mapping.json | 0 .../index/mapper/simple/test-mapping.json | 0 .../mapper/simple/test1-notype-noid.json | 0 .../index/mapper/simple/test1.json | 0 .../index/query/commonTerms-query1.json | 0 .../index/query/commonTerms-query2.json | 0 .../index/query/commonTerms-query3.json | 0 .../index/query/geo_polygon_exception_1.json | 0 .../index/query/geo_polygon_exception_2.json | 0 .../index/query/geo_polygon_exception_3.json | 0 .../index/query/geo_polygon_exception_4.json | 0 .../index/query/geo_polygon_exception_5.json | 0 .../translog-invalid-first-byte.binary | Bin .../index/translog/translog-v0.binary | Bin .../translog-v1-corrupted-body.binary | Bin .../translog-v1-corrupted-magic.binary | Bin .../translog/translog-v1-truncated.binary | Bin .../index/translog/translog-v1.binary | Bin .../elasticsearch/plugins/dummy-plugin.jar | Bin .../plugins/non-extensible-plugin.jar | Bin .../elasticsearch/search/geo/gzippedmap.gz | Bin .../search/query/all-example-document.json | 0 .../search/query/all-query-index.json | 0 settings.gradle | 16 +- 4641 files changed, 744 insertions(+), 744 deletions(-) rename buildSrc/src/main/resources/forbidden/{es-core-signatures.txt => es-server-signatures.txt} (100%) rename {core => server}/build.gradle (98%) rename {core => server}/cli/build.gradle (95%) rename {core => server}/cli/licenses/jopt-simple-5.0.2.jar.sha1 (100%) rename {core => server}/cli/licenses/jopt-simple-LICENSE.txt (100%) rename {core => server}/cli/licenses/jopt-simple-NOTICE.txt (100%) rename {core => server}/cli/src/main/java/org/elasticsearch/cli/Command.java (100%) rename {core => server}/cli/src/main/java/org/elasticsearch/cli/ExitCodes.java (100%) rename {core => server}/cli/src/main/java/org/elasticsearch/cli/MultiCommand.java (100%) rename {core => server}/cli/src/main/java/org/elasticsearch/cli/SuppressForbidden.java (100%) rename {core => server}/cli/src/main/java/org/elasticsearch/cli/Terminal.java (100%) rename {core => server}/cli/src/main/java/org/elasticsearch/cli/UserException.java (100%) rename {core => server}/licenses/HdrHistogram-2.1.9.jar.sha1 (100%) rename {core => server}/licenses/HdrHistogram-LICENSE.txt (100%) rename {core => server}/licenses/HdrHistogram-NOTICE.txt (100%) rename {core => server}/licenses/apache-log4j-extras-DEPENDENCIES (100%) rename {core => server}/licenses/hppc-0.7.1.jar.sha1 (100%) rename {core => server}/licenses/hppc-LICENSE.txt (100%) rename {core => server}/licenses/hppc-NOTICE.txt (100%) rename {core => server}/licenses/jackson-LICENSE (100%) rename {core => server}/licenses/jackson-NOTICE (100%) rename {core => server}/licenses/jackson-core-2.8.10.jar.sha1 (100%) rename {core => server}/licenses/jackson-dataformat-cbor-2.8.10.jar.sha1 (100%) rename {core => server}/licenses/jackson-dataformat-smile-2.8.10.jar.sha1 (100%) rename {core => server}/licenses/jackson-dataformat-yaml-2.8.10.jar.sha1 (100%) rename {core => server}/licenses/jna-4.5.1.jar.sha1 (100%) rename {core => server}/licenses/jna-LICENSE.txt (100%) rename {core => server}/licenses/jna-NOTICE.txt (100%) rename {core => server}/licenses/joda-time-2.9.5.jar.sha1 (100%) rename {core => server}/licenses/joda-time-LICENSE.txt (100%) rename {core => server}/licenses/joda-time-NOTICE.txt (100%) rename {core => server}/licenses/jts-1.13.jar.sha1 (100%) rename {core => server}/licenses/jts-LICENSE.txt (100%) rename {core => server}/licenses/jts-NOTICE.txt (100%) rename {core => server}/licenses/log4j-1.2-api-2.9.1.jar.sha1 (100%) rename {core => server}/licenses/log4j-LICENSE.txt (100%) rename {core => server}/licenses/log4j-NOTICE.txt (100%) rename {core => server}/licenses/log4j-api-2.9.1.jar.sha1 (100%) rename {core => server}/licenses/log4j-api-LICENSE.txt (100%) rename {core => server}/licenses/log4j-api-NOTICE.txt (100%) rename {core => server}/licenses/log4j-core-2.9.1.jar.sha1 (100%) rename {core => server}/licenses/log4j-core-LICENSE.txt (100%) rename {core => server}/licenses/log4j-core-NOTICE.txt (100%) rename {core => server}/licenses/lucene-LICENSE.txt (100%) rename {core => server}/licenses/lucene-NOTICE.txt (100%) rename {core => server}/licenses/lucene-analyzers-common-7.2.0.jar.sha1 (100%) rename {core => server}/licenses/lucene-backward-codecs-7.2.0.jar.sha1 (100%) rename {core => server}/licenses/lucene-core-7.2.0.jar.sha1 (100%) rename {core => server}/licenses/lucene-grouping-7.2.0.jar.sha1 (100%) rename {core => server}/licenses/lucene-highlighter-7.2.0.jar.sha1 (100%) rename {core => server}/licenses/lucene-join-7.2.0.jar.sha1 (100%) rename {core => server}/licenses/lucene-memory-7.2.0.jar.sha1 (100%) rename {core => server}/licenses/lucene-misc-7.2.0.jar.sha1 (100%) rename {core => server}/licenses/lucene-queries-7.2.0.jar.sha1 (100%) rename {core => server}/licenses/lucene-queryparser-7.2.0.jar.sha1 (100%) rename {core => server}/licenses/lucene-sandbox-7.2.0.jar.sha1 (100%) rename {core => server}/licenses/lucene-spatial-7.2.0.jar.sha1 (100%) rename {core => server}/licenses/lucene-spatial-extras-7.2.0.jar.sha1 (100%) rename {core => server}/licenses/lucene-spatial3d-7.2.0.jar.sha1 (100%) rename {core => server}/licenses/lucene-suggest-7.2.0.jar.sha1 (100%) rename {core => server}/licenses/securesm-1.2.jar.sha1 (100%) rename {core => server}/licenses/securesm-LICENSE.txt (100%) rename {core => server}/licenses/securesm-NOTICE.txt (100%) rename {core => server}/licenses/snakeyaml-1.17.jar.sha1 (100%) rename {core => server}/licenses/snakeyaml-LICENSE.txt (100%) rename {core => server}/licenses/snakeyaml-NOTICE.txt (100%) rename {core => server}/licenses/spatial4j-0.6.jar.sha1 (100%) rename {core => server}/licenses/spatial4j-ABOUT.txt (100%) rename {core => server}/licenses/spatial4j-LICENSE.txt (100%) rename {core => server}/licenses/spatial4j-NOTICE.txt (100%) rename {core => server}/licenses/t-digest-3.0.jar.sha1 (100%) rename {core => server}/licenses/t-digest-LICENSE.txt (100%) rename {core => server}/licenses/t-digest-NOTICE.txt (100%) rename {core => server}/src/main/eclipse-build.gradle (100%) rename {core => server}/src/main/java/org/apache/lucene/analysis/miscellaneous/DeDuplicatingTokenFilter.java (100%) rename {core => server}/src/main/java/org/apache/lucene/analysis/miscellaneous/DisableGraphAttribute.java (100%) rename {core => server}/src/main/java/org/apache/lucene/analysis/miscellaneous/DisableGraphAttributeImpl.java (100%) rename {core => server}/src/main/java/org/apache/lucene/analysis/miscellaneous/DuplicateByteSequenceSpotter.java (100%) rename {core => server}/src/main/java/org/apache/lucene/analysis/miscellaneous/DuplicateSequenceAttribute.java (100%) rename {core => server}/src/main/java/org/apache/lucene/analysis/miscellaneous/DuplicateSequenceAttributeImpl.java (100%) rename {core => server}/src/main/java/org/apache/lucene/document/BinaryRange.java (100%) rename {core => server}/src/main/java/org/apache/lucene/index/OneMergeHelper.java (100%) rename {core => server}/src/main/java/org/apache/lucene/queries/BinaryDocValuesRangeQuery.java (100%) rename {core => server}/src/main/java/org/apache/lucene/queries/BlendedTermQuery.java (100%) rename {core => server}/src/main/java/org/apache/lucene/queries/ExtendedCommonTermsQuery.java (100%) rename {core => server}/src/main/java/org/apache/lucene/queries/MinDocQuery.java (100%) rename {core => server}/src/main/java/org/apache/lucene/queries/SearchAfterSortedDocQuery.java (100%) rename {core => server}/src/main/java/org/apache/lucene/queryparser/classic/XQueryParser.java (100%) rename {core => server}/src/main/java/org/apache/lucene/search/grouping/CollapseTopFieldDocs.java (100%) rename {core => server}/src/main/java/org/apache/lucene/search/grouping/CollapsingDocValuesSource.java (100%) rename {core => server}/src/main/java/org/apache/lucene/search/grouping/CollapsingTopDocsCollector.java (100%) rename {core => server}/src/main/java/org/apache/lucene/search/uhighlight/BoundedBreakIteratorScanner.java (100%) rename {core => server}/src/main/java/org/apache/lucene/search/uhighlight/CustomFieldHighlighter.java (100%) rename {core => server}/src/main/java/org/apache/lucene/search/uhighlight/CustomPassageFormatter.java (100%) rename {core => server}/src/main/java/org/apache/lucene/search/uhighlight/CustomUnifiedHighlighter.java (100%) rename {core => server}/src/main/java/org/apache/lucene/search/uhighlight/Snippet.java (100%) rename {core => server}/src/main/java/org/apache/lucene/search/vectorhighlight/CustomFieldQuery.java (100%) rename {core => server}/src/main/java/org/elasticsearch/Assertions.java (100%) rename {core => server}/src/main/java/org/elasticsearch/Build.java (100%) rename {core => server}/src/main/java/org/elasticsearch/ElasticsearchCorruptionException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/ElasticsearchException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/ElasticsearchGenerationException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/ElasticsearchParseException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/ElasticsearchSecurityException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/ElasticsearchStatusException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/ElasticsearchTimeoutException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/ElasticsearchWrapperException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/ExceptionsHelper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/ResourceAlreadyExistsException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/ResourceNotFoundException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/SpecialPermission.java (100%) rename {core => server}/src/main/java/org/elasticsearch/Version.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/Action.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ActionFuture.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ActionListener.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ActionListenerResponseHandler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ActionModule.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ActionRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ActionRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ActionRequestValidationException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ActionResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ActionRunnable.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/AliasesRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/CompositeIndicesRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/DocWriteRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/DocWriteResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/FailedNodeException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/GenericAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/IndicesRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/LatchedActionListener.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ListenableActionFuture.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/NoShardAvailableActionException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/NoSuchNodeException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/NotifyOnceListener.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/OriginalIndices.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/PrimaryMissingActionException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/RealtimeRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/RoutingMissingException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ShardOperationFailedException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/TaskOperationFailure.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ThreadingModel.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/TimestampParsingException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/TransportActionNodeProxy.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/UnavailableShardsException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ValidateActions.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplanation.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/allocation/TransportClusterAllocationExplainAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodeHotThreads.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/TransportNodesHotThreadsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodeInfo.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/info/PluginsAndModules.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/info/TransportNodesInfoAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/liveness/LivenessRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/liveness/LivenessResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/liveness/TransportLivenessAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodeStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/TransportNodesStatsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/cancel/CancelTasksAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/cancel/CancelTasksRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/cancel/CancelTasksRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/cancel/CancelTasksResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/cancel/TransportCancelTasksAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/get/GetTaskAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/get/GetTaskRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/get/GetTaskRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/get/GetTaskResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/get/TransportGetTaskAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/ListTasksAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/ListTasksRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/ListTasksRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/ListTasksResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/TaskGroup.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/TransportListTasksAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/usage/NodeUsage.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/usage/NodesUsageAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/usage/NodesUsageRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/usage/NodesUsageRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/usage/NodesUsageResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/node/usage/TransportNodesUsageAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/remote/RemoteInfoAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/remote/RemoteInfoRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/remote/RemoteInfoRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/remote/RemoteInfoResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/remote/TransportRemoteInfoAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/DeleteRepositoryAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/DeleteRepositoryRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/DeleteRepositoryRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/DeleteRepositoryResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/TransportDeleteRepositoryAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/GetRepositoriesAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/GetRepositoriesRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/GetRepositoriesRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/GetRepositoriesResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/TransportGetRepositoriesAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/TransportPutRepositoryAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/TransportVerifyRepositoryAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/VerifyRepositoryAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/VerifyRepositoryRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/VerifyRepositoryRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/VerifyRepositoryResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/reroute/TransportClusterRerouteAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/settings/SettingsUpdater.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/settings/TransportClusterUpdateSettingsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsGroup.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/shards/TransportClusterSearchShardsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/TransportCreateSnapshotAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/TransportDeleteSnapshotAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/TransportGetSnapshotsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/TransportRestoreSnapshotAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotIndexShardStage.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotIndexShardStatus.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotIndexStatus.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotShardsStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotStatus.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotsStatusAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotsStatusRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotsStatusRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotsStatusResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportNodesSnapshotsStatus.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportSnapshotsStatusAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/state/TransportClusterStateAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsIndices.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsNodeResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsNodes.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/stats/TransportClusterStatsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/DeleteStoredScriptAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/DeleteStoredScriptRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/DeleteStoredScriptRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/DeleteStoredScriptResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/GetStoredScriptAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/GetStoredScriptRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/GetStoredScriptRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/GetStoredScriptResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/PutStoredScriptAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/PutStoredScriptRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/PutStoredScriptRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/PutStoredScriptResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/TransportDeleteStoredScriptAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/TransportGetStoredScriptAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/TransportPutStoredScriptAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/tasks/PendingClusterTasksAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/tasks/PendingClusterTasksRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/tasks/PendingClusterTasksRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/tasks/PendingClusterTasksResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/cluster/tasks/TransportPendingClusterTasksAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/alias/Alias.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesClusterStateUpdateRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/alias/TransportIndicesAliasesAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/alias/exists/AliasesExistAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/alias/exists/AliasesExistRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/alias/exists/AliasesExistResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/alias/exists/TransportAliasesExistAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/alias/get/BaseAliasesRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/alias/get/GetAliasesAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/alias/get/GetAliasesRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/alias/get/GetAliasesRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/alias/get/GetAliasesResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/alias/get/TransportGetAliasesAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/analyze/DetailAnalyzeResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/analyze/TransportAnalyzeAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/TransportClearIndicesCacheAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexClusterStateUpdateRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/close/TransportCloseIndexAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexClusterStateUpdateRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/create/TransportCreateIndexAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/create/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexClusterStateUpdateRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/delete/TransportDeleteIndexAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/delete/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/TransportIndicesExistsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TransportTypesExistsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TypesExistsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TypesExistsRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TypesExistsRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TypesExistsResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/flush/ShardFlushRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/flush/SyncedFlushAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/flush/SyncedFlushRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/flush/SyncedFlushRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/flush/SyncedFlushResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/flush/TransportFlushAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/flush/TransportShardFlushAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/flush/TransportSyncedFlushAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/flush/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/forcemerge/ForceMergeAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/forcemerge/ForceMergeRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/forcemerge/ForceMergeRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/forcemerge/ForceMergeResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/forcemerge/TransportForceMergeAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/forcemerge/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/get/TransportGetIndexAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsIndexRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetMappingsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetMappingsRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetMappingsRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetMappingsResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/TransportGetFieldMappingsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/TransportGetFieldMappingsIndexAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/TransportGetMappingsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/mapping/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingClusterStateUpdateRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/TransportPutMappingAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexClusterStateUpdateRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/open/TransportOpenIndexAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/recovery/TransportRecoveryAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/refresh/TransportRefreshAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/refresh/TransportShardRefreshAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/refresh/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/rollover/Condition.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/rollover/MaxAgeCondition.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/rollover/MaxDocsCondition.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/rollover/MaxSizeCondition.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/rollover/TransportRolloverAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/segments/IndexSegments.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/segments/IndexShardSegments.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/segments/ShardSegments.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/segments/TransportIndicesSegmentsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/settings/get/TransportGetSettingsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/settings/put/TransportUpdateSettingsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsClusterStateUpdateRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoreRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoresAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoresRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoresResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/shards/TransportIndicesShardStoresAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/shrink/ResizeAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/shrink/ResizeRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/shrink/ResizeRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/shrink/ResizeResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/shrink/ResizeType.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/shrink/ShrinkAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/shrink/TransportResizeAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/shrink/TransportShrinkAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/stats/CommonStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/stats/CommonStatsFlags.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/stats/IndexShardStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/stats/IndexStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/stats/ShardStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/stats/TransportIndicesStatsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/template/delete/TransportDeleteIndexTemplateAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetIndexTemplatesAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetIndexTemplatesRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetIndexTemplatesRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetIndexTemplatesResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/template/get/TransportGetIndexTemplatesAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/template/put/TransportPutIndexTemplateAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/IndexShardUpgradeStatus.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/IndexUpgradeStatus.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/ShardUpgradeStatus.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/TransportUpgradeStatusAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/ShardUpgradeRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/ShardUpgradeResult.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/TransportUpgradeAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/TransportUpgradeSettingsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsClusterStateUpdateRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/validate/query/QueryExplanation.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ShardValidateQueryRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ShardValidateQueryResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/validate/query/TransportValidateQueryAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/indices/validate/query/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/admin/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/bulk/BackoffPolicy.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/bulk/BulkAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/bulk/BulkItemRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/bulk/BulkItemResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/bulk/BulkItemResultHolder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/bulk/BulkProcessor.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/bulk/BulkRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/bulk/BulkRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/bulk/BulkRequestHandler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/bulk/BulkResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/bulk/BulkShardRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/bulk/BulkShardResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/bulk/MappingUpdatePerformer.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/bulk/Retry.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/bulk/TransportBulkAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/bulk/TransportShardBulkAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/bulk/TransportSingleItemBulkWriteAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/delete/DeleteAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/delete/DeleteRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/delete/DeleteRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/delete/DeleteResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/delete/TransportDeleteAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/delete/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/explain/ExplainAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/explain/ExplainRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/explain/ExplainRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/explain/ExplainResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/explain/TransportExplainAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/explain/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilities.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesIndexRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesIndexResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/fieldcaps/TransportFieldCapabilitiesAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/fieldcaps/TransportFieldCapabilitiesIndexAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/get/GetAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/get/GetRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/get/GetRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/get/GetResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/get/MultiGetAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/get/MultiGetItemResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/get/MultiGetRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/get/MultiGetRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/get/MultiGetResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/get/MultiGetShardRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/get/MultiGetShardResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/get/TransportGetAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/get/TransportMultiGetAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/get/TransportShardMultiGetAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/get/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/index/IndexAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/index/IndexRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/index/IndexRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/index/IndexResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/index/TransportIndexAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/index/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ingest/DeletePipelineAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ingest/DeletePipelineRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ingest/DeletePipelineRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ingest/DeletePipelineTransportAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ingest/GetPipelineAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ingest/GetPipelineRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ingest/GetPipelineRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ingest/GetPipelineResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ingest/GetPipelineTransportAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ingest/IngestActionForwarder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ingest/PutPipelineAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ingest/PutPipelineRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ingest/PutPipelineRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ingest/PutPipelineTransportAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ingest/SimulateDocumentBaseResult.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ingest/SimulateDocumentResult.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ingest/SimulateDocumentVerboseResult.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ingest/SimulateExecutionService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineTransportAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ingest/SimulateProcessorResult.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ingest/TrackingResultProcessor.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ingest/WritePipelineResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/ingest/WriteableIngestDocument.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/main/MainAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/main/MainRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/main/MainRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/main/MainResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/main/TransportMainAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/resync/ResyncReplicationRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/resync/ResyncReplicationResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/resync/TransportResyncReplicationAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/AbstractSearchAsyncAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/CanMatchPreFilterSearchPhase.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/ClearScrollAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/ClearScrollController.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/ClearScrollRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/ClearScrollRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/ClearScrollResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/CountedCollector.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/DfsQueryPhase.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/ExpandSearchPhase.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/FetchSearchPhase.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/InitialSearchPhase.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/MultiSearchAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/MultiSearchRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/MultiSearchRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/MultiSearchResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/ParsedScrollId.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/ReduceSearchPhaseException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/ScrollIdForNode.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/SearchAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/SearchActionListener.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/SearchDfsQueryThenFetchAsyncAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/SearchExecutionStatsCollector.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/SearchPhase.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/SearchPhaseContext.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/SearchPhaseController.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/SearchPhaseExecutionException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/SearchQueryThenFetchAsyncAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/SearchRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/SearchRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/SearchResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/SearchResponseSections.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/SearchScrollAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/SearchScrollAsyncAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/SearchScrollQueryAndFetchAsyncAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/SearchScrollQueryThenFetchAsyncAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/SearchScrollRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/SearchScrollRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/SearchShardIterator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/SearchTask.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/SearchTransportService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/SearchType.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/ShardSearchFailure.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/TransportClearScrollAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/TransportMultiSearchAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/TransportSearchAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/TransportSearchHelper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/TransportSearchScrollAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/search/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/ActionFilter.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/ActionFilterChain.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/ActionFilters.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/ActiveShardCount.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/ActiveShardsObserver.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/AdapterActionFuture.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/AutoCreateIndex.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/ContextPreservingActionListener.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/DefaultShardOperationFailedException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/DelegatingActionListener.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/DestructiveOperations.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/GroupedActionListener.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/HandledTransportAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/IndicesOptions.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/PlainActionFuture.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/PlainListenableActionFuture.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/ThreadedActionListener.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/TransportAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/TransportActions.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/WriteRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/WriteRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/WriteResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastOperationRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardOperationFailedException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/broadcast/TransportBroadcastAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/broadcast/node/TransportBroadcastByNodeAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/master/AcknowledgedRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/master/AcknowledgedRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/master/AcknowledgedResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/master/MasterNodeOperationRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/master/MasterNodeReadOperationRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/master/MasterNodeReadRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/master/MasterNodeRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeReadAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/master/info/ClusterInfoRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/master/info/ClusterInfoRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/master/info/TransportClusterInfoAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/nodes/BaseNodeRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/nodes/BaseNodeResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/nodes/BaseNodesRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/nodes/BaseNodesResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/nodes/NodesOperationRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/nodes/TransportNodesAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/replication/BasicReplicationRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/replication/ReplicatedWriteRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/replication/ReplicationOperation.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/replication/ReplicationRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/replication/ReplicationRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/replication/ReplicationResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/replication/ReplicationTask.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/replication/TransportBroadcastReplicationAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/replication/TransportReplicationAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/replication/TransportWriteAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/single/instance/InstanceShardOperationRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/single/instance/InstanceShardOperationRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/single/instance/TransportInstanceSingleOperationAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/single/shard/SingleShardOperationRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/single/shard/SingleShardRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/single/shard/TransportSingleShardAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/tasks/BaseTasksRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/tasks/BaseTasksResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/tasks/TasksRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/support/tasks/TransportTasksAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsItemResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsShardRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsShardResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/termvectors/TermVectorsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/termvectors/TermVectorsFields.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/termvectors/TermVectorsFilter.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/termvectors/TermVectorsRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/termvectors/TermVectorsRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/termvectors/TermVectorsResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/termvectors/TermVectorsWriter.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/termvectors/TransportMultiTermVectorsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/termvectors/TransportShardMultiTermsVectorAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/termvectors/TransportTermVectorsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/termvectors/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/update/TransportUpdateAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/update/UpdateAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/update/UpdateHelper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/update/UpdateRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/update/UpdateRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/action/update/UpdateResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/bootstrap/Bootstrap.java (100%) rename {core => server}/src/main/java/org/elasticsearch/bootstrap/BootstrapCheck.java (100%) rename {core => server}/src/main/java/org/elasticsearch/bootstrap/BootstrapChecks.java (100%) rename {core => server}/src/main/java/org/elasticsearch/bootstrap/BootstrapContext.java (100%) rename {core => server}/src/main/java/org/elasticsearch/bootstrap/BootstrapException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/bootstrap/BootstrapInfo.java (100%) rename {core => server}/src/main/java/org/elasticsearch/bootstrap/BootstrapSettings.java (100%) rename {core => server}/src/main/java/org/elasticsearch/bootstrap/ConsoleCtrlHandler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/bootstrap/ESPolicy.java (100%) rename {core => server}/src/main/java/org/elasticsearch/bootstrap/Elasticsearch.java (100%) rename {core => server}/src/main/java/org/elasticsearch/bootstrap/ElasticsearchUncaughtExceptionHandler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/bootstrap/FilePermissionUtils.java (100%) rename {core => server}/src/main/java/org/elasticsearch/bootstrap/JNACLibrary.java (100%) rename {core => server}/src/main/java/org/elasticsearch/bootstrap/JNAKernel32Library.java (100%) rename {core => server}/src/main/java/org/elasticsearch/bootstrap/JNANatives.java (100%) rename {core => server}/src/main/java/org/elasticsearch/bootstrap/JarHell.java (100%) rename {core => server}/src/main/java/org/elasticsearch/bootstrap/JavaVersion.java (100%) rename {core => server}/src/main/java/org/elasticsearch/bootstrap/Natives.java (100%) rename {core => server}/src/main/java/org/elasticsearch/bootstrap/Security.java (100%) rename {core => server}/src/main/java/org/elasticsearch/bootstrap/Spawner.java (100%) rename {core => server}/src/main/java/org/elasticsearch/bootstrap/StartupException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/bootstrap/SystemCallFilter.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cli/CommandLoggingConfigurator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cli/EnvironmentAwareCommand.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cli/LoggingAwareCommand.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cli/LoggingAwareMultiCommand.java (100%) rename {core => server}/src/main/java/org/elasticsearch/client/AdminClient.java (100%) rename {core => server}/src/main/java/org/elasticsearch/client/Client.java (100%) rename {core => server}/src/main/java/org/elasticsearch/client/ClusterAdminClient.java (100%) rename {core => server}/src/main/java/org/elasticsearch/client/ElasticsearchClient.java (100%) rename {core => server}/src/main/java/org/elasticsearch/client/FilterClient.java (100%) rename {core => server}/src/main/java/org/elasticsearch/client/IndicesAdminClient.java (100%) rename {core => server}/src/main/java/org/elasticsearch/client/ParentTaskAssigningClient.java (100%) rename {core => server}/src/main/java/org/elasticsearch/client/Requests.java (100%) rename {core => server}/src/main/java/org/elasticsearch/client/node/NodeClient.java (100%) rename {core => server}/src/main/java/org/elasticsearch/client/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/client/support/AbstractClient.java (100%) rename {core => server}/src/main/java/org/elasticsearch/client/transport/NoNodeAvailableException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/client/transport/TransportClient.java (100%) rename {core => server}/src/main/java/org/elasticsearch/client/transport/TransportClientNodesService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/client/transport/TransportProxyClient.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/AbstractDiffable.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/AbstractNamedDiffable.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/AckedClusterStateTaskListener.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/AckedClusterStateUpdateTask.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/ClusterChangedEvent.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/ClusterInfo.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/ClusterInfoService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/ClusterModule.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/ClusterName.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/ClusterState.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/ClusterStateApplier.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/ClusterStateListener.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/ClusterStateObserver.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/ClusterStateTaskConfig.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/ClusterStateTaskExecutor.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/ClusterStateTaskListener.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/ClusterStateUpdateTask.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/Diff.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/Diffable.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/DiffableUtils.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/DiskUsage.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/EmptyClusterInfoService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/IncompatibleClusterStateVersionException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/InternalClusterInfoService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/LocalClusterUpdateTask.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/LocalNodeMasterListener.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/MasterNodeChangePredicate.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/MergableCustomMetaData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/NamedDiff.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/NamedDiffable.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/NamedDiffableValueSerializer.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/NodeConnectionsService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/NotMasterException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/RestoreInProgress.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/SnapshotDeletionsInProgress.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/SnapshotsInProgress.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/TimeoutClusterStateListener.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/ack/AckedRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/ack/ClusterStateUpdateRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/ack/ClusterStateUpdateResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/ack/CreateIndexClusterStateUpdateResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/ack/IndicesClusterStateUpdateRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/ack/OpenIndexClusterStateUpdateResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/action/index/MappingUpdatedAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/action/index/NodeMappingRefreshAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/action/shard/ShardStateAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/block/ClusterBlock.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/block/ClusterBlockException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/block/ClusterBlockLevel.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/block/ClusterBlocks.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/health/ClusterHealthStatus.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/health/ClusterIndexHealth.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/health/ClusterShardHealth.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/health/ClusterStateHealth.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/metadata/AliasAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/metadata/AliasMetaData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/metadata/AliasOrIndex.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/metadata/AliasValidator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/metadata/AutoExpandReplicas.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/metadata/ClusterNameExpressionResolver.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/metadata/IndexGraveyard.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/metadata/IndexMetaData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolver.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/metadata/IndexTemplateFilter.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/metadata/IndexTemplateMetaData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/metadata/MappingMetaData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/metadata/MetaData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/metadata/MetaDataDeleteIndexService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexAliasesService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexStateService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexTemplateService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexUpgradeService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/metadata/MetaDataMappingService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/metadata/MetaDataUpdateSettingsService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/metadata/ProcessClusterEventTimeoutException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/metadata/RepositoriesMetaData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/metadata/RepositoryMetaData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/metadata/TemplateUpgradeService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/node/DiscoveryNode.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodeFilters.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodes.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/AllocationId.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/DelayedAllocationService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/GroupShardsIterator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/IllegalShardRoutingStateException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/IndexRoutingTable.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/IndexShardRoutingTable.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/Murmur3HashFunction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/OperationRouting.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/PlainShardIterator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/PlainShardsIterator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/Preference.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/RecoverySource.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/RotationShardShuffler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/RoutingChangesObserver.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/RoutingException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/RoutingNode.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/RoutingNodes.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/RoutingService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/RoutingTable.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/ShardIterator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/ShardRouting.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/ShardRoutingState.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/ShardShuffler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/ShardsIterator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/UnassignedInfo.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/AbstractAllocationDecision.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/AllocateUnassignedDecision.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/AllocationDecision.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/AllocationService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdMonitor.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdSettings.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/FailedShard.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/IndexMetaDataUpdater.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/MoveDecision.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/NodeAllocationResult.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/RerouteExplanation.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/RoutingAllocation.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/RoutingExplanations.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/RoutingNodesChangedObserver.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/ShardAllocationDecision.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/StaleShard.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/BalancedShardsAllocator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/ShardsAllocator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AbstractAllocateAllocationCommand.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocateEmptyPrimaryAllocationCommand.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocateReplicaAllocationCommand.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocateStalePrimaryAllocationCommand.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocationCommand.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocationCommands.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/command/BasePrimaryAllocationCommand.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/command/CancelAllocationCommand.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/command/MoveAllocationCommand.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/AllocationDecider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/AllocationDeciders.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/AwarenessAllocationDecider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ClusterRebalanceAllocationDecider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ConcurrentRebalanceAllocationDecider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/Decision.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDecider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/EnableAllocationDecider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/FilterAllocationDecider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/MaxRetryAllocationDecider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/NodeVersionAllocationDecider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/RebalanceOnlyWhenActiveAllocationDecider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ReplicaAfterPrimaryActiveAllocationDecider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ResizeAllocationDecider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/RestoreInProgressAllocationDecider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/SameShardAllocationDecider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ShardsLimitAllocationDecider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/SnapshotInProgressAllocationDecider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ThrottlingAllocationDecider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/service/ClusterApplier.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/service/ClusterApplierService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/service/ClusterService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/service/MasterService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/service/PendingClusterTask.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/service/SourcePrioritizedRunnable.java (100%) rename {core => server}/src/main/java/org/elasticsearch/cluster/service/TaskBatcher.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/Booleans.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/CheckedBiConsumer.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/CheckedConsumer.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/CheckedFunction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/CheckedRunnable.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/CheckedSupplier.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/Classes.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/Explicit.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/ExponentiallyWeightedMovingAverage.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/FieldMemoryStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/LegacyTimeBasedUUIDGenerator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/MacAddressProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/NamedRegistry.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/Nullable.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/Numbers.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/ParseField.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/ParsingException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/PidFile.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/Priority.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/RandomBasedUUIDGenerator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/Randomness.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/SecureRandomHolder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/StopWatch.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/Strings.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/SuppressForbidden.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/SuppressLoggerChecks.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/Table.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/TimeBasedUUIDGenerator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/TriFunction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/UUIDGenerator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/UUIDs.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/ValidationException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/blobstore/BlobContainer.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/blobstore/BlobMetaData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/blobstore/BlobPath.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/blobstore/BlobStore.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/blobstore/BlobStoreException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/blobstore/fs/FsBlobContainer.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/blobstore/fs/FsBlobStore.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/blobstore/support/AbstractBlobContainer.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/blobstore/support/PlainBlobMetaData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/breaker/ChildMemoryCircuitBreaker.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/breaker/CircuitBreaker.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/breaker/CircuitBreakingException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/breaker/MemoryCircuitBreaker.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/breaker/NoopCircuitBreaker.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/bytes/ByteBufferReference.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/bytes/BytesArray.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/bytes/BytesReference.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/bytes/BytesReferenceStreamInput.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/bytes/CompositeBytesReference.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/bytes/PagedBytesReference.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/bytes/ReleasablePagedBytesReference.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/cache/Cache.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/cache/CacheBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/cache/CacheLoader.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/cache/RemovalListener.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/cache/RemovalNotification.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/collect/CopyOnWriteHashMap.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/collect/EvictingQueue.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/collect/HppcMaps.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/collect/ImmutableOpenIntMap.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/collect/ImmutableOpenMap.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/collect/Iterators.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/collect/MapBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/collect/Tuple.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/component/AbstractComponent.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/component/AbstractLifecycleComponent.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/component/Lifecycle.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/component/LifecycleComponent.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/component/LifecycleListener.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/compress/CompressedXContent.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/compress/Compressor.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/compress/CompressorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/compress/DeflateCompressor.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/compress/NotCompressedException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/compress/NotXContentException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/document/DocumentField.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/geo/GeoDistance.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/geo/GeoHashUtils.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/geo/GeoPoint.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/geo/GeoShapeType.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/geo/GeoUtils.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/geo/ShapeRelation.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/geo/ShapesAvailability.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/geo/SpatialStrategy.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/geo/XShapeCollection.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/geo/builders/CircleBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/geo/builders/CoordinatesBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/geo/builders/EnvelopeBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/geo/builders/GeometryCollectionBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/geo/builders/LineStringBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/geo/builders/MultiLineStringBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/geo/builders/MultiPointBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/geo/builders/MultiPolygonBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/geo/builders/PointBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/geo/builders/PolygonBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/geo/builders/ShapeBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/geo/parsers/CoordinateNode.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/geo/parsers/GeoJsonParser.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/geo/parsers/GeoWKTParser.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/geo/parsers/ShapeParser.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/hash/MessageDigests.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/hash/MurmurHash3.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/AbstractModule.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/AbstractProcessor.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/Binder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/Binding.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/BindingAnnotation.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/BindingProcessor.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/BoundProviderFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/ConfigurationException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/ConstantFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/ConstructionProxy.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/ConstructionProxyFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/ConstructorBindingImpl.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/ConstructorInjector.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/ConstructorInjectorStore.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/ContextualCallable.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/CreationException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/DefaultConstructionProxyFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/DeferredLookups.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/EncounterImpl.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/Exposed.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/ExposedKeyFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/FactoryProxy.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/Guice.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/ImplementedBy.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/InheritingState.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/Initializable.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/Initializables.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/Initializer.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/Inject.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/InjectionRequestProcessor.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/Injector.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/InjectorBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/InjectorImpl.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/InjectorShell.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/InternalFactoryToProviderAdapter.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/Key.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/LookupProcessor.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/Lookups.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/MembersInjector.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/MembersInjectorImpl.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/MembersInjectorStore.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/MessageProcessor.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/Module.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/ModulesBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/OutOfScopeException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/PreProcessModule.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/PrivateBinder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/PrivateElementProcessor.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/PrivateModule.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/ProvidedBy.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/Provider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/ProviderToInternalFactoryAdapter.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/Provides.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/ProvisionException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/Reflection.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/Scope.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/ScopeAnnotation.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/ScopeBindingProcessor.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/Scopes.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/SingleFieldInjector.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/SingleMemberInjector.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/SingleMethodInjector.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/SingleParameterInjector.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/Singleton.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/Stage.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/State.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/TypeConverterBindingProcessor.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/TypeListenerBindingProcessor.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/TypeLiteral.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/WeakKeySet.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/assistedinject/Assisted.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/assistedinject/AssistedConstructor.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/assistedinject/AssistedInject.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/assistedinject/FactoryProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/assistedinject/Parameter.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/assistedinject/ParameterListKey.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/assistedinject/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/binder/AnnotatedBindingBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/binder/AnnotatedConstantBindingBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/binder/AnnotatedElementBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/binder/ConstantBindingBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/binder/LinkedBindingBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/binder/ScopedBindingBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/binder/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/AbstractBindingBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/Annotations.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/BindingBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/BindingImpl.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/ConstantBindingBuilderImpl.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/ConstructionContext.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/ErrorHandler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/Errors.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/ErrorsException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/ExpirationTimer.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/ExposedBindingImpl.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/ExposureBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/FailableCache.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/InstanceBindingImpl.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/InternalContext.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/InternalFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/Join.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/LinkedBindingImpl.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/LinkedProviderBindingImpl.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/MatcherAndConverter.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/MoreTypes.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/Nullability.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/Nullable.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/PrivateElementsImpl.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/ProviderInstanceBindingImpl.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/ProviderMethod.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/ProviderMethodsModule.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/Scoping.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/SourceProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/StackTraceElements.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/Stopwatch.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/Strings.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/ToStringBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/UniqueAnnotations.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/UntargettedBindingImpl.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/internal/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/matcher/AbstractMatcher.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/matcher/Matcher.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/matcher/Matchers.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/matcher/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/multibindings/Element.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/multibindings/MapBinder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/multibindings/Multibinder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/multibindings/RealElement.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/multibindings/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/name/Named.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/name/NamedImpl.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/name/Names.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/name/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/spi/BindingScopingVisitor.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/spi/BindingTargetVisitor.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/spi/ConstructorBinding.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/spi/ConvertedConstantBinding.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/spi/DefaultBindingScopingVisitor.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/spi/DefaultBindingTargetVisitor.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/spi/DefaultElementVisitor.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/spi/Dependency.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/spi/Element.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/spi/ElementVisitor.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/spi/Elements.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/spi/ExposedBinding.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/spi/HasDependencies.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/spi/InjectionListener.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/spi/InjectionPoint.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/spi/InjectionRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/spi/InstanceBinding.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/spi/LinkedKeyBinding.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/spi/MembersInjectorLookup.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/spi/Message.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/spi/PrivateElements.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/spi/ProviderBinding.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/spi/ProviderInstanceBinding.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/spi/ProviderKeyBinding.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/spi/ProviderLookup.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/spi/ProviderWithDependencies.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/spi/ScopeBinding.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/spi/StaticInjectionRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/spi/TypeConverter.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/spi/TypeConverterBinding.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/spi/TypeEncounter.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/spi/TypeListener.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/spi/TypeListenerBinding.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/spi/UntargettedBinding.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/spi/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/util/Modules.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/util/Providers.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/util/Types.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/inject/util/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/io/Channels.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/io/FastCharArrayReader.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/io/FastCharArrayWriter.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/io/FastStringReader.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/io/FileSystemUtils.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/io/PathUtils.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/io/Streams.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/io/UTF8StreamWriter.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/io/stream/ByteBufferStreamInput.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/io/stream/BytesStream.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/io/stream/BytesStreamOutput.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/io/stream/DataOutputStreamOutput.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/io/stream/FilterStreamInput.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/io/stream/InputStreamStreamInput.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/io/stream/NamedWriteable.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/io/stream/NamedWriteableAwareStreamInput.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/io/stream/NamedWriteableRegistry.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/io/stream/NotSerializableExceptionWrapper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/io/stream/OutputStreamStreamOutput.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/io/stream/ReleasableBytesStreamOutput.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/io/stream/StreamInput.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/io/stream/StreamOutput.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/io/stream/Streamable.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/io/stream/Writeable.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/io/stream/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/joda/DateMathParser.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/joda/FormatDateTimeFormatter.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/joda/Joda.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/lease/Releasable.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/lease/Releasables.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/logging/DeprecationLogger.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/logging/ESLoggerFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/logging/LogConfigurator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/logging/LoggerMessageFormat.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/logging/Loggers.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/logging/PrefixLogger.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/lucene/BytesRefs.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/lucene/LoggerInfoStream.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/lucene/Lucene.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/lucene/MinimumScoreCollector.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/lucene/ScorerAware.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/lucene/ShardCoreKeyMap.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/lucene/index/ElasticsearchDirectoryReader.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/lucene/index/ElasticsearchLeafReader.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/lucene/index/FilterableTermsEnum.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/lucene/index/FreqTermsEnum.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/lucene/search/FilteredCollector.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/lucene/search/MoreLikeThisQuery.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/lucene/search/MultiPhrasePrefixQuery.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/lucene/search/Queries.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/lucene/search/XMoreLikeThis.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/lucene/search/function/CombineFunction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/lucene/search/function/FieldValueFactorFunction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/lucene/search/function/FunctionScoreQuery.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/lucene/search/function/LeafScoreFunction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/lucene/search/function/MinScoreScorer.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/lucene/search/function/RandomScoreFunction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/lucene/search/function/ScoreFunction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/lucene/search/function/ScriptScoreFunction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/lucene/search/function/WeightFactorFunction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/lucene/store/ByteArrayIndexInput.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/lucene/store/FilterIndexOutput.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/lucene/store/IndexOutputOutputStream.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/lucene/store/InputStreamIndexInput.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/lucene/uid/PerThreadIDVersionAndSeqNoLookup.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/lucene/uid/Versions.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/lucene/uid/VersionsAndSeqNoResolver.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/metrics/CounterMetric.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/metrics/MeanMetric.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/metrics/Metric.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/network/Cidrs.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/network/IfConfig.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/network/InetAddresses.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/network/NetworkAddress.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/network/NetworkModule.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/network/NetworkService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/network/NetworkUtils.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/path/PathTrie.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/recycler/AbstractRecycler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/recycler/AbstractRecyclerC.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/recycler/ConcurrentDequeRecycler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/recycler/DequeRecycler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/recycler/FilterRecycler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/recycler/NoneRecycler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/recycler/Recycler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/recycler/Recyclers.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/regex/Regex.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/rounding/DateTimeUnit.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/rounding/Rounding.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/settings/AbstractScopedSettings.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/settings/AddFileKeyStoreCommand.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/settings/AddStringKeyStoreCommand.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/settings/ClusterSettings.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/settings/CreateKeyStoreCommand.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/settings/IndexScopedSettings.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/settings/KeyStoreCli.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/settings/KeyStoreWrapper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/settings/ListKeyStoreCommand.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/settings/NoClassSettingsException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/settings/PropertyPlaceholder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/settings/RemoveSettingKeyStoreCommand.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/settings/SecureSetting.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/settings/SecureSettings.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/settings/SecureString.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/settings/Setting.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/settings/Settings.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/settings/SettingsException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/settings/SettingsFilter.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/settings/SettingsModule.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/settings/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/text/Text.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/transport/BoundTransportAddress.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/transport/NetworkExceptionHelper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/transport/PortsRange.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/transport/TransportAddress.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/unit/ByteSizeUnit.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/unit/ByteSizeValue.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/unit/DistanceUnit.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/unit/Fuzziness.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/unit/MemorySizeValue.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/unit/RatioValue.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/unit/SizeUnit.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/unit/SizeValue.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/unit/TimeValue.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/AbstractArray.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/AbstractBigArray.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/AbstractHash.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/AbstractPagedHashMap.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/ArrayUtils.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/BigArray.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/BigArrays.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/BigByteArray.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/BigDoubleArray.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/BigFloatArray.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/BigIntArray.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/BigLongArray.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/BigObjectArray.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/ByteArray.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/ByteUtils.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/BytesRefHash.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/CancellableThreads.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/CollectionUtils.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/Comparators.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/DoubleArray.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/FloatArray.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/IndexFolderUpgrader.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/IntArray.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/LocaleUtils.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/LongArray.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/LongHash.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/LongObjectPagedHashMap.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/ObjectArray.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/PageCacheRecycler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/SingleObjectCache.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/URIPattern.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/concurrent/AbstractLifecycleRunnable.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/concurrent/AbstractRefCounted.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/concurrent/AbstractRunnable.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/concurrent/AsyncIOProcessor.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/concurrent/AtomicArray.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/concurrent/BaseFuture.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/concurrent/ConcurrentCollections.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/concurrent/ConcurrentHashMapLong.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/concurrent/ConcurrentMapLong.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/concurrent/CountDown.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/concurrent/EsAbortPolicy.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/concurrent/EsExecutors.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/concurrent/EsRejectedExecutionException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/concurrent/EsThreadPoolExecutor.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/concurrent/FutureUtils.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/concurrent/KeyedLock.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/concurrent/LoggingRunnable.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/concurrent/PrioritizedCallable.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/concurrent/PrioritizedEsThreadPoolExecutor.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/concurrent/PrioritizedRunnable.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/concurrent/QueueResizingEsThreadPoolExecutor.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/concurrent/RefCounted.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/concurrent/ReleasableLock.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/concurrent/ResizableBlockingQueue.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/concurrent/SizeBlockingQueue.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/concurrent/ThreadBarrier.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/concurrent/ThreadContext.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/concurrent/TimedRunnable.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/concurrent/UncategorizedExecutionException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/concurrent/XRejectedExecutionHandler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/iterable/Iterables.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/util/set/Sets.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/xcontent/AbstractObjectParser.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/xcontent/ConstructingObjectParser.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/xcontent/ContextParser.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/xcontent/NamedXContentRegistry.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/xcontent/ObjectParser.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/xcontent/ParseFieldRegistry.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/xcontent/StatusToXContentObject.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/xcontent/ToXContent.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/xcontent/ToXContentFragment.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/xcontent/ToXContentObject.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/xcontent/XContent.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/xcontent/XContentBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/xcontent/XContentFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/xcontent/XContentGenerator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/xcontent/XContentHelper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/xcontent/XContentLocation.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/xcontent/XContentParser.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/xcontent/XContentParserUtils.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/xcontent/XContentType.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/xcontent/cbor/CborXContent.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/xcontent/cbor/CborXContentGenerator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/xcontent/cbor/CborXContentParser.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContent.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContentGenerator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContentParser.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContent.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContentGenerator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContentParser.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/xcontent/support/AbstractXContentParser.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/xcontent/support/XContentMapValues.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/xcontent/support/filtering/FilterPath.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/xcontent/support/filtering/FilterPathBasedFilter.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/xcontent/yaml/YamlXContent.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/xcontent/yaml/YamlXContentGenerator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/common/xcontent/yaml/YamlXContentParser.java (100%) rename {core => server}/src/main/java/org/elasticsearch/discovery/AckClusterStatePublishResponseHandler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/discovery/BlockingClusterStatePublishResponseHandler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/discovery/Discovery.java (100%) rename {core => server}/src/main/java/org/elasticsearch/discovery/DiscoveryModule.java (100%) rename {core => server}/src/main/java/org/elasticsearch/discovery/DiscoverySettings.java (100%) rename {core => server}/src/main/java/org/elasticsearch/discovery/DiscoveryStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/discovery/MasterNotDiscoveredException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/discovery/single/SingleNodeDiscovery.java (100%) rename {core => server}/src/main/java/org/elasticsearch/discovery/zen/ElectMasterService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/discovery/zen/FaultDetection.java (100%) rename {core => server}/src/main/java/org/elasticsearch/discovery/zen/MasterFaultDetection.java (100%) rename {core => server}/src/main/java/org/elasticsearch/discovery/zen/MembershipAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/discovery/zen/NodeJoinController.java (100%) rename {core => server}/src/main/java/org/elasticsearch/discovery/zen/NodesFaultDetection.java (100%) rename {core => server}/src/main/java/org/elasticsearch/discovery/zen/PendingClusterStateStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/discovery/zen/PendingClusterStatesQueue.java (100%) rename {core => server}/src/main/java/org/elasticsearch/discovery/zen/PingContextProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/discovery/zen/PublishClusterStateAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/discovery/zen/PublishClusterStateStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/discovery/zen/UnicastHostsProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/discovery/zen/UnicastZenPing.java (100%) rename {core => server}/src/main/java/org/elasticsearch/discovery/zen/ZenDiscovery.java (100%) rename {core => server}/src/main/java/org/elasticsearch/discovery/zen/ZenPing.java (100%) rename {core => server}/src/main/java/org/elasticsearch/env/ESFileStore.java (100%) rename {core => server}/src/main/java/org/elasticsearch/env/Environment.java (100%) rename {core => server}/src/main/java/org/elasticsearch/env/NodeEnvironment.java (100%) rename {core => server}/src/main/java/org/elasticsearch/env/NodeMetaData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/env/ShardLock.java (100%) rename {core => server}/src/main/java/org/elasticsearch/env/ShardLockObtainFailedException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/gateway/AsyncShardFetch.java (100%) rename {core => server}/src/main/java/org/elasticsearch/gateway/BaseGatewayShardAllocator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/gateway/CorruptStateException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/gateway/DanglingIndicesState.java (100%) rename {core => server}/src/main/java/org/elasticsearch/gateway/Gateway.java (100%) rename {core => server}/src/main/java/org/elasticsearch/gateway/GatewayAllocator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/gateway/GatewayException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/gateway/GatewayMetaState.java (100%) rename {core => server}/src/main/java/org/elasticsearch/gateway/GatewayModule.java (100%) rename {core => server}/src/main/java/org/elasticsearch/gateway/GatewayService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/gateway/LocalAllocateDangledIndices.java (100%) rename {core => server}/src/main/java/org/elasticsearch/gateway/MetaDataStateFormat.java (100%) rename {core => server}/src/main/java/org/elasticsearch/gateway/MetaStateService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/gateway/PrimaryShardAllocator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/gateway/PriorityComparator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/gateway/ReplicaShardAllocator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/gateway/TransportNodesListGatewayMetaState.java (100%) rename {core => server}/src/main/java/org/elasticsearch/gateway/TransportNodesListGatewayStartedShards.java (100%) rename {core => server}/src/main/java/org/elasticsearch/http/BindHttpException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/http/HttpException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/http/HttpInfo.java (100%) rename {core => server}/src/main/java/org/elasticsearch/http/HttpServerTransport.java (100%) rename {core => server}/src/main/java/org/elasticsearch/http/HttpStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/http/HttpTransportSettings.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/AbstractIndexComponent.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/CompositeIndexEventListener.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/Index.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/IndexComponent.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/IndexModule.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/IndexNotFoundException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/IndexService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/IndexSettings.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/IndexSortConfig.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/IndexWarmer.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/IndexingSlowLog.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/MergePolicyConfig.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/MergeSchedulerConfig.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/SearchSlowLog.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/SlowLogLevel.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/VersionType.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/AbstractCharFilterFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/AbstractIndexAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/AbstractTokenFilterFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/AbstractTokenizerFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/Analysis.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/AnalysisRegistry.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/AnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/AnalyzerScope.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/ArabicAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/ArmenianAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/BasqueAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/BengaliAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/BrazilianAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/BulgarianAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/CatalanAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/CharFilterFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/CharMatcher.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/ChineseAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/CjkAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/ClassicTokenizerFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/CustomAnalyzer.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/CustomAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/CustomNormalizerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/CzechAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/DanishAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/DutchAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/EdgeNGramTokenizerFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/EnglishAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/FieldNameAnalyzer.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/FingerprintAnalyzer.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/FingerprintAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/FinnishAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/FrenchAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/GalicianAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/GermanAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/GreekAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/HindiAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/HungarianAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/HunspellTokenFilterFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/IndexAnalyzers.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/IndonesianAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/IrishAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/ItalianAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/KeywordAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/KeywordTokenizerFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/LatvianAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/LetterTokenizerFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/LithuanianAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/LowerCaseTokenizerFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/MultiTermAwareComponent.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/NGramTokenizerFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/NamedAnalyzer.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/NorwegianAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/PathHierarchyTokenizerFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/PatternAnalyzer.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/PatternAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/PatternTokenizerFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/PersianAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/PortugueseAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerProviderFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/PreConfiguredAnalysisComponent.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/PreConfiguredCharFilter.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/PreConfiguredTokenFilter.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/PreConfiguredTokenizer.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/RomanianAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/RussianAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/ShingleTokenFilterFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/SimpleAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/SnowballAnalyzer.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/SnowballAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/SoraniAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/SoraniNormalizationFilterFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/SpanishAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/StandardAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/StandardHtmlStripAnalyzer.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/StandardHtmlStripAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/StandardTokenFilterFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/StandardTokenizerFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/StopAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/StopTokenFilterFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/SwedishAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/SynonymGraphTokenFilterFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/SynonymTokenFilterFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/ThaiAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/ThaiTokenizerFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/TokenFilterFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/TokenizerFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/TurkishAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/UAX29URLEmailTokenizerFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/WhitespaceAnalyzerProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/analysis/WhitespaceTokenizerFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/cache/IndexCache.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/cache/bitset/BitsetFilterCache.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/cache/bitset/ShardBitsetFilterCache.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/cache/query/DisabledQueryCache.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/cache/query/IndexQueryCache.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/cache/query/QueryCache.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/cache/query/QueryCacheStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/cache/request/RequestCacheStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/cache/request/ShardRequestCache.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/codec/CodecService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/codec/PerFieldMappingPostingFormatCodec.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/engine/CombinedDeletionPolicy.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/engine/CommitStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/engine/DeleteVersionValue.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/engine/DocumentMissingException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/engine/DocumentSourceMissingException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/engine/ElasticsearchConcurrentMergeScheduler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/engine/Engine.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/engine/EngineConfig.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/engine/EngineCreationFailureException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/engine/EngineException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/engine/EngineFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/engine/EngineSearcher.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/engine/EngineSearcherFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/engine/FlushFailedEngineException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/engine/InternalEngine.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/engine/InternalEngineFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/engine/LiveVersionMap.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/engine/RamAccountingSearcherFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/engine/RecoveryCounter.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/engine/RecoveryEngineException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/engine/RefreshFailedEngineException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/engine/Segment.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/engine/SegmentsStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/engine/SnapshotFailedEngineException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/engine/VersionConflictEngineException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/engine/VersionValue.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/AbstractBinaryDocValues.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/AbstractNumericDocValues.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/AbstractSortedDocValues.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/AbstractSortedNumericDocValues.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/AbstractSortedSetDocValues.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/AbstractSortingNumericDocValues.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/AtomicFieldData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/AtomicGeoPointFieldData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/AtomicNumericFieldData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/AtomicOrdinalsFieldData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/FieldData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/FieldDataStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/GeoPointValues.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/IndexFieldData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/IndexFieldDataCache.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/IndexFieldDataService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/IndexGeoPointFieldData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/IndexNumericFieldData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/IndexOrdinalsFieldData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/MultiGeoPointValues.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/NumericDoubleValues.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/RamAccountingTermsEnum.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/ScriptDocValues.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/ShardFieldData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/SingletonMultiGeoPointValues.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/SingletonSortedBinaryDocValues.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/SingletonSortedNumericDoubleValues.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/SortableLongBitsNumericDocValues.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/SortableLongBitsSortedNumericDocValues.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/SortableLongBitsToNumericDoubleValues.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/SortableLongBitsToSortedNumericDoubleValues.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/SortedBinaryDocValues.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/SortedNumericDoubleValues.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/SortingBinaryDocValues.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/SortingNumericDocValues.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/SortingNumericDoubleValues.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/UidIndexFieldData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/BytesRefFieldComparatorSource.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/DoubleValuesComparatorSource.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/FloatValuesComparatorSource.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/LongValuesComparatorSource.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/ordinals/GlobalOrdinalMapping.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/ordinals/GlobalOrdinalsBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/ordinals/GlobalOrdinalsIndexFieldData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/ordinals/MultiOrdinals.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/ordinals/Ordinals.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/ordinals/OrdinalsBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/ordinals/SinglePackedOrdinals.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractAtomicGeoPointFieldData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractAtomicOrdinalsFieldData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractIndexFieldData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractIndexOrdinalsFieldData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractLatLonPointDVIndexFieldData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/plain/AtomicDoubleFieldData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/plain/AtomicLongFieldData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/plain/BinaryDVAtomicFieldData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/plain/BinaryDVIndexFieldData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/plain/BytesBinaryDVAtomicFieldData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/plain/BytesBinaryDVIndexFieldData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/plain/ConstantIndexFieldData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/plain/DocValuesIndexFieldData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/plain/LatLonPointDVAtomicFieldData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/plain/NonEstimatingEstimator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/plain/PagedBytesAtomicFieldData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/plain/PagedBytesIndexFieldData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/plain/SortedNumericDVIndexFieldData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/plain/SortedSetDVBytesAtomicFieldData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fielddata/plain/SortedSetDVOrdinalsIndexFieldData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fieldvisitor/CustomFieldsVisitor.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fieldvisitor/FieldsVisitor.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/fieldvisitor/SingleFieldsVisitor.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/flush/FlushStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/get/GetResult.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/get/GetStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/get/ShardGetService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/ArrayValueMapperParser.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/BinaryFieldMapper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/BinaryRangeUtil.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/BooleanFieldMapper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/CompletionFieldMapper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/ContentPath.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/CustomDocValuesField.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/DateFieldMapper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/DocumentFieldMappers.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/DocumentMapper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/DocumentMapperForType.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/DocumentMapperParser.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/DocumentParser.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/DynamicTemplate.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/EnabledAttributeMapper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/FieldMapper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/FieldNamesFieldMapper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/FieldTypeLookup.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/GeoPointFieldMapper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/GeoShapeFieldMapper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/IdFieldMapper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/IndexFieldMapper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/IpFieldMapper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/KeywordFieldMapper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/MappedFieldType.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/Mapper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/MapperException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/MapperParsingException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/MapperService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/MapperUtils.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/Mapping.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/MetadataFieldMapper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/NumberFieldMapper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/ObjectMapper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/ParentFieldMapper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/ParseContext.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/ParsedDocument.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/RangeFieldMapper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/RootObjectMapper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/RoutingFieldMapper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/SeqNoFieldMapper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/SimpleMappedFieldType.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/SourceFieldMapper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/SourceToParse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/StrictDynamicMappingException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/StringFieldType.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/TermBasedFieldType.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/TextFieldMapper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/TypeFieldMapper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/TypeParsers.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/Uid.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/UidFieldMapper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/mapper/VersionFieldMapper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/merge/MergeStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/merge/OnGoingMerge.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/AbstractQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/BaseTermQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/BoolQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/BoostingQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/CommonTermsQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/ConstantScoreQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/DisMaxQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/ExistsQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/FieldMaskingSpanQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/FuzzyQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/GeoBoundingBoxQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/GeoDistanceQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/GeoExecType.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/GeoPolygonQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/GeoShapeQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/GeoValidationMethod.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/IdsQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/InnerHitBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/InnerHitContextBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/MatchAllQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/MatchNoneQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/MatchPhrasePrefixQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/MatchPhraseQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/MatchQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/MultiMatchQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/MultiTermQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/NestedQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/Operator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/ParsedQuery.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/PrefixQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/QueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/QueryBuilders.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/QueryParser.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/QueryRewriteContext.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/QueryShardContext.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/QueryShardException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/QueryStringQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/QueryValidationException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/RangeQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/RegexpFlag.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/RegexpQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/Rewriteable.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/ScriptQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/SimpleQueryStringBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/SimpleQueryStringFlag.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/SpanContainingQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/SpanFirstQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/SpanMultiTermQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/SpanNearQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/SpanNotQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/SpanOrQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/SpanQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/SpanTermQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/SpanWithinQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/TermQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/TermsQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/TermsSetQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/TypeQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/WildcardQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/WrapperQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/functionscore/DecayFunction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/functionscore/DecayFunctionBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/functionscore/DecayFunctionParser.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/functionscore/ExponentialDecayFunctionBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/functionscore/FieldValueFactorFunctionBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/functionscore/FunctionScoreQueryBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/functionscore/GaussDecayFunctionBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/functionscore/LinearDecayFunctionBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/functionscore/RandomScoreFunctionBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/functionscore/ScoreFunctionBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/functionscore/ScoreFunctionBuilders.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/functionscore/ScoreFunctionParser.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/functionscore/ScriptScoreFunctionBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/functionscore/WeightBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/support/NestedScope.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/query/support/QueryParsers.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/recovery/RecoveryStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/refresh/RefreshStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/reindex/AbstractBulkByScrollRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/reindex/AbstractBulkByScrollRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/reindex/AbstractBulkIndexByScrollRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/reindex/AbstractBulkIndexByScrollRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/reindex/BulkByScrollResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/reindex/BulkByScrollTask.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/reindex/ClientScrollableHitSource.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/reindex/DeleteByQueryAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/reindex/DeleteByQueryRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/reindex/DeleteByQueryRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/reindex/LeaderBulkByScrollTaskState.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/reindex/ReindexAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/reindex/ReindexRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/reindex/ReindexRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/reindex/RemoteInfo.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/reindex/ScrollableHitSource.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/reindex/SuccessfullyProcessed.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/reindex/UpdateByQueryAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/reindex/UpdateByQueryRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/reindex/UpdateByQueryRequestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/reindex/WorkerBulkByScrollTaskState.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/search/ESToParentBlockJoinQuery.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/search/MatchQuery.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/search/MultiMatchQuery.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/search/NestedHelper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/search/QueryParserHelper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/search/QueryStringQueryParser.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/search/SimpleQueryStringQueryParser.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/search/stats/SearchStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/search/stats/ShardSearchStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/seqno/CountedBitSet.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/seqno/GlobalCheckpointSyncAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/seqno/GlobalCheckpointTracker.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/seqno/LocalCheckpointTracker.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/seqno/SeqNoStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/seqno/SequenceNumbers.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/settings/IndexDynamicSettings.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/shard/AbstractIndexShardComponent.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/shard/DocsStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/shard/ElasticsearchMergePolicy.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/shard/IllegalIndexShardStateException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/shard/IndexEventListener.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/shard/IndexSearcherWrapper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/shard/IndexShard.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/shard/IndexShardClosedException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/shard/IndexShardComponent.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/shard/IndexShardNotRecoveringException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/shard/IndexShardNotStartedException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/shard/IndexShardOperationPermits.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/shard/IndexShardRecoveringException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/shard/IndexShardRecoveryException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/shard/IndexShardRelocatedException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/shard/IndexShardStartedException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/shard/IndexShardState.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/shard/IndexingOperationListener.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/shard/IndexingStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/shard/InternalIndexingStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/shard/LocalShardSnapshot.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/shard/PrimaryReplicaSyncer.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/shard/RefreshListeners.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/shard/ReplicationGroup.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/shard/SearchOperationListener.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/shard/ShardId.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/shard/ShardNotFoundException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/shard/ShardPath.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/shard/ShardSplittingQuery.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/shard/ShardStateMetaData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/shard/ShardUtils.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/shard/StoreRecovery.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/similarity/AbstractSimilarityProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/similarity/BM25SimilarityProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/similarity/BooleanSimilarityProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/similarity/ClassicSimilarityProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/similarity/DFISimilarityProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/similarity/DFRSimilarityProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/similarity/IBSimilarityProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/similarity/LMDirichletSimilarityProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/similarity/LMJelinekMercerSimilarityProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/similarity/ScriptedSimilarity.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/similarity/ScriptedSimilarityProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/similarity/SimilarityProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/similarity/SimilarityService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/snapshots/IndexShardRestoreException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/snapshots/IndexShardRestoreFailedException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/snapshots/IndexShardSnapshotException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/snapshots/IndexShardSnapshotFailedException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/snapshots/IndexShardSnapshotStatus.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/snapshots/blobstore/BlobStoreIndexShardSnapshot.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/snapshots/blobstore/BlobStoreIndexShardSnapshots.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/snapshots/blobstore/RateLimitingInputStream.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/snapshots/blobstore/SlicedInputStream.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/snapshots/blobstore/SnapshotFiles.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/store/DirectoryService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/store/DirectoryUtils.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/store/FsDirectoryService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/store/IndexStore.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/store/Store.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/store/StoreFileMetaData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/store/StoreStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/store/VerifyingIndexOutput.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/termvectors/TermVectorsService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/translog/BaseTranslogReader.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/translog/BufferedChecksumStreamInput.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/translog/BufferedChecksumStreamOutput.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/translog/ChannelFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/translog/Checkpoint.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/translog/MultiSnapshot.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/translog/Translog.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/translog/TranslogConfig.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/translog/TranslogCorruptedException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/translog/TranslogDeletionPolicy.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/translog/TranslogException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/translog/TranslogReader.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/translog/TranslogSnapshot.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/translog/TranslogStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/translog/TranslogToolCli.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/translog/TranslogWriter.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/translog/TruncateTranslogCommand.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/translog/TruncatedTranslogException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/warmer/ShardIndexWarmerService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/index/warmer/WarmerStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/AbstractIndexShardCacheEntity.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/AliasFilterParsingException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/IndexClosedException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/IndexCreationException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/IndexPrimaryShardNotAllocatedException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/IndexTemplateMissingException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/IndexingMemoryController.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/IndicesModule.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/IndicesQueryCache.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/IndicesRequestCache.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/IndicesService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/InvalidAliasNameException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/InvalidIndexNameException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/InvalidIndexTemplateException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/InvalidTypeNameException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/NodeIndicesStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/TermsLookup.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/TypeMissingException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/analysis/AnalysisModule.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/analysis/HunspellService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/analysis/PreBuiltAnalyzers.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/analysis/PreBuiltCacheFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/analysis/PreBuiltTokenizers.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/breaker/AllCircuitBreakerStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/breaker/BreakerSettings.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/breaker/CircuitBreakerService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/breaker/CircuitBreakerStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/breaker/HierarchyCircuitBreakerService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/breaker/NoneCircuitBreakerService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/cluster/IndicesClusterStateService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/fielddata/cache/IndicesFieldDataCache.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/fielddata/cache/IndicesFieldDataCacheListener.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/flush/ShardsSyncedFlushResult.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/flush/SyncedFlushService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/mapper/MapperRegistry.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/recovery/DelayRecoveryException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/recovery/PeerRecoverySourceService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/recovery/PeerRecoveryTargetService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/recovery/RecoverFilesRecoveryException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/recovery/RecoveriesCollection.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/recovery/RecoveryCleanFilesRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/recovery/RecoveryFailedException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/recovery/RecoveryFileChunkRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/recovery/RecoveryFilesInfoRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/recovery/RecoveryFinalizeRecoveryRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/recovery/RecoveryHandoffPrimaryContextRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/recovery/RecoveryPrepareForTranslogOperationsRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/recovery/RecoveryResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/recovery/RecoverySettings.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/recovery/RecoverySourceHandler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/recovery/RecoveryState.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/recovery/RecoveryTarget.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/recovery/RecoveryTargetHandler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/recovery/RecoveryTranslogOperationsRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/recovery/RecoveryTranslogOperationsResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/recovery/RecoveryWaitForClusterStateRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/recovery/RemoteRecoveryTargetHandler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/recovery/StartRecoveryRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/store/IndicesStore.java (100%) rename {core => server}/src/main/java/org/elasticsearch/indices/store/TransportNodesListShardStoreMetaData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/ingest/AbstractProcessor.java (100%) rename {core => server}/src/main/java/org/elasticsearch/ingest/CompoundProcessor.java (100%) rename {core => server}/src/main/java/org/elasticsearch/ingest/ConfigurationUtils.java (100%) rename {core => server}/src/main/java/org/elasticsearch/ingest/IngestDocument.java (100%) rename {core => server}/src/main/java/org/elasticsearch/ingest/IngestInfo.java (100%) rename {core => server}/src/main/java/org/elasticsearch/ingest/IngestMetadata.java (100%) rename {core => server}/src/main/java/org/elasticsearch/ingest/IngestService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/ingest/IngestStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/ingest/Pipeline.java (100%) rename {core => server}/src/main/java/org/elasticsearch/ingest/PipelineConfiguration.java (100%) rename {core => server}/src/main/java/org/elasticsearch/ingest/PipelineExecutionService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/ingest/PipelineStore.java (100%) rename {core => server}/src/main/java/org/elasticsearch/ingest/Processor.java (100%) rename {core => server}/src/main/java/org/elasticsearch/ingest/ProcessorInfo.java (100%) rename {core => server}/src/main/java/org/elasticsearch/ingest/ValueSource.java (100%) rename {core => server}/src/main/java/org/elasticsearch/monitor/MonitorService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/monitor/Probes.java (100%) rename {core => server}/src/main/java/org/elasticsearch/monitor/fs/FsInfo.java (100%) rename {core => server}/src/main/java/org/elasticsearch/monitor/fs/FsProbe.java (100%) rename {core => server}/src/main/java/org/elasticsearch/monitor/fs/FsService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/monitor/jvm/DeadlockAnalyzer.java (100%) rename {core => server}/src/main/java/org/elasticsearch/monitor/jvm/GcNames.java (100%) rename {core => server}/src/main/java/org/elasticsearch/monitor/jvm/HotThreads.java (100%) rename {core => server}/src/main/java/org/elasticsearch/monitor/jvm/JvmGcMonitorService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/monitor/jvm/JvmInfo.java (100%) rename {core => server}/src/main/java/org/elasticsearch/monitor/jvm/JvmService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/monitor/jvm/JvmStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/monitor/os/DummyOsInfo.java (100%) rename {core => server}/src/main/java/org/elasticsearch/monitor/os/OsInfo.java (100%) rename {core => server}/src/main/java/org/elasticsearch/monitor/os/OsProbe.java (100%) rename {core => server}/src/main/java/org/elasticsearch/monitor/os/OsService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/monitor/os/OsStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/monitor/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/monitor/process/ProcessInfo.java (100%) rename {core => server}/src/main/java/org/elasticsearch/monitor/process/ProcessProbe.java (100%) rename {core => server}/src/main/java/org/elasticsearch/monitor/process/ProcessService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/monitor/process/ProcessStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/node/AdaptiveSelectionStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/node/InternalSettingsPreparer.java (100%) rename {core => server}/src/main/java/org/elasticsearch/node/Node.java (100%) rename {core => server}/src/main/java/org/elasticsearch/node/NodeClosedException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/node/NodeService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/node/NodeValidationException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/node/ResponseCollectorService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/node/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/plugins/ActionPlugin.java (100%) rename {core => server}/src/main/java/org/elasticsearch/plugins/AnalysisPlugin.java (100%) rename {core => server}/src/main/java/org/elasticsearch/plugins/ClusterPlugin.java (100%) rename {core => server}/src/main/java/org/elasticsearch/plugins/DiscoveryPlugin.java (100%) rename {core => server}/src/main/java/org/elasticsearch/plugins/ExtensiblePlugin.java (100%) rename {core => server}/src/main/java/org/elasticsearch/plugins/IngestPlugin.java (100%) rename {core => server}/src/main/java/org/elasticsearch/plugins/MapperPlugin.java (100%) rename {core => server}/src/main/java/org/elasticsearch/plugins/MetaDataUpgrader.java (100%) rename {core => server}/src/main/java/org/elasticsearch/plugins/MetaPluginInfo.java (100%) rename {core => server}/src/main/java/org/elasticsearch/plugins/NetworkPlugin.java (100%) rename {core => server}/src/main/java/org/elasticsearch/plugins/Platforms.java (100%) rename {core => server}/src/main/java/org/elasticsearch/plugins/Plugin.java (100%) rename {core => server}/src/main/java/org/elasticsearch/plugins/PluginInfo.java (100%) rename {core => server}/src/main/java/org/elasticsearch/plugins/PluginLoaderIndirection.java (100%) rename {core => server}/src/main/java/org/elasticsearch/plugins/PluginSecurity.java (100%) rename {core => server}/src/main/java/org/elasticsearch/plugins/PluginsService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/plugins/RepositoryPlugin.java (100%) rename {core => server}/src/main/java/org/elasticsearch/plugins/ScriptPlugin.java (100%) rename {core => server}/src/main/java/org/elasticsearch/plugins/SearchPlugin.java (100%) rename {core => server}/src/main/java/org/elasticsearch/plugins/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/plugins/spi/NamedXContentProvider.java (100%) rename {core => server}/src/main/java/org/elasticsearch/plugins/spi/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/repositories/IndexId.java (100%) rename {core => server}/src/main/java/org/elasticsearch/repositories/RepositoriesModule.java (100%) rename {core => server}/src/main/java/org/elasticsearch/repositories/RepositoriesService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/repositories/Repository.java (100%) rename {core => server}/src/main/java/org/elasticsearch/repositories/RepositoryData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/repositories/RepositoryException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/repositories/RepositoryMissingException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/repositories/RepositoryVerificationException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/repositories/VerificationFailure.java (100%) rename {core => server}/src/main/java/org/elasticsearch/repositories/VerifyNodeRepositoryAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreFormat.java (100%) rename {core => server}/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreRepository.java (100%) rename {core => server}/src/main/java/org/elasticsearch/repositories/blobstore/ChecksumBlobStoreFormat.java (100%) rename {core => server}/src/main/java/org/elasticsearch/repositories/fs/FsRepository.java (100%) rename {core => server}/src/main/java/org/elasticsearch/repositories/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/AbstractRestChannel.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/BaseRestHandler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/BytesRestResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/DeprecationRestHandler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/MethodHandlers.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/RestChannel.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/RestController.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/RestHandler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/RestRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/RestResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/RestStatus.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/RestUtils.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/AcknowledgedRestListener.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/RestActionListener.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/RestActions.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/RestBuilderListener.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/RestFieldCapabilitiesAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/RestMainAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/RestResponseListener.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/RestStatusToXContentListener.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/RestToXContentListener.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestCancelTasksAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterAllocationExplainAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterGetSettingsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterHealthAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterRerouteAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterSearchShardsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterStateAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterStatsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterUpdateSettingsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestCreateSnapshotAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestDeleteRepositoryAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestDeleteSnapshotAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestDeleteStoredScriptAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestGetRepositoriesAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestGetSnapshotsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestGetStoredScriptAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestGetTaskAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestListTasksAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestNodesHotThreadsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestNodesInfoAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestNodesStatsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestNodesUsageAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestPendingClusterTasksAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestPutRepositoryAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestPutStoredScriptAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestRemoteClusterInfoAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestRestoreSnapshotAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestSnapshotsStatusAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestVerifyRepositoryAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/cluster/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/AliasesNotFoundException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/RestAnalyzeAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/RestClearIndicesCacheAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/RestCloseIndexAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/RestCreateIndexAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/RestDeleteIndexAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/RestDeleteIndexTemplateAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/RestFlushAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/RestForceMergeAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetAliasesAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetAllAliasesAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetAllMappingsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetAllSettingsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetFieldMappingAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetIndexTemplateAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetIndicesAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetMappingAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetSettingsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/RestIndexDeleteAliasesAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/RestIndexPutAliasAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/RestIndicesAliasesAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/RestIndicesSegmentsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/RestIndicesShardStoresAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/RestIndicesStatsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/RestOpenIndexAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/RestPutIndexTemplateAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/RestPutMappingAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/RestRecoveryAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/RestRefreshAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/RestRolloverIndexAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/RestShrinkIndexAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/RestSplitIndexAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/RestSyncedFlushAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/RestUpdateSettingsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/RestUpgradeAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/RestValidateQueryAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/admin/indices/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/cat/AbstractCatAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/cat/RestAliasAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/cat/RestAllocationAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/cat/RestCatAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/cat/RestCountAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/cat/RestFielddataAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/cat/RestHealthAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/cat/RestIndicesAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/cat/RestMasterAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/cat/RestNodeAttrsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/cat/RestNodesAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/cat/RestPendingClusterTasksAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/cat/RestPluginsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/cat/RestRecoveryAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/cat/RestRepositoriesAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/cat/RestSegmentsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/cat/RestShardsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/cat/RestSnapshotAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/cat/RestTable.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/cat/RestTasksAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/cat/RestTemplatesAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/cat/RestThreadPoolAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/cat/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/document/RestBulkAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/document/RestCountAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/document/RestDeleteAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/document/RestGetAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/document/RestGetSourceAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/document/RestIndexAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/document/RestMultiGetAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/document/RestMultiTermVectorsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/document/RestTermVectorsAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/document/RestUpdateAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/document/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/ingest/RestDeletePipelineAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/ingest/RestGetPipelineAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/ingest/RestPutPipelineAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/ingest/RestSimulatePipelineAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/ingest/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/search/RestClearScrollAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/search/RestExplainAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/search/RestMultiSearchAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/search/RestSearchAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/search/RestSearchScrollAction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/action/search/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/rest/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/script/ClassPermission.java (100%) rename {core => server}/src/main/java/org/elasticsearch/script/ExecutableScript.java (100%) rename {core => server}/src/main/java/org/elasticsearch/script/ExplainableSearchScript.java (100%) rename {core => server}/src/main/java/org/elasticsearch/script/FilterScript.java (100%) rename {core => server}/src/main/java/org/elasticsearch/script/GeneralScriptException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/script/ScoreAccessor.java (100%) rename {core => server}/src/main/java/org/elasticsearch/script/Script.java (100%) rename {core => server}/src/main/java/org/elasticsearch/script/ScriptContext.java (100%) rename {core => server}/src/main/java/org/elasticsearch/script/ScriptEngine.java (100%) rename {core => server}/src/main/java/org/elasticsearch/script/ScriptException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/script/ScriptMetaData.java (100%) rename {core => server}/src/main/java/org/elasticsearch/script/ScriptMetrics.java (100%) rename {core => server}/src/main/java/org/elasticsearch/script/ScriptModule.java (100%) rename {core => server}/src/main/java/org/elasticsearch/script/ScriptService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/script/ScriptStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/script/ScriptType.java (100%) rename {core => server}/src/main/java/org/elasticsearch/script/SearchScript.java (100%) rename {core => server}/src/main/java/org/elasticsearch/script/SimilarityScript.java (100%) rename {core => server}/src/main/java/org/elasticsearch/script/SimilarityWeightScript.java (100%) rename {core => server}/src/main/java/org/elasticsearch/script/StoredScriptSource.java (100%) rename {core => server}/src/main/java/org/elasticsearch/script/TemplateScript.java (100%) rename {core => server}/src/main/java/org/elasticsearch/script/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/DefaultSearchContext.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/DocValueFormat.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/MultiValueMode.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/Scroll.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/SearchContextException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/SearchContextMissingException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/SearchException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/SearchExtBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/SearchHit.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/SearchHits.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/SearchModule.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/SearchParseException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/SearchPhase.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/SearchPhaseResult.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/SearchService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/SearchShardTarget.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/SearchSortValues.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/AbstractAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/Aggregation.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/AggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/AggregationBuilders.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/AggregationExecutionException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/AggregationInitializationException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/AggregationPhase.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/Aggregations.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/Aggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/AggregatorBase.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/AggregatorFactories.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/AggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/BaseAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/BucketCollector.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/BucketOrder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/HasAggregations.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/InternalAggregation.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/InternalAggregations.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/InternalMultiBucketAggregation.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/InternalOrder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/InvalidAggregationPathException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/KeyComparable.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/LeafBucketCollector.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/LeafBucketCollectorBase.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/MultiBucketConsumerService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/NonCollectingAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/ParsedAggregation.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/ParsedMultiBucketAggregation.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/PipelineAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/SearchContextAggregations.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/BestBucketsDeferringCollector.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/BucketUtils.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/BucketsAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/DeferableBucketAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/DeferringBucketCollector.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/InternalSingleBucketAggregation.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/MultiBucketAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/MultiBucketsAggregation.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/ParsedSingleBucketAggregation.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/SingleBucketAggregation.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/SingleBucketAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/adjacency/AdjacencyMatrix.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/adjacency/AdjacencyMatrixAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/adjacency/AdjacencyMatrixAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/adjacency/AdjacencyMatrixAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/adjacency/InternalAdjacencyMatrix.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/adjacency/ParsedAdjacencyMatrix.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregation.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregationFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregationPlugin.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeKey.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesComparator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesSource.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesSourceBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesSourceConfig.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesSourceParserHelper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/DateHistogramValuesSourceBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/HistogramValuesSource.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/HistogramValuesSourceBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/InternalComposite.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/ParsedComposite.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/RoundingValuesSource.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/TermsValuesSourceBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/Filter.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FilterAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FilterAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FilterAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/Filters.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FiltersAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FiltersAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FiltersAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/InternalFilter.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/InternalFilters.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/ParsedFilter.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/ParsedFilters.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoGridAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGrid.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridParams.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/InternalGeoHashGrid.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/ParsedGeoHashGrid.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/global/Global.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/global/GlobalAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/global/GlobalAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/global/GlobalAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/global/InternalGlobal.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/global/ParsedGlobal.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramInterval.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/ExtendedBounds.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/Histogram.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalDateHistogram.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalHistogram.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/ParsedDateHistogram.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/ParsedHistogram.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/InternalMissing.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/Missing.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/MissingAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/MissingAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/MissingAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/ParsedMissing.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/InternalNested.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/InternalReverseNested.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/Nested.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ParsedNested.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ParsedReverseNested.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNested.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/package-info (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/range/AbstractRangeAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/range/AbstractRangeBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/range/BinaryRangeAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/range/BinaryRangeAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/range/DateRangeAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/range/DateRangeAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/range/GeoDistanceAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/range/GeoDistanceRangeAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/range/InternalBinaryRange.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/range/InternalDateRange.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/range/InternalGeoDistance.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/range/InternalRange.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/range/IpRangeAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/range/ParsedBinaryRange.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/range/ParsedDateRange.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/range/ParsedGeoDistance.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/range/ParsedRange.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/range/Range.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/range/RangeAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/range/RangeAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/range/RangeAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/BestDocsDeferringCollector.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedBytesHashSamplerAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedMapSamplerAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedNumericSamplerAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedOrdinalsSamplerAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/InternalSampler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/ParsedSampler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/Sampler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/SamplerAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/SamplerAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/SamplerAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/UnmappedSampler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/BucketSignificancePriorityQueue.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/GlobalOrdinalsSignificantTermsAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/InternalMappedSignificantTerms.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/InternalSignificantTerms.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/ParsedSignificantLongTerms.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/ParsedSignificantStringTerms.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/ParsedSignificantTerms.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantLongTerms.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantLongTermsAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantStringTerms.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantStringTermsAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTerms.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTermsAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTermsAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTextAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTextAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTextAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/UnmappedSignificantTerms.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/ChiSquare.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/GND.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/JLHScore.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/MutualInformation.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/NXYSignificanceHeuristic.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/PercentageScore.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/ScriptHeuristic.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificanceHeuristic.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificanceHeuristicBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificanceHeuristicParser.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/AbstractStringTermsAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/BucketPriorityQueue.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/DoubleTerms.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/DoubleTermsAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/GlobalOrdinalsStringTermsAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/IncludeExclude.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/InternalMappedTerms.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/InternalTerms.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/LongTerms.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/LongTermsAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/ParsedDoubleTerms.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/ParsedLongTerms.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/ParsedStringTerms.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/ParsedTerms.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/StringTerms.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/StringTermsAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/Terms.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/UnmappedTerms.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/InternalNumericMetricsAggregation.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/MetricsAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/NumericMetricsAggregation.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/NumericMetricsAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/ParsedSingleValueNumericMetricsAggregation.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/Avg.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/AvgAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/AvgAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/AvgAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/InternalAvg.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/ParsedAvg.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/Cardinality.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/CardinalityAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/CardinalityAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/CardinalityAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/HyperLogLogPlusPlus.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/InternalCardinality.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/ParsedCardinality.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/GeoBounds.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/GeoBoundsAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/GeoBoundsAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/GeoBoundsAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/InternalGeoBounds.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/ParsedGeoBounds.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/geocentroid/GeoCentroid.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/geocentroid/GeoCentroidAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/geocentroid/GeoCentroidAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/geocentroid/GeoCentroidAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/geocentroid/InternalGeoCentroid.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/geocentroid/ParsedGeoCentroid.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/max/InternalMax.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/max/Max.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/max/MaxAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/max/MaxAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/max/MaxAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/max/ParsedMax.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/min/InternalMin.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/min/Min.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/min/MinAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/min/MinAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/min/MinAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/min/ParsedMin.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/ParsedPercentileRanks.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/ParsedPercentiles.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/Percentile.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentileRanks.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentileRanksAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/Percentiles.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentilesAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentilesMethod.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/AbstractHDRPercentilesAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/AbstractInternalHDRPercentiles.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/HDRPercentileRanksAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/HDRPercentileRanksAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/HDRPercentilesAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/HDRPercentilesAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/InternalHDRPercentileRanks.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/InternalHDRPercentiles.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/ParsedHDRPercentileRanks.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/ParsedHDRPercentiles.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/AbstractInternalTDigestPercentiles.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/AbstractTDigestPercentilesAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/InternalTDigestPercentileRanks.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/InternalTDigestPercentiles.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/ParsedTDigestPercentileRanks.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/ParsedTDigestPercentiles.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestPercentileRanksAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestPercentileRanksAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestPercentilesAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestPercentilesAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestState.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/InternalScriptedMetric.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ParsedScriptedMetric.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetric.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/InternalStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/ParsedStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/Stats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/StatsAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/StatsAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/StatsAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ExtendedStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ExtendedStatsAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ExtendedStatsAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ExtendedStatsAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/InternalExtendedStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ParsedExtendedStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/InternalSum.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/ParsedSum.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/Sum.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/SumAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/SumAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/SumAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/InternalTopHits.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/ParsedTopHits.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHits.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHitsAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHitsAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHitsAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/InternalValueCount.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/ParsedValueCount.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/ValueCount.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/ValueCountAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/ValueCountAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/ValueCountAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/AbstractPipelineAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/BucketHelpers.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/InternalSimpleValue.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/ParsedSimpleValue.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/PipelineAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/PipelineAggregatorBuilders.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/SiblingPipelineAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/SimpleValue.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/BucketMetricValue.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/BucketMetricsParser.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/BucketMetricsPipelineAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/BucketMetricsPipelineAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/InternalBucketMetricValue.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/ParsedBucketMetricValue.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/avg/AvgBucketPipelineAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/avg/AvgBucketPipelineAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/max/MaxBucketPipelineAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/max/MaxBucketPipelineAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/min/MinBucketPipelineAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/min/MinBucketPipelineAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/percentile/InternalPercentilesBucket.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/percentile/ParsedPercentilesBucket.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/percentile/PercentilesBucket.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/percentile/PercentilesBucketPipelineAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/percentile/PercentilesBucketPipelineAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/InternalStatsBucket.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/ParsedStatsBucket.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/StatsBucket.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/StatsBucketPipelineAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/StatsBucketPipelineAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/ExtendedStatsBucket.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/ExtendedStatsBucketParser.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/ExtendedStatsBucketPipelineAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/ExtendedStatsBucketPipelineAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/InternalExtendedStatsBucket.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/ParsedExtendedStatsBucket.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/sum/SumBucketPipelineAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/sum/SumBucketPipelineAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketscript/BucketScriptPipelineAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketscript/BucketScriptPipelineAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketselector/BucketSelectorPipelineAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketselector/BucketSelectorPipelineAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketsort/BucketSortPipelineAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketsort/BucketSortPipelineAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/cumulativesum/CumulativeSumPipelineAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/cumulativesum/CumulativeSumPipelineAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/Derivative.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/DerivativePipelineAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/DerivativePipelineAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/InternalDerivative.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/ParsedDerivative.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/MovAvgPipelineAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/MovAvgPipelineAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/SimulatedAnealingMinimizer.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/EwmaModel.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/HoltLinearModel.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/HoltWintersModel.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/LinearModel.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/MovAvgModel.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/MovAvgModelBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/SimpleModel.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/serialdiff/SerialDiffPipelineAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/pipeline/serialdiff/SerialDiffPipelineAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/support/AggregationPath.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/support/FieldContext.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/support/MissingValues.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/support/ValueType.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSource.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceAggregationBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceAggregatorFactory.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceConfig.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceParserHelper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceType.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/support/values/ScriptBytesValues.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/support/values/ScriptDoubleValues.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/aggregations/support/values/ScriptLongValues.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilderException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/collapse/CollapseBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/collapse/CollapseContext.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/dfs/AggregatedDfs.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/dfs/DfsPhase.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/dfs/DfsPhaseExecutionException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/dfs/DfsSearchResult.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/FetchPhase.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/FetchPhaseExecutionException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/FetchSearchResult.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/FetchSubPhase.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/QueryFetchSearchResult.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/ScrollQueryFetchSearchResult.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/ShardFetchRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/ShardFetchSearchRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/StoredFieldsContext.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/subphase/DocValueFieldsContext.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/subphase/DocValueFieldsFetchSubPhase.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/subphase/ExplainFetchSubPhase.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/subphase/FetchSourceContext.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/subphase/FetchSourceSubPhase.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/subphase/InnerHitsContext.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/subphase/InnerHitsFetchSubPhase.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/subphase/MatchedQueriesFetchSubPhase.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/subphase/ParentFieldSubFetchPhase.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/subphase/ScriptFieldsContext.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/subphase/ScriptFieldsFetchSubPhase.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/subphase/VersionFetchSubPhase.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/AbstractHighlighterBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/CustomQueryScorer.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/FastVectorHighlighter.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/FragmentBuilderHelper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightField.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightPhase.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightUtils.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/Highlighter.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlighterContext.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/PlainHighlighter.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/SearchContextHighlight.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/SimpleFragmentsBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/SourceScoreOrderFragmentsBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/SourceSimpleFragmentsBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/UnifiedHighlighter.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/fetch/subphase/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/internal/AliasFilter.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/internal/CancellableBulkScorer.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/internal/ContextIndexSearcher.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/internal/FilteredSearchContext.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/internal/InternalScrollSearchRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/internal/InternalSearchResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/internal/ScrollContext.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/internal/SearchContext.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/internal/ShardSearchLocalRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/internal/ShardSearchRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/internal/ShardSearchTransportRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/internal/SubSearchContext.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/lookup/DocLookup.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/lookup/FieldLookup.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/lookup/FieldsLookup.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/lookup/LeafDocLookup.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/lookup/LeafFieldsLookup.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/lookup/LeafSearchLookup.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/lookup/SearchLookup.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/lookup/SourceLookup.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/profile/AbstractInternalProfileTree.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/profile/AbstractProfileBreakdown.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/profile/AbstractProfiler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/profile/ProfileResult.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/profile/ProfileShardResult.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/profile/Profilers.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/profile/SearchProfileShardResults.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/profile/Timer.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/profile/aggregation/AggregationProfileBreakdown.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/profile/aggregation/AggregationProfileShardResult.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/profile/aggregation/AggregationProfiler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/profile/aggregation/AggregationTimingType.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/profile/aggregation/InternalAggregationProfileTree.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/profile/aggregation/ProfilingAggregator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/profile/aggregation/ProfilingLeafBucketCollector.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/profile/aggregation/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/profile/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/profile/query/CollectorResult.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/profile/query/InternalProfileCollector.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/profile/query/InternalQueryProfileTree.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/profile/query/ProfileCollector.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/profile/query/ProfileScorer.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/profile/query/ProfileWeight.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/profile/query/QueryProfileBreakdown.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/profile/query/QueryProfileShardResult.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/profile/query/QueryProfiler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/profile/query/QueryTimingType.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/profile/query/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/query/CancellableCollector.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/query/EarlyTerminatingCollector.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/query/QueryCollectorContext.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/query/QueryPhase.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/query/QueryPhaseExecutionException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/query/QuerySearchRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/query/QuerySearchResult.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/query/ScrollQuerySearchResult.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/query/TopDocsCollectorContext.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/rescore/QueryRescoreMode.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/rescore/QueryRescorer.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/rescore/QueryRescorerBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/rescore/RescoreContext.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/rescore/RescorePhase.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/rescore/Rescorer.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/rescore/RescorerBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/searchafter/SearchAfterBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/slice/DocValuesSliceQuery.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/slice/SliceBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/slice/SliceQuery.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/slice/TermsSliceQuery.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/sort/FieldSortBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/sort/GeoDistanceSortBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/sort/NestedSortBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/sort/ScoreSortBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/sort/ScriptSortBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/sort/SortAndFormats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/sort/SortBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/sort/SortBuilders.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/sort/SortFieldAndFormat.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/sort/SortMode.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/sort/SortOrder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/DirectSpellcheckerSettings.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/SortBy.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/Suggest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/SuggestBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/SuggestBuilders.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/SuggestPhase.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/Suggester.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/SuggestionBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/SuggestionSearchContext.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/completion/CompletionFieldStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/completion/CompletionStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggester.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestion.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestionBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestionContext.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/completion/FuzzyOptions.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/completion/RegexOptions.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/completion/context/CategoryContextMapping.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/completion/context/CategoryQueryContext.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/completion/context/ContextBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/completion/context/ContextMapping.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/completion/context/ContextMappings.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/completion/context/GeoContextMapping.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/completion/context/GeoQueryContext.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/completion/context/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/completion/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/phrase/CandidateGenerator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/phrase/CandidateScorer.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/phrase/Correction.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/phrase/DirectCandidateGenerator.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/phrase/DirectCandidateGeneratorBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/phrase/Laplace.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/phrase/LaplaceScorer.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/phrase/LinearInterpolatingScorer.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/phrase/LinearInterpolation.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/phrase/MultiCandidateGeneratorWrapper.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/phrase/NoisyChannelSpellChecker.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggester.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestion.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionContext.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/phrase/SmoothingModel.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/phrase/StupidBackoff.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/phrase/StupidBackoffScorer.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/phrase/WordScorer.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/phrase/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/term/TermSuggester.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/term/TermSuggestion.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/term/TermSuggestionBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/term/TermSuggestionContext.java (100%) rename {core => server}/src/main/java/org/elasticsearch/search/suggest/term/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/snapshots/ConcurrentSnapshotExecutionException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/snapshots/InvalidSnapshotNameException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/snapshots/RestoreInfo.java (100%) rename {core => server}/src/main/java/org/elasticsearch/snapshots/RestoreService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/snapshots/Snapshot.java (100%) rename {core => server}/src/main/java/org/elasticsearch/snapshots/SnapshotCreationException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/snapshots/SnapshotException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/snapshots/SnapshotId.java (100%) rename {core => server}/src/main/java/org/elasticsearch/snapshots/SnapshotInfo.java (100%) rename {core => server}/src/main/java/org/elasticsearch/snapshots/SnapshotMissingException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/snapshots/SnapshotRestoreException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/snapshots/SnapshotShardFailure.java (100%) rename {core => server}/src/main/java/org/elasticsearch/snapshots/SnapshotShardsService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/snapshots/SnapshotState.java (100%) rename {core => server}/src/main/java/org/elasticsearch/snapshots/SnapshotUtils.java (100%) rename {core => server}/src/main/java/org/elasticsearch/snapshots/SnapshotsService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/tasks/CancellableTask.java (100%) rename {core => server}/src/main/java/org/elasticsearch/tasks/LoggingTaskListener.java (100%) rename {core => server}/src/main/java/org/elasticsearch/tasks/RawTaskStatus.java (100%) rename {core => server}/src/main/java/org/elasticsearch/tasks/Task.java (100%) rename {core => server}/src/main/java/org/elasticsearch/tasks/TaskAwareRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/tasks/TaskCancelledException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/tasks/TaskId.java (100%) rename {core => server}/src/main/java/org/elasticsearch/tasks/TaskInfo.java (100%) rename {core => server}/src/main/java/org/elasticsearch/tasks/TaskListener.java (100%) rename {core => server}/src/main/java/org/elasticsearch/tasks/TaskManager.java (100%) rename {core => server}/src/main/java/org/elasticsearch/tasks/TaskResult.java (100%) rename {core => server}/src/main/java/org/elasticsearch/tasks/TaskResultsService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/tasks/package-info.java (100%) rename {core => server}/src/main/java/org/elasticsearch/threadpool/AutoQueueAdjustingExecutorBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/threadpool/ExecutorBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/threadpool/FixedExecutorBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/threadpool/ScalingExecutorBuilder.java (100%) rename {core => server}/src/main/java/org/elasticsearch/threadpool/Scheduler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/threadpool/ThreadPool.java (100%) rename {core => server}/src/main/java/org/elasticsearch/threadpool/ThreadPoolInfo.java (100%) rename {core => server}/src/main/java/org/elasticsearch/threadpool/ThreadPoolStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/ActionNotFoundTransportException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/ActionTransportException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/BindTransportException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/BytesTransportRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/CompressibleBytesOutputStream.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/ConnectTransportException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/ConnectionProfile.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/EmptyTransportResponseHandler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/FutureTransportResponseHandler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/NodeDisconnectedException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/NodeNotConnectedException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/NodeShouldNotConnectException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/NotSerializableTransportException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/PlainTransportFuture.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/ReceiveTimeoutTransportException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/RemoteClusterAware.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/RemoteClusterConnection.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/RemoteClusterService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/RemoteConnectionInfo.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/RemoteTransportException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/RequestHandlerRegistry.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/ResponseHandlerFailureTransportException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/SendRequestTransportException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/TaskAwareTransportRequestHandler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/TaskTransportChannel.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/TcpChannel.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/TcpHeader.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/TcpTransport.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/TcpTransportChannel.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/Transport.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/TransportActionProxy.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/TransportChannel.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/TransportChannelResponseHandler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/TransportConnectionListener.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/TransportException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/TransportFuture.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/TransportInfo.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/TransportInterceptor.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/TransportMessage.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/TransportRequest.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/TransportRequestHandler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/TransportRequestOptions.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/TransportResponse.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/TransportResponseHandler.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/TransportResponseOptions.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/TransportSerializationException.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/TransportService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/TransportStats.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/TransportStatus.java (100%) rename {core => server}/src/main/java/org/elasticsearch/transport/Transports.java (100%) rename {core => server}/src/main/java/org/elasticsearch/usage/UsageService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/watcher/AbstractResourceWatcher.java (100%) rename {core => server}/src/main/java/org/elasticsearch/watcher/FileChangesListener.java (100%) rename {core => server}/src/main/java/org/elasticsearch/watcher/FileWatcher.java (100%) rename {core => server}/src/main/java/org/elasticsearch/watcher/ResourceWatcher.java (100%) rename {core => server}/src/main/java/org/elasticsearch/watcher/ResourceWatcherService.java (100%) rename {core => server}/src/main/java/org/elasticsearch/watcher/WatcherHandle.java (100%) rename {core => server}/src/main/java/org/joda/time/format/StrictISODateTimeFormat.java (100%) rename {core => server}/src/main/resources/META-INF/services/org.apache.lucene.codecs.Codec (100%) rename {core => server}/src/main/resources/META-INF/services/org.apache.lucene.codecs.DocValuesFormat (100%) rename {core => server}/src/main/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat (100%) rename {core => server}/src/main/resources/config/favicon.ico (100%) rename {core => server}/src/main/resources/org/elasticsearch/bootstrap/security.policy (100%) rename {core => server}/src/main/resources/org/elasticsearch/bootstrap/test-framework.policy (100%) rename {core => server}/src/main/resources/org/elasticsearch/bootstrap/untrusted.policy (100%) rename {core => server}/src/main/resources/org/elasticsearch/index/mapper/default-mapping.json (100%) rename {core => server}/src/main/resources/org/elasticsearch/index/mapper/script-mapping.json (100%) rename {core => server}/src/main/resources/org/elasticsearch/tasks/task-index-mapping.json (100%) rename {core => server}/src/test/eclipse-build.gradle (81%) rename {core => server}/src/test/java/org/apache/lucene/analysis/miscellaneous/DeDuplicatingTokenFilterTests.java (100%) rename {core => server}/src/test/java/org/apache/lucene/analysis/miscellaneous/TruncateTokenFilterTests.java (100%) rename {core => server}/src/test/java/org/apache/lucene/grouping/CollapsingTopDocsCollectorTests.java (100%) rename {core => server}/src/test/java/org/apache/lucene/queries/BaseRandomBinaryDocValuesRangeQueryTestCase.java (100%) rename {core => server}/src/test/java/org/apache/lucene/queries/BinaryDocValuesRangeQueryTests.java (100%) rename {core => server}/src/test/java/org/apache/lucene/queries/BlendedTermQueryTests.java (100%) rename {core => server}/src/test/java/org/apache/lucene/queries/DoubleRandomBinaryDocValuesRangeQueryTests.java (100%) rename {core => server}/src/test/java/org/apache/lucene/queries/FloatRandomBinaryDocValuesRangeQueryTests.java (100%) rename {core => server}/src/test/java/org/apache/lucene/queries/InetAddressRandomBinaryDocValuesRangeQueryTests.java (100%) rename {core => server}/src/test/java/org/apache/lucene/queries/IntegerRandomBinaryDocValuesRangeQueryTests.java (100%) rename {core => server}/src/test/java/org/apache/lucene/queries/LongRandomBinaryDocValuesRangeQueryTests.java (100%) rename {core => server}/src/test/java/org/apache/lucene/queries/MinDocQueryTests.java (100%) rename {core => server}/src/test/java/org/apache/lucene/queries/SearchAfterSortedDocQueryTests.java (100%) rename {core => server}/src/test/java/org/apache/lucene/search/QueriesTests.java (100%) rename {core => server}/src/test/java/org/apache/lucene/search/uhighlight/BoundedBreakIteratorScannerTests.java (100%) rename {core => server}/src/test/java/org/apache/lucene/search/uhighlight/CustomPassageFormatterTests.java (100%) rename {core => server}/src/test/java/org/apache/lucene/search/uhighlight/CustomUnifiedHighlighterTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/BuildTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/ElasticsearchExceptionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/ExceptionSerializationTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/SpecialPermissionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/VersionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/ActionListenerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/ActionModuleTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/DocWriteResponseTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/ExplainRequestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/IndicesRequestIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/ListenerActionIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/NotifyOnceListenerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/OriginalIndicesTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/RejectionActionIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/ShardValidateQueryRequestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/HotThreadsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainActionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainRequestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplanationTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthResponsesTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthActionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/cluster/node/stats/NodeStatsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/CancellableTasksTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/RecordingTaskManagerListener.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TaskManagerTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TaskTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TasksIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TestTaskPlugin.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TransportTasksActionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/cluster/repositories/RepositoryBlocksIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteRequestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/cluster/settings/SettingsUpdaterTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsRequestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsResponseTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/cluster/snapshots/SnapshotBlocksIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotStatusTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsNodesTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/cluster/storedscripts/GetStoredScriptRequestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/cluster/storedscripts/PutStoredScriptRequestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/cluster/tasks/PendingTasksBlocksIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/indices/TransportAnalyzeActionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/indices/alias/AliasActionsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeRequestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheBlocksIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequestBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexResponseTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/indices/create/ShrinkIndexIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/indices/create/SplitIndexIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexBlocksIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexResponseTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/indices/exists/IndicesExistsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/indices/flush/FlushBlocksIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/indices/flush/SyncedFlushUnitTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/indices/forcemerge/ForceMergeBlocksIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/indices/get/GetIndexIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsResponseTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/indices/open/OpenIndexResponseTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/indices/refresh/RefreshBlocksIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/indices/rollover/ConditionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/indices/rollover/RolloverIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/indices/rollover/RolloverRequestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/indices/rollover/TransportRolloverActionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsBlocksIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoreRequestIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoreResponseTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/indices/shrink/TransportResizeActionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsBlocksIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsResponseTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/indices/template/put/MetaDataIndexTemplateServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/bulk/BackoffPolicyTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/bulk/BulkIntegrationIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/bulk/BulkItemResponseTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/bulk/BulkProcessorClusterSettingsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/bulk/BulkProcessorIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/bulk/BulkProcessorRetryIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/bulk/BulkProcessorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/bulk/BulkRequestModifierTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/bulk/BulkRequestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/bulk/BulkResponseTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/bulk/BulkShardRequestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/bulk/BulkWithUpdatesIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/bulk/RetryTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionIndicesThatCannotBeCreatedTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionIngestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionTookTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/bulk/TransportShardBulkActionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/delete/DeleteResponseTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesRequestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesResponseTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/get/GetResponseTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/get/MultiGetRequestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/get/MultiGetShardRequestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/index/IndexRequestBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/index/IndexRequestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/index/IndexResponseTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/ingest/PutPipelineRequestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/ingest/SimulateDocumentSimpleResultTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/ingest/SimulateExecutionServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/ingest/SimulatePipelineRequestParsingTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/ingest/SimulatePipelineRequestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/ingest/SimulatePipelineResponseTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/ingest/SimulateProcessorResultTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/ingest/TrackingResultProcessorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/ingest/WritePipelineResponseTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/ingest/WriteableIngestDocumentTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/main/MainActionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/main/MainResponseTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/resync/ResyncReplicationRequestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/search/AbstractSearchAsyncActionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/search/CanMatchPreFilterSearchPhaseTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/search/ClearScrollControllerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/search/ClearScrollRequestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/search/CountedCollectorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/search/DfsQueryPhaseTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/search/ExpandSearchPhaseTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/search/FetchSearchPhaseTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/search/MockSearchPhaseContext.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/search/MultiSearchActionTookTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/search/MultiSearchRequestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/search/MultiSearchResponseTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/search/SearchAsyncActionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/search/SearchPhaseControllerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/search/SearchPhaseExecutionExceptionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/search/SearchRequestBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/search/SearchResponseTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/search/SearchScrollAsyncActionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/search/SearchScrollRequestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/search/ShardSearchFailureTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/search/TransportMultiSearchActionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/search/TransportSearchActionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/search/TransportSearchHelperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/search/TransportSearchIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/support/ActiveShardCountTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/support/ActiveShardsObserverIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/support/AdapterActionFutureTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/support/AutoCreateIndexTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/support/ContextPreservingActionListenerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/support/GroupedActionListenerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/support/IndicesOptionsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/support/ListenableActionFutureTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/support/RefreshPolicyTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/support/TransportActionFilterChainTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/support/WaitActiveShardCountIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/support/broadcast/node/TransportBroadcastByNodeActionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/support/master/IndexingMasterFailoverIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/support/master/TransportMasterNodeActionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/support/master/TransportMasterNodeActionUtils.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/support/nodes/TransportNodesActionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/support/replication/BroadcastReplicationTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/support/replication/ClusterStateCreationUtils.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/support/replication/ReplicationOperationTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/support/replication/ReplicationResponseTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/support/replication/TransportReplicationActionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/support/replication/TransportWriteActionTestHelper.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/support/replication/TransportWriteActionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/support/single/instance/TransportInstanceSingleOperationActionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/termvectors/AbstractTermVectorsTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/termvectors/GetTermVectorsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/termvectors/GetTermVectorsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/termvectors/MultiTermVectorsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/termvectors/TermVectorsUnitTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/update/UpdateRequestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/action/update/UpdateResponseTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/aliases/IndexAliasesIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/blocks/SimpleBlocksIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/bootstrap/BootstrapChecksTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/bootstrap/BootstrapSettingsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/bootstrap/BootstrapTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/bootstrap/ESPolicyTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/bootstrap/ElasticsearchCliTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/bootstrap/ElasticsearchUncaughtExceptionHandlerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/bootstrap/JNANativesTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/bootstrap/JarHellTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/bootstrap/JavaVersionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/bootstrap/MaxMapCountCheckTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/bootstrap/SecurityTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/broadcast/BroadcastActionsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/bwcompat/RecoveryWithUnsupportedIndicesIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/bwcompat/RestoreBackwardsCompatIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cli/CommandTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cli/MultiCommandTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cli/TerminalTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/client/AbstractClientHeadersTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/client/ParentTaskAssigningClientTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/client/node/NodeClientHeadersTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/client/node/NodeClientIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/client/transport/FailAndRetryMockTransport.java (100%) rename {core => server}/src/test/java/org/elasticsearch/client/transport/NodeDisconnectIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/client/transport/TransportClientHeadersTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/client/transport/TransportClientIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/client/transport/TransportClientNodesServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/client/transport/TransportClientRetryIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/client/transport/TransportClientTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/ClusterChangedEventTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/ClusterHealthIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/ClusterInfoServiceIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/ClusterInfoTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/ClusterModuleTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/ClusterStateDiffIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/ClusterStateTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/DiskUsageTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/GetClusterStateTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/MinimumMasterNodesIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/NoMasterNodeIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/NodeConnectionsServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/SimpleClusterStateIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/SimpleDataNodesIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/SnapshotsInProgressTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/SpecificMasterNodesIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/UpdateSettingsValidationIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/ack/AckClusterUpdateSettingsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/ack/AckIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/action/shard/ShardFailedClusterStateTaskExecutorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/action/shard/ShardStateActionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/allocation/AwarenessAllocationIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/allocation/ClusterRerouteIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/allocation/FilteringAllocationIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/allocation/SimpleAllocationIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/block/ClusterBlockTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/health/ClusterIndexHealthTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/health/ClusterStateHealthTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/metadata/AliasMetaDataTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/metadata/AliasValidatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/metadata/AutoExpandReplicasTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/metadata/ClusterNameExpressionResolverTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/metadata/DateMathExpressionResolverTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/metadata/HumanReadableIndexSettingsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/metadata/IndexCreationTaskTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/metadata/IndexGraveyardTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/metadata/IndexMetaDataTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolverTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/metadata/IndexTemplateMetaDataTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/metadata/MetaDataDeleteIndexServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/metadata/MetaDataIndexAliasesServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/metadata/MetaDataIndexUpgradeServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/metadata/MetaDataMappingServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/metadata/MetaDataTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/metadata/TemplateUpgradeServiceIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/metadata/TemplateUpgradeServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/metadata/ToAndFromJsonMetaDataTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/metadata/WildcardExpressionResolverTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeFiltersTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodesTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/AllocationIdTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/DelayedAllocationIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/DelayedAllocationServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/GroupShardsIteratorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/OperationRoutingTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/PrimaryAllocationIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/PrimaryTermsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/RandomShardRoutingMutator.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/RecoverySourceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/RoutingServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/RoutingTableGenerator.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/RoutingTableTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/ShardRoutingTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/UnassignedInfoTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/AddIncrementallyTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocateUnassignedDecisionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationCommandsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationDecisionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationPriorityTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/AwarenessAllocationTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/BalanceConfigurationTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/BalanceUnbalancedClusterTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/BalancedSingleShardTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/CatAllocationTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/ClusterRebalanceRoutingTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/ConcurrentRebalanceRoutingTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/DeadNodesAllocationTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/DecisionsImpactOnClusterHealthTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdMonitorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdSettingsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/ElectReplicaAsPrimaryDuringRelocationTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/ExpectedShardSizeAllocationTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedNodeRoutingTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedShardsRoutingTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/FilterRoutingTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/InSyncAllocationIdTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/IndexBalanceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/MaxRetryAllocationDeciderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/MoveDecisionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/NodeAllocationResultTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/NodeVersionAllocationDeciderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/PreferLocalPrimariesToRelocatingPrimariesTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/PreferPrimaryAllocationTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryElectionRoutingTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryNotRelocatedWhileBeingRecoveredTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/RandomAllocationDeciderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/RebalanceAfterActiveTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/ReplicaAllocatedAfterPrimaryTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/ResizeAllocationDeciderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/RoutingNodesIntegrityTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/RoutingNodesUtils.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/SameShardRoutingTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardStateIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardVersioningTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardsLimitAllocationTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardNoReplicasRoutingTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardOneReplicaRoutingTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/StartedShardsRoutingTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/TenShardsOneReplicaRoutingTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/ThrottlingAllocationTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/UpdateNumberOfReplicasTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DecisionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderUnitTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/EnableAllocationTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/FilterAllocationDeciderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/MockDiskUsagesIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/RestoreInProgressAllocationDeciderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/UpdateShardAllocationSettingsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/routing/operation/hash/murmur3/Murmur3HashFunctionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/serialization/ClusterSerializationTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/serialization/ClusterStateToStringTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/serialization/DiffableTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/service/ClusterApplierServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/service/ClusterSerivceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/service/ClusterServiceIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/service/MasterServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/service/TaskBatcherTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/service/TaskExecutorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/settings/ClusterSettingsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/settings/SettingsFilteringIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/shards/ClusterSearchShardsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/cluster/structure/RoutingIteratorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/BooleansTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/ChannelsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/ExponentiallyWeightedMovingAverageTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/FieldMemoryStatsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/NumbersTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/ParseFieldTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/PidFileTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/PriorityTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/ReleasablesTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/StringsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/TableTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/UUIDTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/blobstore/BlobPathTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/blobstore/FsBlobStoreContainerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/blobstore/FsBlobStoreTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/breaker/MemoryCircuitBreakerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/bytes/ByteBufferReferenceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/bytes/BytesArrayTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/bytes/CompositeBytesReferenceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/bytes/PagedBytesReferenceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/cache/CacheBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/cache/CacheTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/collect/CopyOnWriteHashMapTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/collect/EvictingQueueTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/collect/IteratorsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/compress/DeflateCompressTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/compress/DeflateCompressedXContentTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/geo/BaseGeoParsingTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/geo/GeoDistanceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/geo/GeoHashTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/geo/GeoJsonShapeParserTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/geo/GeoWKTShapeParserTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/geo/ShapeBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/geo/ShapeRelationTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/geo/SpatialStrategyTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/geo/builders/AbstractShapeBuilderTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/geo/builders/CircleBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/geo/builders/EnvelopeBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/geo/builders/GeometryCollectionBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/geo/builders/LineStringBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/geo/builders/MultiLineStringBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/geo/builders/MultiPointBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/geo/builders/MultiPolygonBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/geo/builders/PointBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/geo/builders/PolygonBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/hash/MessageDigestsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/hashing/MurmurHash3Tests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/hppc/HppcMapsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/io/FileSystemUtilsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/io/StreamsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/io/stream/AbstractWriteableEnumTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/io/stream/BytesStreamsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/io/stream/NamedWriteableRegistryTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/io/stream/ReleasableBytesStreamOutputTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/io/stream/StreamTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/joda/DateMathParserTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/joda/JodaTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/logging/DeprecationLoggerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/lucene/LuceneTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/lucene/ShardCoreKeyMapTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/lucene/index/ESDirectoryReaderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/lucene/index/FreqTermsEnumTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/lucene/search/MultiPhrasePrefixQueryTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/lucene/search/function/MinScoreScorerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/lucene/search/morelikethis/MoreLikeThisQueryTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/lucene/search/morelikethis/XMoreLikeThisTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/lucene/store/ByteArrayIndexInputTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/lucene/store/InputStreamIndexInputTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/lucene/uid/VersionLookupTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/lucene/uid/VersionsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/network/CidrsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/network/InetAddressesTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/network/NetworkAddressTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/network/NetworkModuleTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/network/NetworkServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/network/NetworkUtilsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/path/PathTrieTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/recycler/AbstractRecyclerTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/recycler/ConcurrentRecyclerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/recycler/LockedRecyclerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/recycler/NoneRecyclerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/recycler/QueueRecyclerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/regex/RegexTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/rounding/DateTimeUnitTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/rounding/TimeZoneRoundingTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/settings/AddFileKeyStoreCommandTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/settings/AddStringKeyStoreCommandTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/settings/CreateKeyStoreCommandTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/settings/KeyStoreCommandTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/settings/KeyStoreWrapperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/settings/ListKeyStoreCommandTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/settings/MemorySizeSettingsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/settings/PropertyPlaceholderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/settings/RemoveSettingKeyStoreCommandTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/settings/ScopedSettingsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/settings/SecureStringTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/settings/SettingTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/settings/SettingsFilterTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/settings/SettingsModuleTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/settings/SettingsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/transport/BoundTransportAddressTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/unit/ByteSizeUnitTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/unit/ByteSizeValueTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/unit/DistanceUnitTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/unit/FuzzinessTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/unit/RatioValueTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/unit/SizeValueTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/unit/TimeValueTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/util/ArrayUtilsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/util/BigArraysTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/util/ByteUtilsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/util/BytesRefHashTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/util/CancellableThreadsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/util/CollectionUtilsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/util/IndexFolderUpgraderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/util/LocaleUtilsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/util/LongHashTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/util/LongObjectHashMapTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/util/SingleObjectCacheTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/util/URIPatternTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/util/concurrent/AbstractLifecycleRunnableTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/util/concurrent/AbstractRunnableTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/util/concurrent/AsyncIOProcessorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/util/concurrent/CountDownTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/util/concurrent/EsExecutorsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/util/concurrent/EsThreadPoolExecutorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/util/concurrent/KeyedLockTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/util/concurrent/PrioritizedExecutorsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/util/concurrent/PrioritizedRunnableTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/util/concurrent/QueueResizingEsThreadPoolExecutorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/util/concurrent/RefCountedTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/util/concurrent/ResizableBlockingQueueTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/util/concurrent/ThreadContextTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/util/concurrent/TimedRunnableTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/util/iterable/IterablesTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/util/set/SetsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/xcontent/BaseXContentTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/xcontent/ConstructingObjectParserTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/xcontent/ObjectParserTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/xcontent/UnknownNamedObjectExceptionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/xcontent/XContentFactoryTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/xcontent/XContentParserTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/xcontent/XContentParserUtilsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/xcontent/XContentTypeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/xcontent/builder/XContentBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/xcontent/cbor/CborXContentParserTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/xcontent/cbor/CborXContentTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/xcontent/cbor/JsonVsCborTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/xcontent/json/JsonXContentTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/xcontent/smile/JsonVsSmileTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/xcontent/smile/SmileXContentTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/xcontent/support/AbstractFilteringTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/xcontent/support/XContentHelperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/xcontent/support/XContentMapValuesTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/xcontent/support/filtering/AbstractXContentFilteringTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/xcontent/support/filtering/CborXContentFilteringTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/xcontent/support/filtering/FilterPathGeneratorFilteringTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/xcontent/support/filtering/FilterPathTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/xcontent/support/filtering/JsonXContentFilteringTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/xcontent/support/filtering/SmileFilteringGeneratorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/xcontent/support/filtering/YamlFilteringGeneratorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/common/xcontent/yaml/YamlXContentTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/deps/jackson/JacksonLocationTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/deps/joda/SimpleJodaTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/deps/lucene/SimpleLuceneTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/deps/lucene/VectorHighlighterTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/discovery/AbstractDisruptionTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/discovery/BlockingClusterStatePublishResponseHandlerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/discovery/ClusterDisruptionIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/discovery/DiscoveryDisruptionIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/discovery/DiscoveryModuleTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/discovery/MasterDisruptionIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/discovery/SnapshotDisruptionIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/discovery/ZenFaultDetectionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/discovery/single/SingleNodeDiscoveryIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/discovery/single/SingleNodeDiscoveryTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/discovery/zen/ElectMasterServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/discovery/zen/MembershipActionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/discovery/zen/NodeJoinControllerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/discovery/zen/NodeRemovalClusterStateTaskExecutorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/discovery/zen/PendingClusterStatesQueueTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/discovery/zen/PublishClusterStateActionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/discovery/zen/UnicastZenPingTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/discovery/zen/ZenDiscoveryIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/discovery/zen/ZenDiscoveryUnitTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/discovery/zen/ZenPingTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/document/AliasedIndexDocumentActionsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/document/DocumentActionsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/document/ShardInfoIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/env/ESFileStoreTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/env/EnvironmentTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/env/NodeEnvironmentTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/explain/ExplainActionIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/gateway/AsyncShardFetchTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/gateway/DanglingIndicesStateTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/gateway/GatewayIndexStateIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/gateway/GatewayMetaStateTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/gateway/GatewayServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/gateway/MetaDataStateFormatTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/gateway/MetaDataWriteDataNodesIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/gateway/MetaStateServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/gateway/PrimaryShardAllocatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/gateway/PriorityComparatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/gateway/QuorumGatewayIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/gateway/RecoverAfterNodesIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/gateway/RecoveryFromGatewayIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/gateway/ReplicaShardAllocatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/gateway/ReusePeerRecoverySharedTest.java (100%) rename {core => server}/src/test/java/org/elasticsearch/get/GetActionIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/IndexModuleTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/IndexRequestBuilderIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/IndexServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/IndexSettingsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/IndexSortIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/IndexSortSettingsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/IndexTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/IndexingSlowLogTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/MergePolicySettingsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/MergeSchedulerSettingsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/SearchSlowLogTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/SettingsListenerIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/VersionTypeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/WaitUntilRefreshIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/analysis/AnalysisRegistryTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/analysis/AnalysisTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/analysis/CharMatcherTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/analysis/CoreAnalysisFactoryTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/analysis/CustomNormalizerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/analysis/FingerprintAnalyzerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/analysis/HunspellTokenFilterFactoryTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/analysis/PathHierarchyTokenizerFactoryTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/analysis/PatternAnalyzerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/analysis/ShingleTokenFilterFactoryTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/analysis/SnowballAnalyzerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/analysis/StopAnalyzerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/analysis/StopTokenFilterTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/analysis/WhitespaceTokenizerFactoryTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/analysis/synonyms/SynonymsAnalysisTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/cache/bitset/BitSetFilterCacheTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/codec/CodecTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/engine/CombinedDeletionPolicyTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/engine/EngineSearcherTotalHitsMatcher.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/engine/InternalEngineMergeIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/engine/InternalEngineSettingsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/engine/LiveVersionMapTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/engine/SegmentTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/engine/VersionValueTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/fielddata/AbstractFieldDataImplTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/fielddata/AbstractFieldDataTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/fielddata/AbstractGeoFieldDataTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/fielddata/AbstractStringFieldDataTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/fielddata/BinaryDVFieldDataTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/fielddata/FieldDataCacheTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/fielddata/FieldDataLoadingIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/fielddata/FieldDataStatsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/fielddata/FieldDataTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/fielddata/FilterFieldDataTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/fielddata/GeoFieldDataTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/fielddata/IndexFieldDataServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/fielddata/NoOrdinalsStringFieldDataTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/fielddata/PagedBytesStringFieldDataTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/fielddata/ScriptDocValuesDatesTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/fielddata/ScriptDocValuesGeoPointsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/fielddata/ScriptDocValuesLongsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/fielddata/SortedSetDVStringFieldDataTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/fielddata/UidFieldDataTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/fielddata/fieldcomparator/ReplaceMissingTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/fielddata/ordinals/MultiOrdinalsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/fielddata/ordinals/SingleOrdinalsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/fielddata/plain/HalfFloatFielddataTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/fieldstats/FieldStatsProviderRefreshTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/get/DocumentFieldTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/get/GetResultTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/AllFieldMapperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/BinaryFieldMapperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/BinaryFieldTypeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/BinaryRangeUtilTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/BooleanFieldMapperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/BooleanFieldTypeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/CamelCaseFieldNameTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/CompletionFieldMapperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/CompletionFieldTypeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/CopyToMapperIntegrationIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/CopyToMapperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/DateFieldMapperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/DateFieldTypeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/DocumentFieldMapperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/DocumentMapperMergeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/DocumentMapperParserTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/DocumentParserTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/DoubleIndexingDocTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/DynamicMappingIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/DynamicMappingTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/DynamicMappingVersionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/DynamicTemplateTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/DynamicTemplatesTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/ExternalFieldMapperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/ExternalMapper.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/ExternalMapperPlugin.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/ExternalMetadataMapper.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/ExternalValuesMapperIntegrationIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/FakeStringFieldMapper.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/FieldFilterMapperPluginTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/FieldNamesFieldMapperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/FieldNamesFieldTypeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/FieldTypeLookupTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/GenericStoreDynamicTemplateTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/GeoPointFieldMapperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/GeoPointFieldTypeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/GeoShapeFieldMapperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/GeoShapeFieldTypeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/IdFieldMapperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/IdFieldTypeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/IndexFieldMapperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/IndexFieldTypeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/IpFieldMapperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/IpFieldTypeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/IpRangeFieldMapperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/JavaMultiFieldMergeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/KeywordFieldMapperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/KeywordFieldTypeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/MapperServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/MapperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/MultiFieldCopyToMapperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/MultiFieldTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/MultiFieldsIntegrationIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/NestedObjectMapperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/NullValueObjectMappingTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/NullValueTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/NumberFieldMapperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/NumberFieldTypeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/ObjectMapperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/ParentFieldMapperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/ParentFieldTypeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/PathMapperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/PathMatchDynamicTemplateTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/RangeFieldMapperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/RangeFieldQueryStringQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/RangeFieldTypeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/RootObjectMapperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/RoutingFieldMapperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/RoutingFieldTypeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/SourceFieldMapperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/SourceFieldTypeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/StoredNumericValuesTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/TextFieldMapperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/TextFieldTypeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/TypeFieldMapperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/TypeFieldTypeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/UidFieldMapperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/UidFieldTypeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/UidTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/UpdateMappingOnClusterIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/UpdateMappingTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/VersionFieldTypeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/mapper/package-info.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/AbstractQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/AbstractTermQueryTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/BoolQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/BoostingQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/CombineFunctionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/CommonTermsQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/CommonTermsQueryParserTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/ConstantScoreQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/DisMaxQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/DisableGraphQueryTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/ExistsQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/FieldMaskingSpanQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/FuzzyQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/GeoBoundingBoxQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/GeoDistanceQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/GeoPolygonQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/GeoShapeQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/IdsQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/InnerHitBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/MatchAllQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/MatchNoneQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/MatchPhrasePrefixQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/MatchPhraseQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/MatchQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/MockRepeatAnalyzer.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/MoreLikeThisQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/MultiMatchQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/NestedQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/OperatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/PrefixQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/QueryShardContextTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/QueryStringQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/RandomQueryBuilder.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/RangeQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/RangeQueryRewriteTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/RegexpQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/RewriteableTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/ScoreModeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/ScriptQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/SimpleQueryStringBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/SpanContainingQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/SpanFirstQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/SpanMultiTermQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/SpanNearQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/SpanNotQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/SpanOrQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/SpanTermQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/SpanWithinQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/TermQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/TermsQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/TermsSetQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/TypeQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/WildcardQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/WrapperQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/functionscore/FieldValueFactorFunctionModifierTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreEquivalenceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreQueryBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/functionscore/ScoreFunctionBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/plugin/CustomQueryParserIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/plugin/DummyQueryBuilder.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/query/plugin/DummyQueryParserPlugin.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/refresh/RefreshStatsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/reindex/AbstractBulkByScrollRequestTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/reindex/BulkByScrollResponseTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/reindex/BulkByScrollTaskStatusTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/reindex/BulkByScrollTaskTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/reindex/DeleteByQueryRequestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/reindex/LeaderBulkByScrollTaskStateTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/reindex/ReindexRequestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/reindex/UpdateByQueryRequestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/reindex/WorkerBulkByScrollTaskStateTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/replication/ESIndexLevelReplicationTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/replication/IndexLevelReplicationTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/replication/RecoveryDuringReplicationTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/search/ESToParentBlockJoinQueryTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/search/MatchQueryIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/search/MultiMatchQueryTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/search/NestedHelperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/search/geo/GeoPointParsingTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/search/geo/GeoUtilsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/search/nested/AbstractNumberNestedSortingTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/search/nested/DoubleNestedSortingTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/search/nested/FloatNestedSortingTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/search/nested/LongNestedSortingTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/search/nested/NestedSortingTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/seqno/CountedBitSetTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/seqno/GlobalCheckpointSyncActionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/seqno/GlobalCheckpointSyncIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/seqno/GlobalCheckpointTrackerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/seqno/LocalCheckpointTrackerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/seqno/SequenceNumbersTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/shard/DocsStatsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/shard/EngineAccess.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/shard/IndexSearcherWrapperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/shard/IndexShardIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/shard/IndexShardOperationPermitsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/shard/IndexingOperationListenerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/shard/NewPathForShardTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/shard/PrimaryReplicaSyncerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/shard/RefreshListenersTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/shard/SearchOperationListenerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/shard/ShardIdTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/shard/ShardPathTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/shard/ShardSplittingQueryTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/shard/ShardUtilsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/shard/StoreRecoveryTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/similarity/ScriptedSimilarityTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/similarity/SimilarityServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/similarity/SimilarityTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/snapshots/blobstore/FileInfoTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/snapshots/blobstore/SlicedInputStreamTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/store/CorruptedFileIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/store/CorruptedTranslogIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/store/DirectoryUtilsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/store/ExceptionRetryIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/store/FsDirectoryServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/store/IndexStoreTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/store/StoreTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/suggest/stats/CompletionsStatsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/suggest/stats/SuggestStatsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/termvectors/TermVectorsServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/translog/MultiSnapshotTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/translog/SnapshotMatchers.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/translog/TestTranslog.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/translog/TranslogDeletionPolicyTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/translog/TranslogTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/translog/TranslogVersionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/index/translog/TruncateTranslogIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indexing/IndexActionIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indexlifecycle/IndexLifecycleActionIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/DateMathIndexExpressionsIntegrationIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/IndexingMemoryControllerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/IndicesLifecycleListenerIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/IndicesLifecycleListenerSingleNodeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/IndicesModuleTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/IndicesOptionsIntegrationIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/IndicesQueryCacheTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/IndicesRequestCacheIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/IndicesRequestCacheTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/IndicesServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/NodeIndicesStatsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/TermsLookupTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/analysis/AnalysisModuleTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/analysis/PreBuiltAnalyzerIntegrationIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/analyze/AnalyzeActionIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/analyze/HunspellServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/cluster/AbstractIndicesClusterStateServiceTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/cluster/ClusterStateChanges.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/cluster/IndicesClusterStateServiceRandomUpdatesTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/exists/indices/IndicesExistsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/exists/types/TypesExistsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/flush/FlushIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/flush/SyncedFlushSingleNodeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/flush/SyncedFlushUtil.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/mapping/ConcurrentDynamicTemplateIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/mapping/DedicatedMasterGetFieldMappingIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/mapping/SimpleGetFieldMappingsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/mapping/SimpleGetMappingsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/mapping/UpdateMappingIntegrationIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerNoopIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerServiceIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerUnitTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/memory/breaker/RandomExceptionCircuitBreakerIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/recovery/IndexPrimaryRelocationIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/recovery/IndexRecoveryIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/recovery/PeerRecoverySourceServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/recovery/PeerRecoveryTargetServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/recovery/RecoverySettingsDynamicUpdateTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/recovery/RecoverySourceHandlerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/recovery/RecoveryStatusTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/recovery/RecoveryTargetTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/recovery/RecoveryTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/recovery/StartRecoveryRequestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/settings/GetSettingsBlocksIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/settings/UpdateNumberOfReplicasIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/settings/UpdateSettingsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/state/CloseIndexDisableCloseAllIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/state/OpenCloseIndexIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/state/RareClusterStateIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/state/SimpleIndexStateIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/stats/IndexStatsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/store/IndicesStoreIntegrationIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/store/IndicesStoreTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/template/IndexTemplateBlocksIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/indices/template/SimpleIndexTemplateIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/ingest/CompoundProcessorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/ingest/ConfigurationUtilsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/ingest/IngestClientIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/ingest/IngestDocumentTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/ingest/IngestMetadataTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/ingest/IngestProcessorNotInstalledOnAllNodesIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/ingest/IngestServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/ingest/IngestStatsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/ingest/PipelineConfigurationTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/ingest/PipelineExecutionServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/ingest/PipelineFactoryTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/ingest/PipelineStoreTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/ingest/ValueSourceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/mget/SimpleMgetIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/monitor/fs/DeviceStatsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/monitor/fs/FsProbeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/monitor/jvm/JvmGcMonitorServiceSettingsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/monitor/jvm/JvmGcMonitorServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/monitor/jvm/JvmInfoTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/monitor/jvm/JvmMonitorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/monitor/jvm/JvmStatsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/monitor/os/OsProbeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/monitor/os/OsStatsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/monitor/process/ProcessProbeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/node/InternalSettingsPreparerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/node/NodeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/node/ResponseCollectorServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/node/service/NodeServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/nodesinfo/NodeInfoStreamingTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/nodesinfo/SimpleNodesInfoIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/operateAllIndices/DestructiveOperationsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/plugins/MetaPluginInfoTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/plugins/PluginInfoTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/plugins/PluginsServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/plugins/PluginsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/plugins/spi/NamedXContentProviderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/recovery/FullRollingRestartIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/recovery/RecoveriesCollectionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/recovery/RecoveryWhileUnderLoadIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/recovery/RelocationIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/recovery/SimpleRecoveryIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/recovery/TruncatedRecoveryIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/repositories/IndexIdTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/repositories/RepositoryDataTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/repositories/blobstore/BlobStoreRepositoryRestoreTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/repositories/blobstore/BlobStoreRepositoryTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/rest/BaseRestHandlerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/rest/BytesRestResponseTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/rest/DeprecationRestHandlerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/rest/RestControllerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/rest/RestHttpResponseHeadersTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/rest/RestRequestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/rest/RestUtilsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/rest/action/RestActionsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/rest/action/RestBuilderListenerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/rest/action/RestMainActionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/rest/action/admin/cluster/RestNodesStatsActionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/rest/action/admin/indices/RestAnalyzeActionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/rest/action/admin/indices/RestClearIndicesCacheActionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/rest/action/admin/indices/RestIndicesStatsActionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/rest/action/cat/RestIndicesActionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/rest/action/cat/RestRecoveryActionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/rest/action/cat/RestTableTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/rest/action/document/RestBulkActionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/rest/action/document/RestIndexActionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/routing/AliasResolveRoutingIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/routing/AliasRoutingIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/routing/PartitionedRoutingIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/routing/SimpleRoutingIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/script/ClassPermissionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/script/ScriptContextTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/script/ScriptExceptionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/script/ScriptMetaDataTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/script/ScriptServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/script/ScriptTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/script/StoredScriptSourceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/script/StoredScriptTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/script/StoredScriptsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/AbstractSearchTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/ClearScrollResponseTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/DefaultSearchContextTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/DocValueFormatTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/MultiValueModeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/NestedIdentityTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/SearchCancellationIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/SearchCancellationTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/SearchHitTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/SearchHitsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/SearchModuleTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/SearchRequestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/SearchServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/SearchSortValuesTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/SearchTimeoutIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/SearchWithRejectionsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/StressSearchServiceReaperIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/AggregationCollectorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/AggregationTestScriptsPlugin.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/AggregationsIntegrationIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/AggregationsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/AggregatorFactoriesTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/BasePipelineAggregationTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/CombiIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/EquivalenceIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/FiltersAggsRewriteIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/InternalOrderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/MetaDataIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/MissingValueIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/MultiBucketAggregatorWrapperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/SubAggCollectionModeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/AdjacencyMatrixIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/BestBucketsDeferringCollectorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/BooleanTermsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/BucketUtilsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/DateHistogramIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/DateHistogramOffsetIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/DateHistogramTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/DateRangeIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/DateRangeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/DateScriptMocksPlugin.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/DiversifiedSamplerIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/DoubleTermsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/FilterIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/FilterTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/FiltersIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/FiltersTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoDistanceIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoDistanceRangeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoHashGridIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoHashGridTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/GlobalAggregatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/GlobalIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/GlobalTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/HistogramIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/HistogramTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/IpRangeIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/IpRangeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/IpTermsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/LongTermsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/MinDocCountIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/MissingIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/MissingTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/NaNSortingIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/NestedIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/ParentIdAggIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/RangeIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/RangeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/ReverseNestedIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/SamplerIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/SamplerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/ShardReduceIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/ShardSizeTermsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/ShardSizeTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsSignificanceScoreIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTextTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/TermsDocCountErrorIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/TermsShardMinDocCountIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/TermsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/adjacency/AdjacencyMatrixAggregationBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/adjacency/InternalAdjacencyMatrixTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregationBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/InternalCompositeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/filter/FilterAggregatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/filter/FiltersAggregatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/filter/InternalFilterTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/filter/InternalFiltersTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridAggregatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridParserTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/geogrid/InternalGeoHashGridTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/global/InternalGlobalTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramAggregatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/ExtendedBoundsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramAggregatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalDateHistogramTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalHistogramTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/missing/InternalMissingTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/missing/MissingAggregatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/InternalNestedTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/InternalReverseNestedTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/NestedTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedAggregatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/range/BinaryRangeAggregatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/range/InternalBinaryRangeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/range/InternalDateRangeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/range/InternalGeoDistanceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/range/InternalRangeTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/range/InternalRangeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/range/IpRangeAggregatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/sampler/BestDocsDeferringCollectorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedAggregationBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedSamplerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/sampler/InternalSamplerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/sampler/SamplerAggregatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/InternalSignificantTermsTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificanceHeuristicTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantLongTermsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantStringTermsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTermsAggregatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTextAggregatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/DoubleTermsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/InternalTermsTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/LongTermsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/StringTermsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/StringTermsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorFactoryTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/AbstractGeoTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/AbstractNumericMetricTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/AdjacencyMatrixTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/AvgIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/AvgTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/CardinalityAggregatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/CardinalityIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/ExtendedStatsAggregatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/ExtendedStatsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/ExtendedStatsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoBoundsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoBoundsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoCentroidIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoCentroidTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/HDRPercentileRanksIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/HDRPercentilesIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalExtendedStatsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalMaxTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalMinTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalStatsBucketTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalStatsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalSumTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/MaxAggregatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/MaxIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/MaxTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/MetricAggScriptPlugin.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/MinAggregatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/MinIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/MinTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/PercentileRanksTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/PercentilesTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/StatsAggregatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/StatsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/StatsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/SumAggregatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/SumIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/SumTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/TDigestPercentileRanksIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/TDigestPercentilesIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/TopHitsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/TopHitsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/ValueCountIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/ValueCountTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/avg/AvgAggregatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/avg/InternalAvgTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/cardinality/CardinalityTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/cardinality/HyperLogLogPlusPlusTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/cardinality/InternalCardinalityTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/geobounds/GeoBoundsAggregatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/geobounds/InternalGeoBoundsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/geocentroid/GeoCentroidAggregatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/geocentroid/InternalGeoCentroidTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/AbstractPercentilesTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/InternalPercentilesRanksTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/InternalPercentilesTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentilesMethodTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/HDRPercentileRanksAggregatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/HDRPercentilesAggregatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/InternalHDRPercentilesRanksTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/InternalHDRPercentilesTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/InternalTDigestPercentilesRanksTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/InternalTDigestPercentilesTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestPercentileRanksAggregatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestPercentilesAggregatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/scripted/InternalScriptedMetricTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricAggregatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/tophits/InternalTopHitsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHitsAggregatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/valuecount/InternalValueCountTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/metrics/valuecount/ValueCountAggregatorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/AvgBucketIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketScriptIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketScriptTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketSelectorIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketSelectorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/CumulativeSumIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/CumulativeSumTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/DateDerivativeIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/DerivativeIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/DerivativeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/ExtendedStatsBucketIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/InternalSimpleValueTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/MaxBucketIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/MinBucketIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/PercentilesBucketIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/PipelineAggregationHelperTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/SerialDifferenceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/StatsBucketIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/SumBucketIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/AbstractBucketMetricsTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/AvgBucketTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/ExtendedStatsBucketTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/InternalBucketMetricValueTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/MaxBucketTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/MinBucketTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/PercentilesBucketTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/StatsBucketTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/SumBucketTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/percentile/InternalPercentilesBucketTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/InternalExtendedStatsBucketTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketsort/BucketSortIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketsort/BucketSortTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/derivative/InternalDerivativeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgUnitTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/pipeline/serialdiff/SerialDiffIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/support/IncludeExcludeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/support/MissingValuesTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/support/PathTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/support/ScriptValuesTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/support/ValueTypeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/aggregations/support/ValuesSourceConfigTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/basic/SearchWhileCreatingIndexIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/basic/SearchWhileRelocatingIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/basic/SearchWithRandomExceptionsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/basic/SearchWithRandomIOExceptionsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/basic/TransportSearchFailuresIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/basic/TransportTwoNodesSearchIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/builder/SearchSourceBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/child/ParentFieldLoadingIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/collapse/CollapseBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/fetch/FetchSubPhasePluginIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/fetch/subphase/FetchSourceSubPhaseTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/fetch/subphase/InnerHitsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/fetch/subphase/MatchedQueriesIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/fetch/subphase/ParentFieldSubFetchPhaseTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/CustomHighlighter.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/CustomHighlighterPlugin.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/CustomHighlighterSearchIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightFieldTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/HighlighterSearchIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/PlainHighlighterTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/fields/SearchFieldsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/functionscore/DecayFunctionScoreIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/functionscore/ExplainableScriptIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/functionscore/FunctionScoreFieldValueIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/functionscore/FunctionScoreIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/functionscore/FunctionScorePluginIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/functionscore/QueryRescorerIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/functionscore/RandomScoreFunctionIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/geo/GeoBoundingBoxIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/geo/GeoDistanceIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/geo/GeoFilterIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/geo/GeoPolygonIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/geo/GeoShapeIntegrationIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/geo/GeoShapeQueryTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/internal/AliasFilterTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/internal/ScrollContextTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/internal/ShardSearchTransportRequestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/morelikethis/MoreLikeThisIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/msearch/MultiSearchIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/nested/SimpleNestedIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/preference/SearchPreferenceIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/profile/ProfileResultTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/profile/SearchProfileShardResultsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/profile/TimerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/profile/aggregation/AggregationProfileShardResultTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/profile/aggregation/AggregationProfilerIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/profile/query/CollectorResultTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/profile/query/QueryProfileShardResultTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/profile/query/QueryProfilerIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/profile/query/QueryProfilerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/profile/query/RandomQueryGenerator.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/query/ExistsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/query/MultiMatchQueryIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/query/QueryPhaseTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/query/QueryStringIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/query/SearchQueryIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/query/SimpleQueryStringIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/rescore/QueryRescoreModeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/rescore/QueryRescorerBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/scriptfilter/ScriptQuerySearchIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/scroll/DuelScrollIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/scroll/RestClearScrollActionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/scroll/RestSearchScrollActionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/scroll/SearchScrollIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/scroll/SearchScrollWithFailingNodesIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/searchafter/SearchAfterBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/searchafter/SearchAfterIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/simple/SimpleSearchIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/slice/DocValuesSliceQueryTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/slice/SearchSliceIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/slice/SliceBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/slice/TermsSliceQueryTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/sort/AbstractSortTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/sort/FieldSortBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/sort/FieldSortIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/sort/GeoDistanceIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/sort/GeoDistanceSortBuilderIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/sort/GeoDistanceSortBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/sort/NestedSortBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/sort/ScoreSortBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/sort/ScriptSortBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/sort/SimpleSortIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/sort/SortBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/sort/SortModeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/sort/SortOrderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/source/MetadataFetchingIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/source/SourceFetchingIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/stats/SearchStatsIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/stats/SearchStatsUnitTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/suggest/AbstractSuggestionBuilderTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/suggest/CompletionSuggestSearchIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/suggest/CompletionSuggestionOptionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/suggest/ContextCompletionSuggestSearchIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/suggest/CustomSuggester.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/suggest/CustomSuggesterSearchIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/suggest/SuggestBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/suggest/SuggestSearchIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/suggest/SuggestTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/suggest/SuggestionEntryTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/suggest/SuggestionOptionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/suggest/SuggestionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/suggest/TermSuggestionOptionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/suggest/completion/CategoryContextMappingTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/suggest/completion/CategoryQueryContextTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/suggest/completion/CompletionSuggesterBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/suggest/completion/CompletionSuggestionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/suggest/completion/FuzzyOptionsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/suggest/completion/GeoContextMappingTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/suggest/completion/GeoQueryContextTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/suggest/completion/QueryContextTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/suggest/completion/RegexOptionsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/suggest/phrase/DirectCandidateGeneratorTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/suggest/phrase/LaplaceModelTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/suggest/phrase/LinearInterpolationModelTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/suggest/phrase/NoisyChannelSpellCheckerTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/suggest/phrase/SmoothingModelTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/suggest/phrase/StupidBackoffModelTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/suggest/term/SortByTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/suggest/term/StringDistanceImplTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/suggest/term/SuggestModeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/search/suggest/term/TermSuggestionBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/similarity/SimilarityIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/snapshots/AbstractSnapshotIntegTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/snapshots/BlobStoreFormatIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/snapshots/DedicatedClusterSnapshotRestoreIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/snapshots/FsBlobStoreRepositoryIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/snapshots/MinThreadsSnapshotRestoreIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/snapshots/RepositoriesIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/snapshots/RepositoriesMetaDataSerializationTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/snapshots/SharedClusterSnapshotRestoreIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/snapshots/SnapshotRequestsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/snapshots/SnapshotShardsServiceIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/snapshots/SnapshotTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/snapshots/SnapshotUtilsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/snapshots/SnapshotsInProgressSerializationTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/snapshots/mockstore/BlobContainerWrapper.java (100%) rename {core => server}/src/test/java/org/elasticsearch/snapshots/mockstore/BlobStoreWrapper.java (100%) rename {core => server}/src/test/java/org/elasticsearch/snapshots/mockstore/MockRepository.java (100%) rename {core => server}/src/test/java/org/elasticsearch/tasks/ListTasksResponseTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/tasks/TaskIdTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/tasks/TaskResultTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/test/NoopDiscovery.java (100%) rename {core => server}/src/test/java/org/elasticsearch/test/geo/RandomGeoGenerator.java (100%) rename {core => server}/src/test/java/org/elasticsearch/test/geo/RandomShapeGenerator.java (100%) rename {core => server}/src/test/java/org/elasticsearch/test/hamcrest/DoubleMatcher.java (100%) rename {core => server}/src/test/java/org/elasticsearch/test/hamcrest/ElasticsearchGeoAssertions.java (100%) rename {core => server}/src/test/java/org/elasticsearch/test/search/aggregations/bucket/SharedSignificantTermsTestMethods.java (100%) rename {core => server}/src/test/java/org/elasticsearch/threadpool/AutoQueueAdjustingExecutorBuilderTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/threadpool/ESThreadPoolTestCase.java (100%) rename {core => server}/src/test/java/org/elasticsearch/threadpool/FixedThreadPoolTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/threadpool/ScalingThreadPoolTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/threadpool/ScheduleWithFixedDelayTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/threadpool/SimpleThreadPoolIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/threadpool/ThreadPoolSerializationTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/threadpool/ThreadPoolStatsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/threadpool/ThreadPoolTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/threadpool/UpdateThreadPoolSettingsTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/transport/ActionNamesIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/transport/CompressibleBytesOutputStreamTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/transport/ConnectionProfileTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/transport/PublishPortTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/transport/RemoteClusterConnectionTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/transport/RemoteClusterServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/transport/TcpTransportTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/transport/TransportActionProxyTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/transport/TransportServiceHandshakeTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/update/UpdateIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/update/UpdateNoopIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/usage/UsageServiceTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/validate/SimpleValidateQueryIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/versioning/ConcurrentDocumentOperationIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/versioning/SimpleVersioningIT.java (100%) rename {core => server}/src/test/java/org/elasticsearch/watcher/FileWatcherTests.java (100%) rename {core => server}/src/test/java/org/elasticsearch/watcher/ResourceWatcherServiceTests.java (100%) rename {core => server}/src/test/resources/META-INF/services/org.elasticsearch.plugins.spi.NamedXContentProvider (100%) rename {core => server}/src/test/resources/config/elasticsearch.json (100%) rename {core => server}/src/test/resources/config/elasticsearch.yml (100%) rename {core => server}/src/test/resources/config/garbage/garbage.yml (100%) rename {core => server}/src/test/resources/indices/analyze/conf_dir/hunspell/en_US/en_US.aff (100%) rename {core => server}/src/test/resources/indices/analyze/conf_dir/hunspell/en_US/en_US.dic (100%) rename {core => server}/src/test/resources/indices/analyze/conf_dir/hunspell/en_US_custom/en_US.aff (100%) rename {core => server}/src/test/resources/indices/analyze/conf_dir/hunspell/en_US_custom/en_US.dic (100%) rename {core => server}/src/test/resources/indices/analyze/conf_dir/hunspell/en_US_custom/settings.yml (100%) rename {core => server}/src/test/resources/indices/analyze/no_aff_conf_dir/hunspell/en_US/en_US.dic (100%) rename {core => server}/src/test/resources/indices/analyze/two_aff_conf_dir/hunspell/en_US/en_AU.aff (100%) rename {core => server}/src/test/resources/indices/analyze/two_aff_conf_dir/hunspell/en_US/en_US.aff (100%) rename {core => server}/src/test/resources/indices/analyze/two_aff_conf_dir/hunspell/en_US/en_US.dic (100%) rename {core => server}/src/test/resources/indices/bwc/compressed-repo-1.7.4.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-0.20.6.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-0.90.0.Beta1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-0.90.0.RC1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-0.90.0.RC2.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-0.90.0.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-0.90.1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-0.90.10.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-0.90.11.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-0.90.12.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-0.90.13.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-0.90.2.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-0.90.3.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-0.90.4.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-0.90.5.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-0.90.6.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-0.90.7.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-0.90.8.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-0.90.9.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.0.0.Beta1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.0.0.Beta2.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.0.0.RC1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.0.0.RC2.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.0.0.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.0.1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.0.2.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.0.3.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.1.0.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.1.1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.1.2.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.2.0.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.2.1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.2.2.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.2.3.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.2.4.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.3.0.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.3.1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.3.2.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.3.3.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.3.4.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.3.5.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.3.6.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.3.7.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.3.8.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.3.9.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.4.0.Beta1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.4.0.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.4.1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.4.2.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.4.3.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.4.4.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.4.5.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.5.0.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.5.1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.5.2.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.6.0.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.6.1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.6.2.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.7.0.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.7.1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.7.2.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.7.3.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.7.4.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-1.7.5.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-2.0.0-beta1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-2.0.0-beta2.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-2.0.0-rc1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-2.0.0.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-2.0.1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-2.0.2.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-2.1.0.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-2.1.1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-2.1.2.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-2.2.0.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-2.2.1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-2.2.2.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-2.3.0.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-2.3.1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-2.3.2.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-2.3.3.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-2.3.4.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-2.3.5.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-2.4.0.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-2.4.1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-2.4.2.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-2.4.3.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupported-2.4.5.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-0.20.6.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.0.0.Beta2.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.0.0.RC1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.0.0.RC2.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.0.0.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.0.1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.0.2.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.0.3.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.1.0.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.1.1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.1.2.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.2.0.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.2.1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.2.2.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.2.3.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.2.4.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.3.0.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.3.1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.3.2.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.3.3.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.3.4.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.3.5.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.3.6.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.3.7.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.3.8.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.3.9.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.4.0.Beta1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.4.0.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.4.1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.4.2.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.4.3.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.4.4.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.4.5.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.5.0.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.5.1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.5.2.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.6.0.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.6.1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.6.2.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.7.0.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.7.1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.7.2.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.7.3.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.7.4.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-1.7.5.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-2.0.0-beta1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-2.0.0-beta2.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-2.0.0-rc1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-2.0.0.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-2.0.1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-2.0.2.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-2.1.0.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-2.1.1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-2.1.2.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-2.2.0.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-2.2.1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-2.2.2.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-2.3.0.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-2.3.1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-2.3.2.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-2.3.3.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-2.3.4.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-2.3.5.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-2.4.0.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-2.4.1.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-2.4.2.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-2.4.3.zip (100%) rename {core => server}/src/test/resources/indices/bwc/unsupportedrepo-2.4.5.zip (100%) rename {core => server}/src/test/resources/org/elasticsearch/action/bulk/bulk-log.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/action/bulk/simple-bulk.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/action/bulk/simple-bulk10.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/action/bulk/simple-bulk11.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/action/bulk/simple-bulk2.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/action/bulk/simple-bulk3.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/action/bulk/simple-bulk4.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/action/bulk/simple-bulk5.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/action/bulk/simple-bulk6.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/action/bulk/simple-bulk7.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/action/bulk/simple-bulk8.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/action/bulk/simple-bulk9.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/action/fieldstats/fieldstats-index-constraints-request.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/action/search/simple-msearch1.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/action/search/simple-msearch2.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/action/search/simple-msearch3.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/action/search/simple-msearch4.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/action/search/simple-msearch5.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/action/termvectors/multiRequest1.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/action/termvectors/multiRequest2.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/action/termvectors/multiRequest3.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/bootstrap/duplicate-classes.jar (100%) rename {core => server}/src/test/resources/org/elasticsearch/bootstrap/duplicate-xmlbeans-classes.jar (100%) rename {core => server}/src/test/resources/org/elasticsearch/cluster/routing/issue_9023.zip (100%) rename {core => server}/src/test/resources/org/elasticsearch/common/settings/loader/indentation-settings.yml (100%) rename {core => server}/src/test/resources/org/elasticsearch/common/settings/loader/indentation-with-explicit-document-start-settings.yml (100%) rename {core => server}/src/test/resources/org/elasticsearch/common/settings/loader/test-settings.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/common/settings/loader/test-settings.yml (100%) rename {core => server}/src/test/resources/org/elasticsearch/gateway/global-3.st (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/analysis/shingle_analysis.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/analysis/shingle_analysis2.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/analysis/stop.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/analysis/synonyms/synonyms.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/analysis/synonyms/synonyms.txt (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/analysis/synonyms/synonyms_wordnet.txt (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/analysis/test1.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/analysis/test1.yml (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/genericstore/test-data.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/genericstore/test-mapping.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/test-data.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/test-mapping.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/simple/test-data.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/simple/test-mapping.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/test-data.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/test-mapping1.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/test-mapping2.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/test-mapping3.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/test-mapping4.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/upgrade1.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/upgrade2.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/upgrade3.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/mapper/multifield/test-data.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/mapper/multifield/test-multi-fields.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/mapper/path/test-mapping.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/mapper/simple/test-mapping.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/mapper/simple/test1-notype-noid.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/mapper/simple/test1.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/query/commonTerms-query1.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/query/commonTerms-query2.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/query/commonTerms-query3.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/query/geo_polygon_exception_1.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/query/geo_polygon_exception_2.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/query/geo_polygon_exception_3.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/query/geo_polygon_exception_4.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/query/geo_polygon_exception_5.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/translog/translog-invalid-first-byte.binary (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/translog/translog-v0.binary (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/translog/translog-v1-corrupted-body.binary (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/translog/translog-v1-corrupted-magic.binary (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/translog/translog-v1-truncated.binary (100%) rename {core => server}/src/test/resources/org/elasticsearch/index/translog/translog-v1.binary (100%) rename {core => server}/src/test/resources/org/elasticsearch/plugins/dummy-plugin.jar (100%) rename {core => server}/src/test/resources/org/elasticsearch/plugins/non-extensible-plugin.jar (100%) rename {core => server}/src/test/resources/org/elasticsearch/search/geo/gzippedmap.gz (100%) rename {core => server}/src/test/resources/org/elasticsearch/search/query/all-example-document.json (100%) rename {core => server}/src/test/resources/org/elasticsearch/search/query/all-query-index.json (100%) diff --git a/build.gradle b/build.gradle index 56506d8c125f1..f7936d5efed71 100644 --- a/build.gradle +++ b/build.gradle @@ -79,7 +79,7 @@ configure(subprojects.findAll { it.projectDir.toPath().startsWith(rootPath) }) { * backwards compatibility guarantees and only keeping the latest beta or rc * in a branch if there are only betas and rcs in the branch so we have * *something* to test against. */ -VersionCollection versions = new VersionCollection(file('core/src/main/java/org/elasticsearch/Version.java').readLines('UTF-8')) +VersionCollection versions = new VersionCollection(file('server/src/main/java/org/elasticsearch/Version.java').readLines('UTF-8')) if (versions.currentVersion.toString() != VersionProperties.elasticsearch) { throw new GradleException("The last version in Versions.java [${versions.currentVersion}] does not match " + "VersionProperties.elasticsearch [${VersionProperties.elasticsearch}]") @@ -181,8 +181,8 @@ subprojects { ext.projectSubstitutions = [ "org.elasticsearch.gradle:build-tools:${version}": ':build-tools', "org.elasticsearch:rest-api-spec:${version}": ':rest-api-spec', - "org.elasticsearch:elasticsearch:${version}": ':core', - "org.elasticsearch:elasticsearch-cli:${version}": ':core:cli', + "org.elasticsearch:elasticsearch:${version}": ':server', + "org.elasticsearch:elasticsearch-cli:${version}": ':server:cli', "org.elasticsearch:elasticsearch-nio:${version}": ':libs:elasticsearch-nio', "org.elasticsearch.client:elasticsearch-rest-client:${version}": ':client:rest', "org.elasticsearch.client:elasticsearch-rest-client-sniffer:${version}": ':client:sniffer', @@ -227,7 +227,7 @@ subprojects { // Handle javadoc dependencies across projects. Order matters: the linksOffline for // org.elasticsearch:elasticsearch must be the last one or all the links for the - // other packages (e.g org.elasticsearch.client) will point to core rather than + // other packages (e.g org.elasticsearch.client) will point to server rather than // their own artifacts. if (project.plugins.hasPlugin(BuildPlugin)) { String artifactsHost = VersionProperties.elasticsearch.endsWith("-SNAPSHOT") ? "https://snapshots.elastic.co" : "https://artifacts.elastic.co" @@ -255,7 +255,7 @@ subprojects { gradle.projectsEvaluated { allprojects { if (project.path == ':test:framework') { - // :test:framework:test cannot run before and after :core:test + // :test:framework:test cannot run before and after :server:test return } configurations.all { diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/precommit/PrecommitTasks.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/precommit/PrecommitTasks.groovy index f7b30e774e340..c836f0bbcb167 100644 --- a/buildSrc/src/main/groovy/org/elasticsearch/gradle/precommit/PrecommitTasks.groovy +++ b/buildSrc/src/main/groovy/org/elasticsearch/gradle/precommit/PrecommitTasks.groovy @@ -84,7 +84,7 @@ class PrecommitTasks { Task mainForbidden = project.tasks.findByName('forbiddenApisMain') if (mainForbidden != null) { mainForbidden.configure { - signaturesURLs += getClass().getResource('/forbidden/es-core-signatures.txt') + signaturesURLs += getClass().getResource('/forbidden/es-server-signatures.txt') } } Task testForbidden = project.tasks.findByName('forbiddenApisTest') diff --git a/buildSrc/src/main/resources/checkstyle_suppressions.xml b/buildSrc/src/main/resources/checkstyle_suppressions.xml index 67302f1fe8f05..6940dfe1bd97e 100644 --- a/buildSrc/src/main/resources/checkstyle_suppressions.xml +++ b/buildSrc/src/main/resources/checkstyle_suppressions.xml @@ -11,719 +11,719 @@ - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/buildSrc/src/main/resources/forbidden/es-core-signatures.txt b/buildSrc/src/main/resources/forbidden/es-server-signatures.txt similarity index 100% rename from buildSrc/src/main/resources/forbidden/es-core-signatures.txt rename to buildSrc/src/main/resources/forbidden/es-server-signatures.txt diff --git a/buildSrc/version.properties b/buildSrc/version.properties index 7419a8b131a8b..3c06aecb0fa09 100644 --- a/buildSrc/version.properties +++ b/buildSrc/version.properties @@ -17,15 +17,15 @@ jna = 4.5.1 randomizedrunner = 2.5.2 junit = 4.12 httpclient = 4.5.2 -# When updating httpcore, please also update core/src/main/resources/org/elasticsearch/bootstrap/test-framework.policy +# When updating httpcore, please also update server/src/main/resources/org/elasticsearch/bootstrap/test-framework.policy httpcore = 4.4.5 -# When updating httpasyncclient, please also update core/src/main/resources/org/elasticsearch/bootstrap/test-framework.policy +# When updating httpasyncclient, please also update server/src/main/resources/org/elasticsearch/bootstrap/test-framework.policy httpasyncclient = 4.1.2 commonslogging = 1.1.3 commonscodec = 1.10 hamcrest = 1.3 securemock = 1.2 -# When updating mocksocket, please also update core/src/main/resources/org/elasticsearch/bootstrap/test-framework.policy +# When updating mocksocket, please also update server/src/main/resources/org/elasticsearch/bootstrap/test-framework.policy mocksocket = 1.2 # benchmark dependencies diff --git a/client/rest/build.gradle b/client/rest/build.gradle index ac489f5871116..1c7e86f799f61 100644 --- a/client/rest/build.gradle +++ b/client/rest/build.gradle @@ -57,7 +57,7 @@ dependencies { } forbiddenApisMain { - //client does not depend on core, so only jdk and http signatures should be checked + //client does not depend on server, so only jdk and http signatures should be checked signaturesURLs = [PrecommitTasks.getResource('/forbidden/jdk-signatures.txt'), PrecommitTasks.getResource('/forbidden/http-signatures.txt')] } @@ -66,12 +66,12 @@ forbiddenApisTest { //we are using jdk-internal instead of jdk-non-portable to allow for com.sun.net.httpserver.* usage bundledSignatures -= 'jdk-non-portable' bundledSignatures += 'jdk-internal' - //client does not depend on core, so only jdk signatures should be checked + //client does not depend on server, so only jdk signatures should be checked signaturesURLs = [PrecommitTasks.getResource('/forbidden/jdk-signatures.txt'), PrecommitTasks.getResource('/forbidden/http-signatures.txt')] } -//JarHell is part of es core, which we don't want to pull in +// JarHell is part of es server, which we don't want to pull in jarHell.enabled=false namingConventions { diff --git a/client/sniffer/build.gradle b/client/sniffer/build.gradle index fdf624e1daa7f..bcde806f4df16 100644 --- a/client/sniffer/build.gradle +++ b/client/sniffer/build.gradle @@ -57,7 +57,7 @@ dependencies { } forbiddenApisMain { - //client does not depend on core, so only jdk signatures should be checked + //client does not depend on server, so only jdk signatures should be checked signaturesURLs = [PrecommitTasks.getResource('/forbidden/jdk-signatures.txt')] } @@ -65,7 +65,7 @@ forbiddenApisTest { //we are using jdk-internal instead of jdk-non-portable to allow for com.sun.net.httpserver.* usage bundledSignatures -= 'jdk-non-portable' bundledSignatures += 'jdk-internal' - //client does not depend on core, so only jdk signatures should be checked + //client does not depend on server, so only jdk signatures should be checked signaturesURLs = [PrecommitTasks.getResource('/forbidden/jdk-signatures.txt')] } @@ -74,7 +74,7 @@ dependencyLicenses { mapping from: /commons-.*/, to: 'commons' } -//JarHell is part of es core, which we don't want to pull in +// JarHell is part of es server, which we don't want to pull in jarHell.enabled=false namingConventions { @@ -101,4 +101,4 @@ thirdPartyAudit.excludes = [ //commons-logging provided dependencies 'javax.servlet.ServletContextEvent', 'javax.servlet.ServletContextListener' -] \ No newline at end of file +] diff --git a/client/test/build.gradle b/client/test/build.gradle index a05443a702758..ccc7be81466a4 100644 --- a/client/test/build.gradle +++ b/client/test/build.gradle @@ -48,7 +48,7 @@ forbiddenApisTest { signaturesURLs = [PrecommitTasks.getResource('/forbidden/jdk-signatures.txt')] } -//JarHell is part of es core, which we don't want to pull in +// JarHell is part of es server, which we don't want to pull in jarHell.enabled=false // TODO: should we have licenses for our test deps? diff --git a/distribution/build.gradle b/distribution/build.gradle index 542a34bb4f52f..c6fc9d5b6946f 100644 --- a/distribution/build.gradle +++ b/distribution/build.gradle @@ -59,14 +59,14 @@ task generateDependenciesReport(type: ConcatFilesTask) { * Notice file * *****************************************************************************/ -// integ test zip only uses core, so a different notice file is needed there +// integ test zip only uses server, so a different notice file is needed there task buildCoreNotice(type: NoticeTask) { - licensesDir new File(project(':core').projectDir, 'licenses') + licensesDir new File(project(':server').projectDir, 'licenses') } // other distributions include notices from modules as well, which are added below later task buildFullNotice(type: NoticeTask) { - licensesDir new File(project(':core').projectDir, 'licenses') + licensesDir new File(project(':server').projectDir, 'licenses') } /***************************************************************************** @@ -173,8 +173,8 @@ configure(distributions) { *****************************************************************************/ libFiles = copySpec { into 'lib' - from project(':core').jar - from project(':core').configurations.runtime + from { project(':server').jar } + from { project(':server').configurations.runtime } from { project(':libs:plugin-classloader').jar } // delay add tools using closures, since they have not yet been configured, so no jar task exists yet from { project(':distribution:tools:launchers').jar } diff --git a/docs/build.gradle b/docs/build.gradle index bca2a05100099..97094c6e79cbe 100644 --- a/docs/build.gradle +++ b/docs/build.gradle @@ -32,8 +32,8 @@ integTestCluster { configFile 'analysis/stemmer_override.txt' configFile 'userdict_ja.txt' configFile 'KeywordTokenizer.rbbi' - extraConfigFile 'hunspell/en_US/en_US.aff', '../core/src/test/resources/indices/analyze/conf_dir/hunspell/en_US/en_US.aff' - extraConfigFile 'hunspell/en_US/en_US.dic', '../core/src/test/resources/indices/analyze/conf_dir/hunspell/en_US/en_US.dic' + extraConfigFile 'hunspell/en_US/en_US.aff', '../server/src/test/resources/indices/analyze/conf_dir/hunspell/en_US/en_US.aff' + extraConfigFile 'hunspell/en_US/en_US.dic', '../server/src/test/resources/indices/analyze/conf_dir/hunspell/en_US/en_US.dic' // Whitelist reindexing from the local node so we can test it. setting 'reindex.remote.whitelist', '127.0.0.1:*' } diff --git a/core/build.gradle b/server/build.gradle similarity index 98% rename from core/build.gradle rename to server/build.gradle index 32c7017acaae4..20693a30c0cec 100644 --- a/core/build.gradle +++ b/server/build.gradle @@ -92,9 +92,9 @@ dependencies { // repackaged jna with native bits linked against all elastic supported platforms compile "org.elasticsearch:jna:${versions.jna}" - if (isEclipse == false || project.path == ":core-tests") { + if (isEclipse == false || project.path == ":server-tests") { testCompile("org.elasticsearch.test:framework:${version}") { - // tests use the locally compiled version of core + // tests use the locally compiled version of server exclude group: 'org.elasticsearch', module: 'elasticsearch' } } @@ -105,7 +105,7 @@ dependencies { if (isEclipse) { // in eclipse the project is under a fake root, we need to change around the source sets sourceSets { - if (project.path == ":core") { + if (project.path == ":server") { main.java.srcDirs = ['java'] main.resources.srcDirs = ['resources'] } else { @@ -276,7 +276,7 @@ dependencyLicenses { } } -if (isEclipse == false || project.path == ":core-tests") { +if (isEclipse == false || project.path == ":server-tests") { task integTest(type: RandomizedTestingTask, group: JavaBasePlugin.VERIFICATION_GROUP, description: 'Multi-node tests', diff --git a/core/cli/build.gradle b/server/cli/build.gradle similarity index 95% rename from core/cli/build.gradle rename to server/cli/build.gradle index 6f0e2e55eec7e..c41c4d975b082 100644 --- a/core/cli/build.gradle +++ b/server/cli/build.gradle @@ -39,7 +39,7 @@ dependencies { } test.enabled = false -// Since CLI does not depend on :core, it cannot run the jarHell task +// Since CLI does not depend on :server, it cannot run the jarHell task jarHell.enabled = false forbiddenApisMain { diff --git a/core/cli/licenses/jopt-simple-5.0.2.jar.sha1 b/server/cli/licenses/jopt-simple-5.0.2.jar.sha1 similarity index 100% rename from core/cli/licenses/jopt-simple-5.0.2.jar.sha1 rename to server/cli/licenses/jopt-simple-5.0.2.jar.sha1 diff --git a/core/cli/licenses/jopt-simple-LICENSE.txt b/server/cli/licenses/jopt-simple-LICENSE.txt similarity index 100% rename from core/cli/licenses/jopt-simple-LICENSE.txt rename to server/cli/licenses/jopt-simple-LICENSE.txt diff --git a/core/cli/licenses/jopt-simple-NOTICE.txt b/server/cli/licenses/jopt-simple-NOTICE.txt similarity index 100% rename from core/cli/licenses/jopt-simple-NOTICE.txt rename to server/cli/licenses/jopt-simple-NOTICE.txt diff --git a/core/cli/src/main/java/org/elasticsearch/cli/Command.java b/server/cli/src/main/java/org/elasticsearch/cli/Command.java similarity index 100% rename from core/cli/src/main/java/org/elasticsearch/cli/Command.java rename to server/cli/src/main/java/org/elasticsearch/cli/Command.java diff --git a/core/cli/src/main/java/org/elasticsearch/cli/ExitCodes.java b/server/cli/src/main/java/org/elasticsearch/cli/ExitCodes.java similarity index 100% rename from core/cli/src/main/java/org/elasticsearch/cli/ExitCodes.java rename to server/cli/src/main/java/org/elasticsearch/cli/ExitCodes.java diff --git a/core/cli/src/main/java/org/elasticsearch/cli/MultiCommand.java b/server/cli/src/main/java/org/elasticsearch/cli/MultiCommand.java similarity index 100% rename from core/cli/src/main/java/org/elasticsearch/cli/MultiCommand.java rename to server/cli/src/main/java/org/elasticsearch/cli/MultiCommand.java diff --git a/core/cli/src/main/java/org/elasticsearch/cli/SuppressForbidden.java b/server/cli/src/main/java/org/elasticsearch/cli/SuppressForbidden.java similarity index 100% rename from core/cli/src/main/java/org/elasticsearch/cli/SuppressForbidden.java rename to server/cli/src/main/java/org/elasticsearch/cli/SuppressForbidden.java diff --git a/core/cli/src/main/java/org/elasticsearch/cli/Terminal.java b/server/cli/src/main/java/org/elasticsearch/cli/Terminal.java similarity index 100% rename from core/cli/src/main/java/org/elasticsearch/cli/Terminal.java rename to server/cli/src/main/java/org/elasticsearch/cli/Terminal.java diff --git a/core/cli/src/main/java/org/elasticsearch/cli/UserException.java b/server/cli/src/main/java/org/elasticsearch/cli/UserException.java similarity index 100% rename from core/cli/src/main/java/org/elasticsearch/cli/UserException.java rename to server/cli/src/main/java/org/elasticsearch/cli/UserException.java diff --git a/core/licenses/HdrHistogram-2.1.9.jar.sha1 b/server/licenses/HdrHistogram-2.1.9.jar.sha1 similarity index 100% rename from core/licenses/HdrHistogram-2.1.9.jar.sha1 rename to server/licenses/HdrHistogram-2.1.9.jar.sha1 diff --git a/core/licenses/HdrHistogram-LICENSE.txt b/server/licenses/HdrHistogram-LICENSE.txt similarity index 100% rename from core/licenses/HdrHistogram-LICENSE.txt rename to server/licenses/HdrHistogram-LICENSE.txt diff --git a/core/licenses/HdrHistogram-NOTICE.txt b/server/licenses/HdrHistogram-NOTICE.txt similarity index 100% rename from core/licenses/HdrHistogram-NOTICE.txt rename to server/licenses/HdrHistogram-NOTICE.txt diff --git a/core/licenses/apache-log4j-extras-DEPENDENCIES b/server/licenses/apache-log4j-extras-DEPENDENCIES similarity index 100% rename from core/licenses/apache-log4j-extras-DEPENDENCIES rename to server/licenses/apache-log4j-extras-DEPENDENCIES diff --git a/core/licenses/hppc-0.7.1.jar.sha1 b/server/licenses/hppc-0.7.1.jar.sha1 similarity index 100% rename from core/licenses/hppc-0.7.1.jar.sha1 rename to server/licenses/hppc-0.7.1.jar.sha1 diff --git a/core/licenses/hppc-LICENSE.txt b/server/licenses/hppc-LICENSE.txt similarity index 100% rename from core/licenses/hppc-LICENSE.txt rename to server/licenses/hppc-LICENSE.txt diff --git a/core/licenses/hppc-NOTICE.txt b/server/licenses/hppc-NOTICE.txt similarity index 100% rename from core/licenses/hppc-NOTICE.txt rename to server/licenses/hppc-NOTICE.txt diff --git a/core/licenses/jackson-LICENSE b/server/licenses/jackson-LICENSE similarity index 100% rename from core/licenses/jackson-LICENSE rename to server/licenses/jackson-LICENSE diff --git a/core/licenses/jackson-NOTICE b/server/licenses/jackson-NOTICE similarity index 100% rename from core/licenses/jackson-NOTICE rename to server/licenses/jackson-NOTICE diff --git a/core/licenses/jackson-core-2.8.10.jar.sha1 b/server/licenses/jackson-core-2.8.10.jar.sha1 similarity index 100% rename from core/licenses/jackson-core-2.8.10.jar.sha1 rename to server/licenses/jackson-core-2.8.10.jar.sha1 diff --git a/core/licenses/jackson-dataformat-cbor-2.8.10.jar.sha1 b/server/licenses/jackson-dataformat-cbor-2.8.10.jar.sha1 similarity index 100% rename from core/licenses/jackson-dataformat-cbor-2.8.10.jar.sha1 rename to server/licenses/jackson-dataformat-cbor-2.8.10.jar.sha1 diff --git a/core/licenses/jackson-dataformat-smile-2.8.10.jar.sha1 b/server/licenses/jackson-dataformat-smile-2.8.10.jar.sha1 similarity index 100% rename from core/licenses/jackson-dataformat-smile-2.8.10.jar.sha1 rename to server/licenses/jackson-dataformat-smile-2.8.10.jar.sha1 diff --git a/core/licenses/jackson-dataformat-yaml-2.8.10.jar.sha1 b/server/licenses/jackson-dataformat-yaml-2.8.10.jar.sha1 similarity index 100% rename from core/licenses/jackson-dataformat-yaml-2.8.10.jar.sha1 rename to server/licenses/jackson-dataformat-yaml-2.8.10.jar.sha1 diff --git a/core/licenses/jna-4.5.1.jar.sha1 b/server/licenses/jna-4.5.1.jar.sha1 similarity index 100% rename from core/licenses/jna-4.5.1.jar.sha1 rename to server/licenses/jna-4.5.1.jar.sha1 diff --git a/core/licenses/jna-LICENSE.txt b/server/licenses/jna-LICENSE.txt similarity index 100% rename from core/licenses/jna-LICENSE.txt rename to server/licenses/jna-LICENSE.txt diff --git a/core/licenses/jna-NOTICE.txt b/server/licenses/jna-NOTICE.txt similarity index 100% rename from core/licenses/jna-NOTICE.txt rename to server/licenses/jna-NOTICE.txt diff --git a/core/licenses/joda-time-2.9.5.jar.sha1 b/server/licenses/joda-time-2.9.5.jar.sha1 similarity index 100% rename from core/licenses/joda-time-2.9.5.jar.sha1 rename to server/licenses/joda-time-2.9.5.jar.sha1 diff --git a/core/licenses/joda-time-LICENSE.txt b/server/licenses/joda-time-LICENSE.txt similarity index 100% rename from core/licenses/joda-time-LICENSE.txt rename to server/licenses/joda-time-LICENSE.txt diff --git a/core/licenses/joda-time-NOTICE.txt b/server/licenses/joda-time-NOTICE.txt similarity index 100% rename from core/licenses/joda-time-NOTICE.txt rename to server/licenses/joda-time-NOTICE.txt diff --git a/core/licenses/jts-1.13.jar.sha1 b/server/licenses/jts-1.13.jar.sha1 similarity index 100% rename from core/licenses/jts-1.13.jar.sha1 rename to server/licenses/jts-1.13.jar.sha1 diff --git a/core/licenses/jts-LICENSE.txt b/server/licenses/jts-LICENSE.txt similarity index 100% rename from core/licenses/jts-LICENSE.txt rename to server/licenses/jts-LICENSE.txt diff --git a/core/licenses/jts-NOTICE.txt b/server/licenses/jts-NOTICE.txt similarity index 100% rename from core/licenses/jts-NOTICE.txt rename to server/licenses/jts-NOTICE.txt diff --git a/core/licenses/log4j-1.2-api-2.9.1.jar.sha1 b/server/licenses/log4j-1.2-api-2.9.1.jar.sha1 similarity index 100% rename from core/licenses/log4j-1.2-api-2.9.1.jar.sha1 rename to server/licenses/log4j-1.2-api-2.9.1.jar.sha1 diff --git a/core/licenses/log4j-LICENSE.txt b/server/licenses/log4j-LICENSE.txt similarity index 100% rename from core/licenses/log4j-LICENSE.txt rename to server/licenses/log4j-LICENSE.txt diff --git a/core/licenses/log4j-NOTICE.txt b/server/licenses/log4j-NOTICE.txt similarity index 100% rename from core/licenses/log4j-NOTICE.txt rename to server/licenses/log4j-NOTICE.txt diff --git a/core/licenses/log4j-api-2.9.1.jar.sha1 b/server/licenses/log4j-api-2.9.1.jar.sha1 similarity index 100% rename from core/licenses/log4j-api-2.9.1.jar.sha1 rename to server/licenses/log4j-api-2.9.1.jar.sha1 diff --git a/core/licenses/log4j-api-LICENSE.txt b/server/licenses/log4j-api-LICENSE.txt similarity index 100% rename from core/licenses/log4j-api-LICENSE.txt rename to server/licenses/log4j-api-LICENSE.txt diff --git a/core/licenses/log4j-api-NOTICE.txt b/server/licenses/log4j-api-NOTICE.txt similarity index 100% rename from core/licenses/log4j-api-NOTICE.txt rename to server/licenses/log4j-api-NOTICE.txt diff --git a/core/licenses/log4j-core-2.9.1.jar.sha1 b/server/licenses/log4j-core-2.9.1.jar.sha1 similarity index 100% rename from core/licenses/log4j-core-2.9.1.jar.sha1 rename to server/licenses/log4j-core-2.9.1.jar.sha1 diff --git a/core/licenses/log4j-core-LICENSE.txt b/server/licenses/log4j-core-LICENSE.txt similarity index 100% rename from core/licenses/log4j-core-LICENSE.txt rename to server/licenses/log4j-core-LICENSE.txt diff --git a/core/licenses/log4j-core-NOTICE.txt b/server/licenses/log4j-core-NOTICE.txt similarity index 100% rename from core/licenses/log4j-core-NOTICE.txt rename to server/licenses/log4j-core-NOTICE.txt diff --git a/core/licenses/lucene-LICENSE.txt b/server/licenses/lucene-LICENSE.txt similarity index 100% rename from core/licenses/lucene-LICENSE.txt rename to server/licenses/lucene-LICENSE.txt diff --git a/core/licenses/lucene-NOTICE.txt b/server/licenses/lucene-NOTICE.txt similarity index 100% rename from core/licenses/lucene-NOTICE.txt rename to server/licenses/lucene-NOTICE.txt diff --git a/core/licenses/lucene-analyzers-common-7.2.0.jar.sha1 b/server/licenses/lucene-analyzers-common-7.2.0.jar.sha1 similarity index 100% rename from core/licenses/lucene-analyzers-common-7.2.0.jar.sha1 rename to server/licenses/lucene-analyzers-common-7.2.0.jar.sha1 diff --git a/core/licenses/lucene-backward-codecs-7.2.0.jar.sha1 b/server/licenses/lucene-backward-codecs-7.2.0.jar.sha1 similarity index 100% rename from core/licenses/lucene-backward-codecs-7.2.0.jar.sha1 rename to server/licenses/lucene-backward-codecs-7.2.0.jar.sha1 diff --git a/core/licenses/lucene-core-7.2.0.jar.sha1 b/server/licenses/lucene-core-7.2.0.jar.sha1 similarity index 100% rename from core/licenses/lucene-core-7.2.0.jar.sha1 rename to server/licenses/lucene-core-7.2.0.jar.sha1 diff --git a/core/licenses/lucene-grouping-7.2.0.jar.sha1 b/server/licenses/lucene-grouping-7.2.0.jar.sha1 similarity index 100% rename from core/licenses/lucene-grouping-7.2.0.jar.sha1 rename to server/licenses/lucene-grouping-7.2.0.jar.sha1 diff --git a/core/licenses/lucene-highlighter-7.2.0.jar.sha1 b/server/licenses/lucene-highlighter-7.2.0.jar.sha1 similarity index 100% rename from core/licenses/lucene-highlighter-7.2.0.jar.sha1 rename to server/licenses/lucene-highlighter-7.2.0.jar.sha1 diff --git a/core/licenses/lucene-join-7.2.0.jar.sha1 b/server/licenses/lucene-join-7.2.0.jar.sha1 similarity index 100% rename from core/licenses/lucene-join-7.2.0.jar.sha1 rename to server/licenses/lucene-join-7.2.0.jar.sha1 diff --git a/core/licenses/lucene-memory-7.2.0.jar.sha1 b/server/licenses/lucene-memory-7.2.0.jar.sha1 similarity index 100% rename from core/licenses/lucene-memory-7.2.0.jar.sha1 rename to server/licenses/lucene-memory-7.2.0.jar.sha1 diff --git a/core/licenses/lucene-misc-7.2.0.jar.sha1 b/server/licenses/lucene-misc-7.2.0.jar.sha1 similarity index 100% rename from core/licenses/lucene-misc-7.2.0.jar.sha1 rename to server/licenses/lucene-misc-7.2.0.jar.sha1 diff --git a/core/licenses/lucene-queries-7.2.0.jar.sha1 b/server/licenses/lucene-queries-7.2.0.jar.sha1 similarity index 100% rename from core/licenses/lucene-queries-7.2.0.jar.sha1 rename to server/licenses/lucene-queries-7.2.0.jar.sha1 diff --git a/core/licenses/lucene-queryparser-7.2.0.jar.sha1 b/server/licenses/lucene-queryparser-7.2.0.jar.sha1 similarity index 100% rename from core/licenses/lucene-queryparser-7.2.0.jar.sha1 rename to server/licenses/lucene-queryparser-7.2.0.jar.sha1 diff --git a/core/licenses/lucene-sandbox-7.2.0.jar.sha1 b/server/licenses/lucene-sandbox-7.2.0.jar.sha1 similarity index 100% rename from core/licenses/lucene-sandbox-7.2.0.jar.sha1 rename to server/licenses/lucene-sandbox-7.2.0.jar.sha1 diff --git a/core/licenses/lucene-spatial-7.2.0.jar.sha1 b/server/licenses/lucene-spatial-7.2.0.jar.sha1 similarity index 100% rename from core/licenses/lucene-spatial-7.2.0.jar.sha1 rename to server/licenses/lucene-spatial-7.2.0.jar.sha1 diff --git a/core/licenses/lucene-spatial-extras-7.2.0.jar.sha1 b/server/licenses/lucene-spatial-extras-7.2.0.jar.sha1 similarity index 100% rename from core/licenses/lucene-spatial-extras-7.2.0.jar.sha1 rename to server/licenses/lucene-spatial-extras-7.2.0.jar.sha1 diff --git a/core/licenses/lucene-spatial3d-7.2.0.jar.sha1 b/server/licenses/lucene-spatial3d-7.2.0.jar.sha1 similarity index 100% rename from core/licenses/lucene-spatial3d-7.2.0.jar.sha1 rename to server/licenses/lucene-spatial3d-7.2.0.jar.sha1 diff --git a/core/licenses/lucene-suggest-7.2.0.jar.sha1 b/server/licenses/lucene-suggest-7.2.0.jar.sha1 similarity index 100% rename from core/licenses/lucene-suggest-7.2.0.jar.sha1 rename to server/licenses/lucene-suggest-7.2.0.jar.sha1 diff --git a/core/licenses/securesm-1.2.jar.sha1 b/server/licenses/securesm-1.2.jar.sha1 similarity index 100% rename from core/licenses/securesm-1.2.jar.sha1 rename to server/licenses/securesm-1.2.jar.sha1 diff --git a/core/licenses/securesm-LICENSE.txt b/server/licenses/securesm-LICENSE.txt similarity index 100% rename from core/licenses/securesm-LICENSE.txt rename to server/licenses/securesm-LICENSE.txt diff --git a/core/licenses/securesm-NOTICE.txt b/server/licenses/securesm-NOTICE.txt similarity index 100% rename from core/licenses/securesm-NOTICE.txt rename to server/licenses/securesm-NOTICE.txt diff --git a/core/licenses/snakeyaml-1.17.jar.sha1 b/server/licenses/snakeyaml-1.17.jar.sha1 similarity index 100% rename from core/licenses/snakeyaml-1.17.jar.sha1 rename to server/licenses/snakeyaml-1.17.jar.sha1 diff --git a/core/licenses/snakeyaml-LICENSE.txt b/server/licenses/snakeyaml-LICENSE.txt similarity index 100% rename from core/licenses/snakeyaml-LICENSE.txt rename to server/licenses/snakeyaml-LICENSE.txt diff --git a/core/licenses/snakeyaml-NOTICE.txt b/server/licenses/snakeyaml-NOTICE.txt similarity index 100% rename from core/licenses/snakeyaml-NOTICE.txt rename to server/licenses/snakeyaml-NOTICE.txt diff --git a/core/licenses/spatial4j-0.6.jar.sha1 b/server/licenses/spatial4j-0.6.jar.sha1 similarity index 100% rename from core/licenses/spatial4j-0.6.jar.sha1 rename to server/licenses/spatial4j-0.6.jar.sha1 diff --git a/core/licenses/spatial4j-ABOUT.txt b/server/licenses/spatial4j-ABOUT.txt similarity index 100% rename from core/licenses/spatial4j-ABOUT.txt rename to server/licenses/spatial4j-ABOUT.txt diff --git a/core/licenses/spatial4j-LICENSE.txt b/server/licenses/spatial4j-LICENSE.txt similarity index 100% rename from core/licenses/spatial4j-LICENSE.txt rename to server/licenses/spatial4j-LICENSE.txt diff --git a/core/licenses/spatial4j-NOTICE.txt b/server/licenses/spatial4j-NOTICE.txt similarity index 100% rename from core/licenses/spatial4j-NOTICE.txt rename to server/licenses/spatial4j-NOTICE.txt diff --git a/core/licenses/t-digest-3.0.jar.sha1 b/server/licenses/t-digest-3.0.jar.sha1 similarity index 100% rename from core/licenses/t-digest-3.0.jar.sha1 rename to server/licenses/t-digest-3.0.jar.sha1 diff --git a/core/licenses/t-digest-LICENSE.txt b/server/licenses/t-digest-LICENSE.txt similarity index 100% rename from core/licenses/t-digest-LICENSE.txt rename to server/licenses/t-digest-LICENSE.txt diff --git a/core/licenses/t-digest-NOTICE.txt b/server/licenses/t-digest-NOTICE.txt similarity index 100% rename from core/licenses/t-digest-NOTICE.txt rename to server/licenses/t-digest-NOTICE.txt diff --git a/core/src/main/eclipse-build.gradle b/server/src/main/eclipse-build.gradle similarity index 100% rename from core/src/main/eclipse-build.gradle rename to server/src/main/eclipse-build.gradle diff --git a/core/src/main/java/org/apache/lucene/analysis/miscellaneous/DeDuplicatingTokenFilter.java b/server/src/main/java/org/apache/lucene/analysis/miscellaneous/DeDuplicatingTokenFilter.java similarity index 100% rename from core/src/main/java/org/apache/lucene/analysis/miscellaneous/DeDuplicatingTokenFilter.java rename to server/src/main/java/org/apache/lucene/analysis/miscellaneous/DeDuplicatingTokenFilter.java diff --git a/core/src/main/java/org/apache/lucene/analysis/miscellaneous/DisableGraphAttribute.java b/server/src/main/java/org/apache/lucene/analysis/miscellaneous/DisableGraphAttribute.java similarity index 100% rename from core/src/main/java/org/apache/lucene/analysis/miscellaneous/DisableGraphAttribute.java rename to server/src/main/java/org/apache/lucene/analysis/miscellaneous/DisableGraphAttribute.java diff --git a/core/src/main/java/org/apache/lucene/analysis/miscellaneous/DisableGraphAttributeImpl.java b/server/src/main/java/org/apache/lucene/analysis/miscellaneous/DisableGraphAttributeImpl.java similarity index 100% rename from core/src/main/java/org/apache/lucene/analysis/miscellaneous/DisableGraphAttributeImpl.java rename to server/src/main/java/org/apache/lucene/analysis/miscellaneous/DisableGraphAttributeImpl.java diff --git a/core/src/main/java/org/apache/lucene/analysis/miscellaneous/DuplicateByteSequenceSpotter.java b/server/src/main/java/org/apache/lucene/analysis/miscellaneous/DuplicateByteSequenceSpotter.java similarity index 100% rename from core/src/main/java/org/apache/lucene/analysis/miscellaneous/DuplicateByteSequenceSpotter.java rename to server/src/main/java/org/apache/lucene/analysis/miscellaneous/DuplicateByteSequenceSpotter.java diff --git a/core/src/main/java/org/apache/lucene/analysis/miscellaneous/DuplicateSequenceAttribute.java b/server/src/main/java/org/apache/lucene/analysis/miscellaneous/DuplicateSequenceAttribute.java similarity index 100% rename from core/src/main/java/org/apache/lucene/analysis/miscellaneous/DuplicateSequenceAttribute.java rename to server/src/main/java/org/apache/lucene/analysis/miscellaneous/DuplicateSequenceAttribute.java diff --git a/core/src/main/java/org/apache/lucene/analysis/miscellaneous/DuplicateSequenceAttributeImpl.java b/server/src/main/java/org/apache/lucene/analysis/miscellaneous/DuplicateSequenceAttributeImpl.java similarity index 100% rename from core/src/main/java/org/apache/lucene/analysis/miscellaneous/DuplicateSequenceAttributeImpl.java rename to server/src/main/java/org/apache/lucene/analysis/miscellaneous/DuplicateSequenceAttributeImpl.java diff --git a/core/src/main/java/org/apache/lucene/document/BinaryRange.java b/server/src/main/java/org/apache/lucene/document/BinaryRange.java similarity index 100% rename from core/src/main/java/org/apache/lucene/document/BinaryRange.java rename to server/src/main/java/org/apache/lucene/document/BinaryRange.java diff --git a/core/src/main/java/org/apache/lucene/index/OneMergeHelper.java b/server/src/main/java/org/apache/lucene/index/OneMergeHelper.java similarity index 100% rename from core/src/main/java/org/apache/lucene/index/OneMergeHelper.java rename to server/src/main/java/org/apache/lucene/index/OneMergeHelper.java diff --git a/core/src/main/java/org/apache/lucene/queries/BinaryDocValuesRangeQuery.java b/server/src/main/java/org/apache/lucene/queries/BinaryDocValuesRangeQuery.java similarity index 100% rename from core/src/main/java/org/apache/lucene/queries/BinaryDocValuesRangeQuery.java rename to server/src/main/java/org/apache/lucene/queries/BinaryDocValuesRangeQuery.java diff --git a/core/src/main/java/org/apache/lucene/queries/BlendedTermQuery.java b/server/src/main/java/org/apache/lucene/queries/BlendedTermQuery.java similarity index 100% rename from core/src/main/java/org/apache/lucene/queries/BlendedTermQuery.java rename to server/src/main/java/org/apache/lucene/queries/BlendedTermQuery.java diff --git a/core/src/main/java/org/apache/lucene/queries/ExtendedCommonTermsQuery.java b/server/src/main/java/org/apache/lucene/queries/ExtendedCommonTermsQuery.java similarity index 100% rename from core/src/main/java/org/apache/lucene/queries/ExtendedCommonTermsQuery.java rename to server/src/main/java/org/apache/lucene/queries/ExtendedCommonTermsQuery.java diff --git a/core/src/main/java/org/apache/lucene/queries/MinDocQuery.java b/server/src/main/java/org/apache/lucene/queries/MinDocQuery.java similarity index 100% rename from core/src/main/java/org/apache/lucene/queries/MinDocQuery.java rename to server/src/main/java/org/apache/lucene/queries/MinDocQuery.java diff --git a/core/src/main/java/org/apache/lucene/queries/SearchAfterSortedDocQuery.java b/server/src/main/java/org/apache/lucene/queries/SearchAfterSortedDocQuery.java similarity index 100% rename from core/src/main/java/org/apache/lucene/queries/SearchAfterSortedDocQuery.java rename to server/src/main/java/org/apache/lucene/queries/SearchAfterSortedDocQuery.java diff --git a/core/src/main/java/org/apache/lucene/queryparser/classic/XQueryParser.java b/server/src/main/java/org/apache/lucene/queryparser/classic/XQueryParser.java similarity index 100% rename from core/src/main/java/org/apache/lucene/queryparser/classic/XQueryParser.java rename to server/src/main/java/org/apache/lucene/queryparser/classic/XQueryParser.java diff --git a/core/src/main/java/org/apache/lucene/search/grouping/CollapseTopFieldDocs.java b/server/src/main/java/org/apache/lucene/search/grouping/CollapseTopFieldDocs.java similarity index 100% rename from core/src/main/java/org/apache/lucene/search/grouping/CollapseTopFieldDocs.java rename to server/src/main/java/org/apache/lucene/search/grouping/CollapseTopFieldDocs.java diff --git a/core/src/main/java/org/apache/lucene/search/grouping/CollapsingDocValuesSource.java b/server/src/main/java/org/apache/lucene/search/grouping/CollapsingDocValuesSource.java similarity index 100% rename from core/src/main/java/org/apache/lucene/search/grouping/CollapsingDocValuesSource.java rename to server/src/main/java/org/apache/lucene/search/grouping/CollapsingDocValuesSource.java diff --git a/core/src/main/java/org/apache/lucene/search/grouping/CollapsingTopDocsCollector.java b/server/src/main/java/org/apache/lucene/search/grouping/CollapsingTopDocsCollector.java similarity index 100% rename from core/src/main/java/org/apache/lucene/search/grouping/CollapsingTopDocsCollector.java rename to server/src/main/java/org/apache/lucene/search/grouping/CollapsingTopDocsCollector.java diff --git a/core/src/main/java/org/apache/lucene/search/uhighlight/BoundedBreakIteratorScanner.java b/server/src/main/java/org/apache/lucene/search/uhighlight/BoundedBreakIteratorScanner.java similarity index 100% rename from core/src/main/java/org/apache/lucene/search/uhighlight/BoundedBreakIteratorScanner.java rename to server/src/main/java/org/apache/lucene/search/uhighlight/BoundedBreakIteratorScanner.java diff --git a/core/src/main/java/org/apache/lucene/search/uhighlight/CustomFieldHighlighter.java b/server/src/main/java/org/apache/lucene/search/uhighlight/CustomFieldHighlighter.java similarity index 100% rename from core/src/main/java/org/apache/lucene/search/uhighlight/CustomFieldHighlighter.java rename to server/src/main/java/org/apache/lucene/search/uhighlight/CustomFieldHighlighter.java diff --git a/core/src/main/java/org/apache/lucene/search/uhighlight/CustomPassageFormatter.java b/server/src/main/java/org/apache/lucene/search/uhighlight/CustomPassageFormatter.java similarity index 100% rename from core/src/main/java/org/apache/lucene/search/uhighlight/CustomPassageFormatter.java rename to server/src/main/java/org/apache/lucene/search/uhighlight/CustomPassageFormatter.java diff --git a/core/src/main/java/org/apache/lucene/search/uhighlight/CustomUnifiedHighlighter.java b/server/src/main/java/org/apache/lucene/search/uhighlight/CustomUnifiedHighlighter.java similarity index 100% rename from core/src/main/java/org/apache/lucene/search/uhighlight/CustomUnifiedHighlighter.java rename to server/src/main/java/org/apache/lucene/search/uhighlight/CustomUnifiedHighlighter.java diff --git a/core/src/main/java/org/apache/lucene/search/uhighlight/Snippet.java b/server/src/main/java/org/apache/lucene/search/uhighlight/Snippet.java similarity index 100% rename from core/src/main/java/org/apache/lucene/search/uhighlight/Snippet.java rename to server/src/main/java/org/apache/lucene/search/uhighlight/Snippet.java diff --git a/core/src/main/java/org/apache/lucene/search/vectorhighlight/CustomFieldQuery.java b/server/src/main/java/org/apache/lucene/search/vectorhighlight/CustomFieldQuery.java similarity index 100% rename from core/src/main/java/org/apache/lucene/search/vectorhighlight/CustomFieldQuery.java rename to server/src/main/java/org/apache/lucene/search/vectorhighlight/CustomFieldQuery.java diff --git a/core/src/main/java/org/elasticsearch/Assertions.java b/server/src/main/java/org/elasticsearch/Assertions.java similarity index 100% rename from core/src/main/java/org/elasticsearch/Assertions.java rename to server/src/main/java/org/elasticsearch/Assertions.java diff --git a/core/src/main/java/org/elasticsearch/Build.java b/server/src/main/java/org/elasticsearch/Build.java similarity index 100% rename from core/src/main/java/org/elasticsearch/Build.java rename to server/src/main/java/org/elasticsearch/Build.java diff --git a/core/src/main/java/org/elasticsearch/ElasticsearchCorruptionException.java b/server/src/main/java/org/elasticsearch/ElasticsearchCorruptionException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/ElasticsearchCorruptionException.java rename to server/src/main/java/org/elasticsearch/ElasticsearchCorruptionException.java diff --git a/core/src/main/java/org/elasticsearch/ElasticsearchException.java b/server/src/main/java/org/elasticsearch/ElasticsearchException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/ElasticsearchException.java rename to server/src/main/java/org/elasticsearch/ElasticsearchException.java diff --git a/core/src/main/java/org/elasticsearch/ElasticsearchGenerationException.java b/server/src/main/java/org/elasticsearch/ElasticsearchGenerationException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/ElasticsearchGenerationException.java rename to server/src/main/java/org/elasticsearch/ElasticsearchGenerationException.java diff --git a/core/src/main/java/org/elasticsearch/ElasticsearchParseException.java b/server/src/main/java/org/elasticsearch/ElasticsearchParseException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/ElasticsearchParseException.java rename to server/src/main/java/org/elasticsearch/ElasticsearchParseException.java diff --git a/core/src/main/java/org/elasticsearch/ElasticsearchSecurityException.java b/server/src/main/java/org/elasticsearch/ElasticsearchSecurityException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/ElasticsearchSecurityException.java rename to server/src/main/java/org/elasticsearch/ElasticsearchSecurityException.java diff --git a/core/src/main/java/org/elasticsearch/ElasticsearchStatusException.java b/server/src/main/java/org/elasticsearch/ElasticsearchStatusException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/ElasticsearchStatusException.java rename to server/src/main/java/org/elasticsearch/ElasticsearchStatusException.java diff --git a/core/src/main/java/org/elasticsearch/ElasticsearchTimeoutException.java b/server/src/main/java/org/elasticsearch/ElasticsearchTimeoutException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/ElasticsearchTimeoutException.java rename to server/src/main/java/org/elasticsearch/ElasticsearchTimeoutException.java diff --git a/core/src/main/java/org/elasticsearch/ElasticsearchWrapperException.java b/server/src/main/java/org/elasticsearch/ElasticsearchWrapperException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/ElasticsearchWrapperException.java rename to server/src/main/java/org/elasticsearch/ElasticsearchWrapperException.java diff --git a/core/src/main/java/org/elasticsearch/ExceptionsHelper.java b/server/src/main/java/org/elasticsearch/ExceptionsHelper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/ExceptionsHelper.java rename to server/src/main/java/org/elasticsearch/ExceptionsHelper.java diff --git a/core/src/main/java/org/elasticsearch/ResourceAlreadyExistsException.java b/server/src/main/java/org/elasticsearch/ResourceAlreadyExistsException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/ResourceAlreadyExistsException.java rename to server/src/main/java/org/elasticsearch/ResourceAlreadyExistsException.java diff --git a/core/src/main/java/org/elasticsearch/ResourceNotFoundException.java b/server/src/main/java/org/elasticsearch/ResourceNotFoundException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/ResourceNotFoundException.java rename to server/src/main/java/org/elasticsearch/ResourceNotFoundException.java diff --git a/core/src/main/java/org/elasticsearch/SpecialPermission.java b/server/src/main/java/org/elasticsearch/SpecialPermission.java similarity index 100% rename from core/src/main/java/org/elasticsearch/SpecialPermission.java rename to server/src/main/java/org/elasticsearch/SpecialPermission.java diff --git a/core/src/main/java/org/elasticsearch/Version.java b/server/src/main/java/org/elasticsearch/Version.java similarity index 100% rename from core/src/main/java/org/elasticsearch/Version.java rename to server/src/main/java/org/elasticsearch/Version.java diff --git a/core/src/main/java/org/elasticsearch/action/Action.java b/server/src/main/java/org/elasticsearch/action/Action.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/Action.java rename to server/src/main/java/org/elasticsearch/action/Action.java diff --git a/core/src/main/java/org/elasticsearch/action/ActionFuture.java b/server/src/main/java/org/elasticsearch/action/ActionFuture.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ActionFuture.java rename to server/src/main/java/org/elasticsearch/action/ActionFuture.java diff --git a/core/src/main/java/org/elasticsearch/action/ActionListener.java b/server/src/main/java/org/elasticsearch/action/ActionListener.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ActionListener.java rename to server/src/main/java/org/elasticsearch/action/ActionListener.java diff --git a/core/src/main/java/org/elasticsearch/action/ActionListenerResponseHandler.java b/server/src/main/java/org/elasticsearch/action/ActionListenerResponseHandler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ActionListenerResponseHandler.java rename to server/src/main/java/org/elasticsearch/action/ActionListenerResponseHandler.java diff --git a/core/src/main/java/org/elasticsearch/action/ActionModule.java b/server/src/main/java/org/elasticsearch/action/ActionModule.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ActionModule.java rename to server/src/main/java/org/elasticsearch/action/ActionModule.java diff --git a/core/src/main/java/org/elasticsearch/action/ActionRequest.java b/server/src/main/java/org/elasticsearch/action/ActionRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ActionRequest.java rename to server/src/main/java/org/elasticsearch/action/ActionRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/ActionRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/ActionRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ActionRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/ActionRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/ActionRequestValidationException.java b/server/src/main/java/org/elasticsearch/action/ActionRequestValidationException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ActionRequestValidationException.java rename to server/src/main/java/org/elasticsearch/action/ActionRequestValidationException.java diff --git a/core/src/main/java/org/elasticsearch/action/ActionResponse.java b/server/src/main/java/org/elasticsearch/action/ActionResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ActionResponse.java rename to server/src/main/java/org/elasticsearch/action/ActionResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/ActionRunnable.java b/server/src/main/java/org/elasticsearch/action/ActionRunnable.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ActionRunnable.java rename to server/src/main/java/org/elasticsearch/action/ActionRunnable.java diff --git a/core/src/main/java/org/elasticsearch/action/AliasesRequest.java b/server/src/main/java/org/elasticsearch/action/AliasesRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/AliasesRequest.java rename to server/src/main/java/org/elasticsearch/action/AliasesRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/CompositeIndicesRequest.java b/server/src/main/java/org/elasticsearch/action/CompositeIndicesRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/CompositeIndicesRequest.java rename to server/src/main/java/org/elasticsearch/action/CompositeIndicesRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/DocWriteRequest.java b/server/src/main/java/org/elasticsearch/action/DocWriteRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/DocWriteRequest.java rename to server/src/main/java/org/elasticsearch/action/DocWriteRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/DocWriteResponse.java b/server/src/main/java/org/elasticsearch/action/DocWriteResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/DocWriteResponse.java rename to server/src/main/java/org/elasticsearch/action/DocWriteResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/FailedNodeException.java b/server/src/main/java/org/elasticsearch/action/FailedNodeException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/FailedNodeException.java rename to server/src/main/java/org/elasticsearch/action/FailedNodeException.java diff --git a/core/src/main/java/org/elasticsearch/action/GenericAction.java b/server/src/main/java/org/elasticsearch/action/GenericAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/GenericAction.java rename to server/src/main/java/org/elasticsearch/action/GenericAction.java diff --git a/core/src/main/java/org/elasticsearch/action/IndicesRequest.java b/server/src/main/java/org/elasticsearch/action/IndicesRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/IndicesRequest.java rename to server/src/main/java/org/elasticsearch/action/IndicesRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/LatchedActionListener.java b/server/src/main/java/org/elasticsearch/action/LatchedActionListener.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/LatchedActionListener.java rename to server/src/main/java/org/elasticsearch/action/LatchedActionListener.java diff --git a/core/src/main/java/org/elasticsearch/action/ListenableActionFuture.java b/server/src/main/java/org/elasticsearch/action/ListenableActionFuture.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ListenableActionFuture.java rename to server/src/main/java/org/elasticsearch/action/ListenableActionFuture.java diff --git a/core/src/main/java/org/elasticsearch/action/NoShardAvailableActionException.java b/server/src/main/java/org/elasticsearch/action/NoShardAvailableActionException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/NoShardAvailableActionException.java rename to server/src/main/java/org/elasticsearch/action/NoShardAvailableActionException.java diff --git a/core/src/main/java/org/elasticsearch/action/NoSuchNodeException.java b/server/src/main/java/org/elasticsearch/action/NoSuchNodeException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/NoSuchNodeException.java rename to server/src/main/java/org/elasticsearch/action/NoSuchNodeException.java diff --git a/core/src/main/java/org/elasticsearch/action/NotifyOnceListener.java b/server/src/main/java/org/elasticsearch/action/NotifyOnceListener.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/NotifyOnceListener.java rename to server/src/main/java/org/elasticsearch/action/NotifyOnceListener.java diff --git a/core/src/main/java/org/elasticsearch/action/OriginalIndices.java b/server/src/main/java/org/elasticsearch/action/OriginalIndices.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/OriginalIndices.java rename to server/src/main/java/org/elasticsearch/action/OriginalIndices.java diff --git a/core/src/main/java/org/elasticsearch/action/PrimaryMissingActionException.java b/server/src/main/java/org/elasticsearch/action/PrimaryMissingActionException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/PrimaryMissingActionException.java rename to server/src/main/java/org/elasticsearch/action/PrimaryMissingActionException.java diff --git a/core/src/main/java/org/elasticsearch/action/RealtimeRequest.java b/server/src/main/java/org/elasticsearch/action/RealtimeRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/RealtimeRequest.java rename to server/src/main/java/org/elasticsearch/action/RealtimeRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/RoutingMissingException.java b/server/src/main/java/org/elasticsearch/action/RoutingMissingException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/RoutingMissingException.java rename to server/src/main/java/org/elasticsearch/action/RoutingMissingException.java diff --git a/core/src/main/java/org/elasticsearch/action/ShardOperationFailedException.java b/server/src/main/java/org/elasticsearch/action/ShardOperationFailedException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ShardOperationFailedException.java rename to server/src/main/java/org/elasticsearch/action/ShardOperationFailedException.java diff --git a/core/src/main/java/org/elasticsearch/action/TaskOperationFailure.java b/server/src/main/java/org/elasticsearch/action/TaskOperationFailure.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/TaskOperationFailure.java rename to server/src/main/java/org/elasticsearch/action/TaskOperationFailure.java diff --git a/core/src/main/java/org/elasticsearch/action/ThreadingModel.java b/server/src/main/java/org/elasticsearch/action/ThreadingModel.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ThreadingModel.java rename to server/src/main/java/org/elasticsearch/action/ThreadingModel.java diff --git a/core/src/main/java/org/elasticsearch/action/TimestampParsingException.java b/server/src/main/java/org/elasticsearch/action/TimestampParsingException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/TimestampParsingException.java rename to server/src/main/java/org/elasticsearch/action/TimestampParsingException.java diff --git a/core/src/main/java/org/elasticsearch/action/TransportActionNodeProxy.java b/server/src/main/java/org/elasticsearch/action/TransportActionNodeProxy.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/TransportActionNodeProxy.java rename to server/src/main/java/org/elasticsearch/action/TransportActionNodeProxy.java diff --git a/core/src/main/java/org/elasticsearch/action/UnavailableShardsException.java b/server/src/main/java/org/elasticsearch/action/UnavailableShardsException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/UnavailableShardsException.java rename to server/src/main/java/org/elasticsearch/action/UnavailableShardsException.java diff --git a/core/src/main/java/org/elasticsearch/action/ValidateActions.java b/server/src/main/java/org/elasticsearch/action/ValidateActions.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ValidateActions.java rename to server/src/main/java/org/elasticsearch/action/ValidateActions.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainResponse.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplanation.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplanation.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplanation.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplanation.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/allocation/TransportClusterAllocationExplainAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/TransportClusterAllocationExplainAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/allocation/TransportClusterAllocationExplainAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/TransportClusterAllocationExplainAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthResponse.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodeHotThreads.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodeHotThreads.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodeHotThreads.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodeHotThreads.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsResponse.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/TransportNodesHotThreadsAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/TransportNodesHotThreadsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/TransportNodesHotThreadsAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/TransportNodesHotThreadsAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodeInfo.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodeInfo.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodeInfo.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodeInfo.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoResponse.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/info/PluginsAndModules.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/info/PluginsAndModules.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/info/PluginsAndModules.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/info/PluginsAndModules.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/info/TransportNodesInfoAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/info/TransportNodesInfoAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/info/TransportNodesInfoAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/info/TransportNodesInfoAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/liveness/LivenessRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/liveness/LivenessRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/liveness/LivenessRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/liveness/LivenessRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/liveness/LivenessResponse.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/liveness/LivenessResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/liveness/LivenessResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/liveness/LivenessResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/liveness/TransportLivenessAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/liveness/TransportLivenessAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/liveness/TransportLivenessAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/liveness/TransportLivenessAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodeStats.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodeStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodeStats.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodeStats.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsResponse.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/TransportNodesStatsAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/TransportNodesStatsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/TransportNodesStatsAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/TransportNodesStatsAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/cancel/CancelTasksAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/cancel/CancelTasksAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/cancel/CancelTasksAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/cancel/CancelTasksAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/cancel/CancelTasksRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/cancel/CancelTasksRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/cancel/CancelTasksRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/cancel/CancelTasksRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/cancel/CancelTasksRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/cancel/CancelTasksRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/cancel/CancelTasksRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/cancel/CancelTasksRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/cancel/CancelTasksResponse.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/cancel/CancelTasksResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/cancel/CancelTasksResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/cancel/CancelTasksResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/cancel/TransportCancelTasksAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/cancel/TransportCancelTasksAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/cancel/TransportCancelTasksAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/cancel/TransportCancelTasksAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/get/GetTaskAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/get/GetTaskAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/get/GetTaskAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/get/GetTaskAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/get/GetTaskRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/get/GetTaskRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/get/GetTaskRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/get/GetTaskRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/get/GetTaskRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/get/GetTaskRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/get/GetTaskRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/get/GetTaskRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/get/GetTaskResponse.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/get/GetTaskResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/get/GetTaskResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/get/GetTaskResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/get/TransportGetTaskAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/get/TransportGetTaskAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/get/TransportGetTaskAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/get/TransportGetTaskAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/ListTasksAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/ListTasksAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/ListTasksAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/ListTasksAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/ListTasksRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/ListTasksRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/ListTasksRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/ListTasksRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/ListTasksRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/ListTasksRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/ListTasksRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/ListTasksRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/ListTasksResponse.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/ListTasksResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/ListTasksResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/ListTasksResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/TaskGroup.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/TaskGroup.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/TaskGroup.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/TaskGroup.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/TransportListTasksAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/TransportListTasksAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/TransportListTasksAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/TransportListTasksAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/usage/NodeUsage.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/usage/NodeUsage.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/usage/NodeUsage.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/usage/NodeUsage.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/usage/NodesUsageAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/usage/NodesUsageAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/usage/NodesUsageAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/usage/NodesUsageAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/usage/NodesUsageRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/usage/NodesUsageRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/usage/NodesUsageRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/usage/NodesUsageRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/usage/NodesUsageRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/usage/NodesUsageRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/usage/NodesUsageRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/usage/NodesUsageRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/usage/NodesUsageResponse.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/usage/NodesUsageResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/usage/NodesUsageResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/usage/NodesUsageResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/usage/TransportNodesUsageAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/usage/TransportNodesUsageAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/node/usage/TransportNodesUsageAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/node/usage/TransportNodesUsageAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/remote/RemoteInfoAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/remote/RemoteInfoAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/remote/RemoteInfoAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/remote/RemoteInfoAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/remote/RemoteInfoRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/remote/RemoteInfoRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/remote/RemoteInfoRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/remote/RemoteInfoRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/remote/RemoteInfoRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/remote/RemoteInfoRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/remote/RemoteInfoRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/remote/RemoteInfoRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/remote/RemoteInfoResponse.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/remote/RemoteInfoResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/remote/RemoteInfoResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/remote/RemoteInfoResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/remote/TransportRemoteInfoAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/remote/TransportRemoteInfoAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/remote/TransportRemoteInfoAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/remote/TransportRemoteInfoAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/DeleteRepositoryAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/DeleteRepositoryAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/DeleteRepositoryAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/DeleteRepositoryAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/DeleteRepositoryRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/DeleteRepositoryRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/DeleteRepositoryRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/DeleteRepositoryRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/DeleteRepositoryRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/DeleteRepositoryRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/DeleteRepositoryRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/DeleteRepositoryRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/DeleteRepositoryResponse.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/DeleteRepositoryResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/DeleteRepositoryResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/DeleteRepositoryResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/TransportDeleteRepositoryAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/TransportDeleteRepositoryAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/TransportDeleteRepositoryAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/TransportDeleteRepositoryAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/GetRepositoriesAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/GetRepositoriesAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/GetRepositoriesAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/GetRepositoriesAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/GetRepositoriesRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/GetRepositoriesRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/GetRepositoriesRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/GetRepositoriesRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/GetRepositoriesRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/GetRepositoriesRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/GetRepositoriesRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/GetRepositoriesRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/GetRepositoriesResponse.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/GetRepositoriesResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/GetRepositoriesResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/GetRepositoriesResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/TransportGetRepositoriesAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/TransportGetRepositoriesAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/TransportGetRepositoriesAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/TransportGetRepositoriesAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryResponse.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/TransportPutRepositoryAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/TransportPutRepositoryAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/TransportPutRepositoryAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/TransportPutRepositoryAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/TransportVerifyRepositoryAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/TransportVerifyRepositoryAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/TransportVerifyRepositoryAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/TransportVerifyRepositoryAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/VerifyRepositoryAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/VerifyRepositoryAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/VerifyRepositoryAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/VerifyRepositoryAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/VerifyRepositoryRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/VerifyRepositoryRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/VerifyRepositoryRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/VerifyRepositoryRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/VerifyRepositoryRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/VerifyRepositoryRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/VerifyRepositoryRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/VerifyRepositoryRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/VerifyRepositoryResponse.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/VerifyRepositoryResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/VerifyRepositoryResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/VerifyRepositoryResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteResponse.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/reroute/TransportClusterRerouteAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/reroute/TransportClusterRerouteAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/reroute/TransportClusterRerouteAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/reroute/TransportClusterRerouteAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsResponse.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/settings/SettingsUpdater.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/settings/SettingsUpdater.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/settings/SettingsUpdater.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/settings/SettingsUpdater.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/settings/TransportClusterUpdateSettingsAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/settings/TransportClusterUpdateSettingsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/settings/TransportClusterUpdateSettingsAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/settings/TransportClusterUpdateSettingsAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsGroup.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsGroup.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsGroup.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsGroup.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsResponse.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/shards/TransportClusterSearchShardsAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/shards/TransportClusterSearchShardsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/shards/TransportClusterSearchShardsAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/shards/TransportClusterSearchShardsAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotResponse.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/TransportCreateSnapshotAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/TransportCreateSnapshotAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/TransportCreateSnapshotAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/TransportCreateSnapshotAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotResponse.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/TransportDeleteSnapshotAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/TransportDeleteSnapshotAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/TransportDeleteSnapshotAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/TransportDeleteSnapshotAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsResponse.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/TransportGetSnapshotsAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/TransportGetSnapshotsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/TransportGetSnapshotsAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/TransportGetSnapshotsAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotResponse.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/TransportRestoreSnapshotAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/TransportRestoreSnapshotAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/TransportRestoreSnapshotAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/TransportRestoreSnapshotAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotIndexShardStage.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotIndexShardStage.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotIndexShardStage.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotIndexShardStage.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotIndexShardStatus.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotIndexShardStatus.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotIndexShardStatus.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotIndexShardStatus.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotIndexStatus.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotIndexStatus.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotIndexStatus.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotIndexStatus.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotShardsStats.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotShardsStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotShardsStats.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotShardsStats.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotStats.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotStats.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotStats.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotStatus.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotStatus.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotStatus.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotStatus.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotsStatusAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotsStatusAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotsStatusAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotsStatusAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotsStatusRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotsStatusRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotsStatusRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotsStatusRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotsStatusRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotsStatusRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotsStatusRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotsStatusRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotsStatusResponse.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotsStatusResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotsStatusResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotsStatusResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportNodesSnapshotsStatus.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportNodesSnapshotsStatus.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportNodesSnapshotsStatus.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportNodesSnapshotsStatus.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportSnapshotsStatusAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportSnapshotsStatusAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportSnapshotsStatusAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportSnapshotsStatusAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateResponse.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/state/TransportClusterStateAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/state/TransportClusterStateAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/state/TransportClusterStateAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/state/TransportClusterStateAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsIndices.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsIndices.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsIndices.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsIndices.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsNodeResponse.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsNodeResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsNodeResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsNodeResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsNodes.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsNodes.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsNodes.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsNodes.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsResponse.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/stats/TransportClusterStatsAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/stats/TransportClusterStatsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/stats/TransportClusterStatsAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/stats/TransportClusterStatsAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/DeleteStoredScriptAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/DeleteStoredScriptAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/DeleteStoredScriptAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/DeleteStoredScriptAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/DeleteStoredScriptRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/DeleteStoredScriptRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/DeleteStoredScriptRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/DeleteStoredScriptRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/DeleteStoredScriptRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/DeleteStoredScriptRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/DeleteStoredScriptRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/DeleteStoredScriptRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/DeleteStoredScriptResponse.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/DeleteStoredScriptResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/DeleteStoredScriptResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/DeleteStoredScriptResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/GetStoredScriptAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/GetStoredScriptAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/GetStoredScriptAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/GetStoredScriptAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/GetStoredScriptRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/GetStoredScriptRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/GetStoredScriptRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/GetStoredScriptRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/GetStoredScriptRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/GetStoredScriptRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/GetStoredScriptRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/GetStoredScriptRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/GetStoredScriptResponse.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/GetStoredScriptResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/GetStoredScriptResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/GetStoredScriptResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/PutStoredScriptAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/PutStoredScriptAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/PutStoredScriptAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/PutStoredScriptAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/PutStoredScriptRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/PutStoredScriptRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/PutStoredScriptRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/PutStoredScriptRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/PutStoredScriptRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/PutStoredScriptRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/PutStoredScriptRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/PutStoredScriptRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/PutStoredScriptResponse.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/PutStoredScriptResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/PutStoredScriptResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/PutStoredScriptResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/TransportDeleteStoredScriptAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/TransportDeleteStoredScriptAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/TransportDeleteStoredScriptAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/TransportDeleteStoredScriptAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/TransportGetStoredScriptAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/TransportGetStoredScriptAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/TransportGetStoredScriptAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/TransportGetStoredScriptAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/TransportPutStoredScriptAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/TransportPutStoredScriptAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/TransportPutStoredScriptAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/TransportPutStoredScriptAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/tasks/PendingClusterTasksAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/tasks/PendingClusterTasksAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/tasks/PendingClusterTasksAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/tasks/PendingClusterTasksAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/tasks/PendingClusterTasksRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/tasks/PendingClusterTasksRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/tasks/PendingClusterTasksRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/tasks/PendingClusterTasksRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/tasks/PendingClusterTasksRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/tasks/PendingClusterTasksRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/tasks/PendingClusterTasksRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/tasks/PendingClusterTasksRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/tasks/PendingClusterTasksResponse.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/tasks/PendingClusterTasksResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/tasks/PendingClusterTasksResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/tasks/PendingClusterTasksResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/tasks/TransportPendingClusterTasksAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/tasks/TransportPendingClusterTasksAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/cluster/tasks/TransportPendingClusterTasksAction.java rename to server/src/main/java/org/elasticsearch/action/admin/cluster/tasks/TransportPendingClusterTasksAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/alias/Alias.java b/server/src/main/java/org/elasticsearch/action/admin/indices/alias/Alias.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/alias/Alias.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/alias/Alias.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesClusterStateUpdateRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesClusterStateUpdateRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesClusterStateUpdateRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesClusterStateUpdateRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/alias/TransportIndicesAliasesAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/alias/TransportIndicesAliasesAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/alias/TransportIndicesAliasesAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/alias/TransportIndicesAliasesAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/alias/exists/AliasesExistAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/alias/exists/AliasesExistAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/alias/exists/AliasesExistAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/alias/exists/AliasesExistAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/alias/exists/AliasesExistRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/indices/alias/exists/AliasesExistRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/alias/exists/AliasesExistRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/alias/exists/AliasesExistRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/alias/exists/AliasesExistResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/alias/exists/AliasesExistResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/alias/exists/AliasesExistResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/alias/exists/AliasesExistResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/alias/exists/TransportAliasesExistAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/alias/exists/TransportAliasesExistAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/alias/exists/TransportAliasesExistAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/alias/exists/TransportAliasesExistAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/alias/get/BaseAliasesRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/indices/alias/get/BaseAliasesRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/alias/get/BaseAliasesRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/alias/get/BaseAliasesRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/alias/get/GetAliasesAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/alias/get/GetAliasesAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/alias/get/GetAliasesAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/alias/get/GetAliasesAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/alias/get/GetAliasesRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/alias/get/GetAliasesRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/alias/get/GetAliasesRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/alias/get/GetAliasesRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/alias/get/GetAliasesRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/indices/alias/get/GetAliasesRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/alias/get/GetAliasesRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/alias/get/GetAliasesRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/alias/get/GetAliasesResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/alias/get/GetAliasesResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/alias/get/GetAliasesResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/alias/get/GetAliasesResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/alias/get/TransportGetAliasesAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/alias/get/TransportGetAliasesAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/alias/get/TransportGetAliasesAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/alias/get/TransportGetAliasesAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/analyze/DetailAnalyzeResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/analyze/DetailAnalyzeResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/analyze/DetailAnalyzeResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/analyze/DetailAnalyzeResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/analyze/TransportAnalyzeAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/analyze/TransportAnalyzeAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/analyze/TransportAnalyzeAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/analyze/TransportAnalyzeAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/TransportClearIndicesCacheAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/TransportClearIndicesCacheAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/TransportClearIndicesCacheAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/TransportClearIndicesCacheAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexClusterStateUpdateRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexClusterStateUpdateRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexClusterStateUpdateRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexClusterStateUpdateRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/close/TransportCloseIndexAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/close/TransportCloseIndexAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/close/TransportCloseIndexAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/close/TransportCloseIndexAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexClusterStateUpdateRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexClusterStateUpdateRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexClusterStateUpdateRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexClusterStateUpdateRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/create/TransportCreateIndexAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/create/TransportCreateIndexAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/create/TransportCreateIndexAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/create/TransportCreateIndexAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/create/package-info.java b/server/src/main/java/org/elasticsearch/action/admin/indices/create/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/create/package-info.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/create/package-info.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexClusterStateUpdateRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexClusterStateUpdateRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexClusterStateUpdateRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexClusterStateUpdateRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/delete/TransportDeleteIndexAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/delete/TransportDeleteIndexAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/delete/TransportDeleteIndexAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/delete/TransportDeleteIndexAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/delete/package-info.java b/server/src/main/java/org/elasticsearch/action/admin/indices/delete/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/delete/package-info.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/delete/package-info.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/TransportIndicesExistsAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/TransportIndicesExistsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/TransportIndicesExistsAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/TransportIndicesExistsAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TransportTypesExistsAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TransportTypesExistsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TransportTypesExistsAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TransportTypesExistsAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TypesExistsAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TypesExistsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TypesExistsAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TypesExistsAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TypesExistsRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TypesExistsRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TypesExistsRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TypesExistsRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TypesExistsRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TypesExistsRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TypesExistsRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TypesExistsRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TypesExistsResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TypesExistsResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TypesExistsResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TypesExistsResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/flush/ShardFlushRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/flush/ShardFlushRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/flush/ShardFlushRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/flush/ShardFlushRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/flush/SyncedFlushAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/flush/SyncedFlushAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/flush/SyncedFlushAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/flush/SyncedFlushAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/flush/SyncedFlushRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/flush/SyncedFlushRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/flush/SyncedFlushRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/flush/SyncedFlushRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/flush/SyncedFlushRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/indices/flush/SyncedFlushRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/flush/SyncedFlushRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/flush/SyncedFlushRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/flush/SyncedFlushResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/flush/SyncedFlushResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/flush/SyncedFlushResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/flush/SyncedFlushResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/flush/TransportFlushAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/flush/TransportFlushAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/flush/TransportFlushAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/flush/TransportFlushAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/flush/TransportShardFlushAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/flush/TransportShardFlushAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/flush/TransportShardFlushAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/flush/TransportShardFlushAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/flush/TransportSyncedFlushAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/flush/TransportSyncedFlushAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/flush/TransportSyncedFlushAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/flush/TransportSyncedFlushAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/flush/package-info.java b/server/src/main/java/org/elasticsearch/action/admin/indices/flush/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/flush/package-info.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/flush/package-info.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/forcemerge/ForceMergeAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/forcemerge/ForceMergeAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/forcemerge/ForceMergeAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/forcemerge/ForceMergeAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/forcemerge/ForceMergeRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/forcemerge/ForceMergeRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/forcemerge/ForceMergeRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/forcemerge/ForceMergeRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/forcemerge/ForceMergeRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/indices/forcemerge/ForceMergeRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/forcemerge/ForceMergeRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/forcemerge/ForceMergeRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/forcemerge/ForceMergeResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/forcemerge/ForceMergeResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/forcemerge/ForceMergeResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/forcemerge/ForceMergeResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/forcemerge/TransportForceMergeAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/forcemerge/TransportForceMergeAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/forcemerge/TransportForceMergeAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/forcemerge/TransportForceMergeAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/forcemerge/package-info.java b/server/src/main/java/org/elasticsearch/action/admin/indices/forcemerge/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/forcemerge/package-info.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/forcemerge/package-info.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/get/TransportGetIndexAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/get/TransportGetIndexAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/get/TransportGetIndexAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/get/TransportGetIndexAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsIndexRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsIndexRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsIndexRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsIndexRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetMappingsAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetMappingsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetMappingsAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetMappingsAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetMappingsRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetMappingsRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetMappingsRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetMappingsRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetMappingsRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetMappingsRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetMappingsRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetMappingsRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetMappingsResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetMappingsResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetMappingsResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetMappingsResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/TransportGetFieldMappingsAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/TransportGetFieldMappingsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/TransportGetFieldMappingsAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/TransportGetFieldMappingsAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/TransportGetFieldMappingsIndexAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/TransportGetFieldMappingsIndexAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/TransportGetFieldMappingsIndexAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/TransportGetFieldMappingsIndexAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/TransportGetMappingsAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/TransportGetMappingsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/TransportGetMappingsAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/TransportGetMappingsAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/mapping/package-info.java b/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/mapping/package-info.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/mapping/package-info.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingClusterStateUpdateRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingClusterStateUpdateRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingClusterStateUpdateRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingClusterStateUpdateRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/TransportPutMappingAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/TransportPutMappingAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/TransportPutMappingAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/TransportPutMappingAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/package-info.java b/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/package-info.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/package-info.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexClusterStateUpdateRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexClusterStateUpdateRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexClusterStateUpdateRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexClusterStateUpdateRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/open/TransportOpenIndexAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/open/TransportOpenIndexAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/open/TransportOpenIndexAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/open/TransportOpenIndexAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/package-info.java b/server/src/main/java/org/elasticsearch/action/admin/indices/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/package-info.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/package-info.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/recovery/TransportRecoveryAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/recovery/TransportRecoveryAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/recovery/TransportRecoveryAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/recovery/TransportRecoveryAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/refresh/TransportRefreshAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/refresh/TransportRefreshAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/refresh/TransportRefreshAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/refresh/TransportRefreshAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/refresh/TransportShardRefreshAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/refresh/TransportShardRefreshAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/refresh/TransportShardRefreshAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/refresh/TransportShardRefreshAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/refresh/package-info.java b/server/src/main/java/org/elasticsearch/action/admin/indices/refresh/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/refresh/package-info.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/refresh/package-info.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/rollover/Condition.java b/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/Condition.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/rollover/Condition.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/rollover/Condition.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/rollover/MaxAgeCondition.java b/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/MaxAgeCondition.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/rollover/MaxAgeCondition.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/rollover/MaxAgeCondition.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/rollover/MaxDocsCondition.java b/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/MaxDocsCondition.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/rollover/MaxDocsCondition.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/rollover/MaxDocsCondition.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/rollover/MaxSizeCondition.java b/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/MaxSizeCondition.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/rollover/MaxSizeCondition.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/rollover/MaxSizeCondition.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/rollover/TransportRolloverAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/TransportRolloverAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/rollover/TransportRolloverAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/rollover/TransportRolloverAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/segments/IndexSegments.java b/server/src/main/java/org/elasticsearch/action/admin/indices/segments/IndexSegments.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/segments/IndexSegments.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/segments/IndexSegments.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/segments/IndexShardSegments.java b/server/src/main/java/org/elasticsearch/action/admin/indices/segments/IndexShardSegments.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/segments/IndexShardSegments.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/segments/IndexShardSegments.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/segments/ShardSegments.java b/server/src/main/java/org/elasticsearch/action/admin/indices/segments/ShardSegments.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/segments/ShardSegments.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/segments/ShardSegments.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/segments/TransportIndicesSegmentsAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/segments/TransportIndicesSegmentsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/segments/TransportIndicesSegmentsAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/segments/TransportIndicesSegmentsAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/settings/get/TransportGetSettingsAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/settings/get/TransportGetSettingsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/settings/get/TransportGetSettingsAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/settings/get/TransportGetSettingsAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/settings/put/TransportUpdateSettingsAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/settings/put/TransportUpdateSettingsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/settings/put/TransportUpdateSettingsAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/settings/put/TransportUpdateSettingsAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsClusterStateUpdateRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsClusterStateUpdateRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsClusterStateUpdateRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsClusterStateUpdateRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoreRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoreRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoreRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoreRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoresAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoresAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoresAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoresAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoresRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoresRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoresRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoresRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoresResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoresResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoresResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoresResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/shards/TransportIndicesShardStoresAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/shards/TransportIndicesShardStoresAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/shards/TransportIndicesShardStoresAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/shards/TransportIndicesShardStoresAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/shrink/ResizeAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/shrink/ResizeAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/shrink/ResizeAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/shrink/ResizeAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/shrink/ResizeRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/shrink/ResizeRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/shrink/ResizeRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/shrink/ResizeRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/shrink/ResizeRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/indices/shrink/ResizeRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/shrink/ResizeRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/shrink/ResizeRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/shrink/ResizeResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/shrink/ResizeResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/shrink/ResizeResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/shrink/ResizeResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/shrink/ResizeType.java b/server/src/main/java/org/elasticsearch/action/admin/indices/shrink/ResizeType.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/shrink/ResizeType.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/shrink/ResizeType.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/shrink/ShrinkAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/shrink/ShrinkAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/shrink/ShrinkAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/shrink/ShrinkAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/shrink/TransportResizeAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/shrink/TransportResizeAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/shrink/TransportResizeAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/shrink/TransportResizeAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/shrink/TransportShrinkAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/shrink/TransportShrinkAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/shrink/TransportShrinkAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/shrink/TransportShrinkAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/stats/CommonStats.java b/server/src/main/java/org/elasticsearch/action/admin/indices/stats/CommonStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/stats/CommonStats.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/stats/CommonStats.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/stats/CommonStatsFlags.java b/server/src/main/java/org/elasticsearch/action/admin/indices/stats/CommonStatsFlags.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/stats/CommonStatsFlags.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/stats/CommonStatsFlags.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/stats/IndexShardStats.java b/server/src/main/java/org/elasticsearch/action/admin/indices/stats/IndexShardStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/stats/IndexShardStats.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/stats/IndexShardStats.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/stats/IndexStats.java b/server/src/main/java/org/elasticsearch/action/admin/indices/stats/IndexStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/stats/IndexStats.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/stats/IndexStats.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/stats/ShardStats.java b/server/src/main/java/org/elasticsearch/action/admin/indices/stats/ShardStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/stats/ShardStats.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/stats/ShardStats.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/stats/TransportIndicesStatsAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/stats/TransportIndicesStatsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/stats/TransportIndicesStatsAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/stats/TransportIndicesStatsAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/template/delete/TransportDeleteIndexTemplateAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/template/delete/TransportDeleteIndexTemplateAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/template/delete/TransportDeleteIndexTemplateAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/template/delete/TransportDeleteIndexTemplateAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetIndexTemplatesAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetIndexTemplatesAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetIndexTemplatesAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetIndexTemplatesAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetIndexTemplatesRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetIndexTemplatesRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetIndexTemplatesRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetIndexTemplatesRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetIndexTemplatesRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetIndexTemplatesRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetIndexTemplatesRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetIndexTemplatesRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetIndexTemplatesResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetIndexTemplatesResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetIndexTemplatesResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetIndexTemplatesResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/template/get/TransportGetIndexTemplatesAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/template/get/TransportGetIndexTemplatesAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/template/get/TransportGetIndexTemplatesAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/template/get/TransportGetIndexTemplatesAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/template/put/TransportPutIndexTemplateAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/template/put/TransportPutIndexTemplateAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/template/put/TransportPutIndexTemplateAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/template/put/TransportPutIndexTemplateAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/IndexShardUpgradeStatus.java b/server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/IndexShardUpgradeStatus.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/IndexShardUpgradeStatus.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/IndexShardUpgradeStatus.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/IndexUpgradeStatus.java b/server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/IndexUpgradeStatus.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/IndexUpgradeStatus.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/IndexUpgradeStatus.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/ShardUpgradeStatus.java b/server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/ShardUpgradeStatus.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/ShardUpgradeStatus.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/ShardUpgradeStatus.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/TransportUpgradeStatusAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/TransportUpgradeStatusAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/TransportUpgradeStatusAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/TransportUpgradeStatusAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/ShardUpgradeRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/ShardUpgradeRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/ShardUpgradeRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/ShardUpgradeRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/ShardUpgradeResult.java b/server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/ShardUpgradeResult.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/ShardUpgradeResult.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/ShardUpgradeResult.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/TransportUpgradeAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/TransportUpgradeAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/TransportUpgradeAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/TransportUpgradeAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/TransportUpgradeSettingsAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/TransportUpgradeSettingsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/TransportUpgradeSettingsAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/TransportUpgradeSettingsAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsClusterStateUpdateRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsClusterStateUpdateRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsClusterStateUpdateRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsClusterStateUpdateRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/validate/query/QueryExplanation.java b/server/src/main/java/org/elasticsearch/action/admin/indices/validate/query/QueryExplanation.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/validate/query/QueryExplanation.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/validate/query/QueryExplanation.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ShardValidateQueryRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ShardValidateQueryRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ShardValidateQueryRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ShardValidateQueryRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ShardValidateQueryResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ShardValidateQueryResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ShardValidateQueryResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ShardValidateQueryResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/validate/query/TransportValidateQueryAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/validate/query/TransportValidateQueryAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/validate/query/TransportValidateQueryAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/validate/query/TransportValidateQueryAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryAction.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryAction.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryRequest.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryResponse.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/validate/query/package-info.java b/server/src/main/java/org/elasticsearch/action/admin/indices/validate/query/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/indices/validate/query/package-info.java rename to server/src/main/java/org/elasticsearch/action/admin/indices/validate/query/package-info.java diff --git a/core/src/main/java/org/elasticsearch/action/admin/package-info.java b/server/src/main/java/org/elasticsearch/action/admin/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/admin/package-info.java rename to server/src/main/java/org/elasticsearch/action/admin/package-info.java diff --git a/core/src/main/java/org/elasticsearch/action/bulk/BackoffPolicy.java b/server/src/main/java/org/elasticsearch/action/bulk/BackoffPolicy.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/bulk/BackoffPolicy.java rename to server/src/main/java/org/elasticsearch/action/bulk/BackoffPolicy.java diff --git a/core/src/main/java/org/elasticsearch/action/bulk/BulkAction.java b/server/src/main/java/org/elasticsearch/action/bulk/BulkAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/bulk/BulkAction.java rename to server/src/main/java/org/elasticsearch/action/bulk/BulkAction.java diff --git a/core/src/main/java/org/elasticsearch/action/bulk/BulkItemRequest.java b/server/src/main/java/org/elasticsearch/action/bulk/BulkItemRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/bulk/BulkItemRequest.java rename to server/src/main/java/org/elasticsearch/action/bulk/BulkItemRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/bulk/BulkItemResponse.java b/server/src/main/java/org/elasticsearch/action/bulk/BulkItemResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/bulk/BulkItemResponse.java rename to server/src/main/java/org/elasticsearch/action/bulk/BulkItemResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/bulk/BulkItemResultHolder.java b/server/src/main/java/org/elasticsearch/action/bulk/BulkItemResultHolder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/bulk/BulkItemResultHolder.java rename to server/src/main/java/org/elasticsearch/action/bulk/BulkItemResultHolder.java diff --git a/core/src/main/java/org/elasticsearch/action/bulk/BulkProcessor.java b/server/src/main/java/org/elasticsearch/action/bulk/BulkProcessor.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/bulk/BulkProcessor.java rename to server/src/main/java/org/elasticsearch/action/bulk/BulkProcessor.java diff --git a/core/src/main/java/org/elasticsearch/action/bulk/BulkRequest.java b/server/src/main/java/org/elasticsearch/action/bulk/BulkRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/bulk/BulkRequest.java rename to server/src/main/java/org/elasticsearch/action/bulk/BulkRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/bulk/BulkRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/bulk/BulkRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/bulk/BulkRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/bulk/BulkRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/bulk/BulkRequestHandler.java b/server/src/main/java/org/elasticsearch/action/bulk/BulkRequestHandler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/bulk/BulkRequestHandler.java rename to server/src/main/java/org/elasticsearch/action/bulk/BulkRequestHandler.java diff --git a/core/src/main/java/org/elasticsearch/action/bulk/BulkResponse.java b/server/src/main/java/org/elasticsearch/action/bulk/BulkResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/bulk/BulkResponse.java rename to server/src/main/java/org/elasticsearch/action/bulk/BulkResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/bulk/BulkShardRequest.java b/server/src/main/java/org/elasticsearch/action/bulk/BulkShardRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/bulk/BulkShardRequest.java rename to server/src/main/java/org/elasticsearch/action/bulk/BulkShardRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/bulk/BulkShardResponse.java b/server/src/main/java/org/elasticsearch/action/bulk/BulkShardResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/bulk/BulkShardResponse.java rename to server/src/main/java/org/elasticsearch/action/bulk/BulkShardResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/bulk/MappingUpdatePerformer.java b/server/src/main/java/org/elasticsearch/action/bulk/MappingUpdatePerformer.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/bulk/MappingUpdatePerformer.java rename to server/src/main/java/org/elasticsearch/action/bulk/MappingUpdatePerformer.java diff --git a/core/src/main/java/org/elasticsearch/action/bulk/Retry.java b/server/src/main/java/org/elasticsearch/action/bulk/Retry.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/bulk/Retry.java rename to server/src/main/java/org/elasticsearch/action/bulk/Retry.java diff --git a/core/src/main/java/org/elasticsearch/action/bulk/TransportBulkAction.java b/server/src/main/java/org/elasticsearch/action/bulk/TransportBulkAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/bulk/TransportBulkAction.java rename to server/src/main/java/org/elasticsearch/action/bulk/TransportBulkAction.java diff --git a/core/src/main/java/org/elasticsearch/action/bulk/TransportShardBulkAction.java b/server/src/main/java/org/elasticsearch/action/bulk/TransportShardBulkAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/bulk/TransportShardBulkAction.java rename to server/src/main/java/org/elasticsearch/action/bulk/TransportShardBulkAction.java diff --git a/core/src/main/java/org/elasticsearch/action/bulk/TransportSingleItemBulkWriteAction.java b/server/src/main/java/org/elasticsearch/action/bulk/TransportSingleItemBulkWriteAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/bulk/TransportSingleItemBulkWriteAction.java rename to server/src/main/java/org/elasticsearch/action/bulk/TransportSingleItemBulkWriteAction.java diff --git a/core/src/main/java/org/elasticsearch/action/delete/DeleteAction.java b/server/src/main/java/org/elasticsearch/action/delete/DeleteAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/delete/DeleteAction.java rename to server/src/main/java/org/elasticsearch/action/delete/DeleteAction.java diff --git a/core/src/main/java/org/elasticsearch/action/delete/DeleteRequest.java b/server/src/main/java/org/elasticsearch/action/delete/DeleteRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/delete/DeleteRequest.java rename to server/src/main/java/org/elasticsearch/action/delete/DeleteRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/delete/DeleteRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/delete/DeleteRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/delete/DeleteRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/delete/DeleteRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/delete/DeleteResponse.java b/server/src/main/java/org/elasticsearch/action/delete/DeleteResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/delete/DeleteResponse.java rename to server/src/main/java/org/elasticsearch/action/delete/DeleteResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/delete/TransportDeleteAction.java b/server/src/main/java/org/elasticsearch/action/delete/TransportDeleteAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/delete/TransportDeleteAction.java rename to server/src/main/java/org/elasticsearch/action/delete/TransportDeleteAction.java diff --git a/core/src/main/java/org/elasticsearch/action/delete/package-info.java b/server/src/main/java/org/elasticsearch/action/delete/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/delete/package-info.java rename to server/src/main/java/org/elasticsearch/action/delete/package-info.java diff --git a/core/src/main/java/org/elasticsearch/action/explain/ExplainAction.java b/server/src/main/java/org/elasticsearch/action/explain/ExplainAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/explain/ExplainAction.java rename to server/src/main/java/org/elasticsearch/action/explain/ExplainAction.java diff --git a/core/src/main/java/org/elasticsearch/action/explain/ExplainRequest.java b/server/src/main/java/org/elasticsearch/action/explain/ExplainRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/explain/ExplainRequest.java rename to server/src/main/java/org/elasticsearch/action/explain/ExplainRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/explain/ExplainRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/explain/ExplainRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/explain/ExplainRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/explain/ExplainRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/explain/ExplainResponse.java b/server/src/main/java/org/elasticsearch/action/explain/ExplainResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/explain/ExplainResponse.java rename to server/src/main/java/org/elasticsearch/action/explain/ExplainResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/explain/TransportExplainAction.java b/server/src/main/java/org/elasticsearch/action/explain/TransportExplainAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/explain/TransportExplainAction.java rename to server/src/main/java/org/elasticsearch/action/explain/TransportExplainAction.java diff --git a/core/src/main/java/org/elasticsearch/action/explain/package-info.java b/server/src/main/java/org/elasticsearch/action/explain/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/explain/package-info.java rename to server/src/main/java/org/elasticsearch/action/explain/package-info.java diff --git a/core/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilities.java b/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilities.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilities.java rename to server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilities.java diff --git a/core/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesAction.java b/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesAction.java rename to server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesAction.java diff --git a/core/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesIndexRequest.java b/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesIndexRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesIndexRequest.java rename to server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesIndexRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesIndexResponse.java b/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesIndexResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesIndexResponse.java rename to server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesIndexResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesRequest.java b/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesRequest.java rename to server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesResponse.java b/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesResponse.java rename to server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/fieldcaps/TransportFieldCapabilitiesAction.java b/server/src/main/java/org/elasticsearch/action/fieldcaps/TransportFieldCapabilitiesAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/fieldcaps/TransportFieldCapabilitiesAction.java rename to server/src/main/java/org/elasticsearch/action/fieldcaps/TransportFieldCapabilitiesAction.java diff --git a/core/src/main/java/org/elasticsearch/action/fieldcaps/TransportFieldCapabilitiesIndexAction.java b/server/src/main/java/org/elasticsearch/action/fieldcaps/TransportFieldCapabilitiesIndexAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/fieldcaps/TransportFieldCapabilitiesIndexAction.java rename to server/src/main/java/org/elasticsearch/action/fieldcaps/TransportFieldCapabilitiesIndexAction.java diff --git a/core/src/main/java/org/elasticsearch/action/get/GetAction.java b/server/src/main/java/org/elasticsearch/action/get/GetAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/get/GetAction.java rename to server/src/main/java/org/elasticsearch/action/get/GetAction.java diff --git a/core/src/main/java/org/elasticsearch/action/get/GetRequest.java b/server/src/main/java/org/elasticsearch/action/get/GetRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/get/GetRequest.java rename to server/src/main/java/org/elasticsearch/action/get/GetRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/get/GetRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/get/GetRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/get/GetRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/get/GetRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/get/GetResponse.java b/server/src/main/java/org/elasticsearch/action/get/GetResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/get/GetResponse.java rename to server/src/main/java/org/elasticsearch/action/get/GetResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/get/MultiGetAction.java b/server/src/main/java/org/elasticsearch/action/get/MultiGetAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/get/MultiGetAction.java rename to server/src/main/java/org/elasticsearch/action/get/MultiGetAction.java diff --git a/core/src/main/java/org/elasticsearch/action/get/MultiGetItemResponse.java b/server/src/main/java/org/elasticsearch/action/get/MultiGetItemResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/get/MultiGetItemResponse.java rename to server/src/main/java/org/elasticsearch/action/get/MultiGetItemResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/get/MultiGetRequest.java b/server/src/main/java/org/elasticsearch/action/get/MultiGetRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/get/MultiGetRequest.java rename to server/src/main/java/org/elasticsearch/action/get/MultiGetRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/get/MultiGetRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/get/MultiGetRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/get/MultiGetRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/get/MultiGetRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/get/MultiGetResponse.java b/server/src/main/java/org/elasticsearch/action/get/MultiGetResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/get/MultiGetResponse.java rename to server/src/main/java/org/elasticsearch/action/get/MultiGetResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/get/MultiGetShardRequest.java b/server/src/main/java/org/elasticsearch/action/get/MultiGetShardRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/get/MultiGetShardRequest.java rename to server/src/main/java/org/elasticsearch/action/get/MultiGetShardRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/get/MultiGetShardResponse.java b/server/src/main/java/org/elasticsearch/action/get/MultiGetShardResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/get/MultiGetShardResponse.java rename to server/src/main/java/org/elasticsearch/action/get/MultiGetShardResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/get/TransportGetAction.java b/server/src/main/java/org/elasticsearch/action/get/TransportGetAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/get/TransportGetAction.java rename to server/src/main/java/org/elasticsearch/action/get/TransportGetAction.java diff --git a/core/src/main/java/org/elasticsearch/action/get/TransportMultiGetAction.java b/server/src/main/java/org/elasticsearch/action/get/TransportMultiGetAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/get/TransportMultiGetAction.java rename to server/src/main/java/org/elasticsearch/action/get/TransportMultiGetAction.java diff --git a/core/src/main/java/org/elasticsearch/action/get/TransportShardMultiGetAction.java b/server/src/main/java/org/elasticsearch/action/get/TransportShardMultiGetAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/get/TransportShardMultiGetAction.java rename to server/src/main/java/org/elasticsearch/action/get/TransportShardMultiGetAction.java diff --git a/core/src/main/java/org/elasticsearch/action/get/package-info.java b/server/src/main/java/org/elasticsearch/action/get/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/get/package-info.java rename to server/src/main/java/org/elasticsearch/action/get/package-info.java diff --git a/core/src/main/java/org/elasticsearch/action/index/IndexAction.java b/server/src/main/java/org/elasticsearch/action/index/IndexAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/index/IndexAction.java rename to server/src/main/java/org/elasticsearch/action/index/IndexAction.java diff --git a/core/src/main/java/org/elasticsearch/action/index/IndexRequest.java b/server/src/main/java/org/elasticsearch/action/index/IndexRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/index/IndexRequest.java rename to server/src/main/java/org/elasticsearch/action/index/IndexRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/index/IndexRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/index/IndexRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/index/IndexRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/index/IndexRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/index/IndexResponse.java b/server/src/main/java/org/elasticsearch/action/index/IndexResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/index/IndexResponse.java rename to server/src/main/java/org/elasticsearch/action/index/IndexResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/index/TransportIndexAction.java b/server/src/main/java/org/elasticsearch/action/index/TransportIndexAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/index/TransportIndexAction.java rename to server/src/main/java/org/elasticsearch/action/index/TransportIndexAction.java diff --git a/core/src/main/java/org/elasticsearch/action/index/package-info.java b/server/src/main/java/org/elasticsearch/action/index/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/index/package-info.java rename to server/src/main/java/org/elasticsearch/action/index/package-info.java diff --git a/core/src/main/java/org/elasticsearch/action/ingest/DeletePipelineAction.java b/server/src/main/java/org/elasticsearch/action/ingest/DeletePipelineAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ingest/DeletePipelineAction.java rename to server/src/main/java/org/elasticsearch/action/ingest/DeletePipelineAction.java diff --git a/core/src/main/java/org/elasticsearch/action/ingest/DeletePipelineRequest.java b/server/src/main/java/org/elasticsearch/action/ingest/DeletePipelineRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ingest/DeletePipelineRequest.java rename to server/src/main/java/org/elasticsearch/action/ingest/DeletePipelineRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/ingest/DeletePipelineRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/ingest/DeletePipelineRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ingest/DeletePipelineRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/ingest/DeletePipelineRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/ingest/DeletePipelineTransportAction.java b/server/src/main/java/org/elasticsearch/action/ingest/DeletePipelineTransportAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ingest/DeletePipelineTransportAction.java rename to server/src/main/java/org/elasticsearch/action/ingest/DeletePipelineTransportAction.java diff --git a/core/src/main/java/org/elasticsearch/action/ingest/GetPipelineAction.java b/server/src/main/java/org/elasticsearch/action/ingest/GetPipelineAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ingest/GetPipelineAction.java rename to server/src/main/java/org/elasticsearch/action/ingest/GetPipelineAction.java diff --git a/core/src/main/java/org/elasticsearch/action/ingest/GetPipelineRequest.java b/server/src/main/java/org/elasticsearch/action/ingest/GetPipelineRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ingest/GetPipelineRequest.java rename to server/src/main/java/org/elasticsearch/action/ingest/GetPipelineRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/ingest/GetPipelineRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/ingest/GetPipelineRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ingest/GetPipelineRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/ingest/GetPipelineRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/ingest/GetPipelineResponse.java b/server/src/main/java/org/elasticsearch/action/ingest/GetPipelineResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ingest/GetPipelineResponse.java rename to server/src/main/java/org/elasticsearch/action/ingest/GetPipelineResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/ingest/GetPipelineTransportAction.java b/server/src/main/java/org/elasticsearch/action/ingest/GetPipelineTransportAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ingest/GetPipelineTransportAction.java rename to server/src/main/java/org/elasticsearch/action/ingest/GetPipelineTransportAction.java diff --git a/core/src/main/java/org/elasticsearch/action/ingest/IngestActionForwarder.java b/server/src/main/java/org/elasticsearch/action/ingest/IngestActionForwarder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ingest/IngestActionForwarder.java rename to server/src/main/java/org/elasticsearch/action/ingest/IngestActionForwarder.java diff --git a/core/src/main/java/org/elasticsearch/action/ingest/PutPipelineAction.java b/server/src/main/java/org/elasticsearch/action/ingest/PutPipelineAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ingest/PutPipelineAction.java rename to server/src/main/java/org/elasticsearch/action/ingest/PutPipelineAction.java diff --git a/core/src/main/java/org/elasticsearch/action/ingest/PutPipelineRequest.java b/server/src/main/java/org/elasticsearch/action/ingest/PutPipelineRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ingest/PutPipelineRequest.java rename to server/src/main/java/org/elasticsearch/action/ingest/PutPipelineRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/ingest/PutPipelineRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/ingest/PutPipelineRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ingest/PutPipelineRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/ingest/PutPipelineRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/ingest/PutPipelineTransportAction.java b/server/src/main/java/org/elasticsearch/action/ingest/PutPipelineTransportAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ingest/PutPipelineTransportAction.java rename to server/src/main/java/org/elasticsearch/action/ingest/PutPipelineTransportAction.java diff --git a/core/src/main/java/org/elasticsearch/action/ingest/SimulateDocumentBaseResult.java b/server/src/main/java/org/elasticsearch/action/ingest/SimulateDocumentBaseResult.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ingest/SimulateDocumentBaseResult.java rename to server/src/main/java/org/elasticsearch/action/ingest/SimulateDocumentBaseResult.java diff --git a/core/src/main/java/org/elasticsearch/action/ingest/SimulateDocumentResult.java b/server/src/main/java/org/elasticsearch/action/ingest/SimulateDocumentResult.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ingest/SimulateDocumentResult.java rename to server/src/main/java/org/elasticsearch/action/ingest/SimulateDocumentResult.java diff --git a/core/src/main/java/org/elasticsearch/action/ingest/SimulateDocumentVerboseResult.java b/server/src/main/java/org/elasticsearch/action/ingest/SimulateDocumentVerboseResult.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ingest/SimulateDocumentVerboseResult.java rename to server/src/main/java/org/elasticsearch/action/ingest/SimulateDocumentVerboseResult.java diff --git a/core/src/main/java/org/elasticsearch/action/ingest/SimulateExecutionService.java b/server/src/main/java/org/elasticsearch/action/ingest/SimulateExecutionService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ingest/SimulateExecutionService.java rename to server/src/main/java/org/elasticsearch/action/ingest/SimulateExecutionService.java diff --git a/core/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineAction.java b/server/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineAction.java rename to server/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineAction.java diff --git a/core/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineRequest.java b/server/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineRequest.java rename to server/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineResponse.java b/server/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineResponse.java rename to server/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineTransportAction.java b/server/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineTransportAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineTransportAction.java rename to server/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineTransportAction.java diff --git a/core/src/main/java/org/elasticsearch/action/ingest/SimulateProcessorResult.java b/server/src/main/java/org/elasticsearch/action/ingest/SimulateProcessorResult.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ingest/SimulateProcessorResult.java rename to server/src/main/java/org/elasticsearch/action/ingest/SimulateProcessorResult.java diff --git a/core/src/main/java/org/elasticsearch/action/ingest/TrackingResultProcessor.java b/server/src/main/java/org/elasticsearch/action/ingest/TrackingResultProcessor.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ingest/TrackingResultProcessor.java rename to server/src/main/java/org/elasticsearch/action/ingest/TrackingResultProcessor.java diff --git a/core/src/main/java/org/elasticsearch/action/ingest/WritePipelineResponse.java b/server/src/main/java/org/elasticsearch/action/ingest/WritePipelineResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ingest/WritePipelineResponse.java rename to server/src/main/java/org/elasticsearch/action/ingest/WritePipelineResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/ingest/WriteableIngestDocument.java b/server/src/main/java/org/elasticsearch/action/ingest/WriteableIngestDocument.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/ingest/WriteableIngestDocument.java rename to server/src/main/java/org/elasticsearch/action/ingest/WriteableIngestDocument.java diff --git a/core/src/main/java/org/elasticsearch/action/main/MainAction.java b/server/src/main/java/org/elasticsearch/action/main/MainAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/main/MainAction.java rename to server/src/main/java/org/elasticsearch/action/main/MainAction.java diff --git a/core/src/main/java/org/elasticsearch/action/main/MainRequest.java b/server/src/main/java/org/elasticsearch/action/main/MainRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/main/MainRequest.java rename to server/src/main/java/org/elasticsearch/action/main/MainRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/main/MainRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/main/MainRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/main/MainRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/main/MainRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/main/MainResponse.java b/server/src/main/java/org/elasticsearch/action/main/MainResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/main/MainResponse.java rename to server/src/main/java/org/elasticsearch/action/main/MainResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/main/TransportMainAction.java b/server/src/main/java/org/elasticsearch/action/main/TransportMainAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/main/TransportMainAction.java rename to server/src/main/java/org/elasticsearch/action/main/TransportMainAction.java diff --git a/core/src/main/java/org/elasticsearch/action/package-info.java b/server/src/main/java/org/elasticsearch/action/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/package-info.java rename to server/src/main/java/org/elasticsearch/action/package-info.java diff --git a/core/src/main/java/org/elasticsearch/action/resync/ResyncReplicationRequest.java b/server/src/main/java/org/elasticsearch/action/resync/ResyncReplicationRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/resync/ResyncReplicationRequest.java rename to server/src/main/java/org/elasticsearch/action/resync/ResyncReplicationRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/resync/ResyncReplicationResponse.java b/server/src/main/java/org/elasticsearch/action/resync/ResyncReplicationResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/resync/ResyncReplicationResponse.java rename to server/src/main/java/org/elasticsearch/action/resync/ResyncReplicationResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/resync/TransportResyncReplicationAction.java b/server/src/main/java/org/elasticsearch/action/resync/TransportResyncReplicationAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/resync/TransportResyncReplicationAction.java rename to server/src/main/java/org/elasticsearch/action/resync/TransportResyncReplicationAction.java diff --git a/core/src/main/java/org/elasticsearch/action/search/AbstractSearchAsyncAction.java b/server/src/main/java/org/elasticsearch/action/search/AbstractSearchAsyncAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/AbstractSearchAsyncAction.java rename to server/src/main/java/org/elasticsearch/action/search/AbstractSearchAsyncAction.java diff --git a/core/src/main/java/org/elasticsearch/action/search/CanMatchPreFilterSearchPhase.java b/server/src/main/java/org/elasticsearch/action/search/CanMatchPreFilterSearchPhase.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/CanMatchPreFilterSearchPhase.java rename to server/src/main/java/org/elasticsearch/action/search/CanMatchPreFilterSearchPhase.java diff --git a/core/src/main/java/org/elasticsearch/action/search/ClearScrollAction.java b/server/src/main/java/org/elasticsearch/action/search/ClearScrollAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/ClearScrollAction.java rename to server/src/main/java/org/elasticsearch/action/search/ClearScrollAction.java diff --git a/core/src/main/java/org/elasticsearch/action/search/ClearScrollController.java b/server/src/main/java/org/elasticsearch/action/search/ClearScrollController.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/ClearScrollController.java rename to server/src/main/java/org/elasticsearch/action/search/ClearScrollController.java diff --git a/core/src/main/java/org/elasticsearch/action/search/ClearScrollRequest.java b/server/src/main/java/org/elasticsearch/action/search/ClearScrollRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/ClearScrollRequest.java rename to server/src/main/java/org/elasticsearch/action/search/ClearScrollRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/search/ClearScrollRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/search/ClearScrollRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/ClearScrollRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/search/ClearScrollRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/search/ClearScrollResponse.java b/server/src/main/java/org/elasticsearch/action/search/ClearScrollResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/ClearScrollResponse.java rename to server/src/main/java/org/elasticsearch/action/search/ClearScrollResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/search/CountedCollector.java b/server/src/main/java/org/elasticsearch/action/search/CountedCollector.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/CountedCollector.java rename to server/src/main/java/org/elasticsearch/action/search/CountedCollector.java diff --git a/core/src/main/java/org/elasticsearch/action/search/DfsQueryPhase.java b/server/src/main/java/org/elasticsearch/action/search/DfsQueryPhase.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/DfsQueryPhase.java rename to server/src/main/java/org/elasticsearch/action/search/DfsQueryPhase.java diff --git a/core/src/main/java/org/elasticsearch/action/search/ExpandSearchPhase.java b/server/src/main/java/org/elasticsearch/action/search/ExpandSearchPhase.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/ExpandSearchPhase.java rename to server/src/main/java/org/elasticsearch/action/search/ExpandSearchPhase.java diff --git a/core/src/main/java/org/elasticsearch/action/search/FetchSearchPhase.java b/server/src/main/java/org/elasticsearch/action/search/FetchSearchPhase.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/FetchSearchPhase.java rename to server/src/main/java/org/elasticsearch/action/search/FetchSearchPhase.java diff --git a/core/src/main/java/org/elasticsearch/action/search/InitialSearchPhase.java b/server/src/main/java/org/elasticsearch/action/search/InitialSearchPhase.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/InitialSearchPhase.java rename to server/src/main/java/org/elasticsearch/action/search/InitialSearchPhase.java diff --git a/core/src/main/java/org/elasticsearch/action/search/MultiSearchAction.java b/server/src/main/java/org/elasticsearch/action/search/MultiSearchAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/MultiSearchAction.java rename to server/src/main/java/org/elasticsearch/action/search/MultiSearchAction.java diff --git a/core/src/main/java/org/elasticsearch/action/search/MultiSearchRequest.java b/server/src/main/java/org/elasticsearch/action/search/MultiSearchRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/MultiSearchRequest.java rename to server/src/main/java/org/elasticsearch/action/search/MultiSearchRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/search/MultiSearchRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/search/MultiSearchRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/MultiSearchRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/search/MultiSearchRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/search/MultiSearchResponse.java b/server/src/main/java/org/elasticsearch/action/search/MultiSearchResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/MultiSearchResponse.java rename to server/src/main/java/org/elasticsearch/action/search/MultiSearchResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/search/ParsedScrollId.java b/server/src/main/java/org/elasticsearch/action/search/ParsedScrollId.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/ParsedScrollId.java rename to server/src/main/java/org/elasticsearch/action/search/ParsedScrollId.java diff --git a/core/src/main/java/org/elasticsearch/action/search/ReduceSearchPhaseException.java b/server/src/main/java/org/elasticsearch/action/search/ReduceSearchPhaseException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/ReduceSearchPhaseException.java rename to server/src/main/java/org/elasticsearch/action/search/ReduceSearchPhaseException.java diff --git a/core/src/main/java/org/elasticsearch/action/search/ScrollIdForNode.java b/server/src/main/java/org/elasticsearch/action/search/ScrollIdForNode.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/ScrollIdForNode.java rename to server/src/main/java/org/elasticsearch/action/search/ScrollIdForNode.java diff --git a/core/src/main/java/org/elasticsearch/action/search/SearchAction.java b/server/src/main/java/org/elasticsearch/action/search/SearchAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/SearchAction.java rename to server/src/main/java/org/elasticsearch/action/search/SearchAction.java diff --git a/core/src/main/java/org/elasticsearch/action/search/SearchActionListener.java b/server/src/main/java/org/elasticsearch/action/search/SearchActionListener.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/SearchActionListener.java rename to server/src/main/java/org/elasticsearch/action/search/SearchActionListener.java diff --git a/core/src/main/java/org/elasticsearch/action/search/SearchDfsQueryThenFetchAsyncAction.java b/server/src/main/java/org/elasticsearch/action/search/SearchDfsQueryThenFetchAsyncAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/SearchDfsQueryThenFetchAsyncAction.java rename to server/src/main/java/org/elasticsearch/action/search/SearchDfsQueryThenFetchAsyncAction.java diff --git a/core/src/main/java/org/elasticsearch/action/search/SearchExecutionStatsCollector.java b/server/src/main/java/org/elasticsearch/action/search/SearchExecutionStatsCollector.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/SearchExecutionStatsCollector.java rename to server/src/main/java/org/elasticsearch/action/search/SearchExecutionStatsCollector.java diff --git a/core/src/main/java/org/elasticsearch/action/search/SearchPhase.java b/server/src/main/java/org/elasticsearch/action/search/SearchPhase.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/SearchPhase.java rename to server/src/main/java/org/elasticsearch/action/search/SearchPhase.java diff --git a/core/src/main/java/org/elasticsearch/action/search/SearchPhaseContext.java b/server/src/main/java/org/elasticsearch/action/search/SearchPhaseContext.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/SearchPhaseContext.java rename to server/src/main/java/org/elasticsearch/action/search/SearchPhaseContext.java diff --git a/core/src/main/java/org/elasticsearch/action/search/SearchPhaseController.java b/server/src/main/java/org/elasticsearch/action/search/SearchPhaseController.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/SearchPhaseController.java rename to server/src/main/java/org/elasticsearch/action/search/SearchPhaseController.java diff --git a/core/src/main/java/org/elasticsearch/action/search/SearchPhaseExecutionException.java b/server/src/main/java/org/elasticsearch/action/search/SearchPhaseExecutionException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/SearchPhaseExecutionException.java rename to server/src/main/java/org/elasticsearch/action/search/SearchPhaseExecutionException.java diff --git a/core/src/main/java/org/elasticsearch/action/search/SearchQueryThenFetchAsyncAction.java b/server/src/main/java/org/elasticsearch/action/search/SearchQueryThenFetchAsyncAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/SearchQueryThenFetchAsyncAction.java rename to server/src/main/java/org/elasticsearch/action/search/SearchQueryThenFetchAsyncAction.java diff --git a/core/src/main/java/org/elasticsearch/action/search/SearchRequest.java b/server/src/main/java/org/elasticsearch/action/search/SearchRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/SearchRequest.java rename to server/src/main/java/org/elasticsearch/action/search/SearchRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/search/SearchRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/search/SearchRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/SearchRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/search/SearchRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/search/SearchResponse.java b/server/src/main/java/org/elasticsearch/action/search/SearchResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/SearchResponse.java rename to server/src/main/java/org/elasticsearch/action/search/SearchResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/search/SearchResponseSections.java b/server/src/main/java/org/elasticsearch/action/search/SearchResponseSections.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/SearchResponseSections.java rename to server/src/main/java/org/elasticsearch/action/search/SearchResponseSections.java diff --git a/core/src/main/java/org/elasticsearch/action/search/SearchScrollAction.java b/server/src/main/java/org/elasticsearch/action/search/SearchScrollAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/SearchScrollAction.java rename to server/src/main/java/org/elasticsearch/action/search/SearchScrollAction.java diff --git a/core/src/main/java/org/elasticsearch/action/search/SearchScrollAsyncAction.java b/server/src/main/java/org/elasticsearch/action/search/SearchScrollAsyncAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/SearchScrollAsyncAction.java rename to server/src/main/java/org/elasticsearch/action/search/SearchScrollAsyncAction.java diff --git a/core/src/main/java/org/elasticsearch/action/search/SearchScrollQueryAndFetchAsyncAction.java b/server/src/main/java/org/elasticsearch/action/search/SearchScrollQueryAndFetchAsyncAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/SearchScrollQueryAndFetchAsyncAction.java rename to server/src/main/java/org/elasticsearch/action/search/SearchScrollQueryAndFetchAsyncAction.java diff --git a/core/src/main/java/org/elasticsearch/action/search/SearchScrollQueryThenFetchAsyncAction.java b/server/src/main/java/org/elasticsearch/action/search/SearchScrollQueryThenFetchAsyncAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/SearchScrollQueryThenFetchAsyncAction.java rename to server/src/main/java/org/elasticsearch/action/search/SearchScrollQueryThenFetchAsyncAction.java diff --git a/core/src/main/java/org/elasticsearch/action/search/SearchScrollRequest.java b/server/src/main/java/org/elasticsearch/action/search/SearchScrollRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/SearchScrollRequest.java rename to server/src/main/java/org/elasticsearch/action/search/SearchScrollRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/search/SearchScrollRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/search/SearchScrollRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/SearchScrollRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/search/SearchScrollRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/search/SearchShardIterator.java b/server/src/main/java/org/elasticsearch/action/search/SearchShardIterator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/SearchShardIterator.java rename to server/src/main/java/org/elasticsearch/action/search/SearchShardIterator.java diff --git a/core/src/main/java/org/elasticsearch/action/search/SearchTask.java b/server/src/main/java/org/elasticsearch/action/search/SearchTask.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/SearchTask.java rename to server/src/main/java/org/elasticsearch/action/search/SearchTask.java diff --git a/core/src/main/java/org/elasticsearch/action/search/SearchTransportService.java b/server/src/main/java/org/elasticsearch/action/search/SearchTransportService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/SearchTransportService.java rename to server/src/main/java/org/elasticsearch/action/search/SearchTransportService.java diff --git a/core/src/main/java/org/elasticsearch/action/search/SearchType.java b/server/src/main/java/org/elasticsearch/action/search/SearchType.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/SearchType.java rename to server/src/main/java/org/elasticsearch/action/search/SearchType.java diff --git a/core/src/main/java/org/elasticsearch/action/search/ShardSearchFailure.java b/server/src/main/java/org/elasticsearch/action/search/ShardSearchFailure.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/ShardSearchFailure.java rename to server/src/main/java/org/elasticsearch/action/search/ShardSearchFailure.java diff --git a/core/src/main/java/org/elasticsearch/action/search/TransportClearScrollAction.java b/server/src/main/java/org/elasticsearch/action/search/TransportClearScrollAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/TransportClearScrollAction.java rename to server/src/main/java/org/elasticsearch/action/search/TransportClearScrollAction.java diff --git a/core/src/main/java/org/elasticsearch/action/search/TransportMultiSearchAction.java b/server/src/main/java/org/elasticsearch/action/search/TransportMultiSearchAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/TransportMultiSearchAction.java rename to server/src/main/java/org/elasticsearch/action/search/TransportMultiSearchAction.java diff --git a/core/src/main/java/org/elasticsearch/action/search/TransportSearchAction.java b/server/src/main/java/org/elasticsearch/action/search/TransportSearchAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/TransportSearchAction.java rename to server/src/main/java/org/elasticsearch/action/search/TransportSearchAction.java diff --git a/core/src/main/java/org/elasticsearch/action/search/TransportSearchHelper.java b/server/src/main/java/org/elasticsearch/action/search/TransportSearchHelper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/TransportSearchHelper.java rename to server/src/main/java/org/elasticsearch/action/search/TransportSearchHelper.java diff --git a/core/src/main/java/org/elasticsearch/action/search/TransportSearchScrollAction.java b/server/src/main/java/org/elasticsearch/action/search/TransportSearchScrollAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/TransportSearchScrollAction.java rename to server/src/main/java/org/elasticsearch/action/search/TransportSearchScrollAction.java diff --git a/core/src/main/java/org/elasticsearch/action/search/package-info.java b/server/src/main/java/org/elasticsearch/action/search/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/search/package-info.java rename to server/src/main/java/org/elasticsearch/action/search/package-info.java diff --git a/core/src/main/java/org/elasticsearch/action/support/ActionFilter.java b/server/src/main/java/org/elasticsearch/action/support/ActionFilter.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/ActionFilter.java rename to server/src/main/java/org/elasticsearch/action/support/ActionFilter.java diff --git a/core/src/main/java/org/elasticsearch/action/support/ActionFilterChain.java b/server/src/main/java/org/elasticsearch/action/support/ActionFilterChain.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/ActionFilterChain.java rename to server/src/main/java/org/elasticsearch/action/support/ActionFilterChain.java diff --git a/core/src/main/java/org/elasticsearch/action/support/ActionFilters.java b/server/src/main/java/org/elasticsearch/action/support/ActionFilters.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/ActionFilters.java rename to server/src/main/java/org/elasticsearch/action/support/ActionFilters.java diff --git a/core/src/main/java/org/elasticsearch/action/support/ActiveShardCount.java b/server/src/main/java/org/elasticsearch/action/support/ActiveShardCount.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/ActiveShardCount.java rename to server/src/main/java/org/elasticsearch/action/support/ActiveShardCount.java diff --git a/core/src/main/java/org/elasticsearch/action/support/ActiveShardsObserver.java b/server/src/main/java/org/elasticsearch/action/support/ActiveShardsObserver.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/ActiveShardsObserver.java rename to server/src/main/java/org/elasticsearch/action/support/ActiveShardsObserver.java diff --git a/core/src/main/java/org/elasticsearch/action/support/AdapterActionFuture.java b/server/src/main/java/org/elasticsearch/action/support/AdapterActionFuture.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/AdapterActionFuture.java rename to server/src/main/java/org/elasticsearch/action/support/AdapterActionFuture.java diff --git a/core/src/main/java/org/elasticsearch/action/support/AutoCreateIndex.java b/server/src/main/java/org/elasticsearch/action/support/AutoCreateIndex.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/AutoCreateIndex.java rename to server/src/main/java/org/elasticsearch/action/support/AutoCreateIndex.java diff --git a/core/src/main/java/org/elasticsearch/action/support/ContextPreservingActionListener.java b/server/src/main/java/org/elasticsearch/action/support/ContextPreservingActionListener.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/ContextPreservingActionListener.java rename to server/src/main/java/org/elasticsearch/action/support/ContextPreservingActionListener.java diff --git a/core/src/main/java/org/elasticsearch/action/support/DefaultShardOperationFailedException.java b/server/src/main/java/org/elasticsearch/action/support/DefaultShardOperationFailedException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/DefaultShardOperationFailedException.java rename to server/src/main/java/org/elasticsearch/action/support/DefaultShardOperationFailedException.java diff --git a/core/src/main/java/org/elasticsearch/action/support/DelegatingActionListener.java b/server/src/main/java/org/elasticsearch/action/support/DelegatingActionListener.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/DelegatingActionListener.java rename to server/src/main/java/org/elasticsearch/action/support/DelegatingActionListener.java diff --git a/core/src/main/java/org/elasticsearch/action/support/DestructiveOperations.java b/server/src/main/java/org/elasticsearch/action/support/DestructiveOperations.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/DestructiveOperations.java rename to server/src/main/java/org/elasticsearch/action/support/DestructiveOperations.java diff --git a/core/src/main/java/org/elasticsearch/action/support/GroupedActionListener.java b/server/src/main/java/org/elasticsearch/action/support/GroupedActionListener.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/GroupedActionListener.java rename to server/src/main/java/org/elasticsearch/action/support/GroupedActionListener.java diff --git a/core/src/main/java/org/elasticsearch/action/support/HandledTransportAction.java b/server/src/main/java/org/elasticsearch/action/support/HandledTransportAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/HandledTransportAction.java rename to server/src/main/java/org/elasticsearch/action/support/HandledTransportAction.java diff --git a/core/src/main/java/org/elasticsearch/action/support/IndicesOptions.java b/server/src/main/java/org/elasticsearch/action/support/IndicesOptions.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/IndicesOptions.java rename to server/src/main/java/org/elasticsearch/action/support/IndicesOptions.java diff --git a/core/src/main/java/org/elasticsearch/action/support/PlainActionFuture.java b/server/src/main/java/org/elasticsearch/action/support/PlainActionFuture.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/PlainActionFuture.java rename to server/src/main/java/org/elasticsearch/action/support/PlainActionFuture.java diff --git a/core/src/main/java/org/elasticsearch/action/support/PlainListenableActionFuture.java b/server/src/main/java/org/elasticsearch/action/support/PlainListenableActionFuture.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/PlainListenableActionFuture.java rename to server/src/main/java/org/elasticsearch/action/support/PlainListenableActionFuture.java diff --git a/core/src/main/java/org/elasticsearch/action/support/ThreadedActionListener.java b/server/src/main/java/org/elasticsearch/action/support/ThreadedActionListener.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/ThreadedActionListener.java rename to server/src/main/java/org/elasticsearch/action/support/ThreadedActionListener.java diff --git a/core/src/main/java/org/elasticsearch/action/support/TransportAction.java b/server/src/main/java/org/elasticsearch/action/support/TransportAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/TransportAction.java rename to server/src/main/java/org/elasticsearch/action/support/TransportAction.java diff --git a/core/src/main/java/org/elasticsearch/action/support/TransportActions.java b/server/src/main/java/org/elasticsearch/action/support/TransportActions.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/TransportActions.java rename to server/src/main/java/org/elasticsearch/action/support/TransportActions.java diff --git a/core/src/main/java/org/elasticsearch/action/support/WriteRequest.java b/server/src/main/java/org/elasticsearch/action/support/WriteRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/WriteRequest.java rename to server/src/main/java/org/elasticsearch/action/support/WriteRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/support/WriteRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/support/WriteRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/WriteRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/support/WriteRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/support/WriteResponse.java b/server/src/main/java/org/elasticsearch/action/support/WriteResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/WriteResponse.java rename to server/src/main/java/org/elasticsearch/action/support/WriteResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastOperationRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastOperationRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastOperationRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastOperationRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastRequest.java b/server/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastRequest.java rename to server/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastResponse.java b/server/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastResponse.java rename to server/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardOperationFailedException.java b/server/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardOperationFailedException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardOperationFailedException.java rename to server/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardOperationFailedException.java diff --git a/core/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardRequest.java b/server/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardRequest.java rename to server/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardResponse.java b/server/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardResponse.java rename to server/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/support/broadcast/TransportBroadcastAction.java b/server/src/main/java/org/elasticsearch/action/support/broadcast/TransportBroadcastAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/broadcast/TransportBroadcastAction.java rename to server/src/main/java/org/elasticsearch/action/support/broadcast/TransportBroadcastAction.java diff --git a/core/src/main/java/org/elasticsearch/action/support/broadcast/node/TransportBroadcastByNodeAction.java b/server/src/main/java/org/elasticsearch/action/support/broadcast/node/TransportBroadcastByNodeAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/broadcast/node/TransportBroadcastByNodeAction.java rename to server/src/main/java/org/elasticsearch/action/support/broadcast/node/TransportBroadcastByNodeAction.java diff --git a/core/src/main/java/org/elasticsearch/action/support/master/AcknowledgedRequest.java b/server/src/main/java/org/elasticsearch/action/support/master/AcknowledgedRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/master/AcknowledgedRequest.java rename to server/src/main/java/org/elasticsearch/action/support/master/AcknowledgedRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/support/master/AcknowledgedRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/support/master/AcknowledgedRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/master/AcknowledgedRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/support/master/AcknowledgedRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/support/master/AcknowledgedResponse.java b/server/src/main/java/org/elasticsearch/action/support/master/AcknowledgedResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/master/AcknowledgedResponse.java rename to server/src/main/java/org/elasticsearch/action/support/master/AcknowledgedResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/support/master/MasterNodeOperationRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/support/master/MasterNodeOperationRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/master/MasterNodeOperationRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/support/master/MasterNodeOperationRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/support/master/MasterNodeReadOperationRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/support/master/MasterNodeReadOperationRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/master/MasterNodeReadOperationRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/support/master/MasterNodeReadOperationRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/support/master/MasterNodeReadRequest.java b/server/src/main/java/org/elasticsearch/action/support/master/MasterNodeReadRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/master/MasterNodeReadRequest.java rename to server/src/main/java/org/elasticsearch/action/support/master/MasterNodeReadRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/support/master/MasterNodeRequest.java b/server/src/main/java/org/elasticsearch/action/support/master/MasterNodeRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/master/MasterNodeRequest.java rename to server/src/main/java/org/elasticsearch/action/support/master/MasterNodeRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeAction.java b/server/src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeAction.java rename to server/src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeAction.java diff --git a/core/src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeReadAction.java b/server/src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeReadAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeReadAction.java rename to server/src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeReadAction.java diff --git a/core/src/main/java/org/elasticsearch/action/support/master/info/ClusterInfoRequest.java b/server/src/main/java/org/elasticsearch/action/support/master/info/ClusterInfoRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/master/info/ClusterInfoRequest.java rename to server/src/main/java/org/elasticsearch/action/support/master/info/ClusterInfoRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/support/master/info/ClusterInfoRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/support/master/info/ClusterInfoRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/master/info/ClusterInfoRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/support/master/info/ClusterInfoRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/support/master/info/TransportClusterInfoAction.java b/server/src/main/java/org/elasticsearch/action/support/master/info/TransportClusterInfoAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/master/info/TransportClusterInfoAction.java rename to server/src/main/java/org/elasticsearch/action/support/master/info/TransportClusterInfoAction.java diff --git a/core/src/main/java/org/elasticsearch/action/support/nodes/BaseNodeRequest.java b/server/src/main/java/org/elasticsearch/action/support/nodes/BaseNodeRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/nodes/BaseNodeRequest.java rename to server/src/main/java/org/elasticsearch/action/support/nodes/BaseNodeRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/support/nodes/BaseNodeResponse.java b/server/src/main/java/org/elasticsearch/action/support/nodes/BaseNodeResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/nodes/BaseNodeResponse.java rename to server/src/main/java/org/elasticsearch/action/support/nodes/BaseNodeResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/support/nodes/BaseNodesRequest.java b/server/src/main/java/org/elasticsearch/action/support/nodes/BaseNodesRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/nodes/BaseNodesRequest.java rename to server/src/main/java/org/elasticsearch/action/support/nodes/BaseNodesRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/support/nodes/BaseNodesResponse.java b/server/src/main/java/org/elasticsearch/action/support/nodes/BaseNodesResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/nodes/BaseNodesResponse.java rename to server/src/main/java/org/elasticsearch/action/support/nodes/BaseNodesResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/support/nodes/NodesOperationRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/support/nodes/NodesOperationRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/nodes/NodesOperationRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/support/nodes/NodesOperationRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/support/nodes/TransportNodesAction.java b/server/src/main/java/org/elasticsearch/action/support/nodes/TransportNodesAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/nodes/TransportNodesAction.java rename to server/src/main/java/org/elasticsearch/action/support/nodes/TransportNodesAction.java diff --git a/core/src/main/java/org/elasticsearch/action/support/replication/BasicReplicationRequest.java b/server/src/main/java/org/elasticsearch/action/support/replication/BasicReplicationRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/replication/BasicReplicationRequest.java rename to server/src/main/java/org/elasticsearch/action/support/replication/BasicReplicationRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/support/replication/ReplicatedWriteRequest.java b/server/src/main/java/org/elasticsearch/action/support/replication/ReplicatedWriteRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/replication/ReplicatedWriteRequest.java rename to server/src/main/java/org/elasticsearch/action/support/replication/ReplicatedWriteRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/support/replication/ReplicationOperation.java b/server/src/main/java/org/elasticsearch/action/support/replication/ReplicationOperation.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/replication/ReplicationOperation.java rename to server/src/main/java/org/elasticsearch/action/support/replication/ReplicationOperation.java diff --git a/core/src/main/java/org/elasticsearch/action/support/replication/ReplicationRequest.java b/server/src/main/java/org/elasticsearch/action/support/replication/ReplicationRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/replication/ReplicationRequest.java rename to server/src/main/java/org/elasticsearch/action/support/replication/ReplicationRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/support/replication/ReplicationRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/support/replication/ReplicationRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/replication/ReplicationRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/support/replication/ReplicationRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/support/replication/ReplicationResponse.java b/server/src/main/java/org/elasticsearch/action/support/replication/ReplicationResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/replication/ReplicationResponse.java rename to server/src/main/java/org/elasticsearch/action/support/replication/ReplicationResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/support/replication/ReplicationTask.java b/server/src/main/java/org/elasticsearch/action/support/replication/ReplicationTask.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/replication/ReplicationTask.java rename to server/src/main/java/org/elasticsearch/action/support/replication/ReplicationTask.java diff --git a/core/src/main/java/org/elasticsearch/action/support/replication/TransportBroadcastReplicationAction.java b/server/src/main/java/org/elasticsearch/action/support/replication/TransportBroadcastReplicationAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/replication/TransportBroadcastReplicationAction.java rename to server/src/main/java/org/elasticsearch/action/support/replication/TransportBroadcastReplicationAction.java diff --git a/core/src/main/java/org/elasticsearch/action/support/replication/TransportReplicationAction.java b/server/src/main/java/org/elasticsearch/action/support/replication/TransportReplicationAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/replication/TransportReplicationAction.java rename to server/src/main/java/org/elasticsearch/action/support/replication/TransportReplicationAction.java diff --git a/core/src/main/java/org/elasticsearch/action/support/replication/TransportWriteAction.java b/server/src/main/java/org/elasticsearch/action/support/replication/TransportWriteAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/replication/TransportWriteAction.java rename to server/src/main/java/org/elasticsearch/action/support/replication/TransportWriteAction.java diff --git a/core/src/main/java/org/elasticsearch/action/support/single/instance/InstanceShardOperationRequest.java b/server/src/main/java/org/elasticsearch/action/support/single/instance/InstanceShardOperationRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/single/instance/InstanceShardOperationRequest.java rename to server/src/main/java/org/elasticsearch/action/support/single/instance/InstanceShardOperationRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/support/single/instance/InstanceShardOperationRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/support/single/instance/InstanceShardOperationRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/single/instance/InstanceShardOperationRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/support/single/instance/InstanceShardOperationRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/support/single/instance/TransportInstanceSingleOperationAction.java b/server/src/main/java/org/elasticsearch/action/support/single/instance/TransportInstanceSingleOperationAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/single/instance/TransportInstanceSingleOperationAction.java rename to server/src/main/java/org/elasticsearch/action/support/single/instance/TransportInstanceSingleOperationAction.java diff --git a/core/src/main/java/org/elasticsearch/action/support/single/shard/SingleShardOperationRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/support/single/shard/SingleShardOperationRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/single/shard/SingleShardOperationRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/support/single/shard/SingleShardOperationRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/support/single/shard/SingleShardRequest.java b/server/src/main/java/org/elasticsearch/action/support/single/shard/SingleShardRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/single/shard/SingleShardRequest.java rename to server/src/main/java/org/elasticsearch/action/support/single/shard/SingleShardRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/support/single/shard/TransportSingleShardAction.java b/server/src/main/java/org/elasticsearch/action/support/single/shard/TransportSingleShardAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/single/shard/TransportSingleShardAction.java rename to server/src/main/java/org/elasticsearch/action/support/single/shard/TransportSingleShardAction.java diff --git a/core/src/main/java/org/elasticsearch/action/support/tasks/BaseTasksRequest.java b/server/src/main/java/org/elasticsearch/action/support/tasks/BaseTasksRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/tasks/BaseTasksRequest.java rename to server/src/main/java/org/elasticsearch/action/support/tasks/BaseTasksRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/support/tasks/BaseTasksResponse.java b/server/src/main/java/org/elasticsearch/action/support/tasks/BaseTasksResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/tasks/BaseTasksResponse.java rename to server/src/main/java/org/elasticsearch/action/support/tasks/BaseTasksResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/support/tasks/TasksRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/support/tasks/TasksRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/tasks/TasksRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/support/tasks/TasksRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/support/tasks/TransportTasksAction.java b/server/src/main/java/org/elasticsearch/action/support/tasks/TransportTasksAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/support/tasks/TransportTasksAction.java rename to server/src/main/java/org/elasticsearch/action/support/tasks/TransportTasksAction.java diff --git a/core/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsAction.java b/server/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsAction.java rename to server/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsAction.java diff --git a/core/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsItemResponse.java b/server/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsItemResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsItemResponse.java rename to server/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsItemResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsRequest.java b/server/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsRequest.java rename to server/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsResponse.java b/server/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsResponse.java rename to server/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsShardRequest.java b/server/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsShardRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsShardRequest.java rename to server/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsShardRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsShardResponse.java b/server/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsShardResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsShardResponse.java rename to server/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsShardResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/termvectors/TermVectorsAction.java b/server/src/main/java/org/elasticsearch/action/termvectors/TermVectorsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/termvectors/TermVectorsAction.java rename to server/src/main/java/org/elasticsearch/action/termvectors/TermVectorsAction.java diff --git a/core/src/main/java/org/elasticsearch/action/termvectors/TermVectorsFields.java b/server/src/main/java/org/elasticsearch/action/termvectors/TermVectorsFields.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/termvectors/TermVectorsFields.java rename to server/src/main/java/org/elasticsearch/action/termvectors/TermVectorsFields.java diff --git a/core/src/main/java/org/elasticsearch/action/termvectors/TermVectorsFilter.java b/server/src/main/java/org/elasticsearch/action/termvectors/TermVectorsFilter.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/termvectors/TermVectorsFilter.java rename to server/src/main/java/org/elasticsearch/action/termvectors/TermVectorsFilter.java diff --git a/core/src/main/java/org/elasticsearch/action/termvectors/TermVectorsRequest.java b/server/src/main/java/org/elasticsearch/action/termvectors/TermVectorsRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/termvectors/TermVectorsRequest.java rename to server/src/main/java/org/elasticsearch/action/termvectors/TermVectorsRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/termvectors/TermVectorsRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/termvectors/TermVectorsRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/termvectors/TermVectorsRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/termvectors/TermVectorsRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/termvectors/TermVectorsResponse.java b/server/src/main/java/org/elasticsearch/action/termvectors/TermVectorsResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/termvectors/TermVectorsResponse.java rename to server/src/main/java/org/elasticsearch/action/termvectors/TermVectorsResponse.java diff --git a/core/src/main/java/org/elasticsearch/action/termvectors/TermVectorsWriter.java b/server/src/main/java/org/elasticsearch/action/termvectors/TermVectorsWriter.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/termvectors/TermVectorsWriter.java rename to server/src/main/java/org/elasticsearch/action/termvectors/TermVectorsWriter.java diff --git a/core/src/main/java/org/elasticsearch/action/termvectors/TransportMultiTermVectorsAction.java b/server/src/main/java/org/elasticsearch/action/termvectors/TransportMultiTermVectorsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/termvectors/TransportMultiTermVectorsAction.java rename to server/src/main/java/org/elasticsearch/action/termvectors/TransportMultiTermVectorsAction.java diff --git a/core/src/main/java/org/elasticsearch/action/termvectors/TransportShardMultiTermsVectorAction.java b/server/src/main/java/org/elasticsearch/action/termvectors/TransportShardMultiTermsVectorAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/termvectors/TransportShardMultiTermsVectorAction.java rename to server/src/main/java/org/elasticsearch/action/termvectors/TransportShardMultiTermsVectorAction.java diff --git a/core/src/main/java/org/elasticsearch/action/termvectors/TransportTermVectorsAction.java b/server/src/main/java/org/elasticsearch/action/termvectors/TransportTermVectorsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/termvectors/TransportTermVectorsAction.java rename to server/src/main/java/org/elasticsearch/action/termvectors/TransportTermVectorsAction.java diff --git a/core/src/main/java/org/elasticsearch/action/termvectors/package-info.java b/server/src/main/java/org/elasticsearch/action/termvectors/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/termvectors/package-info.java rename to server/src/main/java/org/elasticsearch/action/termvectors/package-info.java diff --git a/core/src/main/java/org/elasticsearch/action/update/TransportUpdateAction.java b/server/src/main/java/org/elasticsearch/action/update/TransportUpdateAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/update/TransportUpdateAction.java rename to server/src/main/java/org/elasticsearch/action/update/TransportUpdateAction.java diff --git a/core/src/main/java/org/elasticsearch/action/update/UpdateAction.java b/server/src/main/java/org/elasticsearch/action/update/UpdateAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/update/UpdateAction.java rename to server/src/main/java/org/elasticsearch/action/update/UpdateAction.java diff --git a/core/src/main/java/org/elasticsearch/action/update/UpdateHelper.java b/server/src/main/java/org/elasticsearch/action/update/UpdateHelper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/update/UpdateHelper.java rename to server/src/main/java/org/elasticsearch/action/update/UpdateHelper.java diff --git a/core/src/main/java/org/elasticsearch/action/update/UpdateRequest.java b/server/src/main/java/org/elasticsearch/action/update/UpdateRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/update/UpdateRequest.java rename to server/src/main/java/org/elasticsearch/action/update/UpdateRequest.java diff --git a/core/src/main/java/org/elasticsearch/action/update/UpdateRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/update/UpdateRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/update/UpdateRequestBuilder.java rename to server/src/main/java/org/elasticsearch/action/update/UpdateRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/action/update/UpdateResponse.java b/server/src/main/java/org/elasticsearch/action/update/UpdateResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/action/update/UpdateResponse.java rename to server/src/main/java/org/elasticsearch/action/update/UpdateResponse.java diff --git a/core/src/main/java/org/elasticsearch/bootstrap/Bootstrap.java b/server/src/main/java/org/elasticsearch/bootstrap/Bootstrap.java similarity index 100% rename from core/src/main/java/org/elasticsearch/bootstrap/Bootstrap.java rename to server/src/main/java/org/elasticsearch/bootstrap/Bootstrap.java diff --git a/core/src/main/java/org/elasticsearch/bootstrap/BootstrapCheck.java b/server/src/main/java/org/elasticsearch/bootstrap/BootstrapCheck.java similarity index 100% rename from core/src/main/java/org/elasticsearch/bootstrap/BootstrapCheck.java rename to server/src/main/java/org/elasticsearch/bootstrap/BootstrapCheck.java diff --git a/core/src/main/java/org/elasticsearch/bootstrap/BootstrapChecks.java b/server/src/main/java/org/elasticsearch/bootstrap/BootstrapChecks.java similarity index 100% rename from core/src/main/java/org/elasticsearch/bootstrap/BootstrapChecks.java rename to server/src/main/java/org/elasticsearch/bootstrap/BootstrapChecks.java diff --git a/core/src/main/java/org/elasticsearch/bootstrap/BootstrapContext.java b/server/src/main/java/org/elasticsearch/bootstrap/BootstrapContext.java similarity index 100% rename from core/src/main/java/org/elasticsearch/bootstrap/BootstrapContext.java rename to server/src/main/java/org/elasticsearch/bootstrap/BootstrapContext.java diff --git a/core/src/main/java/org/elasticsearch/bootstrap/BootstrapException.java b/server/src/main/java/org/elasticsearch/bootstrap/BootstrapException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/bootstrap/BootstrapException.java rename to server/src/main/java/org/elasticsearch/bootstrap/BootstrapException.java diff --git a/core/src/main/java/org/elasticsearch/bootstrap/BootstrapInfo.java b/server/src/main/java/org/elasticsearch/bootstrap/BootstrapInfo.java similarity index 100% rename from core/src/main/java/org/elasticsearch/bootstrap/BootstrapInfo.java rename to server/src/main/java/org/elasticsearch/bootstrap/BootstrapInfo.java diff --git a/core/src/main/java/org/elasticsearch/bootstrap/BootstrapSettings.java b/server/src/main/java/org/elasticsearch/bootstrap/BootstrapSettings.java similarity index 100% rename from core/src/main/java/org/elasticsearch/bootstrap/BootstrapSettings.java rename to server/src/main/java/org/elasticsearch/bootstrap/BootstrapSettings.java diff --git a/core/src/main/java/org/elasticsearch/bootstrap/ConsoleCtrlHandler.java b/server/src/main/java/org/elasticsearch/bootstrap/ConsoleCtrlHandler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/bootstrap/ConsoleCtrlHandler.java rename to server/src/main/java/org/elasticsearch/bootstrap/ConsoleCtrlHandler.java diff --git a/core/src/main/java/org/elasticsearch/bootstrap/ESPolicy.java b/server/src/main/java/org/elasticsearch/bootstrap/ESPolicy.java similarity index 100% rename from core/src/main/java/org/elasticsearch/bootstrap/ESPolicy.java rename to server/src/main/java/org/elasticsearch/bootstrap/ESPolicy.java diff --git a/core/src/main/java/org/elasticsearch/bootstrap/Elasticsearch.java b/server/src/main/java/org/elasticsearch/bootstrap/Elasticsearch.java similarity index 100% rename from core/src/main/java/org/elasticsearch/bootstrap/Elasticsearch.java rename to server/src/main/java/org/elasticsearch/bootstrap/Elasticsearch.java diff --git a/core/src/main/java/org/elasticsearch/bootstrap/ElasticsearchUncaughtExceptionHandler.java b/server/src/main/java/org/elasticsearch/bootstrap/ElasticsearchUncaughtExceptionHandler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/bootstrap/ElasticsearchUncaughtExceptionHandler.java rename to server/src/main/java/org/elasticsearch/bootstrap/ElasticsearchUncaughtExceptionHandler.java diff --git a/core/src/main/java/org/elasticsearch/bootstrap/FilePermissionUtils.java b/server/src/main/java/org/elasticsearch/bootstrap/FilePermissionUtils.java similarity index 100% rename from core/src/main/java/org/elasticsearch/bootstrap/FilePermissionUtils.java rename to server/src/main/java/org/elasticsearch/bootstrap/FilePermissionUtils.java diff --git a/core/src/main/java/org/elasticsearch/bootstrap/JNACLibrary.java b/server/src/main/java/org/elasticsearch/bootstrap/JNACLibrary.java similarity index 100% rename from core/src/main/java/org/elasticsearch/bootstrap/JNACLibrary.java rename to server/src/main/java/org/elasticsearch/bootstrap/JNACLibrary.java diff --git a/core/src/main/java/org/elasticsearch/bootstrap/JNAKernel32Library.java b/server/src/main/java/org/elasticsearch/bootstrap/JNAKernel32Library.java similarity index 100% rename from core/src/main/java/org/elasticsearch/bootstrap/JNAKernel32Library.java rename to server/src/main/java/org/elasticsearch/bootstrap/JNAKernel32Library.java diff --git a/core/src/main/java/org/elasticsearch/bootstrap/JNANatives.java b/server/src/main/java/org/elasticsearch/bootstrap/JNANatives.java similarity index 100% rename from core/src/main/java/org/elasticsearch/bootstrap/JNANatives.java rename to server/src/main/java/org/elasticsearch/bootstrap/JNANatives.java diff --git a/core/src/main/java/org/elasticsearch/bootstrap/JarHell.java b/server/src/main/java/org/elasticsearch/bootstrap/JarHell.java similarity index 100% rename from core/src/main/java/org/elasticsearch/bootstrap/JarHell.java rename to server/src/main/java/org/elasticsearch/bootstrap/JarHell.java diff --git a/core/src/main/java/org/elasticsearch/bootstrap/JavaVersion.java b/server/src/main/java/org/elasticsearch/bootstrap/JavaVersion.java similarity index 100% rename from core/src/main/java/org/elasticsearch/bootstrap/JavaVersion.java rename to server/src/main/java/org/elasticsearch/bootstrap/JavaVersion.java diff --git a/core/src/main/java/org/elasticsearch/bootstrap/Natives.java b/server/src/main/java/org/elasticsearch/bootstrap/Natives.java similarity index 100% rename from core/src/main/java/org/elasticsearch/bootstrap/Natives.java rename to server/src/main/java/org/elasticsearch/bootstrap/Natives.java diff --git a/core/src/main/java/org/elasticsearch/bootstrap/Security.java b/server/src/main/java/org/elasticsearch/bootstrap/Security.java similarity index 100% rename from core/src/main/java/org/elasticsearch/bootstrap/Security.java rename to server/src/main/java/org/elasticsearch/bootstrap/Security.java diff --git a/core/src/main/java/org/elasticsearch/bootstrap/Spawner.java b/server/src/main/java/org/elasticsearch/bootstrap/Spawner.java similarity index 100% rename from core/src/main/java/org/elasticsearch/bootstrap/Spawner.java rename to server/src/main/java/org/elasticsearch/bootstrap/Spawner.java diff --git a/core/src/main/java/org/elasticsearch/bootstrap/StartupException.java b/server/src/main/java/org/elasticsearch/bootstrap/StartupException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/bootstrap/StartupException.java rename to server/src/main/java/org/elasticsearch/bootstrap/StartupException.java diff --git a/core/src/main/java/org/elasticsearch/bootstrap/SystemCallFilter.java b/server/src/main/java/org/elasticsearch/bootstrap/SystemCallFilter.java similarity index 100% rename from core/src/main/java/org/elasticsearch/bootstrap/SystemCallFilter.java rename to server/src/main/java/org/elasticsearch/bootstrap/SystemCallFilter.java diff --git a/core/src/main/java/org/elasticsearch/cli/CommandLoggingConfigurator.java b/server/src/main/java/org/elasticsearch/cli/CommandLoggingConfigurator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cli/CommandLoggingConfigurator.java rename to server/src/main/java/org/elasticsearch/cli/CommandLoggingConfigurator.java diff --git a/core/src/main/java/org/elasticsearch/cli/EnvironmentAwareCommand.java b/server/src/main/java/org/elasticsearch/cli/EnvironmentAwareCommand.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cli/EnvironmentAwareCommand.java rename to server/src/main/java/org/elasticsearch/cli/EnvironmentAwareCommand.java diff --git a/core/src/main/java/org/elasticsearch/cli/LoggingAwareCommand.java b/server/src/main/java/org/elasticsearch/cli/LoggingAwareCommand.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cli/LoggingAwareCommand.java rename to server/src/main/java/org/elasticsearch/cli/LoggingAwareCommand.java diff --git a/core/src/main/java/org/elasticsearch/cli/LoggingAwareMultiCommand.java b/server/src/main/java/org/elasticsearch/cli/LoggingAwareMultiCommand.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cli/LoggingAwareMultiCommand.java rename to server/src/main/java/org/elasticsearch/cli/LoggingAwareMultiCommand.java diff --git a/core/src/main/java/org/elasticsearch/client/AdminClient.java b/server/src/main/java/org/elasticsearch/client/AdminClient.java similarity index 100% rename from core/src/main/java/org/elasticsearch/client/AdminClient.java rename to server/src/main/java/org/elasticsearch/client/AdminClient.java diff --git a/core/src/main/java/org/elasticsearch/client/Client.java b/server/src/main/java/org/elasticsearch/client/Client.java similarity index 100% rename from core/src/main/java/org/elasticsearch/client/Client.java rename to server/src/main/java/org/elasticsearch/client/Client.java diff --git a/core/src/main/java/org/elasticsearch/client/ClusterAdminClient.java b/server/src/main/java/org/elasticsearch/client/ClusterAdminClient.java similarity index 100% rename from core/src/main/java/org/elasticsearch/client/ClusterAdminClient.java rename to server/src/main/java/org/elasticsearch/client/ClusterAdminClient.java diff --git a/core/src/main/java/org/elasticsearch/client/ElasticsearchClient.java b/server/src/main/java/org/elasticsearch/client/ElasticsearchClient.java similarity index 100% rename from core/src/main/java/org/elasticsearch/client/ElasticsearchClient.java rename to server/src/main/java/org/elasticsearch/client/ElasticsearchClient.java diff --git a/core/src/main/java/org/elasticsearch/client/FilterClient.java b/server/src/main/java/org/elasticsearch/client/FilterClient.java similarity index 100% rename from core/src/main/java/org/elasticsearch/client/FilterClient.java rename to server/src/main/java/org/elasticsearch/client/FilterClient.java diff --git a/core/src/main/java/org/elasticsearch/client/IndicesAdminClient.java b/server/src/main/java/org/elasticsearch/client/IndicesAdminClient.java similarity index 100% rename from core/src/main/java/org/elasticsearch/client/IndicesAdminClient.java rename to server/src/main/java/org/elasticsearch/client/IndicesAdminClient.java diff --git a/core/src/main/java/org/elasticsearch/client/ParentTaskAssigningClient.java b/server/src/main/java/org/elasticsearch/client/ParentTaskAssigningClient.java similarity index 100% rename from core/src/main/java/org/elasticsearch/client/ParentTaskAssigningClient.java rename to server/src/main/java/org/elasticsearch/client/ParentTaskAssigningClient.java diff --git a/core/src/main/java/org/elasticsearch/client/Requests.java b/server/src/main/java/org/elasticsearch/client/Requests.java similarity index 100% rename from core/src/main/java/org/elasticsearch/client/Requests.java rename to server/src/main/java/org/elasticsearch/client/Requests.java diff --git a/core/src/main/java/org/elasticsearch/client/node/NodeClient.java b/server/src/main/java/org/elasticsearch/client/node/NodeClient.java similarity index 100% rename from core/src/main/java/org/elasticsearch/client/node/NodeClient.java rename to server/src/main/java/org/elasticsearch/client/node/NodeClient.java diff --git a/core/src/main/java/org/elasticsearch/client/package-info.java b/server/src/main/java/org/elasticsearch/client/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/client/package-info.java rename to server/src/main/java/org/elasticsearch/client/package-info.java diff --git a/core/src/main/java/org/elasticsearch/client/support/AbstractClient.java b/server/src/main/java/org/elasticsearch/client/support/AbstractClient.java similarity index 100% rename from core/src/main/java/org/elasticsearch/client/support/AbstractClient.java rename to server/src/main/java/org/elasticsearch/client/support/AbstractClient.java diff --git a/core/src/main/java/org/elasticsearch/client/transport/NoNodeAvailableException.java b/server/src/main/java/org/elasticsearch/client/transport/NoNodeAvailableException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/client/transport/NoNodeAvailableException.java rename to server/src/main/java/org/elasticsearch/client/transport/NoNodeAvailableException.java diff --git a/core/src/main/java/org/elasticsearch/client/transport/TransportClient.java b/server/src/main/java/org/elasticsearch/client/transport/TransportClient.java similarity index 100% rename from core/src/main/java/org/elasticsearch/client/transport/TransportClient.java rename to server/src/main/java/org/elasticsearch/client/transport/TransportClient.java diff --git a/core/src/main/java/org/elasticsearch/client/transport/TransportClientNodesService.java b/server/src/main/java/org/elasticsearch/client/transport/TransportClientNodesService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/client/transport/TransportClientNodesService.java rename to server/src/main/java/org/elasticsearch/client/transport/TransportClientNodesService.java diff --git a/core/src/main/java/org/elasticsearch/client/transport/TransportProxyClient.java b/server/src/main/java/org/elasticsearch/client/transport/TransportProxyClient.java similarity index 100% rename from core/src/main/java/org/elasticsearch/client/transport/TransportProxyClient.java rename to server/src/main/java/org/elasticsearch/client/transport/TransportProxyClient.java diff --git a/core/src/main/java/org/elasticsearch/cluster/AbstractDiffable.java b/server/src/main/java/org/elasticsearch/cluster/AbstractDiffable.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/AbstractDiffable.java rename to server/src/main/java/org/elasticsearch/cluster/AbstractDiffable.java diff --git a/core/src/main/java/org/elasticsearch/cluster/AbstractNamedDiffable.java b/server/src/main/java/org/elasticsearch/cluster/AbstractNamedDiffable.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/AbstractNamedDiffable.java rename to server/src/main/java/org/elasticsearch/cluster/AbstractNamedDiffable.java diff --git a/core/src/main/java/org/elasticsearch/cluster/AckedClusterStateTaskListener.java b/server/src/main/java/org/elasticsearch/cluster/AckedClusterStateTaskListener.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/AckedClusterStateTaskListener.java rename to server/src/main/java/org/elasticsearch/cluster/AckedClusterStateTaskListener.java diff --git a/core/src/main/java/org/elasticsearch/cluster/AckedClusterStateUpdateTask.java b/server/src/main/java/org/elasticsearch/cluster/AckedClusterStateUpdateTask.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/AckedClusterStateUpdateTask.java rename to server/src/main/java/org/elasticsearch/cluster/AckedClusterStateUpdateTask.java diff --git a/core/src/main/java/org/elasticsearch/cluster/ClusterChangedEvent.java b/server/src/main/java/org/elasticsearch/cluster/ClusterChangedEvent.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/ClusterChangedEvent.java rename to server/src/main/java/org/elasticsearch/cluster/ClusterChangedEvent.java diff --git a/core/src/main/java/org/elasticsearch/cluster/ClusterInfo.java b/server/src/main/java/org/elasticsearch/cluster/ClusterInfo.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/ClusterInfo.java rename to server/src/main/java/org/elasticsearch/cluster/ClusterInfo.java diff --git a/core/src/main/java/org/elasticsearch/cluster/ClusterInfoService.java b/server/src/main/java/org/elasticsearch/cluster/ClusterInfoService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/ClusterInfoService.java rename to server/src/main/java/org/elasticsearch/cluster/ClusterInfoService.java diff --git a/core/src/main/java/org/elasticsearch/cluster/ClusterModule.java b/server/src/main/java/org/elasticsearch/cluster/ClusterModule.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/ClusterModule.java rename to server/src/main/java/org/elasticsearch/cluster/ClusterModule.java diff --git a/core/src/main/java/org/elasticsearch/cluster/ClusterName.java b/server/src/main/java/org/elasticsearch/cluster/ClusterName.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/ClusterName.java rename to server/src/main/java/org/elasticsearch/cluster/ClusterName.java diff --git a/core/src/main/java/org/elasticsearch/cluster/ClusterState.java b/server/src/main/java/org/elasticsearch/cluster/ClusterState.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/ClusterState.java rename to server/src/main/java/org/elasticsearch/cluster/ClusterState.java diff --git a/core/src/main/java/org/elasticsearch/cluster/ClusterStateApplier.java b/server/src/main/java/org/elasticsearch/cluster/ClusterStateApplier.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/ClusterStateApplier.java rename to server/src/main/java/org/elasticsearch/cluster/ClusterStateApplier.java diff --git a/core/src/main/java/org/elasticsearch/cluster/ClusterStateListener.java b/server/src/main/java/org/elasticsearch/cluster/ClusterStateListener.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/ClusterStateListener.java rename to server/src/main/java/org/elasticsearch/cluster/ClusterStateListener.java diff --git a/core/src/main/java/org/elasticsearch/cluster/ClusterStateObserver.java b/server/src/main/java/org/elasticsearch/cluster/ClusterStateObserver.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/ClusterStateObserver.java rename to server/src/main/java/org/elasticsearch/cluster/ClusterStateObserver.java diff --git a/core/src/main/java/org/elasticsearch/cluster/ClusterStateTaskConfig.java b/server/src/main/java/org/elasticsearch/cluster/ClusterStateTaskConfig.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/ClusterStateTaskConfig.java rename to server/src/main/java/org/elasticsearch/cluster/ClusterStateTaskConfig.java diff --git a/core/src/main/java/org/elasticsearch/cluster/ClusterStateTaskExecutor.java b/server/src/main/java/org/elasticsearch/cluster/ClusterStateTaskExecutor.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/ClusterStateTaskExecutor.java rename to server/src/main/java/org/elasticsearch/cluster/ClusterStateTaskExecutor.java diff --git a/core/src/main/java/org/elasticsearch/cluster/ClusterStateTaskListener.java b/server/src/main/java/org/elasticsearch/cluster/ClusterStateTaskListener.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/ClusterStateTaskListener.java rename to server/src/main/java/org/elasticsearch/cluster/ClusterStateTaskListener.java diff --git a/core/src/main/java/org/elasticsearch/cluster/ClusterStateUpdateTask.java b/server/src/main/java/org/elasticsearch/cluster/ClusterStateUpdateTask.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/ClusterStateUpdateTask.java rename to server/src/main/java/org/elasticsearch/cluster/ClusterStateUpdateTask.java diff --git a/core/src/main/java/org/elasticsearch/cluster/Diff.java b/server/src/main/java/org/elasticsearch/cluster/Diff.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/Diff.java rename to server/src/main/java/org/elasticsearch/cluster/Diff.java diff --git a/core/src/main/java/org/elasticsearch/cluster/Diffable.java b/server/src/main/java/org/elasticsearch/cluster/Diffable.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/Diffable.java rename to server/src/main/java/org/elasticsearch/cluster/Diffable.java diff --git a/core/src/main/java/org/elasticsearch/cluster/DiffableUtils.java b/server/src/main/java/org/elasticsearch/cluster/DiffableUtils.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/DiffableUtils.java rename to server/src/main/java/org/elasticsearch/cluster/DiffableUtils.java diff --git a/core/src/main/java/org/elasticsearch/cluster/DiskUsage.java b/server/src/main/java/org/elasticsearch/cluster/DiskUsage.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/DiskUsage.java rename to server/src/main/java/org/elasticsearch/cluster/DiskUsage.java diff --git a/core/src/main/java/org/elasticsearch/cluster/EmptyClusterInfoService.java b/server/src/main/java/org/elasticsearch/cluster/EmptyClusterInfoService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/EmptyClusterInfoService.java rename to server/src/main/java/org/elasticsearch/cluster/EmptyClusterInfoService.java diff --git a/core/src/main/java/org/elasticsearch/cluster/IncompatibleClusterStateVersionException.java b/server/src/main/java/org/elasticsearch/cluster/IncompatibleClusterStateVersionException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/IncompatibleClusterStateVersionException.java rename to server/src/main/java/org/elasticsearch/cluster/IncompatibleClusterStateVersionException.java diff --git a/core/src/main/java/org/elasticsearch/cluster/InternalClusterInfoService.java b/server/src/main/java/org/elasticsearch/cluster/InternalClusterInfoService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/InternalClusterInfoService.java rename to server/src/main/java/org/elasticsearch/cluster/InternalClusterInfoService.java diff --git a/core/src/main/java/org/elasticsearch/cluster/LocalClusterUpdateTask.java b/server/src/main/java/org/elasticsearch/cluster/LocalClusterUpdateTask.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/LocalClusterUpdateTask.java rename to server/src/main/java/org/elasticsearch/cluster/LocalClusterUpdateTask.java diff --git a/core/src/main/java/org/elasticsearch/cluster/LocalNodeMasterListener.java b/server/src/main/java/org/elasticsearch/cluster/LocalNodeMasterListener.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/LocalNodeMasterListener.java rename to server/src/main/java/org/elasticsearch/cluster/LocalNodeMasterListener.java diff --git a/core/src/main/java/org/elasticsearch/cluster/MasterNodeChangePredicate.java b/server/src/main/java/org/elasticsearch/cluster/MasterNodeChangePredicate.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/MasterNodeChangePredicate.java rename to server/src/main/java/org/elasticsearch/cluster/MasterNodeChangePredicate.java diff --git a/core/src/main/java/org/elasticsearch/cluster/MergableCustomMetaData.java b/server/src/main/java/org/elasticsearch/cluster/MergableCustomMetaData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/MergableCustomMetaData.java rename to server/src/main/java/org/elasticsearch/cluster/MergableCustomMetaData.java diff --git a/core/src/main/java/org/elasticsearch/cluster/NamedDiff.java b/server/src/main/java/org/elasticsearch/cluster/NamedDiff.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/NamedDiff.java rename to server/src/main/java/org/elasticsearch/cluster/NamedDiff.java diff --git a/core/src/main/java/org/elasticsearch/cluster/NamedDiffable.java b/server/src/main/java/org/elasticsearch/cluster/NamedDiffable.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/NamedDiffable.java rename to server/src/main/java/org/elasticsearch/cluster/NamedDiffable.java diff --git a/core/src/main/java/org/elasticsearch/cluster/NamedDiffableValueSerializer.java b/server/src/main/java/org/elasticsearch/cluster/NamedDiffableValueSerializer.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/NamedDiffableValueSerializer.java rename to server/src/main/java/org/elasticsearch/cluster/NamedDiffableValueSerializer.java diff --git a/core/src/main/java/org/elasticsearch/cluster/NodeConnectionsService.java b/server/src/main/java/org/elasticsearch/cluster/NodeConnectionsService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/NodeConnectionsService.java rename to server/src/main/java/org/elasticsearch/cluster/NodeConnectionsService.java diff --git a/core/src/main/java/org/elasticsearch/cluster/NotMasterException.java b/server/src/main/java/org/elasticsearch/cluster/NotMasterException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/NotMasterException.java rename to server/src/main/java/org/elasticsearch/cluster/NotMasterException.java diff --git a/core/src/main/java/org/elasticsearch/cluster/RestoreInProgress.java b/server/src/main/java/org/elasticsearch/cluster/RestoreInProgress.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/RestoreInProgress.java rename to server/src/main/java/org/elasticsearch/cluster/RestoreInProgress.java diff --git a/core/src/main/java/org/elasticsearch/cluster/SnapshotDeletionsInProgress.java b/server/src/main/java/org/elasticsearch/cluster/SnapshotDeletionsInProgress.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/SnapshotDeletionsInProgress.java rename to server/src/main/java/org/elasticsearch/cluster/SnapshotDeletionsInProgress.java diff --git a/core/src/main/java/org/elasticsearch/cluster/SnapshotsInProgress.java b/server/src/main/java/org/elasticsearch/cluster/SnapshotsInProgress.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/SnapshotsInProgress.java rename to server/src/main/java/org/elasticsearch/cluster/SnapshotsInProgress.java diff --git a/core/src/main/java/org/elasticsearch/cluster/TimeoutClusterStateListener.java b/server/src/main/java/org/elasticsearch/cluster/TimeoutClusterStateListener.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/TimeoutClusterStateListener.java rename to server/src/main/java/org/elasticsearch/cluster/TimeoutClusterStateListener.java diff --git a/core/src/main/java/org/elasticsearch/cluster/ack/AckedRequest.java b/server/src/main/java/org/elasticsearch/cluster/ack/AckedRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/ack/AckedRequest.java rename to server/src/main/java/org/elasticsearch/cluster/ack/AckedRequest.java diff --git a/core/src/main/java/org/elasticsearch/cluster/ack/ClusterStateUpdateRequest.java b/server/src/main/java/org/elasticsearch/cluster/ack/ClusterStateUpdateRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/ack/ClusterStateUpdateRequest.java rename to server/src/main/java/org/elasticsearch/cluster/ack/ClusterStateUpdateRequest.java diff --git a/core/src/main/java/org/elasticsearch/cluster/ack/ClusterStateUpdateResponse.java b/server/src/main/java/org/elasticsearch/cluster/ack/ClusterStateUpdateResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/ack/ClusterStateUpdateResponse.java rename to server/src/main/java/org/elasticsearch/cluster/ack/ClusterStateUpdateResponse.java diff --git a/core/src/main/java/org/elasticsearch/cluster/ack/CreateIndexClusterStateUpdateResponse.java b/server/src/main/java/org/elasticsearch/cluster/ack/CreateIndexClusterStateUpdateResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/ack/CreateIndexClusterStateUpdateResponse.java rename to server/src/main/java/org/elasticsearch/cluster/ack/CreateIndexClusterStateUpdateResponse.java diff --git a/core/src/main/java/org/elasticsearch/cluster/ack/IndicesClusterStateUpdateRequest.java b/server/src/main/java/org/elasticsearch/cluster/ack/IndicesClusterStateUpdateRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/ack/IndicesClusterStateUpdateRequest.java rename to server/src/main/java/org/elasticsearch/cluster/ack/IndicesClusterStateUpdateRequest.java diff --git a/core/src/main/java/org/elasticsearch/cluster/ack/OpenIndexClusterStateUpdateResponse.java b/server/src/main/java/org/elasticsearch/cluster/ack/OpenIndexClusterStateUpdateResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/ack/OpenIndexClusterStateUpdateResponse.java rename to server/src/main/java/org/elasticsearch/cluster/ack/OpenIndexClusterStateUpdateResponse.java diff --git a/core/src/main/java/org/elasticsearch/cluster/action/index/MappingUpdatedAction.java b/server/src/main/java/org/elasticsearch/cluster/action/index/MappingUpdatedAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/action/index/MappingUpdatedAction.java rename to server/src/main/java/org/elasticsearch/cluster/action/index/MappingUpdatedAction.java diff --git a/core/src/main/java/org/elasticsearch/cluster/action/index/NodeMappingRefreshAction.java b/server/src/main/java/org/elasticsearch/cluster/action/index/NodeMappingRefreshAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/action/index/NodeMappingRefreshAction.java rename to server/src/main/java/org/elasticsearch/cluster/action/index/NodeMappingRefreshAction.java diff --git a/core/src/main/java/org/elasticsearch/cluster/action/shard/ShardStateAction.java b/server/src/main/java/org/elasticsearch/cluster/action/shard/ShardStateAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/action/shard/ShardStateAction.java rename to server/src/main/java/org/elasticsearch/cluster/action/shard/ShardStateAction.java diff --git a/core/src/main/java/org/elasticsearch/cluster/block/ClusterBlock.java b/server/src/main/java/org/elasticsearch/cluster/block/ClusterBlock.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/block/ClusterBlock.java rename to server/src/main/java/org/elasticsearch/cluster/block/ClusterBlock.java diff --git a/core/src/main/java/org/elasticsearch/cluster/block/ClusterBlockException.java b/server/src/main/java/org/elasticsearch/cluster/block/ClusterBlockException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/block/ClusterBlockException.java rename to server/src/main/java/org/elasticsearch/cluster/block/ClusterBlockException.java diff --git a/core/src/main/java/org/elasticsearch/cluster/block/ClusterBlockLevel.java b/server/src/main/java/org/elasticsearch/cluster/block/ClusterBlockLevel.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/block/ClusterBlockLevel.java rename to server/src/main/java/org/elasticsearch/cluster/block/ClusterBlockLevel.java diff --git a/core/src/main/java/org/elasticsearch/cluster/block/ClusterBlocks.java b/server/src/main/java/org/elasticsearch/cluster/block/ClusterBlocks.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/block/ClusterBlocks.java rename to server/src/main/java/org/elasticsearch/cluster/block/ClusterBlocks.java diff --git a/core/src/main/java/org/elasticsearch/cluster/health/ClusterHealthStatus.java b/server/src/main/java/org/elasticsearch/cluster/health/ClusterHealthStatus.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/health/ClusterHealthStatus.java rename to server/src/main/java/org/elasticsearch/cluster/health/ClusterHealthStatus.java diff --git a/core/src/main/java/org/elasticsearch/cluster/health/ClusterIndexHealth.java b/server/src/main/java/org/elasticsearch/cluster/health/ClusterIndexHealth.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/health/ClusterIndexHealth.java rename to server/src/main/java/org/elasticsearch/cluster/health/ClusterIndexHealth.java diff --git a/core/src/main/java/org/elasticsearch/cluster/health/ClusterShardHealth.java b/server/src/main/java/org/elasticsearch/cluster/health/ClusterShardHealth.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/health/ClusterShardHealth.java rename to server/src/main/java/org/elasticsearch/cluster/health/ClusterShardHealth.java diff --git a/core/src/main/java/org/elasticsearch/cluster/health/ClusterStateHealth.java b/server/src/main/java/org/elasticsearch/cluster/health/ClusterStateHealth.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/health/ClusterStateHealth.java rename to server/src/main/java/org/elasticsearch/cluster/health/ClusterStateHealth.java diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/AliasAction.java b/server/src/main/java/org/elasticsearch/cluster/metadata/AliasAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/metadata/AliasAction.java rename to server/src/main/java/org/elasticsearch/cluster/metadata/AliasAction.java diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/AliasMetaData.java b/server/src/main/java/org/elasticsearch/cluster/metadata/AliasMetaData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/metadata/AliasMetaData.java rename to server/src/main/java/org/elasticsearch/cluster/metadata/AliasMetaData.java diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/AliasOrIndex.java b/server/src/main/java/org/elasticsearch/cluster/metadata/AliasOrIndex.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/metadata/AliasOrIndex.java rename to server/src/main/java/org/elasticsearch/cluster/metadata/AliasOrIndex.java diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/AliasValidator.java b/server/src/main/java/org/elasticsearch/cluster/metadata/AliasValidator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/metadata/AliasValidator.java rename to server/src/main/java/org/elasticsearch/cluster/metadata/AliasValidator.java diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/AutoExpandReplicas.java b/server/src/main/java/org/elasticsearch/cluster/metadata/AutoExpandReplicas.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/metadata/AutoExpandReplicas.java rename to server/src/main/java/org/elasticsearch/cluster/metadata/AutoExpandReplicas.java diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/ClusterNameExpressionResolver.java b/server/src/main/java/org/elasticsearch/cluster/metadata/ClusterNameExpressionResolver.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/metadata/ClusterNameExpressionResolver.java rename to server/src/main/java/org/elasticsearch/cluster/metadata/ClusterNameExpressionResolver.java diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/IndexGraveyard.java b/server/src/main/java/org/elasticsearch/cluster/metadata/IndexGraveyard.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/metadata/IndexGraveyard.java rename to server/src/main/java/org/elasticsearch/cluster/metadata/IndexGraveyard.java diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/IndexMetaData.java b/server/src/main/java/org/elasticsearch/cluster/metadata/IndexMetaData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/metadata/IndexMetaData.java rename to server/src/main/java/org/elasticsearch/cluster/metadata/IndexMetaData.java diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolver.java b/server/src/main/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolver.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolver.java rename to server/src/main/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolver.java diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/IndexTemplateFilter.java b/server/src/main/java/org/elasticsearch/cluster/metadata/IndexTemplateFilter.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/metadata/IndexTemplateFilter.java rename to server/src/main/java/org/elasticsearch/cluster/metadata/IndexTemplateFilter.java diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/IndexTemplateMetaData.java b/server/src/main/java/org/elasticsearch/cluster/metadata/IndexTemplateMetaData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/metadata/IndexTemplateMetaData.java rename to server/src/main/java/org/elasticsearch/cluster/metadata/IndexTemplateMetaData.java diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/MappingMetaData.java b/server/src/main/java/org/elasticsearch/cluster/metadata/MappingMetaData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/metadata/MappingMetaData.java rename to server/src/main/java/org/elasticsearch/cluster/metadata/MappingMetaData.java diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/MetaData.java b/server/src/main/java/org/elasticsearch/cluster/metadata/MetaData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/metadata/MetaData.java rename to server/src/main/java/org/elasticsearch/cluster/metadata/MetaData.java diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java b/server/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java rename to server/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataDeleteIndexService.java b/server/src/main/java/org/elasticsearch/cluster/metadata/MetaDataDeleteIndexService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataDeleteIndexService.java rename to server/src/main/java/org/elasticsearch/cluster/metadata/MetaDataDeleteIndexService.java diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexAliasesService.java b/server/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexAliasesService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexAliasesService.java rename to server/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexAliasesService.java diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexStateService.java b/server/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexStateService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexStateService.java rename to server/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexStateService.java diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexTemplateService.java b/server/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexTemplateService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexTemplateService.java rename to server/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexTemplateService.java diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexUpgradeService.java b/server/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexUpgradeService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexUpgradeService.java rename to server/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexUpgradeService.java diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataMappingService.java b/server/src/main/java/org/elasticsearch/cluster/metadata/MetaDataMappingService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataMappingService.java rename to server/src/main/java/org/elasticsearch/cluster/metadata/MetaDataMappingService.java diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataUpdateSettingsService.java b/server/src/main/java/org/elasticsearch/cluster/metadata/MetaDataUpdateSettingsService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataUpdateSettingsService.java rename to server/src/main/java/org/elasticsearch/cluster/metadata/MetaDataUpdateSettingsService.java diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/ProcessClusterEventTimeoutException.java b/server/src/main/java/org/elasticsearch/cluster/metadata/ProcessClusterEventTimeoutException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/metadata/ProcessClusterEventTimeoutException.java rename to server/src/main/java/org/elasticsearch/cluster/metadata/ProcessClusterEventTimeoutException.java diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/RepositoriesMetaData.java b/server/src/main/java/org/elasticsearch/cluster/metadata/RepositoriesMetaData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/metadata/RepositoriesMetaData.java rename to server/src/main/java/org/elasticsearch/cluster/metadata/RepositoriesMetaData.java diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/RepositoryMetaData.java b/server/src/main/java/org/elasticsearch/cluster/metadata/RepositoryMetaData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/metadata/RepositoryMetaData.java rename to server/src/main/java/org/elasticsearch/cluster/metadata/RepositoryMetaData.java diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/TemplateUpgradeService.java b/server/src/main/java/org/elasticsearch/cluster/metadata/TemplateUpgradeService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/metadata/TemplateUpgradeService.java rename to server/src/main/java/org/elasticsearch/cluster/metadata/TemplateUpgradeService.java diff --git a/core/src/main/java/org/elasticsearch/cluster/node/DiscoveryNode.java b/server/src/main/java/org/elasticsearch/cluster/node/DiscoveryNode.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/node/DiscoveryNode.java rename to server/src/main/java/org/elasticsearch/cluster/node/DiscoveryNode.java diff --git a/core/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodeFilters.java b/server/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodeFilters.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodeFilters.java rename to server/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodeFilters.java diff --git a/core/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodes.java b/server/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodes.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodes.java rename to server/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodes.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/AllocationId.java b/server/src/main/java/org/elasticsearch/cluster/routing/AllocationId.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/AllocationId.java rename to server/src/main/java/org/elasticsearch/cluster/routing/AllocationId.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/DelayedAllocationService.java b/server/src/main/java/org/elasticsearch/cluster/routing/DelayedAllocationService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/DelayedAllocationService.java rename to server/src/main/java/org/elasticsearch/cluster/routing/DelayedAllocationService.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/GroupShardsIterator.java b/server/src/main/java/org/elasticsearch/cluster/routing/GroupShardsIterator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/GroupShardsIterator.java rename to server/src/main/java/org/elasticsearch/cluster/routing/GroupShardsIterator.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/IllegalShardRoutingStateException.java b/server/src/main/java/org/elasticsearch/cluster/routing/IllegalShardRoutingStateException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/IllegalShardRoutingStateException.java rename to server/src/main/java/org/elasticsearch/cluster/routing/IllegalShardRoutingStateException.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/IndexRoutingTable.java b/server/src/main/java/org/elasticsearch/cluster/routing/IndexRoutingTable.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/IndexRoutingTable.java rename to server/src/main/java/org/elasticsearch/cluster/routing/IndexRoutingTable.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/IndexShardRoutingTable.java b/server/src/main/java/org/elasticsearch/cluster/routing/IndexShardRoutingTable.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/IndexShardRoutingTable.java rename to server/src/main/java/org/elasticsearch/cluster/routing/IndexShardRoutingTable.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/Murmur3HashFunction.java b/server/src/main/java/org/elasticsearch/cluster/routing/Murmur3HashFunction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/Murmur3HashFunction.java rename to server/src/main/java/org/elasticsearch/cluster/routing/Murmur3HashFunction.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/OperationRouting.java b/server/src/main/java/org/elasticsearch/cluster/routing/OperationRouting.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/OperationRouting.java rename to server/src/main/java/org/elasticsearch/cluster/routing/OperationRouting.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/PlainShardIterator.java b/server/src/main/java/org/elasticsearch/cluster/routing/PlainShardIterator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/PlainShardIterator.java rename to server/src/main/java/org/elasticsearch/cluster/routing/PlainShardIterator.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/PlainShardsIterator.java b/server/src/main/java/org/elasticsearch/cluster/routing/PlainShardsIterator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/PlainShardsIterator.java rename to server/src/main/java/org/elasticsearch/cluster/routing/PlainShardsIterator.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/Preference.java b/server/src/main/java/org/elasticsearch/cluster/routing/Preference.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/Preference.java rename to server/src/main/java/org/elasticsearch/cluster/routing/Preference.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/RecoverySource.java b/server/src/main/java/org/elasticsearch/cluster/routing/RecoverySource.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/RecoverySource.java rename to server/src/main/java/org/elasticsearch/cluster/routing/RecoverySource.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/RotationShardShuffler.java b/server/src/main/java/org/elasticsearch/cluster/routing/RotationShardShuffler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/RotationShardShuffler.java rename to server/src/main/java/org/elasticsearch/cluster/routing/RotationShardShuffler.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/RoutingChangesObserver.java b/server/src/main/java/org/elasticsearch/cluster/routing/RoutingChangesObserver.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/RoutingChangesObserver.java rename to server/src/main/java/org/elasticsearch/cluster/routing/RoutingChangesObserver.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/RoutingException.java b/server/src/main/java/org/elasticsearch/cluster/routing/RoutingException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/RoutingException.java rename to server/src/main/java/org/elasticsearch/cluster/routing/RoutingException.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/RoutingNode.java b/server/src/main/java/org/elasticsearch/cluster/routing/RoutingNode.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/RoutingNode.java rename to server/src/main/java/org/elasticsearch/cluster/routing/RoutingNode.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/RoutingNodes.java b/server/src/main/java/org/elasticsearch/cluster/routing/RoutingNodes.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/RoutingNodes.java rename to server/src/main/java/org/elasticsearch/cluster/routing/RoutingNodes.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/RoutingService.java b/server/src/main/java/org/elasticsearch/cluster/routing/RoutingService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/RoutingService.java rename to server/src/main/java/org/elasticsearch/cluster/routing/RoutingService.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/RoutingTable.java b/server/src/main/java/org/elasticsearch/cluster/routing/RoutingTable.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/RoutingTable.java rename to server/src/main/java/org/elasticsearch/cluster/routing/RoutingTable.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/ShardIterator.java b/server/src/main/java/org/elasticsearch/cluster/routing/ShardIterator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/ShardIterator.java rename to server/src/main/java/org/elasticsearch/cluster/routing/ShardIterator.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/ShardRouting.java b/server/src/main/java/org/elasticsearch/cluster/routing/ShardRouting.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/ShardRouting.java rename to server/src/main/java/org/elasticsearch/cluster/routing/ShardRouting.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/ShardRoutingState.java b/server/src/main/java/org/elasticsearch/cluster/routing/ShardRoutingState.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/ShardRoutingState.java rename to server/src/main/java/org/elasticsearch/cluster/routing/ShardRoutingState.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/ShardShuffler.java b/server/src/main/java/org/elasticsearch/cluster/routing/ShardShuffler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/ShardShuffler.java rename to server/src/main/java/org/elasticsearch/cluster/routing/ShardShuffler.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/ShardsIterator.java b/server/src/main/java/org/elasticsearch/cluster/routing/ShardsIterator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/ShardsIterator.java rename to server/src/main/java/org/elasticsearch/cluster/routing/ShardsIterator.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/UnassignedInfo.java b/server/src/main/java/org/elasticsearch/cluster/routing/UnassignedInfo.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/UnassignedInfo.java rename to server/src/main/java/org/elasticsearch/cluster/routing/UnassignedInfo.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/AbstractAllocationDecision.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/AbstractAllocationDecision.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/AbstractAllocationDecision.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/AbstractAllocationDecision.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/AllocateUnassignedDecision.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/AllocateUnassignedDecision.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/AllocateUnassignedDecision.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/AllocateUnassignedDecision.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/AllocationDecision.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/AllocationDecision.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/AllocationDecision.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/AllocationDecision.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/AllocationService.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/AllocationService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/AllocationService.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/AllocationService.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdMonitor.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdMonitor.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdMonitor.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdMonitor.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdSettings.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdSettings.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdSettings.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdSettings.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/FailedShard.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/FailedShard.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/FailedShard.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/FailedShard.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/IndexMetaDataUpdater.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/IndexMetaDataUpdater.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/IndexMetaDataUpdater.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/IndexMetaDataUpdater.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/MoveDecision.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/MoveDecision.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/MoveDecision.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/MoveDecision.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/NodeAllocationResult.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/NodeAllocationResult.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/NodeAllocationResult.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/NodeAllocationResult.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/RerouteExplanation.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/RerouteExplanation.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/RerouteExplanation.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/RerouteExplanation.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/RoutingAllocation.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/RoutingAllocation.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/RoutingAllocation.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/RoutingAllocation.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/RoutingExplanations.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/RoutingExplanations.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/RoutingExplanations.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/RoutingExplanations.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/RoutingNodesChangedObserver.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/RoutingNodesChangedObserver.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/RoutingNodesChangedObserver.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/RoutingNodesChangedObserver.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/ShardAllocationDecision.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/ShardAllocationDecision.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/ShardAllocationDecision.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/ShardAllocationDecision.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/StaleShard.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/StaleShard.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/StaleShard.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/StaleShard.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/BalancedShardsAllocator.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/BalancedShardsAllocator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/BalancedShardsAllocator.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/BalancedShardsAllocator.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/ShardsAllocator.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/ShardsAllocator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/ShardsAllocator.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/ShardsAllocator.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AbstractAllocateAllocationCommand.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AbstractAllocateAllocationCommand.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AbstractAllocateAllocationCommand.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AbstractAllocateAllocationCommand.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocateEmptyPrimaryAllocationCommand.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocateEmptyPrimaryAllocationCommand.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocateEmptyPrimaryAllocationCommand.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocateEmptyPrimaryAllocationCommand.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocateReplicaAllocationCommand.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocateReplicaAllocationCommand.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocateReplicaAllocationCommand.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocateReplicaAllocationCommand.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocateStalePrimaryAllocationCommand.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocateStalePrimaryAllocationCommand.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocateStalePrimaryAllocationCommand.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocateStalePrimaryAllocationCommand.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocationCommand.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocationCommand.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocationCommand.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocationCommand.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocationCommands.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocationCommands.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocationCommands.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocationCommands.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/command/BasePrimaryAllocationCommand.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/command/BasePrimaryAllocationCommand.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/command/BasePrimaryAllocationCommand.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/command/BasePrimaryAllocationCommand.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/command/CancelAllocationCommand.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/command/CancelAllocationCommand.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/command/CancelAllocationCommand.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/command/CancelAllocationCommand.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/command/MoveAllocationCommand.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/command/MoveAllocationCommand.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/command/MoveAllocationCommand.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/command/MoveAllocationCommand.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/AllocationDecider.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/AllocationDecider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/AllocationDecider.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/AllocationDecider.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/AllocationDeciders.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/AllocationDeciders.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/AllocationDeciders.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/AllocationDeciders.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/AwarenessAllocationDecider.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/AwarenessAllocationDecider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/AwarenessAllocationDecider.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/AwarenessAllocationDecider.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ClusterRebalanceAllocationDecider.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ClusterRebalanceAllocationDecider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ClusterRebalanceAllocationDecider.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ClusterRebalanceAllocationDecider.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ConcurrentRebalanceAllocationDecider.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ConcurrentRebalanceAllocationDecider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ConcurrentRebalanceAllocationDecider.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ConcurrentRebalanceAllocationDecider.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/Decision.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/Decision.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/Decision.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/Decision.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDecider.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDecider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDecider.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDecider.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/EnableAllocationDecider.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/EnableAllocationDecider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/EnableAllocationDecider.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/EnableAllocationDecider.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/FilterAllocationDecider.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/FilterAllocationDecider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/FilterAllocationDecider.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/FilterAllocationDecider.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/MaxRetryAllocationDecider.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/MaxRetryAllocationDecider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/MaxRetryAllocationDecider.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/MaxRetryAllocationDecider.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/NodeVersionAllocationDecider.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/NodeVersionAllocationDecider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/NodeVersionAllocationDecider.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/NodeVersionAllocationDecider.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/RebalanceOnlyWhenActiveAllocationDecider.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/RebalanceOnlyWhenActiveAllocationDecider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/RebalanceOnlyWhenActiveAllocationDecider.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/RebalanceOnlyWhenActiveAllocationDecider.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ReplicaAfterPrimaryActiveAllocationDecider.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ReplicaAfterPrimaryActiveAllocationDecider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ReplicaAfterPrimaryActiveAllocationDecider.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ReplicaAfterPrimaryActiveAllocationDecider.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ResizeAllocationDecider.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ResizeAllocationDecider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ResizeAllocationDecider.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ResizeAllocationDecider.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/RestoreInProgressAllocationDecider.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/RestoreInProgressAllocationDecider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/RestoreInProgressAllocationDecider.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/RestoreInProgressAllocationDecider.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/SameShardAllocationDecider.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/SameShardAllocationDecider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/SameShardAllocationDecider.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/SameShardAllocationDecider.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ShardsLimitAllocationDecider.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ShardsLimitAllocationDecider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ShardsLimitAllocationDecider.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ShardsLimitAllocationDecider.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/SnapshotInProgressAllocationDecider.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/SnapshotInProgressAllocationDecider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/SnapshotInProgressAllocationDecider.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/SnapshotInProgressAllocationDecider.java diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ThrottlingAllocationDecider.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ThrottlingAllocationDecider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ThrottlingAllocationDecider.java rename to server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/ThrottlingAllocationDecider.java diff --git a/core/src/main/java/org/elasticsearch/cluster/service/ClusterApplier.java b/server/src/main/java/org/elasticsearch/cluster/service/ClusterApplier.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/service/ClusterApplier.java rename to server/src/main/java/org/elasticsearch/cluster/service/ClusterApplier.java diff --git a/core/src/main/java/org/elasticsearch/cluster/service/ClusterApplierService.java b/server/src/main/java/org/elasticsearch/cluster/service/ClusterApplierService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/service/ClusterApplierService.java rename to server/src/main/java/org/elasticsearch/cluster/service/ClusterApplierService.java diff --git a/core/src/main/java/org/elasticsearch/cluster/service/ClusterService.java b/server/src/main/java/org/elasticsearch/cluster/service/ClusterService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/service/ClusterService.java rename to server/src/main/java/org/elasticsearch/cluster/service/ClusterService.java diff --git a/core/src/main/java/org/elasticsearch/cluster/service/MasterService.java b/server/src/main/java/org/elasticsearch/cluster/service/MasterService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/service/MasterService.java rename to server/src/main/java/org/elasticsearch/cluster/service/MasterService.java diff --git a/core/src/main/java/org/elasticsearch/cluster/service/PendingClusterTask.java b/server/src/main/java/org/elasticsearch/cluster/service/PendingClusterTask.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/service/PendingClusterTask.java rename to server/src/main/java/org/elasticsearch/cluster/service/PendingClusterTask.java diff --git a/core/src/main/java/org/elasticsearch/cluster/service/SourcePrioritizedRunnable.java b/server/src/main/java/org/elasticsearch/cluster/service/SourcePrioritizedRunnable.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/service/SourcePrioritizedRunnable.java rename to server/src/main/java/org/elasticsearch/cluster/service/SourcePrioritizedRunnable.java diff --git a/core/src/main/java/org/elasticsearch/cluster/service/TaskBatcher.java b/server/src/main/java/org/elasticsearch/cluster/service/TaskBatcher.java similarity index 100% rename from core/src/main/java/org/elasticsearch/cluster/service/TaskBatcher.java rename to server/src/main/java/org/elasticsearch/cluster/service/TaskBatcher.java diff --git a/core/src/main/java/org/elasticsearch/common/Booleans.java b/server/src/main/java/org/elasticsearch/common/Booleans.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/Booleans.java rename to server/src/main/java/org/elasticsearch/common/Booleans.java diff --git a/core/src/main/java/org/elasticsearch/common/CheckedBiConsumer.java b/server/src/main/java/org/elasticsearch/common/CheckedBiConsumer.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/CheckedBiConsumer.java rename to server/src/main/java/org/elasticsearch/common/CheckedBiConsumer.java diff --git a/core/src/main/java/org/elasticsearch/common/CheckedConsumer.java b/server/src/main/java/org/elasticsearch/common/CheckedConsumer.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/CheckedConsumer.java rename to server/src/main/java/org/elasticsearch/common/CheckedConsumer.java diff --git a/core/src/main/java/org/elasticsearch/common/CheckedFunction.java b/server/src/main/java/org/elasticsearch/common/CheckedFunction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/CheckedFunction.java rename to server/src/main/java/org/elasticsearch/common/CheckedFunction.java diff --git a/core/src/main/java/org/elasticsearch/common/CheckedRunnable.java b/server/src/main/java/org/elasticsearch/common/CheckedRunnable.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/CheckedRunnable.java rename to server/src/main/java/org/elasticsearch/common/CheckedRunnable.java diff --git a/core/src/main/java/org/elasticsearch/common/CheckedSupplier.java b/server/src/main/java/org/elasticsearch/common/CheckedSupplier.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/CheckedSupplier.java rename to server/src/main/java/org/elasticsearch/common/CheckedSupplier.java diff --git a/core/src/main/java/org/elasticsearch/common/Classes.java b/server/src/main/java/org/elasticsearch/common/Classes.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/Classes.java rename to server/src/main/java/org/elasticsearch/common/Classes.java diff --git a/core/src/main/java/org/elasticsearch/common/Explicit.java b/server/src/main/java/org/elasticsearch/common/Explicit.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/Explicit.java rename to server/src/main/java/org/elasticsearch/common/Explicit.java diff --git a/core/src/main/java/org/elasticsearch/common/ExponentiallyWeightedMovingAverage.java b/server/src/main/java/org/elasticsearch/common/ExponentiallyWeightedMovingAverage.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/ExponentiallyWeightedMovingAverage.java rename to server/src/main/java/org/elasticsearch/common/ExponentiallyWeightedMovingAverage.java diff --git a/core/src/main/java/org/elasticsearch/common/FieldMemoryStats.java b/server/src/main/java/org/elasticsearch/common/FieldMemoryStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/FieldMemoryStats.java rename to server/src/main/java/org/elasticsearch/common/FieldMemoryStats.java diff --git a/core/src/main/java/org/elasticsearch/common/LegacyTimeBasedUUIDGenerator.java b/server/src/main/java/org/elasticsearch/common/LegacyTimeBasedUUIDGenerator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/LegacyTimeBasedUUIDGenerator.java rename to server/src/main/java/org/elasticsearch/common/LegacyTimeBasedUUIDGenerator.java diff --git a/core/src/main/java/org/elasticsearch/common/MacAddressProvider.java b/server/src/main/java/org/elasticsearch/common/MacAddressProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/MacAddressProvider.java rename to server/src/main/java/org/elasticsearch/common/MacAddressProvider.java diff --git a/core/src/main/java/org/elasticsearch/common/NamedRegistry.java b/server/src/main/java/org/elasticsearch/common/NamedRegistry.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/NamedRegistry.java rename to server/src/main/java/org/elasticsearch/common/NamedRegistry.java diff --git a/core/src/main/java/org/elasticsearch/common/Nullable.java b/server/src/main/java/org/elasticsearch/common/Nullable.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/Nullable.java rename to server/src/main/java/org/elasticsearch/common/Nullable.java diff --git a/core/src/main/java/org/elasticsearch/common/Numbers.java b/server/src/main/java/org/elasticsearch/common/Numbers.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/Numbers.java rename to server/src/main/java/org/elasticsearch/common/Numbers.java diff --git a/core/src/main/java/org/elasticsearch/common/ParseField.java b/server/src/main/java/org/elasticsearch/common/ParseField.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/ParseField.java rename to server/src/main/java/org/elasticsearch/common/ParseField.java diff --git a/core/src/main/java/org/elasticsearch/common/ParsingException.java b/server/src/main/java/org/elasticsearch/common/ParsingException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/ParsingException.java rename to server/src/main/java/org/elasticsearch/common/ParsingException.java diff --git a/core/src/main/java/org/elasticsearch/common/PidFile.java b/server/src/main/java/org/elasticsearch/common/PidFile.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/PidFile.java rename to server/src/main/java/org/elasticsearch/common/PidFile.java diff --git a/core/src/main/java/org/elasticsearch/common/Priority.java b/server/src/main/java/org/elasticsearch/common/Priority.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/Priority.java rename to server/src/main/java/org/elasticsearch/common/Priority.java diff --git a/core/src/main/java/org/elasticsearch/common/RandomBasedUUIDGenerator.java b/server/src/main/java/org/elasticsearch/common/RandomBasedUUIDGenerator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/RandomBasedUUIDGenerator.java rename to server/src/main/java/org/elasticsearch/common/RandomBasedUUIDGenerator.java diff --git a/core/src/main/java/org/elasticsearch/common/Randomness.java b/server/src/main/java/org/elasticsearch/common/Randomness.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/Randomness.java rename to server/src/main/java/org/elasticsearch/common/Randomness.java diff --git a/core/src/main/java/org/elasticsearch/common/SecureRandomHolder.java b/server/src/main/java/org/elasticsearch/common/SecureRandomHolder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/SecureRandomHolder.java rename to server/src/main/java/org/elasticsearch/common/SecureRandomHolder.java diff --git a/core/src/main/java/org/elasticsearch/common/StopWatch.java b/server/src/main/java/org/elasticsearch/common/StopWatch.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/StopWatch.java rename to server/src/main/java/org/elasticsearch/common/StopWatch.java diff --git a/core/src/main/java/org/elasticsearch/common/Strings.java b/server/src/main/java/org/elasticsearch/common/Strings.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/Strings.java rename to server/src/main/java/org/elasticsearch/common/Strings.java diff --git a/core/src/main/java/org/elasticsearch/common/SuppressForbidden.java b/server/src/main/java/org/elasticsearch/common/SuppressForbidden.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/SuppressForbidden.java rename to server/src/main/java/org/elasticsearch/common/SuppressForbidden.java diff --git a/core/src/main/java/org/elasticsearch/common/SuppressLoggerChecks.java b/server/src/main/java/org/elasticsearch/common/SuppressLoggerChecks.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/SuppressLoggerChecks.java rename to server/src/main/java/org/elasticsearch/common/SuppressLoggerChecks.java diff --git a/core/src/main/java/org/elasticsearch/common/Table.java b/server/src/main/java/org/elasticsearch/common/Table.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/Table.java rename to server/src/main/java/org/elasticsearch/common/Table.java diff --git a/core/src/main/java/org/elasticsearch/common/TimeBasedUUIDGenerator.java b/server/src/main/java/org/elasticsearch/common/TimeBasedUUIDGenerator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/TimeBasedUUIDGenerator.java rename to server/src/main/java/org/elasticsearch/common/TimeBasedUUIDGenerator.java diff --git a/core/src/main/java/org/elasticsearch/common/TriFunction.java b/server/src/main/java/org/elasticsearch/common/TriFunction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/TriFunction.java rename to server/src/main/java/org/elasticsearch/common/TriFunction.java diff --git a/core/src/main/java/org/elasticsearch/common/UUIDGenerator.java b/server/src/main/java/org/elasticsearch/common/UUIDGenerator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/UUIDGenerator.java rename to server/src/main/java/org/elasticsearch/common/UUIDGenerator.java diff --git a/core/src/main/java/org/elasticsearch/common/UUIDs.java b/server/src/main/java/org/elasticsearch/common/UUIDs.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/UUIDs.java rename to server/src/main/java/org/elasticsearch/common/UUIDs.java diff --git a/core/src/main/java/org/elasticsearch/common/ValidationException.java b/server/src/main/java/org/elasticsearch/common/ValidationException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/ValidationException.java rename to server/src/main/java/org/elasticsearch/common/ValidationException.java diff --git a/core/src/main/java/org/elasticsearch/common/blobstore/BlobContainer.java b/server/src/main/java/org/elasticsearch/common/blobstore/BlobContainer.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/blobstore/BlobContainer.java rename to server/src/main/java/org/elasticsearch/common/blobstore/BlobContainer.java diff --git a/core/src/main/java/org/elasticsearch/common/blobstore/BlobMetaData.java b/server/src/main/java/org/elasticsearch/common/blobstore/BlobMetaData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/blobstore/BlobMetaData.java rename to server/src/main/java/org/elasticsearch/common/blobstore/BlobMetaData.java diff --git a/core/src/main/java/org/elasticsearch/common/blobstore/BlobPath.java b/server/src/main/java/org/elasticsearch/common/blobstore/BlobPath.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/blobstore/BlobPath.java rename to server/src/main/java/org/elasticsearch/common/blobstore/BlobPath.java diff --git a/core/src/main/java/org/elasticsearch/common/blobstore/BlobStore.java b/server/src/main/java/org/elasticsearch/common/blobstore/BlobStore.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/blobstore/BlobStore.java rename to server/src/main/java/org/elasticsearch/common/blobstore/BlobStore.java diff --git a/core/src/main/java/org/elasticsearch/common/blobstore/BlobStoreException.java b/server/src/main/java/org/elasticsearch/common/blobstore/BlobStoreException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/blobstore/BlobStoreException.java rename to server/src/main/java/org/elasticsearch/common/blobstore/BlobStoreException.java diff --git a/core/src/main/java/org/elasticsearch/common/blobstore/fs/FsBlobContainer.java b/server/src/main/java/org/elasticsearch/common/blobstore/fs/FsBlobContainer.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/blobstore/fs/FsBlobContainer.java rename to server/src/main/java/org/elasticsearch/common/blobstore/fs/FsBlobContainer.java diff --git a/core/src/main/java/org/elasticsearch/common/blobstore/fs/FsBlobStore.java b/server/src/main/java/org/elasticsearch/common/blobstore/fs/FsBlobStore.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/blobstore/fs/FsBlobStore.java rename to server/src/main/java/org/elasticsearch/common/blobstore/fs/FsBlobStore.java diff --git a/core/src/main/java/org/elasticsearch/common/blobstore/support/AbstractBlobContainer.java b/server/src/main/java/org/elasticsearch/common/blobstore/support/AbstractBlobContainer.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/blobstore/support/AbstractBlobContainer.java rename to server/src/main/java/org/elasticsearch/common/blobstore/support/AbstractBlobContainer.java diff --git a/core/src/main/java/org/elasticsearch/common/blobstore/support/PlainBlobMetaData.java b/server/src/main/java/org/elasticsearch/common/blobstore/support/PlainBlobMetaData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/blobstore/support/PlainBlobMetaData.java rename to server/src/main/java/org/elasticsearch/common/blobstore/support/PlainBlobMetaData.java diff --git a/core/src/main/java/org/elasticsearch/common/breaker/ChildMemoryCircuitBreaker.java b/server/src/main/java/org/elasticsearch/common/breaker/ChildMemoryCircuitBreaker.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/breaker/ChildMemoryCircuitBreaker.java rename to server/src/main/java/org/elasticsearch/common/breaker/ChildMemoryCircuitBreaker.java diff --git a/core/src/main/java/org/elasticsearch/common/breaker/CircuitBreaker.java b/server/src/main/java/org/elasticsearch/common/breaker/CircuitBreaker.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/breaker/CircuitBreaker.java rename to server/src/main/java/org/elasticsearch/common/breaker/CircuitBreaker.java diff --git a/core/src/main/java/org/elasticsearch/common/breaker/CircuitBreakingException.java b/server/src/main/java/org/elasticsearch/common/breaker/CircuitBreakingException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/breaker/CircuitBreakingException.java rename to server/src/main/java/org/elasticsearch/common/breaker/CircuitBreakingException.java diff --git a/core/src/main/java/org/elasticsearch/common/breaker/MemoryCircuitBreaker.java b/server/src/main/java/org/elasticsearch/common/breaker/MemoryCircuitBreaker.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/breaker/MemoryCircuitBreaker.java rename to server/src/main/java/org/elasticsearch/common/breaker/MemoryCircuitBreaker.java diff --git a/core/src/main/java/org/elasticsearch/common/breaker/NoopCircuitBreaker.java b/server/src/main/java/org/elasticsearch/common/breaker/NoopCircuitBreaker.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/breaker/NoopCircuitBreaker.java rename to server/src/main/java/org/elasticsearch/common/breaker/NoopCircuitBreaker.java diff --git a/core/src/main/java/org/elasticsearch/common/bytes/ByteBufferReference.java b/server/src/main/java/org/elasticsearch/common/bytes/ByteBufferReference.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/bytes/ByteBufferReference.java rename to server/src/main/java/org/elasticsearch/common/bytes/ByteBufferReference.java diff --git a/core/src/main/java/org/elasticsearch/common/bytes/BytesArray.java b/server/src/main/java/org/elasticsearch/common/bytes/BytesArray.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/bytes/BytesArray.java rename to server/src/main/java/org/elasticsearch/common/bytes/BytesArray.java diff --git a/core/src/main/java/org/elasticsearch/common/bytes/BytesReference.java b/server/src/main/java/org/elasticsearch/common/bytes/BytesReference.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/bytes/BytesReference.java rename to server/src/main/java/org/elasticsearch/common/bytes/BytesReference.java diff --git a/core/src/main/java/org/elasticsearch/common/bytes/BytesReferenceStreamInput.java b/server/src/main/java/org/elasticsearch/common/bytes/BytesReferenceStreamInput.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/bytes/BytesReferenceStreamInput.java rename to server/src/main/java/org/elasticsearch/common/bytes/BytesReferenceStreamInput.java diff --git a/core/src/main/java/org/elasticsearch/common/bytes/CompositeBytesReference.java b/server/src/main/java/org/elasticsearch/common/bytes/CompositeBytesReference.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/bytes/CompositeBytesReference.java rename to server/src/main/java/org/elasticsearch/common/bytes/CompositeBytesReference.java diff --git a/core/src/main/java/org/elasticsearch/common/bytes/PagedBytesReference.java b/server/src/main/java/org/elasticsearch/common/bytes/PagedBytesReference.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/bytes/PagedBytesReference.java rename to server/src/main/java/org/elasticsearch/common/bytes/PagedBytesReference.java diff --git a/core/src/main/java/org/elasticsearch/common/bytes/ReleasablePagedBytesReference.java b/server/src/main/java/org/elasticsearch/common/bytes/ReleasablePagedBytesReference.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/bytes/ReleasablePagedBytesReference.java rename to server/src/main/java/org/elasticsearch/common/bytes/ReleasablePagedBytesReference.java diff --git a/core/src/main/java/org/elasticsearch/common/cache/Cache.java b/server/src/main/java/org/elasticsearch/common/cache/Cache.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/cache/Cache.java rename to server/src/main/java/org/elasticsearch/common/cache/Cache.java diff --git a/core/src/main/java/org/elasticsearch/common/cache/CacheBuilder.java b/server/src/main/java/org/elasticsearch/common/cache/CacheBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/cache/CacheBuilder.java rename to server/src/main/java/org/elasticsearch/common/cache/CacheBuilder.java diff --git a/core/src/main/java/org/elasticsearch/common/cache/CacheLoader.java b/server/src/main/java/org/elasticsearch/common/cache/CacheLoader.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/cache/CacheLoader.java rename to server/src/main/java/org/elasticsearch/common/cache/CacheLoader.java diff --git a/core/src/main/java/org/elasticsearch/common/cache/RemovalListener.java b/server/src/main/java/org/elasticsearch/common/cache/RemovalListener.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/cache/RemovalListener.java rename to server/src/main/java/org/elasticsearch/common/cache/RemovalListener.java diff --git a/core/src/main/java/org/elasticsearch/common/cache/RemovalNotification.java b/server/src/main/java/org/elasticsearch/common/cache/RemovalNotification.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/cache/RemovalNotification.java rename to server/src/main/java/org/elasticsearch/common/cache/RemovalNotification.java diff --git a/core/src/main/java/org/elasticsearch/common/collect/CopyOnWriteHashMap.java b/server/src/main/java/org/elasticsearch/common/collect/CopyOnWriteHashMap.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/collect/CopyOnWriteHashMap.java rename to server/src/main/java/org/elasticsearch/common/collect/CopyOnWriteHashMap.java diff --git a/core/src/main/java/org/elasticsearch/common/collect/EvictingQueue.java b/server/src/main/java/org/elasticsearch/common/collect/EvictingQueue.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/collect/EvictingQueue.java rename to server/src/main/java/org/elasticsearch/common/collect/EvictingQueue.java diff --git a/core/src/main/java/org/elasticsearch/common/collect/HppcMaps.java b/server/src/main/java/org/elasticsearch/common/collect/HppcMaps.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/collect/HppcMaps.java rename to server/src/main/java/org/elasticsearch/common/collect/HppcMaps.java diff --git a/core/src/main/java/org/elasticsearch/common/collect/ImmutableOpenIntMap.java b/server/src/main/java/org/elasticsearch/common/collect/ImmutableOpenIntMap.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/collect/ImmutableOpenIntMap.java rename to server/src/main/java/org/elasticsearch/common/collect/ImmutableOpenIntMap.java diff --git a/core/src/main/java/org/elasticsearch/common/collect/ImmutableOpenMap.java b/server/src/main/java/org/elasticsearch/common/collect/ImmutableOpenMap.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/collect/ImmutableOpenMap.java rename to server/src/main/java/org/elasticsearch/common/collect/ImmutableOpenMap.java diff --git a/core/src/main/java/org/elasticsearch/common/collect/Iterators.java b/server/src/main/java/org/elasticsearch/common/collect/Iterators.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/collect/Iterators.java rename to server/src/main/java/org/elasticsearch/common/collect/Iterators.java diff --git a/core/src/main/java/org/elasticsearch/common/collect/MapBuilder.java b/server/src/main/java/org/elasticsearch/common/collect/MapBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/collect/MapBuilder.java rename to server/src/main/java/org/elasticsearch/common/collect/MapBuilder.java diff --git a/core/src/main/java/org/elasticsearch/common/collect/Tuple.java b/server/src/main/java/org/elasticsearch/common/collect/Tuple.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/collect/Tuple.java rename to server/src/main/java/org/elasticsearch/common/collect/Tuple.java diff --git a/core/src/main/java/org/elasticsearch/common/component/AbstractComponent.java b/server/src/main/java/org/elasticsearch/common/component/AbstractComponent.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/component/AbstractComponent.java rename to server/src/main/java/org/elasticsearch/common/component/AbstractComponent.java diff --git a/core/src/main/java/org/elasticsearch/common/component/AbstractLifecycleComponent.java b/server/src/main/java/org/elasticsearch/common/component/AbstractLifecycleComponent.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/component/AbstractLifecycleComponent.java rename to server/src/main/java/org/elasticsearch/common/component/AbstractLifecycleComponent.java diff --git a/core/src/main/java/org/elasticsearch/common/component/Lifecycle.java b/server/src/main/java/org/elasticsearch/common/component/Lifecycle.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/component/Lifecycle.java rename to server/src/main/java/org/elasticsearch/common/component/Lifecycle.java diff --git a/core/src/main/java/org/elasticsearch/common/component/LifecycleComponent.java b/server/src/main/java/org/elasticsearch/common/component/LifecycleComponent.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/component/LifecycleComponent.java rename to server/src/main/java/org/elasticsearch/common/component/LifecycleComponent.java diff --git a/core/src/main/java/org/elasticsearch/common/component/LifecycleListener.java b/server/src/main/java/org/elasticsearch/common/component/LifecycleListener.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/component/LifecycleListener.java rename to server/src/main/java/org/elasticsearch/common/component/LifecycleListener.java diff --git a/core/src/main/java/org/elasticsearch/common/compress/CompressedXContent.java b/server/src/main/java/org/elasticsearch/common/compress/CompressedXContent.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/compress/CompressedXContent.java rename to server/src/main/java/org/elasticsearch/common/compress/CompressedXContent.java diff --git a/core/src/main/java/org/elasticsearch/common/compress/Compressor.java b/server/src/main/java/org/elasticsearch/common/compress/Compressor.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/compress/Compressor.java rename to server/src/main/java/org/elasticsearch/common/compress/Compressor.java diff --git a/core/src/main/java/org/elasticsearch/common/compress/CompressorFactory.java b/server/src/main/java/org/elasticsearch/common/compress/CompressorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/compress/CompressorFactory.java rename to server/src/main/java/org/elasticsearch/common/compress/CompressorFactory.java diff --git a/core/src/main/java/org/elasticsearch/common/compress/DeflateCompressor.java b/server/src/main/java/org/elasticsearch/common/compress/DeflateCompressor.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/compress/DeflateCompressor.java rename to server/src/main/java/org/elasticsearch/common/compress/DeflateCompressor.java diff --git a/core/src/main/java/org/elasticsearch/common/compress/NotCompressedException.java b/server/src/main/java/org/elasticsearch/common/compress/NotCompressedException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/compress/NotCompressedException.java rename to server/src/main/java/org/elasticsearch/common/compress/NotCompressedException.java diff --git a/core/src/main/java/org/elasticsearch/common/compress/NotXContentException.java b/server/src/main/java/org/elasticsearch/common/compress/NotXContentException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/compress/NotXContentException.java rename to server/src/main/java/org/elasticsearch/common/compress/NotXContentException.java diff --git a/core/src/main/java/org/elasticsearch/common/document/DocumentField.java b/server/src/main/java/org/elasticsearch/common/document/DocumentField.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/document/DocumentField.java rename to server/src/main/java/org/elasticsearch/common/document/DocumentField.java diff --git a/core/src/main/java/org/elasticsearch/common/geo/GeoDistance.java b/server/src/main/java/org/elasticsearch/common/geo/GeoDistance.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/geo/GeoDistance.java rename to server/src/main/java/org/elasticsearch/common/geo/GeoDistance.java diff --git a/core/src/main/java/org/elasticsearch/common/geo/GeoHashUtils.java b/server/src/main/java/org/elasticsearch/common/geo/GeoHashUtils.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/geo/GeoHashUtils.java rename to server/src/main/java/org/elasticsearch/common/geo/GeoHashUtils.java diff --git a/core/src/main/java/org/elasticsearch/common/geo/GeoPoint.java b/server/src/main/java/org/elasticsearch/common/geo/GeoPoint.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/geo/GeoPoint.java rename to server/src/main/java/org/elasticsearch/common/geo/GeoPoint.java diff --git a/core/src/main/java/org/elasticsearch/common/geo/GeoShapeType.java b/server/src/main/java/org/elasticsearch/common/geo/GeoShapeType.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/geo/GeoShapeType.java rename to server/src/main/java/org/elasticsearch/common/geo/GeoShapeType.java diff --git a/core/src/main/java/org/elasticsearch/common/geo/GeoUtils.java b/server/src/main/java/org/elasticsearch/common/geo/GeoUtils.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/geo/GeoUtils.java rename to server/src/main/java/org/elasticsearch/common/geo/GeoUtils.java diff --git a/core/src/main/java/org/elasticsearch/common/geo/ShapeRelation.java b/server/src/main/java/org/elasticsearch/common/geo/ShapeRelation.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/geo/ShapeRelation.java rename to server/src/main/java/org/elasticsearch/common/geo/ShapeRelation.java diff --git a/core/src/main/java/org/elasticsearch/common/geo/ShapesAvailability.java b/server/src/main/java/org/elasticsearch/common/geo/ShapesAvailability.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/geo/ShapesAvailability.java rename to server/src/main/java/org/elasticsearch/common/geo/ShapesAvailability.java diff --git a/core/src/main/java/org/elasticsearch/common/geo/SpatialStrategy.java b/server/src/main/java/org/elasticsearch/common/geo/SpatialStrategy.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/geo/SpatialStrategy.java rename to server/src/main/java/org/elasticsearch/common/geo/SpatialStrategy.java diff --git a/core/src/main/java/org/elasticsearch/common/geo/XShapeCollection.java b/server/src/main/java/org/elasticsearch/common/geo/XShapeCollection.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/geo/XShapeCollection.java rename to server/src/main/java/org/elasticsearch/common/geo/XShapeCollection.java diff --git a/core/src/main/java/org/elasticsearch/common/geo/builders/CircleBuilder.java b/server/src/main/java/org/elasticsearch/common/geo/builders/CircleBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/geo/builders/CircleBuilder.java rename to server/src/main/java/org/elasticsearch/common/geo/builders/CircleBuilder.java diff --git a/core/src/main/java/org/elasticsearch/common/geo/builders/CoordinatesBuilder.java b/server/src/main/java/org/elasticsearch/common/geo/builders/CoordinatesBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/geo/builders/CoordinatesBuilder.java rename to server/src/main/java/org/elasticsearch/common/geo/builders/CoordinatesBuilder.java diff --git a/core/src/main/java/org/elasticsearch/common/geo/builders/EnvelopeBuilder.java b/server/src/main/java/org/elasticsearch/common/geo/builders/EnvelopeBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/geo/builders/EnvelopeBuilder.java rename to server/src/main/java/org/elasticsearch/common/geo/builders/EnvelopeBuilder.java diff --git a/core/src/main/java/org/elasticsearch/common/geo/builders/GeometryCollectionBuilder.java b/server/src/main/java/org/elasticsearch/common/geo/builders/GeometryCollectionBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/geo/builders/GeometryCollectionBuilder.java rename to server/src/main/java/org/elasticsearch/common/geo/builders/GeometryCollectionBuilder.java diff --git a/core/src/main/java/org/elasticsearch/common/geo/builders/LineStringBuilder.java b/server/src/main/java/org/elasticsearch/common/geo/builders/LineStringBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/geo/builders/LineStringBuilder.java rename to server/src/main/java/org/elasticsearch/common/geo/builders/LineStringBuilder.java diff --git a/core/src/main/java/org/elasticsearch/common/geo/builders/MultiLineStringBuilder.java b/server/src/main/java/org/elasticsearch/common/geo/builders/MultiLineStringBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/geo/builders/MultiLineStringBuilder.java rename to server/src/main/java/org/elasticsearch/common/geo/builders/MultiLineStringBuilder.java diff --git a/core/src/main/java/org/elasticsearch/common/geo/builders/MultiPointBuilder.java b/server/src/main/java/org/elasticsearch/common/geo/builders/MultiPointBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/geo/builders/MultiPointBuilder.java rename to server/src/main/java/org/elasticsearch/common/geo/builders/MultiPointBuilder.java diff --git a/core/src/main/java/org/elasticsearch/common/geo/builders/MultiPolygonBuilder.java b/server/src/main/java/org/elasticsearch/common/geo/builders/MultiPolygonBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/geo/builders/MultiPolygonBuilder.java rename to server/src/main/java/org/elasticsearch/common/geo/builders/MultiPolygonBuilder.java diff --git a/core/src/main/java/org/elasticsearch/common/geo/builders/PointBuilder.java b/server/src/main/java/org/elasticsearch/common/geo/builders/PointBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/geo/builders/PointBuilder.java rename to server/src/main/java/org/elasticsearch/common/geo/builders/PointBuilder.java diff --git a/core/src/main/java/org/elasticsearch/common/geo/builders/PolygonBuilder.java b/server/src/main/java/org/elasticsearch/common/geo/builders/PolygonBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/geo/builders/PolygonBuilder.java rename to server/src/main/java/org/elasticsearch/common/geo/builders/PolygonBuilder.java diff --git a/core/src/main/java/org/elasticsearch/common/geo/builders/ShapeBuilder.java b/server/src/main/java/org/elasticsearch/common/geo/builders/ShapeBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/geo/builders/ShapeBuilder.java rename to server/src/main/java/org/elasticsearch/common/geo/builders/ShapeBuilder.java diff --git a/core/src/main/java/org/elasticsearch/common/geo/parsers/CoordinateNode.java b/server/src/main/java/org/elasticsearch/common/geo/parsers/CoordinateNode.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/geo/parsers/CoordinateNode.java rename to server/src/main/java/org/elasticsearch/common/geo/parsers/CoordinateNode.java diff --git a/core/src/main/java/org/elasticsearch/common/geo/parsers/GeoJsonParser.java b/server/src/main/java/org/elasticsearch/common/geo/parsers/GeoJsonParser.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/geo/parsers/GeoJsonParser.java rename to server/src/main/java/org/elasticsearch/common/geo/parsers/GeoJsonParser.java diff --git a/core/src/main/java/org/elasticsearch/common/geo/parsers/GeoWKTParser.java b/server/src/main/java/org/elasticsearch/common/geo/parsers/GeoWKTParser.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/geo/parsers/GeoWKTParser.java rename to server/src/main/java/org/elasticsearch/common/geo/parsers/GeoWKTParser.java diff --git a/core/src/main/java/org/elasticsearch/common/geo/parsers/ShapeParser.java b/server/src/main/java/org/elasticsearch/common/geo/parsers/ShapeParser.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/geo/parsers/ShapeParser.java rename to server/src/main/java/org/elasticsearch/common/geo/parsers/ShapeParser.java diff --git a/core/src/main/java/org/elasticsearch/common/hash/MessageDigests.java b/server/src/main/java/org/elasticsearch/common/hash/MessageDigests.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/hash/MessageDigests.java rename to server/src/main/java/org/elasticsearch/common/hash/MessageDigests.java diff --git a/core/src/main/java/org/elasticsearch/common/hash/MurmurHash3.java b/server/src/main/java/org/elasticsearch/common/hash/MurmurHash3.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/hash/MurmurHash3.java rename to server/src/main/java/org/elasticsearch/common/hash/MurmurHash3.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/AbstractModule.java b/server/src/main/java/org/elasticsearch/common/inject/AbstractModule.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/AbstractModule.java rename to server/src/main/java/org/elasticsearch/common/inject/AbstractModule.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/AbstractProcessor.java b/server/src/main/java/org/elasticsearch/common/inject/AbstractProcessor.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/AbstractProcessor.java rename to server/src/main/java/org/elasticsearch/common/inject/AbstractProcessor.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/Binder.java b/server/src/main/java/org/elasticsearch/common/inject/Binder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/Binder.java rename to server/src/main/java/org/elasticsearch/common/inject/Binder.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/Binding.java b/server/src/main/java/org/elasticsearch/common/inject/Binding.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/Binding.java rename to server/src/main/java/org/elasticsearch/common/inject/Binding.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/BindingAnnotation.java b/server/src/main/java/org/elasticsearch/common/inject/BindingAnnotation.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/BindingAnnotation.java rename to server/src/main/java/org/elasticsearch/common/inject/BindingAnnotation.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/BindingProcessor.java b/server/src/main/java/org/elasticsearch/common/inject/BindingProcessor.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/BindingProcessor.java rename to server/src/main/java/org/elasticsearch/common/inject/BindingProcessor.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/BoundProviderFactory.java b/server/src/main/java/org/elasticsearch/common/inject/BoundProviderFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/BoundProviderFactory.java rename to server/src/main/java/org/elasticsearch/common/inject/BoundProviderFactory.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/ConfigurationException.java b/server/src/main/java/org/elasticsearch/common/inject/ConfigurationException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/ConfigurationException.java rename to server/src/main/java/org/elasticsearch/common/inject/ConfigurationException.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/ConstantFactory.java b/server/src/main/java/org/elasticsearch/common/inject/ConstantFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/ConstantFactory.java rename to server/src/main/java/org/elasticsearch/common/inject/ConstantFactory.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/ConstructionProxy.java b/server/src/main/java/org/elasticsearch/common/inject/ConstructionProxy.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/ConstructionProxy.java rename to server/src/main/java/org/elasticsearch/common/inject/ConstructionProxy.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/ConstructionProxyFactory.java b/server/src/main/java/org/elasticsearch/common/inject/ConstructionProxyFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/ConstructionProxyFactory.java rename to server/src/main/java/org/elasticsearch/common/inject/ConstructionProxyFactory.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/ConstructorBindingImpl.java b/server/src/main/java/org/elasticsearch/common/inject/ConstructorBindingImpl.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/ConstructorBindingImpl.java rename to server/src/main/java/org/elasticsearch/common/inject/ConstructorBindingImpl.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/ConstructorInjector.java b/server/src/main/java/org/elasticsearch/common/inject/ConstructorInjector.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/ConstructorInjector.java rename to server/src/main/java/org/elasticsearch/common/inject/ConstructorInjector.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/ConstructorInjectorStore.java b/server/src/main/java/org/elasticsearch/common/inject/ConstructorInjectorStore.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/ConstructorInjectorStore.java rename to server/src/main/java/org/elasticsearch/common/inject/ConstructorInjectorStore.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/ContextualCallable.java b/server/src/main/java/org/elasticsearch/common/inject/ContextualCallable.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/ContextualCallable.java rename to server/src/main/java/org/elasticsearch/common/inject/ContextualCallable.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/CreationException.java b/server/src/main/java/org/elasticsearch/common/inject/CreationException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/CreationException.java rename to server/src/main/java/org/elasticsearch/common/inject/CreationException.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/DefaultConstructionProxyFactory.java b/server/src/main/java/org/elasticsearch/common/inject/DefaultConstructionProxyFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/DefaultConstructionProxyFactory.java rename to server/src/main/java/org/elasticsearch/common/inject/DefaultConstructionProxyFactory.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/DeferredLookups.java b/server/src/main/java/org/elasticsearch/common/inject/DeferredLookups.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/DeferredLookups.java rename to server/src/main/java/org/elasticsearch/common/inject/DeferredLookups.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/EncounterImpl.java b/server/src/main/java/org/elasticsearch/common/inject/EncounterImpl.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/EncounterImpl.java rename to server/src/main/java/org/elasticsearch/common/inject/EncounterImpl.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/Exposed.java b/server/src/main/java/org/elasticsearch/common/inject/Exposed.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/Exposed.java rename to server/src/main/java/org/elasticsearch/common/inject/Exposed.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/ExposedKeyFactory.java b/server/src/main/java/org/elasticsearch/common/inject/ExposedKeyFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/ExposedKeyFactory.java rename to server/src/main/java/org/elasticsearch/common/inject/ExposedKeyFactory.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/FactoryProxy.java b/server/src/main/java/org/elasticsearch/common/inject/FactoryProxy.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/FactoryProxy.java rename to server/src/main/java/org/elasticsearch/common/inject/FactoryProxy.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/Guice.java b/server/src/main/java/org/elasticsearch/common/inject/Guice.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/Guice.java rename to server/src/main/java/org/elasticsearch/common/inject/Guice.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/ImplementedBy.java b/server/src/main/java/org/elasticsearch/common/inject/ImplementedBy.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/ImplementedBy.java rename to server/src/main/java/org/elasticsearch/common/inject/ImplementedBy.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/InheritingState.java b/server/src/main/java/org/elasticsearch/common/inject/InheritingState.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/InheritingState.java rename to server/src/main/java/org/elasticsearch/common/inject/InheritingState.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/Initializable.java b/server/src/main/java/org/elasticsearch/common/inject/Initializable.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/Initializable.java rename to server/src/main/java/org/elasticsearch/common/inject/Initializable.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/Initializables.java b/server/src/main/java/org/elasticsearch/common/inject/Initializables.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/Initializables.java rename to server/src/main/java/org/elasticsearch/common/inject/Initializables.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/Initializer.java b/server/src/main/java/org/elasticsearch/common/inject/Initializer.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/Initializer.java rename to server/src/main/java/org/elasticsearch/common/inject/Initializer.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/Inject.java b/server/src/main/java/org/elasticsearch/common/inject/Inject.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/Inject.java rename to server/src/main/java/org/elasticsearch/common/inject/Inject.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/InjectionRequestProcessor.java b/server/src/main/java/org/elasticsearch/common/inject/InjectionRequestProcessor.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/InjectionRequestProcessor.java rename to server/src/main/java/org/elasticsearch/common/inject/InjectionRequestProcessor.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/Injector.java b/server/src/main/java/org/elasticsearch/common/inject/Injector.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/Injector.java rename to server/src/main/java/org/elasticsearch/common/inject/Injector.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/InjectorBuilder.java b/server/src/main/java/org/elasticsearch/common/inject/InjectorBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/InjectorBuilder.java rename to server/src/main/java/org/elasticsearch/common/inject/InjectorBuilder.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/InjectorImpl.java b/server/src/main/java/org/elasticsearch/common/inject/InjectorImpl.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/InjectorImpl.java rename to server/src/main/java/org/elasticsearch/common/inject/InjectorImpl.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/InjectorShell.java b/server/src/main/java/org/elasticsearch/common/inject/InjectorShell.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/InjectorShell.java rename to server/src/main/java/org/elasticsearch/common/inject/InjectorShell.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/InternalFactoryToProviderAdapter.java b/server/src/main/java/org/elasticsearch/common/inject/InternalFactoryToProviderAdapter.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/InternalFactoryToProviderAdapter.java rename to server/src/main/java/org/elasticsearch/common/inject/InternalFactoryToProviderAdapter.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/Key.java b/server/src/main/java/org/elasticsearch/common/inject/Key.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/Key.java rename to server/src/main/java/org/elasticsearch/common/inject/Key.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/LookupProcessor.java b/server/src/main/java/org/elasticsearch/common/inject/LookupProcessor.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/LookupProcessor.java rename to server/src/main/java/org/elasticsearch/common/inject/LookupProcessor.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/Lookups.java b/server/src/main/java/org/elasticsearch/common/inject/Lookups.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/Lookups.java rename to server/src/main/java/org/elasticsearch/common/inject/Lookups.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/MembersInjector.java b/server/src/main/java/org/elasticsearch/common/inject/MembersInjector.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/MembersInjector.java rename to server/src/main/java/org/elasticsearch/common/inject/MembersInjector.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/MembersInjectorImpl.java b/server/src/main/java/org/elasticsearch/common/inject/MembersInjectorImpl.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/MembersInjectorImpl.java rename to server/src/main/java/org/elasticsearch/common/inject/MembersInjectorImpl.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/MembersInjectorStore.java b/server/src/main/java/org/elasticsearch/common/inject/MembersInjectorStore.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/MembersInjectorStore.java rename to server/src/main/java/org/elasticsearch/common/inject/MembersInjectorStore.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/MessageProcessor.java b/server/src/main/java/org/elasticsearch/common/inject/MessageProcessor.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/MessageProcessor.java rename to server/src/main/java/org/elasticsearch/common/inject/MessageProcessor.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/Module.java b/server/src/main/java/org/elasticsearch/common/inject/Module.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/Module.java rename to server/src/main/java/org/elasticsearch/common/inject/Module.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/ModulesBuilder.java b/server/src/main/java/org/elasticsearch/common/inject/ModulesBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/ModulesBuilder.java rename to server/src/main/java/org/elasticsearch/common/inject/ModulesBuilder.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/OutOfScopeException.java b/server/src/main/java/org/elasticsearch/common/inject/OutOfScopeException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/OutOfScopeException.java rename to server/src/main/java/org/elasticsearch/common/inject/OutOfScopeException.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/PreProcessModule.java b/server/src/main/java/org/elasticsearch/common/inject/PreProcessModule.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/PreProcessModule.java rename to server/src/main/java/org/elasticsearch/common/inject/PreProcessModule.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/PrivateBinder.java b/server/src/main/java/org/elasticsearch/common/inject/PrivateBinder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/PrivateBinder.java rename to server/src/main/java/org/elasticsearch/common/inject/PrivateBinder.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/PrivateElementProcessor.java b/server/src/main/java/org/elasticsearch/common/inject/PrivateElementProcessor.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/PrivateElementProcessor.java rename to server/src/main/java/org/elasticsearch/common/inject/PrivateElementProcessor.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/PrivateModule.java b/server/src/main/java/org/elasticsearch/common/inject/PrivateModule.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/PrivateModule.java rename to server/src/main/java/org/elasticsearch/common/inject/PrivateModule.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/ProvidedBy.java b/server/src/main/java/org/elasticsearch/common/inject/ProvidedBy.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/ProvidedBy.java rename to server/src/main/java/org/elasticsearch/common/inject/ProvidedBy.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/Provider.java b/server/src/main/java/org/elasticsearch/common/inject/Provider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/Provider.java rename to server/src/main/java/org/elasticsearch/common/inject/Provider.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/ProviderToInternalFactoryAdapter.java b/server/src/main/java/org/elasticsearch/common/inject/ProviderToInternalFactoryAdapter.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/ProviderToInternalFactoryAdapter.java rename to server/src/main/java/org/elasticsearch/common/inject/ProviderToInternalFactoryAdapter.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/Provides.java b/server/src/main/java/org/elasticsearch/common/inject/Provides.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/Provides.java rename to server/src/main/java/org/elasticsearch/common/inject/Provides.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/ProvisionException.java b/server/src/main/java/org/elasticsearch/common/inject/ProvisionException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/ProvisionException.java rename to server/src/main/java/org/elasticsearch/common/inject/ProvisionException.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/Reflection.java b/server/src/main/java/org/elasticsearch/common/inject/Reflection.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/Reflection.java rename to server/src/main/java/org/elasticsearch/common/inject/Reflection.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/Scope.java b/server/src/main/java/org/elasticsearch/common/inject/Scope.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/Scope.java rename to server/src/main/java/org/elasticsearch/common/inject/Scope.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/ScopeAnnotation.java b/server/src/main/java/org/elasticsearch/common/inject/ScopeAnnotation.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/ScopeAnnotation.java rename to server/src/main/java/org/elasticsearch/common/inject/ScopeAnnotation.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/ScopeBindingProcessor.java b/server/src/main/java/org/elasticsearch/common/inject/ScopeBindingProcessor.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/ScopeBindingProcessor.java rename to server/src/main/java/org/elasticsearch/common/inject/ScopeBindingProcessor.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/Scopes.java b/server/src/main/java/org/elasticsearch/common/inject/Scopes.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/Scopes.java rename to server/src/main/java/org/elasticsearch/common/inject/Scopes.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/SingleFieldInjector.java b/server/src/main/java/org/elasticsearch/common/inject/SingleFieldInjector.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/SingleFieldInjector.java rename to server/src/main/java/org/elasticsearch/common/inject/SingleFieldInjector.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/SingleMemberInjector.java b/server/src/main/java/org/elasticsearch/common/inject/SingleMemberInjector.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/SingleMemberInjector.java rename to server/src/main/java/org/elasticsearch/common/inject/SingleMemberInjector.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/SingleMethodInjector.java b/server/src/main/java/org/elasticsearch/common/inject/SingleMethodInjector.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/SingleMethodInjector.java rename to server/src/main/java/org/elasticsearch/common/inject/SingleMethodInjector.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/SingleParameterInjector.java b/server/src/main/java/org/elasticsearch/common/inject/SingleParameterInjector.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/SingleParameterInjector.java rename to server/src/main/java/org/elasticsearch/common/inject/SingleParameterInjector.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/Singleton.java b/server/src/main/java/org/elasticsearch/common/inject/Singleton.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/Singleton.java rename to server/src/main/java/org/elasticsearch/common/inject/Singleton.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/Stage.java b/server/src/main/java/org/elasticsearch/common/inject/Stage.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/Stage.java rename to server/src/main/java/org/elasticsearch/common/inject/Stage.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/State.java b/server/src/main/java/org/elasticsearch/common/inject/State.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/State.java rename to server/src/main/java/org/elasticsearch/common/inject/State.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/TypeConverterBindingProcessor.java b/server/src/main/java/org/elasticsearch/common/inject/TypeConverterBindingProcessor.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/TypeConverterBindingProcessor.java rename to server/src/main/java/org/elasticsearch/common/inject/TypeConverterBindingProcessor.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/TypeListenerBindingProcessor.java b/server/src/main/java/org/elasticsearch/common/inject/TypeListenerBindingProcessor.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/TypeListenerBindingProcessor.java rename to server/src/main/java/org/elasticsearch/common/inject/TypeListenerBindingProcessor.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/TypeLiteral.java b/server/src/main/java/org/elasticsearch/common/inject/TypeLiteral.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/TypeLiteral.java rename to server/src/main/java/org/elasticsearch/common/inject/TypeLiteral.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/WeakKeySet.java b/server/src/main/java/org/elasticsearch/common/inject/WeakKeySet.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/WeakKeySet.java rename to server/src/main/java/org/elasticsearch/common/inject/WeakKeySet.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/assistedinject/Assisted.java b/server/src/main/java/org/elasticsearch/common/inject/assistedinject/Assisted.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/assistedinject/Assisted.java rename to server/src/main/java/org/elasticsearch/common/inject/assistedinject/Assisted.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/assistedinject/AssistedConstructor.java b/server/src/main/java/org/elasticsearch/common/inject/assistedinject/AssistedConstructor.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/assistedinject/AssistedConstructor.java rename to server/src/main/java/org/elasticsearch/common/inject/assistedinject/AssistedConstructor.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/assistedinject/AssistedInject.java b/server/src/main/java/org/elasticsearch/common/inject/assistedinject/AssistedInject.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/assistedinject/AssistedInject.java rename to server/src/main/java/org/elasticsearch/common/inject/assistedinject/AssistedInject.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/assistedinject/FactoryProvider.java b/server/src/main/java/org/elasticsearch/common/inject/assistedinject/FactoryProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/assistedinject/FactoryProvider.java rename to server/src/main/java/org/elasticsearch/common/inject/assistedinject/FactoryProvider.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/assistedinject/Parameter.java b/server/src/main/java/org/elasticsearch/common/inject/assistedinject/Parameter.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/assistedinject/Parameter.java rename to server/src/main/java/org/elasticsearch/common/inject/assistedinject/Parameter.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/assistedinject/ParameterListKey.java b/server/src/main/java/org/elasticsearch/common/inject/assistedinject/ParameterListKey.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/assistedinject/ParameterListKey.java rename to server/src/main/java/org/elasticsearch/common/inject/assistedinject/ParameterListKey.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/assistedinject/package-info.java b/server/src/main/java/org/elasticsearch/common/inject/assistedinject/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/assistedinject/package-info.java rename to server/src/main/java/org/elasticsearch/common/inject/assistedinject/package-info.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/binder/AnnotatedBindingBuilder.java b/server/src/main/java/org/elasticsearch/common/inject/binder/AnnotatedBindingBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/binder/AnnotatedBindingBuilder.java rename to server/src/main/java/org/elasticsearch/common/inject/binder/AnnotatedBindingBuilder.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/binder/AnnotatedConstantBindingBuilder.java b/server/src/main/java/org/elasticsearch/common/inject/binder/AnnotatedConstantBindingBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/binder/AnnotatedConstantBindingBuilder.java rename to server/src/main/java/org/elasticsearch/common/inject/binder/AnnotatedConstantBindingBuilder.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/binder/AnnotatedElementBuilder.java b/server/src/main/java/org/elasticsearch/common/inject/binder/AnnotatedElementBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/binder/AnnotatedElementBuilder.java rename to server/src/main/java/org/elasticsearch/common/inject/binder/AnnotatedElementBuilder.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/binder/ConstantBindingBuilder.java b/server/src/main/java/org/elasticsearch/common/inject/binder/ConstantBindingBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/binder/ConstantBindingBuilder.java rename to server/src/main/java/org/elasticsearch/common/inject/binder/ConstantBindingBuilder.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/binder/LinkedBindingBuilder.java b/server/src/main/java/org/elasticsearch/common/inject/binder/LinkedBindingBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/binder/LinkedBindingBuilder.java rename to server/src/main/java/org/elasticsearch/common/inject/binder/LinkedBindingBuilder.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/binder/ScopedBindingBuilder.java b/server/src/main/java/org/elasticsearch/common/inject/binder/ScopedBindingBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/binder/ScopedBindingBuilder.java rename to server/src/main/java/org/elasticsearch/common/inject/binder/ScopedBindingBuilder.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/binder/package-info.java b/server/src/main/java/org/elasticsearch/common/inject/binder/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/binder/package-info.java rename to server/src/main/java/org/elasticsearch/common/inject/binder/package-info.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/AbstractBindingBuilder.java b/server/src/main/java/org/elasticsearch/common/inject/internal/AbstractBindingBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/AbstractBindingBuilder.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/AbstractBindingBuilder.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/Annotations.java b/server/src/main/java/org/elasticsearch/common/inject/internal/Annotations.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/Annotations.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/Annotations.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/BindingBuilder.java b/server/src/main/java/org/elasticsearch/common/inject/internal/BindingBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/BindingBuilder.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/BindingBuilder.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/BindingImpl.java b/server/src/main/java/org/elasticsearch/common/inject/internal/BindingImpl.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/BindingImpl.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/BindingImpl.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/ConstantBindingBuilderImpl.java b/server/src/main/java/org/elasticsearch/common/inject/internal/ConstantBindingBuilderImpl.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/ConstantBindingBuilderImpl.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/ConstantBindingBuilderImpl.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/ConstructionContext.java b/server/src/main/java/org/elasticsearch/common/inject/internal/ConstructionContext.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/ConstructionContext.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/ConstructionContext.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/ErrorHandler.java b/server/src/main/java/org/elasticsearch/common/inject/internal/ErrorHandler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/ErrorHandler.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/ErrorHandler.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/Errors.java b/server/src/main/java/org/elasticsearch/common/inject/internal/Errors.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/Errors.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/Errors.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/ErrorsException.java b/server/src/main/java/org/elasticsearch/common/inject/internal/ErrorsException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/ErrorsException.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/ErrorsException.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/ExpirationTimer.java b/server/src/main/java/org/elasticsearch/common/inject/internal/ExpirationTimer.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/ExpirationTimer.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/ExpirationTimer.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/ExposedBindingImpl.java b/server/src/main/java/org/elasticsearch/common/inject/internal/ExposedBindingImpl.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/ExposedBindingImpl.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/ExposedBindingImpl.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/ExposureBuilder.java b/server/src/main/java/org/elasticsearch/common/inject/internal/ExposureBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/ExposureBuilder.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/ExposureBuilder.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/FailableCache.java b/server/src/main/java/org/elasticsearch/common/inject/internal/FailableCache.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/FailableCache.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/FailableCache.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/InstanceBindingImpl.java b/server/src/main/java/org/elasticsearch/common/inject/internal/InstanceBindingImpl.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/InstanceBindingImpl.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/InstanceBindingImpl.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/InternalContext.java b/server/src/main/java/org/elasticsearch/common/inject/internal/InternalContext.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/InternalContext.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/InternalContext.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/InternalFactory.java b/server/src/main/java/org/elasticsearch/common/inject/internal/InternalFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/InternalFactory.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/InternalFactory.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/Join.java b/server/src/main/java/org/elasticsearch/common/inject/internal/Join.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/Join.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/Join.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/LinkedBindingImpl.java b/server/src/main/java/org/elasticsearch/common/inject/internal/LinkedBindingImpl.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/LinkedBindingImpl.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/LinkedBindingImpl.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/LinkedProviderBindingImpl.java b/server/src/main/java/org/elasticsearch/common/inject/internal/LinkedProviderBindingImpl.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/LinkedProviderBindingImpl.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/LinkedProviderBindingImpl.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/MatcherAndConverter.java b/server/src/main/java/org/elasticsearch/common/inject/internal/MatcherAndConverter.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/MatcherAndConverter.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/MatcherAndConverter.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/MoreTypes.java b/server/src/main/java/org/elasticsearch/common/inject/internal/MoreTypes.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/MoreTypes.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/MoreTypes.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/Nullability.java b/server/src/main/java/org/elasticsearch/common/inject/internal/Nullability.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/Nullability.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/Nullability.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/Nullable.java b/server/src/main/java/org/elasticsearch/common/inject/internal/Nullable.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/Nullable.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/Nullable.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/PrivateElementsImpl.java b/server/src/main/java/org/elasticsearch/common/inject/internal/PrivateElementsImpl.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/PrivateElementsImpl.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/PrivateElementsImpl.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/ProviderInstanceBindingImpl.java b/server/src/main/java/org/elasticsearch/common/inject/internal/ProviderInstanceBindingImpl.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/ProviderInstanceBindingImpl.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/ProviderInstanceBindingImpl.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/ProviderMethod.java b/server/src/main/java/org/elasticsearch/common/inject/internal/ProviderMethod.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/ProviderMethod.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/ProviderMethod.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/ProviderMethodsModule.java b/server/src/main/java/org/elasticsearch/common/inject/internal/ProviderMethodsModule.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/ProviderMethodsModule.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/ProviderMethodsModule.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/Scoping.java b/server/src/main/java/org/elasticsearch/common/inject/internal/Scoping.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/Scoping.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/Scoping.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/SourceProvider.java b/server/src/main/java/org/elasticsearch/common/inject/internal/SourceProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/SourceProvider.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/SourceProvider.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/StackTraceElements.java b/server/src/main/java/org/elasticsearch/common/inject/internal/StackTraceElements.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/StackTraceElements.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/StackTraceElements.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/Stopwatch.java b/server/src/main/java/org/elasticsearch/common/inject/internal/Stopwatch.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/Stopwatch.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/Stopwatch.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/Strings.java b/server/src/main/java/org/elasticsearch/common/inject/internal/Strings.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/Strings.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/Strings.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/ToStringBuilder.java b/server/src/main/java/org/elasticsearch/common/inject/internal/ToStringBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/ToStringBuilder.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/ToStringBuilder.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/UniqueAnnotations.java b/server/src/main/java/org/elasticsearch/common/inject/internal/UniqueAnnotations.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/UniqueAnnotations.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/UniqueAnnotations.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/UntargettedBindingImpl.java b/server/src/main/java/org/elasticsearch/common/inject/internal/UntargettedBindingImpl.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/UntargettedBindingImpl.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/UntargettedBindingImpl.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/package-info.java b/server/src/main/java/org/elasticsearch/common/inject/internal/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/internal/package-info.java rename to server/src/main/java/org/elasticsearch/common/inject/internal/package-info.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/matcher/AbstractMatcher.java b/server/src/main/java/org/elasticsearch/common/inject/matcher/AbstractMatcher.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/matcher/AbstractMatcher.java rename to server/src/main/java/org/elasticsearch/common/inject/matcher/AbstractMatcher.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/matcher/Matcher.java b/server/src/main/java/org/elasticsearch/common/inject/matcher/Matcher.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/matcher/Matcher.java rename to server/src/main/java/org/elasticsearch/common/inject/matcher/Matcher.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/matcher/Matchers.java b/server/src/main/java/org/elasticsearch/common/inject/matcher/Matchers.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/matcher/Matchers.java rename to server/src/main/java/org/elasticsearch/common/inject/matcher/Matchers.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/matcher/package-info.java b/server/src/main/java/org/elasticsearch/common/inject/matcher/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/matcher/package-info.java rename to server/src/main/java/org/elasticsearch/common/inject/matcher/package-info.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/multibindings/Element.java b/server/src/main/java/org/elasticsearch/common/inject/multibindings/Element.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/multibindings/Element.java rename to server/src/main/java/org/elasticsearch/common/inject/multibindings/Element.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/multibindings/MapBinder.java b/server/src/main/java/org/elasticsearch/common/inject/multibindings/MapBinder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/multibindings/MapBinder.java rename to server/src/main/java/org/elasticsearch/common/inject/multibindings/MapBinder.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/multibindings/Multibinder.java b/server/src/main/java/org/elasticsearch/common/inject/multibindings/Multibinder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/multibindings/Multibinder.java rename to server/src/main/java/org/elasticsearch/common/inject/multibindings/Multibinder.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/multibindings/RealElement.java b/server/src/main/java/org/elasticsearch/common/inject/multibindings/RealElement.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/multibindings/RealElement.java rename to server/src/main/java/org/elasticsearch/common/inject/multibindings/RealElement.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/multibindings/package-info.java b/server/src/main/java/org/elasticsearch/common/inject/multibindings/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/multibindings/package-info.java rename to server/src/main/java/org/elasticsearch/common/inject/multibindings/package-info.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/name/Named.java b/server/src/main/java/org/elasticsearch/common/inject/name/Named.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/name/Named.java rename to server/src/main/java/org/elasticsearch/common/inject/name/Named.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/name/NamedImpl.java b/server/src/main/java/org/elasticsearch/common/inject/name/NamedImpl.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/name/NamedImpl.java rename to server/src/main/java/org/elasticsearch/common/inject/name/NamedImpl.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/name/Names.java b/server/src/main/java/org/elasticsearch/common/inject/name/Names.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/name/Names.java rename to server/src/main/java/org/elasticsearch/common/inject/name/Names.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/name/package-info.java b/server/src/main/java/org/elasticsearch/common/inject/name/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/name/package-info.java rename to server/src/main/java/org/elasticsearch/common/inject/name/package-info.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/package-info.java b/server/src/main/java/org/elasticsearch/common/inject/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/package-info.java rename to server/src/main/java/org/elasticsearch/common/inject/package-info.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/spi/BindingScopingVisitor.java b/server/src/main/java/org/elasticsearch/common/inject/spi/BindingScopingVisitor.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/spi/BindingScopingVisitor.java rename to server/src/main/java/org/elasticsearch/common/inject/spi/BindingScopingVisitor.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/spi/BindingTargetVisitor.java b/server/src/main/java/org/elasticsearch/common/inject/spi/BindingTargetVisitor.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/spi/BindingTargetVisitor.java rename to server/src/main/java/org/elasticsearch/common/inject/spi/BindingTargetVisitor.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/spi/ConstructorBinding.java b/server/src/main/java/org/elasticsearch/common/inject/spi/ConstructorBinding.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/spi/ConstructorBinding.java rename to server/src/main/java/org/elasticsearch/common/inject/spi/ConstructorBinding.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/spi/ConvertedConstantBinding.java b/server/src/main/java/org/elasticsearch/common/inject/spi/ConvertedConstantBinding.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/spi/ConvertedConstantBinding.java rename to server/src/main/java/org/elasticsearch/common/inject/spi/ConvertedConstantBinding.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/spi/DefaultBindingScopingVisitor.java b/server/src/main/java/org/elasticsearch/common/inject/spi/DefaultBindingScopingVisitor.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/spi/DefaultBindingScopingVisitor.java rename to server/src/main/java/org/elasticsearch/common/inject/spi/DefaultBindingScopingVisitor.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/spi/DefaultBindingTargetVisitor.java b/server/src/main/java/org/elasticsearch/common/inject/spi/DefaultBindingTargetVisitor.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/spi/DefaultBindingTargetVisitor.java rename to server/src/main/java/org/elasticsearch/common/inject/spi/DefaultBindingTargetVisitor.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/spi/DefaultElementVisitor.java b/server/src/main/java/org/elasticsearch/common/inject/spi/DefaultElementVisitor.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/spi/DefaultElementVisitor.java rename to server/src/main/java/org/elasticsearch/common/inject/spi/DefaultElementVisitor.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/spi/Dependency.java b/server/src/main/java/org/elasticsearch/common/inject/spi/Dependency.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/spi/Dependency.java rename to server/src/main/java/org/elasticsearch/common/inject/spi/Dependency.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/spi/Element.java b/server/src/main/java/org/elasticsearch/common/inject/spi/Element.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/spi/Element.java rename to server/src/main/java/org/elasticsearch/common/inject/spi/Element.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/spi/ElementVisitor.java b/server/src/main/java/org/elasticsearch/common/inject/spi/ElementVisitor.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/spi/ElementVisitor.java rename to server/src/main/java/org/elasticsearch/common/inject/spi/ElementVisitor.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/spi/Elements.java b/server/src/main/java/org/elasticsearch/common/inject/spi/Elements.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/spi/Elements.java rename to server/src/main/java/org/elasticsearch/common/inject/spi/Elements.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/spi/ExposedBinding.java b/server/src/main/java/org/elasticsearch/common/inject/spi/ExposedBinding.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/spi/ExposedBinding.java rename to server/src/main/java/org/elasticsearch/common/inject/spi/ExposedBinding.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/spi/HasDependencies.java b/server/src/main/java/org/elasticsearch/common/inject/spi/HasDependencies.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/spi/HasDependencies.java rename to server/src/main/java/org/elasticsearch/common/inject/spi/HasDependencies.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/spi/InjectionListener.java b/server/src/main/java/org/elasticsearch/common/inject/spi/InjectionListener.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/spi/InjectionListener.java rename to server/src/main/java/org/elasticsearch/common/inject/spi/InjectionListener.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/spi/InjectionPoint.java b/server/src/main/java/org/elasticsearch/common/inject/spi/InjectionPoint.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/spi/InjectionPoint.java rename to server/src/main/java/org/elasticsearch/common/inject/spi/InjectionPoint.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/spi/InjectionRequest.java b/server/src/main/java/org/elasticsearch/common/inject/spi/InjectionRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/spi/InjectionRequest.java rename to server/src/main/java/org/elasticsearch/common/inject/spi/InjectionRequest.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/spi/InstanceBinding.java b/server/src/main/java/org/elasticsearch/common/inject/spi/InstanceBinding.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/spi/InstanceBinding.java rename to server/src/main/java/org/elasticsearch/common/inject/spi/InstanceBinding.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/spi/LinkedKeyBinding.java b/server/src/main/java/org/elasticsearch/common/inject/spi/LinkedKeyBinding.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/spi/LinkedKeyBinding.java rename to server/src/main/java/org/elasticsearch/common/inject/spi/LinkedKeyBinding.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/spi/MembersInjectorLookup.java b/server/src/main/java/org/elasticsearch/common/inject/spi/MembersInjectorLookup.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/spi/MembersInjectorLookup.java rename to server/src/main/java/org/elasticsearch/common/inject/spi/MembersInjectorLookup.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/spi/Message.java b/server/src/main/java/org/elasticsearch/common/inject/spi/Message.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/spi/Message.java rename to server/src/main/java/org/elasticsearch/common/inject/spi/Message.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/spi/PrivateElements.java b/server/src/main/java/org/elasticsearch/common/inject/spi/PrivateElements.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/spi/PrivateElements.java rename to server/src/main/java/org/elasticsearch/common/inject/spi/PrivateElements.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/spi/ProviderBinding.java b/server/src/main/java/org/elasticsearch/common/inject/spi/ProviderBinding.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/spi/ProviderBinding.java rename to server/src/main/java/org/elasticsearch/common/inject/spi/ProviderBinding.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/spi/ProviderInstanceBinding.java b/server/src/main/java/org/elasticsearch/common/inject/spi/ProviderInstanceBinding.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/spi/ProviderInstanceBinding.java rename to server/src/main/java/org/elasticsearch/common/inject/spi/ProviderInstanceBinding.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/spi/ProviderKeyBinding.java b/server/src/main/java/org/elasticsearch/common/inject/spi/ProviderKeyBinding.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/spi/ProviderKeyBinding.java rename to server/src/main/java/org/elasticsearch/common/inject/spi/ProviderKeyBinding.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/spi/ProviderLookup.java b/server/src/main/java/org/elasticsearch/common/inject/spi/ProviderLookup.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/spi/ProviderLookup.java rename to server/src/main/java/org/elasticsearch/common/inject/spi/ProviderLookup.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/spi/ProviderWithDependencies.java b/server/src/main/java/org/elasticsearch/common/inject/spi/ProviderWithDependencies.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/spi/ProviderWithDependencies.java rename to server/src/main/java/org/elasticsearch/common/inject/spi/ProviderWithDependencies.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/spi/ScopeBinding.java b/server/src/main/java/org/elasticsearch/common/inject/spi/ScopeBinding.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/spi/ScopeBinding.java rename to server/src/main/java/org/elasticsearch/common/inject/spi/ScopeBinding.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/spi/StaticInjectionRequest.java b/server/src/main/java/org/elasticsearch/common/inject/spi/StaticInjectionRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/spi/StaticInjectionRequest.java rename to server/src/main/java/org/elasticsearch/common/inject/spi/StaticInjectionRequest.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/spi/TypeConverter.java b/server/src/main/java/org/elasticsearch/common/inject/spi/TypeConverter.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/spi/TypeConverter.java rename to server/src/main/java/org/elasticsearch/common/inject/spi/TypeConverter.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/spi/TypeConverterBinding.java b/server/src/main/java/org/elasticsearch/common/inject/spi/TypeConverterBinding.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/spi/TypeConverterBinding.java rename to server/src/main/java/org/elasticsearch/common/inject/spi/TypeConverterBinding.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/spi/TypeEncounter.java b/server/src/main/java/org/elasticsearch/common/inject/spi/TypeEncounter.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/spi/TypeEncounter.java rename to server/src/main/java/org/elasticsearch/common/inject/spi/TypeEncounter.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/spi/TypeListener.java b/server/src/main/java/org/elasticsearch/common/inject/spi/TypeListener.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/spi/TypeListener.java rename to server/src/main/java/org/elasticsearch/common/inject/spi/TypeListener.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/spi/TypeListenerBinding.java b/server/src/main/java/org/elasticsearch/common/inject/spi/TypeListenerBinding.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/spi/TypeListenerBinding.java rename to server/src/main/java/org/elasticsearch/common/inject/spi/TypeListenerBinding.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/spi/UntargettedBinding.java b/server/src/main/java/org/elasticsearch/common/inject/spi/UntargettedBinding.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/spi/UntargettedBinding.java rename to server/src/main/java/org/elasticsearch/common/inject/spi/UntargettedBinding.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/spi/package-info.java b/server/src/main/java/org/elasticsearch/common/inject/spi/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/spi/package-info.java rename to server/src/main/java/org/elasticsearch/common/inject/spi/package-info.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/util/Modules.java b/server/src/main/java/org/elasticsearch/common/inject/util/Modules.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/util/Modules.java rename to server/src/main/java/org/elasticsearch/common/inject/util/Modules.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/util/Providers.java b/server/src/main/java/org/elasticsearch/common/inject/util/Providers.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/util/Providers.java rename to server/src/main/java/org/elasticsearch/common/inject/util/Providers.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/util/Types.java b/server/src/main/java/org/elasticsearch/common/inject/util/Types.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/util/Types.java rename to server/src/main/java/org/elasticsearch/common/inject/util/Types.java diff --git a/core/src/main/java/org/elasticsearch/common/inject/util/package-info.java b/server/src/main/java/org/elasticsearch/common/inject/util/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/inject/util/package-info.java rename to server/src/main/java/org/elasticsearch/common/inject/util/package-info.java diff --git a/core/src/main/java/org/elasticsearch/common/io/Channels.java b/server/src/main/java/org/elasticsearch/common/io/Channels.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/io/Channels.java rename to server/src/main/java/org/elasticsearch/common/io/Channels.java diff --git a/core/src/main/java/org/elasticsearch/common/io/FastCharArrayReader.java b/server/src/main/java/org/elasticsearch/common/io/FastCharArrayReader.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/io/FastCharArrayReader.java rename to server/src/main/java/org/elasticsearch/common/io/FastCharArrayReader.java diff --git a/core/src/main/java/org/elasticsearch/common/io/FastCharArrayWriter.java b/server/src/main/java/org/elasticsearch/common/io/FastCharArrayWriter.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/io/FastCharArrayWriter.java rename to server/src/main/java/org/elasticsearch/common/io/FastCharArrayWriter.java diff --git a/core/src/main/java/org/elasticsearch/common/io/FastStringReader.java b/server/src/main/java/org/elasticsearch/common/io/FastStringReader.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/io/FastStringReader.java rename to server/src/main/java/org/elasticsearch/common/io/FastStringReader.java diff --git a/core/src/main/java/org/elasticsearch/common/io/FileSystemUtils.java b/server/src/main/java/org/elasticsearch/common/io/FileSystemUtils.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/io/FileSystemUtils.java rename to server/src/main/java/org/elasticsearch/common/io/FileSystemUtils.java diff --git a/core/src/main/java/org/elasticsearch/common/io/PathUtils.java b/server/src/main/java/org/elasticsearch/common/io/PathUtils.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/io/PathUtils.java rename to server/src/main/java/org/elasticsearch/common/io/PathUtils.java diff --git a/core/src/main/java/org/elasticsearch/common/io/Streams.java b/server/src/main/java/org/elasticsearch/common/io/Streams.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/io/Streams.java rename to server/src/main/java/org/elasticsearch/common/io/Streams.java diff --git a/core/src/main/java/org/elasticsearch/common/io/UTF8StreamWriter.java b/server/src/main/java/org/elasticsearch/common/io/UTF8StreamWriter.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/io/UTF8StreamWriter.java rename to server/src/main/java/org/elasticsearch/common/io/UTF8StreamWriter.java diff --git a/core/src/main/java/org/elasticsearch/common/io/stream/ByteBufferStreamInput.java b/server/src/main/java/org/elasticsearch/common/io/stream/ByteBufferStreamInput.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/io/stream/ByteBufferStreamInput.java rename to server/src/main/java/org/elasticsearch/common/io/stream/ByteBufferStreamInput.java diff --git a/core/src/main/java/org/elasticsearch/common/io/stream/BytesStream.java b/server/src/main/java/org/elasticsearch/common/io/stream/BytesStream.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/io/stream/BytesStream.java rename to server/src/main/java/org/elasticsearch/common/io/stream/BytesStream.java diff --git a/core/src/main/java/org/elasticsearch/common/io/stream/BytesStreamOutput.java b/server/src/main/java/org/elasticsearch/common/io/stream/BytesStreamOutput.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/io/stream/BytesStreamOutput.java rename to server/src/main/java/org/elasticsearch/common/io/stream/BytesStreamOutput.java diff --git a/core/src/main/java/org/elasticsearch/common/io/stream/DataOutputStreamOutput.java b/server/src/main/java/org/elasticsearch/common/io/stream/DataOutputStreamOutput.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/io/stream/DataOutputStreamOutput.java rename to server/src/main/java/org/elasticsearch/common/io/stream/DataOutputStreamOutput.java diff --git a/core/src/main/java/org/elasticsearch/common/io/stream/FilterStreamInput.java b/server/src/main/java/org/elasticsearch/common/io/stream/FilterStreamInput.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/io/stream/FilterStreamInput.java rename to server/src/main/java/org/elasticsearch/common/io/stream/FilterStreamInput.java diff --git a/core/src/main/java/org/elasticsearch/common/io/stream/InputStreamStreamInput.java b/server/src/main/java/org/elasticsearch/common/io/stream/InputStreamStreamInput.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/io/stream/InputStreamStreamInput.java rename to server/src/main/java/org/elasticsearch/common/io/stream/InputStreamStreamInput.java diff --git a/core/src/main/java/org/elasticsearch/common/io/stream/NamedWriteable.java b/server/src/main/java/org/elasticsearch/common/io/stream/NamedWriteable.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/io/stream/NamedWriteable.java rename to server/src/main/java/org/elasticsearch/common/io/stream/NamedWriteable.java diff --git a/core/src/main/java/org/elasticsearch/common/io/stream/NamedWriteableAwareStreamInput.java b/server/src/main/java/org/elasticsearch/common/io/stream/NamedWriteableAwareStreamInput.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/io/stream/NamedWriteableAwareStreamInput.java rename to server/src/main/java/org/elasticsearch/common/io/stream/NamedWriteableAwareStreamInput.java diff --git a/core/src/main/java/org/elasticsearch/common/io/stream/NamedWriteableRegistry.java b/server/src/main/java/org/elasticsearch/common/io/stream/NamedWriteableRegistry.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/io/stream/NamedWriteableRegistry.java rename to server/src/main/java/org/elasticsearch/common/io/stream/NamedWriteableRegistry.java diff --git a/core/src/main/java/org/elasticsearch/common/io/stream/NotSerializableExceptionWrapper.java b/server/src/main/java/org/elasticsearch/common/io/stream/NotSerializableExceptionWrapper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/io/stream/NotSerializableExceptionWrapper.java rename to server/src/main/java/org/elasticsearch/common/io/stream/NotSerializableExceptionWrapper.java diff --git a/core/src/main/java/org/elasticsearch/common/io/stream/OutputStreamStreamOutput.java b/server/src/main/java/org/elasticsearch/common/io/stream/OutputStreamStreamOutput.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/io/stream/OutputStreamStreamOutput.java rename to server/src/main/java/org/elasticsearch/common/io/stream/OutputStreamStreamOutput.java diff --git a/core/src/main/java/org/elasticsearch/common/io/stream/ReleasableBytesStreamOutput.java b/server/src/main/java/org/elasticsearch/common/io/stream/ReleasableBytesStreamOutput.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/io/stream/ReleasableBytesStreamOutput.java rename to server/src/main/java/org/elasticsearch/common/io/stream/ReleasableBytesStreamOutput.java diff --git a/core/src/main/java/org/elasticsearch/common/io/stream/StreamInput.java b/server/src/main/java/org/elasticsearch/common/io/stream/StreamInput.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/io/stream/StreamInput.java rename to server/src/main/java/org/elasticsearch/common/io/stream/StreamInput.java diff --git a/core/src/main/java/org/elasticsearch/common/io/stream/StreamOutput.java b/server/src/main/java/org/elasticsearch/common/io/stream/StreamOutput.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/io/stream/StreamOutput.java rename to server/src/main/java/org/elasticsearch/common/io/stream/StreamOutput.java diff --git a/core/src/main/java/org/elasticsearch/common/io/stream/Streamable.java b/server/src/main/java/org/elasticsearch/common/io/stream/Streamable.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/io/stream/Streamable.java rename to server/src/main/java/org/elasticsearch/common/io/stream/Streamable.java diff --git a/core/src/main/java/org/elasticsearch/common/io/stream/Writeable.java b/server/src/main/java/org/elasticsearch/common/io/stream/Writeable.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/io/stream/Writeable.java rename to server/src/main/java/org/elasticsearch/common/io/stream/Writeable.java diff --git a/core/src/main/java/org/elasticsearch/common/io/stream/package-info.java b/server/src/main/java/org/elasticsearch/common/io/stream/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/io/stream/package-info.java rename to server/src/main/java/org/elasticsearch/common/io/stream/package-info.java diff --git a/core/src/main/java/org/elasticsearch/common/joda/DateMathParser.java b/server/src/main/java/org/elasticsearch/common/joda/DateMathParser.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/joda/DateMathParser.java rename to server/src/main/java/org/elasticsearch/common/joda/DateMathParser.java diff --git a/core/src/main/java/org/elasticsearch/common/joda/FormatDateTimeFormatter.java b/server/src/main/java/org/elasticsearch/common/joda/FormatDateTimeFormatter.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/joda/FormatDateTimeFormatter.java rename to server/src/main/java/org/elasticsearch/common/joda/FormatDateTimeFormatter.java diff --git a/core/src/main/java/org/elasticsearch/common/joda/Joda.java b/server/src/main/java/org/elasticsearch/common/joda/Joda.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/joda/Joda.java rename to server/src/main/java/org/elasticsearch/common/joda/Joda.java diff --git a/core/src/main/java/org/elasticsearch/common/lease/Releasable.java b/server/src/main/java/org/elasticsearch/common/lease/Releasable.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/lease/Releasable.java rename to server/src/main/java/org/elasticsearch/common/lease/Releasable.java diff --git a/core/src/main/java/org/elasticsearch/common/lease/Releasables.java b/server/src/main/java/org/elasticsearch/common/lease/Releasables.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/lease/Releasables.java rename to server/src/main/java/org/elasticsearch/common/lease/Releasables.java diff --git a/core/src/main/java/org/elasticsearch/common/logging/DeprecationLogger.java b/server/src/main/java/org/elasticsearch/common/logging/DeprecationLogger.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/logging/DeprecationLogger.java rename to server/src/main/java/org/elasticsearch/common/logging/DeprecationLogger.java diff --git a/core/src/main/java/org/elasticsearch/common/logging/ESLoggerFactory.java b/server/src/main/java/org/elasticsearch/common/logging/ESLoggerFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/logging/ESLoggerFactory.java rename to server/src/main/java/org/elasticsearch/common/logging/ESLoggerFactory.java diff --git a/core/src/main/java/org/elasticsearch/common/logging/LogConfigurator.java b/server/src/main/java/org/elasticsearch/common/logging/LogConfigurator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/logging/LogConfigurator.java rename to server/src/main/java/org/elasticsearch/common/logging/LogConfigurator.java diff --git a/core/src/main/java/org/elasticsearch/common/logging/LoggerMessageFormat.java b/server/src/main/java/org/elasticsearch/common/logging/LoggerMessageFormat.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/logging/LoggerMessageFormat.java rename to server/src/main/java/org/elasticsearch/common/logging/LoggerMessageFormat.java diff --git a/core/src/main/java/org/elasticsearch/common/logging/Loggers.java b/server/src/main/java/org/elasticsearch/common/logging/Loggers.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/logging/Loggers.java rename to server/src/main/java/org/elasticsearch/common/logging/Loggers.java diff --git a/core/src/main/java/org/elasticsearch/common/logging/PrefixLogger.java b/server/src/main/java/org/elasticsearch/common/logging/PrefixLogger.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/logging/PrefixLogger.java rename to server/src/main/java/org/elasticsearch/common/logging/PrefixLogger.java diff --git a/core/src/main/java/org/elasticsearch/common/lucene/BytesRefs.java b/server/src/main/java/org/elasticsearch/common/lucene/BytesRefs.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/lucene/BytesRefs.java rename to server/src/main/java/org/elasticsearch/common/lucene/BytesRefs.java diff --git a/core/src/main/java/org/elasticsearch/common/lucene/LoggerInfoStream.java b/server/src/main/java/org/elasticsearch/common/lucene/LoggerInfoStream.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/lucene/LoggerInfoStream.java rename to server/src/main/java/org/elasticsearch/common/lucene/LoggerInfoStream.java diff --git a/core/src/main/java/org/elasticsearch/common/lucene/Lucene.java b/server/src/main/java/org/elasticsearch/common/lucene/Lucene.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/lucene/Lucene.java rename to server/src/main/java/org/elasticsearch/common/lucene/Lucene.java diff --git a/core/src/main/java/org/elasticsearch/common/lucene/MinimumScoreCollector.java b/server/src/main/java/org/elasticsearch/common/lucene/MinimumScoreCollector.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/lucene/MinimumScoreCollector.java rename to server/src/main/java/org/elasticsearch/common/lucene/MinimumScoreCollector.java diff --git a/core/src/main/java/org/elasticsearch/common/lucene/ScorerAware.java b/server/src/main/java/org/elasticsearch/common/lucene/ScorerAware.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/lucene/ScorerAware.java rename to server/src/main/java/org/elasticsearch/common/lucene/ScorerAware.java diff --git a/core/src/main/java/org/elasticsearch/common/lucene/ShardCoreKeyMap.java b/server/src/main/java/org/elasticsearch/common/lucene/ShardCoreKeyMap.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/lucene/ShardCoreKeyMap.java rename to server/src/main/java/org/elasticsearch/common/lucene/ShardCoreKeyMap.java diff --git a/core/src/main/java/org/elasticsearch/common/lucene/index/ElasticsearchDirectoryReader.java b/server/src/main/java/org/elasticsearch/common/lucene/index/ElasticsearchDirectoryReader.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/lucene/index/ElasticsearchDirectoryReader.java rename to server/src/main/java/org/elasticsearch/common/lucene/index/ElasticsearchDirectoryReader.java diff --git a/core/src/main/java/org/elasticsearch/common/lucene/index/ElasticsearchLeafReader.java b/server/src/main/java/org/elasticsearch/common/lucene/index/ElasticsearchLeafReader.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/lucene/index/ElasticsearchLeafReader.java rename to server/src/main/java/org/elasticsearch/common/lucene/index/ElasticsearchLeafReader.java diff --git a/core/src/main/java/org/elasticsearch/common/lucene/index/FilterableTermsEnum.java b/server/src/main/java/org/elasticsearch/common/lucene/index/FilterableTermsEnum.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/lucene/index/FilterableTermsEnum.java rename to server/src/main/java/org/elasticsearch/common/lucene/index/FilterableTermsEnum.java diff --git a/core/src/main/java/org/elasticsearch/common/lucene/index/FreqTermsEnum.java b/server/src/main/java/org/elasticsearch/common/lucene/index/FreqTermsEnum.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/lucene/index/FreqTermsEnum.java rename to server/src/main/java/org/elasticsearch/common/lucene/index/FreqTermsEnum.java diff --git a/core/src/main/java/org/elasticsearch/common/lucene/search/FilteredCollector.java b/server/src/main/java/org/elasticsearch/common/lucene/search/FilteredCollector.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/lucene/search/FilteredCollector.java rename to server/src/main/java/org/elasticsearch/common/lucene/search/FilteredCollector.java diff --git a/core/src/main/java/org/elasticsearch/common/lucene/search/MoreLikeThisQuery.java b/server/src/main/java/org/elasticsearch/common/lucene/search/MoreLikeThisQuery.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/lucene/search/MoreLikeThisQuery.java rename to server/src/main/java/org/elasticsearch/common/lucene/search/MoreLikeThisQuery.java diff --git a/core/src/main/java/org/elasticsearch/common/lucene/search/MultiPhrasePrefixQuery.java b/server/src/main/java/org/elasticsearch/common/lucene/search/MultiPhrasePrefixQuery.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/lucene/search/MultiPhrasePrefixQuery.java rename to server/src/main/java/org/elasticsearch/common/lucene/search/MultiPhrasePrefixQuery.java diff --git a/core/src/main/java/org/elasticsearch/common/lucene/search/Queries.java b/server/src/main/java/org/elasticsearch/common/lucene/search/Queries.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/lucene/search/Queries.java rename to server/src/main/java/org/elasticsearch/common/lucene/search/Queries.java diff --git a/core/src/main/java/org/elasticsearch/common/lucene/search/XMoreLikeThis.java b/server/src/main/java/org/elasticsearch/common/lucene/search/XMoreLikeThis.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/lucene/search/XMoreLikeThis.java rename to server/src/main/java/org/elasticsearch/common/lucene/search/XMoreLikeThis.java diff --git a/core/src/main/java/org/elasticsearch/common/lucene/search/function/CombineFunction.java b/server/src/main/java/org/elasticsearch/common/lucene/search/function/CombineFunction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/lucene/search/function/CombineFunction.java rename to server/src/main/java/org/elasticsearch/common/lucene/search/function/CombineFunction.java diff --git a/core/src/main/java/org/elasticsearch/common/lucene/search/function/FieldValueFactorFunction.java b/server/src/main/java/org/elasticsearch/common/lucene/search/function/FieldValueFactorFunction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/lucene/search/function/FieldValueFactorFunction.java rename to server/src/main/java/org/elasticsearch/common/lucene/search/function/FieldValueFactorFunction.java diff --git a/core/src/main/java/org/elasticsearch/common/lucene/search/function/FunctionScoreQuery.java b/server/src/main/java/org/elasticsearch/common/lucene/search/function/FunctionScoreQuery.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/lucene/search/function/FunctionScoreQuery.java rename to server/src/main/java/org/elasticsearch/common/lucene/search/function/FunctionScoreQuery.java diff --git a/core/src/main/java/org/elasticsearch/common/lucene/search/function/LeafScoreFunction.java b/server/src/main/java/org/elasticsearch/common/lucene/search/function/LeafScoreFunction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/lucene/search/function/LeafScoreFunction.java rename to server/src/main/java/org/elasticsearch/common/lucene/search/function/LeafScoreFunction.java diff --git a/core/src/main/java/org/elasticsearch/common/lucene/search/function/MinScoreScorer.java b/server/src/main/java/org/elasticsearch/common/lucene/search/function/MinScoreScorer.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/lucene/search/function/MinScoreScorer.java rename to server/src/main/java/org/elasticsearch/common/lucene/search/function/MinScoreScorer.java diff --git a/core/src/main/java/org/elasticsearch/common/lucene/search/function/RandomScoreFunction.java b/server/src/main/java/org/elasticsearch/common/lucene/search/function/RandomScoreFunction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/lucene/search/function/RandomScoreFunction.java rename to server/src/main/java/org/elasticsearch/common/lucene/search/function/RandomScoreFunction.java diff --git a/core/src/main/java/org/elasticsearch/common/lucene/search/function/ScoreFunction.java b/server/src/main/java/org/elasticsearch/common/lucene/search/function/ScoreFunction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/lucene/search/function/ScoreFunction.java rename to server/src/main/java/org/elasticsearch/common/lucene/search/function/ScoreFunction.java diff --git a/core/src/main/java/org/elasticsearch/common/lucene/search/function/ScriptScoreFunction.java b/server/src/main/java/org/elasticsearch/common/lucene/search/function/ScriptScoreFunction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/lucene/search/function/ScriptScoreFunction.java rename to server/src/main/java/org/elasticsearch/common/lucene/search/function/ScriptScoreFunction.java diff --git a/core/src/main/java/org/elasticsearch/common/lucene/search/function/WeightFactorFunction.java b/server/src/main/java/org/elasticsearch/common/lucene/search/function/WeightFactorFunction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/lucene/search/function/WeightFactorFunction.java rename to server/src/main/java/org/elasticsearch/common/lucene/search/function/WeightFactorFunction.java diff --git a/core/src/main/java/org/elasticsearch/common/lucene/store/ByteArrayIndexInput.java b/server/src/main/java/org/elasticsearch/common/lucene/store/ByteArrayIndexInput.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/lucene/store/ByteArrayIndexInput.java rename to server/src/main/java/org/elasticsearch/common/lucene/store/ByteArrayIndexInput.java diff --git a/core/src/main/java/org/elasticsearch/common/lucene/store/FilterIndexOutput.java b/server/src/main/java/org/elasticsearch/common/lucene/store/FilterIndexOutput.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/lucene/store/FilterIndexOutput.java rename to server/src/main/java/org/elasticsearch/common/lucene/store/FilterIndexOutput.java diff --git a/core/src/main/java/org/elasticsearch/common/lucene/store/IndexOutputOutputStream.java b/server/src/main/java/org/elasticsearch/common/lucene/store/IndexOutputOutputStream.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/lucene/store/IndexOutputOutputStream.java rename to server/src/main/java/org/elasticsearch/common/lucene/store/IndexOutputOutputStream.java diff --git a/core/src/main/java/org/elasticsearch/common/lucene/store/InputStreamIndexInput.java b/server/src/main/java/org/elasticsearch/common/lucene/store/InputStreamIndexInput.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/lucene/store/InputStreamIndexInput.java rename to server/src/main/java/org/elasticsearch/common/lucene/store/InputStreamIndexInput.java diff --git a/core/src/main/java/org/elasticsearch/common/lucene/uid/PerThreadIDVersionAndSeqNoLookup.java b/server/src/main/java/org/elasticsearch/common/lucene/uid/PerThreadIDVersionAndSeqNoLookup.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/lucene/uid/PerThreadIDVersionAndSeqNoLookup.java rename to server/src/main/java/org/elasticsearch/common/lucene/uid/PerThreadIDVersionAndSeqNoLookup.java diff --git a/core/src/main/java/org/elasticsearch/common/lucene/uid/Versions.java b/server/src/main/java/org/elasticsearch/common/lucene/uid/Versions.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/lucene/uid/Versions.java rename to server/src/main/java/org/elasticsearch/common/lucene/uid/Versions.java diff --git a/core/src/main/java/org/elasticsearch/common/lucene/uid/VersionsAndSeqNoResolver.java b/server/src/main/java/org/elasticsearch/common/lucene/uid/VersionsAndSeqNoResolver.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/lucene/uid/VersionsAndSeqNoResolver.java rename to server/src/main/java/org/elasticsearch/common/lucene/uid/VersionsAndSeqNoResolver.java diff --git a/core/src/main/java/org/elasticsearch/common/metrics/CounterMetric.java b/server/src/main/java/org/elasticsearch/common/metrics/CounterMetric.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/metrics/CounterMetric.java rename to server/src/main/java/org/elasticsearch/common/metrics/CounterMetric.java diff --git a/core/src/main/java/org/elasticsearch/common/metrics/MeanMetric.java b/server/src/main/java/org/elasticsearch/common/metrics/MeanMetric.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/metrics/MeanMetric.java rename to server/src/main/java/org/elasticsearch/common/metrics/MeanMetric.java diff --git a/core/src/main/java/org/elasticsearch/common/metrics/Metric.java b/server/src/main/java/org/elasticsearch/common/metrics/Metric.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/metrics/Metric.java rename to server/src/main/java/org/elasticsearch/common/metrics/Metric.java diff --git a/core/src/main/java/org/elasticsearch/common/network/Cidrs.java b/server/src/main/java/org/elasticsearch/common/network/Cidrs.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/network/Cidrs.java rename to server/src/main/java/org/elasticsearch/common/network/Cidrs.java diff --git a/core/src/main/java/org/elasticsearch/common/network/IfConfig.java b/server/src/main/java/org/elasticsearch/common/network/IfConfig.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/network/IfConfig.java rename to server/src/main/java/org/elasticsearch/common/network/IfConfig.java diff --git a/core/src/main/java/org/elasticsearch/common/network/InetAddresses.java b/server/src/main/java/org/elasticsearch/common/network/InetAddresses.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/network/InetAddresses.java rename to server/src/main/java/org/elasticsearch/common/network/InetAddresses.java diff --git a/core/src/main/java/org/elasticsearch/common/network/NetworkAddress.java b/server/src/main/java/org/elasticsearch/common/network/NetworkAddress.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/network/NetworkAddress.java rename to server/src/main/java/org/elasticsearch/common/network/NetworkAddress.java diff --git a/core/src/main/java/org/elasticsearch/common/network/NetworkModule.java b/server/src/main/java/org/elasticsearch/common/network/NetworkModule.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/network/NetworkModule.java rename to server/src/main/java/org/elasticsearch/common/network/NetworkModule.java diff --git a/core/src/main/java/org/elasticsearch/common/network/NetworkService.java b/server/src/main/java/org/elasticsearch/common/network/NetworkService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/network/NetworkService.java rename to server/src/main/java/org/elasticsearch/common/network/NetworkService.java diff --git a/core/src/main/java/org/elasticsearch/common/network/NetworkUtils.java b/server/src/main/java/org/elasticsearch/common/network/NetworkUtils.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/network/NetworkUtils.java rename to server/src/main/java/org/elasticsearch/common/network/NetworkUtils.java diff --git a/core/src/main/java/org/elasticsearch/common/path/PathTrie.java b/server/src/main/java/org/elasticsearch/common/path/PathTrie.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/path/PathTrie.java rename to server/src/main/java/org/elasticsearch/common/path/PathTrie.java diff --git a/core/src/main/java/org/elasticsearch/common/recycler/AbstractRecycler.java b/server/src/main/java/org/elasticsearch/common/recycler/AbstractRecycler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/recycler/AbstractRecycler.java rename to server/src/main/java/org/elasticsearch/common/recycler/AbstractRecycler.java diff --git a/core/src/main/java/org/elasticsearch/common/recycler/AbstractRecyclerC.java b/server/src/main/java/org/elasticsearch/common/recycler/AbstractRecyclerC.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/recycler/AbstractRecyclerC.java rename to server/src/main/java/org/elasticsearch/common/recycler/AbstractRecyclerC.java diff --git a/core/src/main/java/org/elasticsearch/common/recycler/ConcurrentDequeRecycler.java b/server/src/main/java/org/elasticsearch/common/recycler/ConcurrentDequeRecycler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/recycler/ConcurrentDequeRecycler.java rename to server/src/main/java/org/elasticsearch/common/recycler/ConcurrentDequeRecycler.java diff --git a/core/src/main/java/org/elasticsearch/common/recycler/DequeRecycler.java b/server/src/main/java/org/elasticsearch/common/recycler/DequeRecycler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/recycler/DequeRecycler.java rename to server/src/main/java/org/elasticsearch/common/recycler/DequeRecycler.java diff --git a/core/src/main/java/org/elasticsearch/common/recycler/FilterRecycler.java b/server/src/main/java/org/elasticsearch/common/recycler/FilterRecycler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/recycler/FilterRecycler.java rename to server/src/main/java/org/elasticsearch/common/recycler/FilterRecycler.java diff --git a/core/src/main/java/org/elasticsearch/common/recycler/NoneRecycler.java b/server/src/main/java/org/elasticsearch/common/recycler/NoneRecycler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/recycler/NoneRecycler.java rename to server/src/main/java/org/elasticsearch/common/recycler/NoneRecycler.java diff --git a/core/src/main/java/org/elasticsearch/common/recycler/Recycler.java b/server/src/main/java/org/elasticsearch/common/recycler/Recycler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/recycler/Recycler.java rename to server/src/main/java/org/elasticsearch/common/recycler/Recycler.java diff --git a/core/src/main/java/org/elasticsearch/common/recycler/Recyclers.java b/server/src/main/java/org/elasticsearch/common/recycler/Recyclers.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/recycler/Recyclers.java rename to server/src/main/java/org/elasticsearch/common/recycler/Recyclers.java diff --git a/core/src/main/java/org/elasticsearch/common/regex/Regex.java b/server/src/main/java/org/elasticsearch/common/regex/Regex.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/regex/Regex.java rename to server/src/main/java/org/elasticsearch/common/regex/Regex.java diff --git a/core/src/main/java/org/elasticsearch/common/rounding/DateTimeUnit.java b/server/src/main/java/org/elasticsearch/common/rounding/DateTimeUnit.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/rounding/DateTimeUnit.java rename to server/src/main/java/org/elasticsearch/common/rounding/DateTimeUnit.java diff --git a/core/src/main/java/org/elasticsearch/common/rounding/Rounding.java b/server/src/main/java/org/elasticsearch/common/rounding/Rounding.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/rounding/Rounding.java rename to server/src/main/java/org/elasticsearch/common/rounding/Rounding.java diff --git a/core/src/main/java/org/elasticsearch/common/settings/AbstractScopedSettings.java b/server/src/main/java/org/elasticsearch/common/settings/AbstractScopedSettings.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/settings/AbstractScopedSettings.java rename to server/src/main/java/org/elasticsearch/common/settings/AbstractScopedSettings.java diff --git a/core/src/main/java/org/elasticsearch/common/settings/AddFileKeyStoreCommand.java b/server/src/main/java/org/elasticsearch/common/settings/AddFileKeyStoreCommand.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/settings/AddFileKeyStoreCommand.java rename to server/src/main/java/org/elasticsearch/common/settings/AddFileKeyStoreCommand.java diff --git a/core/src/main/java/org/elasticsearch/common/settings/AddStringKeyStoreCommand.java b/server/src/main/java/org/elasticsearch/common/settings/AddStringKeyStoreCommand.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/settings/AddStringKeyStoreCommand.java rename to server/src/main/java/org/elasticsearch/common/settings/AddStringKeyStoreCommand.java diff --git a/core/src/main/java/org/elasticsearch/common/settings/ClusterSettings.java b/server/src/main/java/org/elasticsearch/common/settings/ClusterSettings.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/settings/ClusterSettings.java rename to server/src/main/java/org/elasticsearch/common/settings/ClusterSettings.java diff --git a/core/src/main/java/org/elasticsearch/common/settings/CreateKeyStoreCommand.java b/server/src/main/java/org/elasticsearch/common/settings/CreateKeyStoreCommand.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/settings/CreateKeyStoreCommand.java rename to server/src/main/java/org/elasticsearch/common/settings/CreateKeyStoreCommand.java diff --git a/core/src/main/java/org/elasticsearch/common/settings/IndexScopedSettings.java b/server/src/main/java/org/elasticsearch/common/settings/IndexScopedSettings.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/settings/IndexScopedSettings.java rename to server/src/main/java/org/elasticsearch/common/settings/IndexScopedSettings.java diff --git a/core/src/main/java/org/elasticsearch/common/settings/KeyStoreCli.java b/server/src/main/java/org/elasticsearch/common/settings/KeyStoreCli.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/settings/KeyStoreCli.java rename to server/src/main/java/org/elasticsearch/common/settings/KeyStoreCli.java diff --git a/core/src/main/java/org/elasticsearch/common/settings/KeyStoreWrapper.java b/server/src/main/java/org/elasticsearch/common/settings/KeyStoreWrapper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/settings/KeyStoreWrapper.java rename to server/src/main/java/org/elasticsearch/common/settings/KeyStoreWrapper.java diff --git a/core/src/main/java/org/elasticsearch/common/settings/ListKeyStoreCommand.java b/server/src/main/java/org/elasticsearch/common/settings/ListKeyStoreCommand.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/settings/ListKeyStoreCommand.java rename to server/src/main/java/org/elasticsearch/common/settings/ListKeyStoreCommand.java diff --git a/core/src/main/java/org/elasticsearch/common/settings/NoClassSettingsException.java b/server/src/main/java/org/elasticsearch/common/settings/NoClassSettingsException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/settings/NoClassSettingsException.java rename to server/src/main/java/org/elasticsearch/common/settings/NoClassSettingsException.java diff --git a/core/src/main/java/org/elasticsearch/common/settings/PropertyPlaceholder.java b/server/src/main/java/org/elasticsearch/common/settings/PropertyPlaceholder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/settings/PropertyPlaceholder.java rename to server/src/main/java/org/elasticsearch/common/settings/PropertyPlaceholder.java diff --git a/core/src/main/java/org/elasticsearch/common/settings/RemoveSettingKeyStoreCommand.java b/server/src/main/java/org/elasticsearch/common/settings/RemoveSettingKeyStoreCommand.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/settings/RemoveSettingKeyStoreCommand.java rename to server/src/main/java/org/elasticsearch/common/settings/RemoveSettingKeyStoreCommand.java diff --git a/core/src/main/java/org/elasticsearch/common/settings/SecureSetting.java b/server/src/main/java/org/elasticsearch/common/settings/SecureSetting.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/settings/SecureSetting.java rename to server/src/main/java/org/elasticsearch/common/settings/SecureSetting.java diff --git a/core/src/main/java/org/elasticsearch/common/settings/SecureSettings.java b/server/src/main/java/org/elasticsearch/common/settings/SecureSettings.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/settings/SecureSettings.java rename to server/src/main/java/org/elasticsearch/common/settings/SecureSettings.java diff --git a/core/src/main/java/org/elasticsearch/common/settings/SecureString.java b/server/src/main/java/org/elasticsearch/common/settings/SecureString.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/settings/SecureString.java rename to server/src/main/java/org/elasticsearch/common/settings/SecureString.java diff --git a/core/src/main/java/org/elasticsearch/common/settings/Setting.java b/server/src/main/java/org/elasticsearch/common/settings/Setting.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/settings/Setting.java rename to server/src/main/java/org/elasticsearch/common/settings/Setting.java diff --git a/core/src/main/java/org/elasticsearch/common/settings/Settings.java b/server/src/main/java/org/elasticsearch/common/settings/Settings.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/settings/Settings.java rename to server/src/main/java/org/elasticsearch/common/settings/Settings.java diff --git a/core/src/main/java/org/elasticsearch/common/settings/SettingsException.java b/server/src/main/java/org/elasticsearch/common/settings/SettingsException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/settings/SettingsException.java rename to server/src/main/java/org/elasticsearch/common/settings/SettingsException.java diff --git a/core/src/main/java/org/elasticsearch/common/settings/SettingsFilter.java b/server/src/main/java/org/elasticsearch/common/settings/SettingsFilter.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/settings/SettingsFilter.java rename to server/src/main/java/org/elasticsearch/common/settings/SettingsFilter.java diff --git a/core/src/main/java/org/elasticsearch/common/settings/SettingsModule.java b/server/src/main/java/org/elasticsearch/common/settings/SettingsModule.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/settings/SettingsModule.java rename to server/src/main/java/org/elasticsearch/common/settings/SettingsModule.java diff --git a/core/src/main/java/org/elasticsearch/common/settings/package-info.java b/server/src/main/java/org/elasticsearch/common/settings/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/settings/package-info.java rename to server/src/main/java/org/elasticsearch/common/settings/package-info.java diff --git a/core/src/main/java/org/elasticsearch/common/text/Text.java b/server/src/main/java/org/elasticsearch/common/text/Text.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/text/Text.java rename to server/src/main/java/org/elasticsearch/common/text/Text.java diff --git a/core/src/main/java/org/elasticsearch/common/transport/BoundTransportAddress.java b/server/src/main/java/org/elasticsearch/common/transport/BoundTransportAddress.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/transport/BoundTransportAddress.java rename to server/src/main/java/org/elasticsearch/common/transport/BoundTransportAddress.java diff --git a/core/src/main/java/org/elasticsearch/common/transport/NetworkExceptionHelper.java b/server/src/main/java/org/elasticsearch/common/transport/NetworkExceptionHelper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/transport/NetworkExceptionHelper.java rename to server/src/main/java/org/elasticsearch/common/transport/NetworkExceptionHelper.java diff --git a/core/src/main/java/org/elasticsearch/common/transport/PortsRange.java b/server/src/main/java/org/elasticsearch/common/transport/PortsRange.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/transport/PortsRange.java rename to server/src/main/java/org/elasticsearch/common/transport/PortsRange.java diff --git a/core/src/main/java/org/elasticsearch/common/transport/TransportAddress.java b/server/src/main/java/org/elasticsearch/common/transport/TransportAddress.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/transport/TransportAddress.java rename to server/src/main/java/org/elasticsearch/common/transport/TransportAddress.java diff --git a/core/src/main/java/org/elasticsearch/common/unit/ByteSizeUnit.java b/server/src/main/java/org/elasticsearch/common/unit/ByteSizeUnit.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/unit/ByteSizeUnit.java rename to server/src/main/java/org/elasticsearch/common/unit/ByteSizeUnit.java diff --git a/core/src/main/java/org/elasticsearch/common/unit/ByteSizeValue.java b/server/src/main/java/org/elasticsearch/common/unit/ByteSizeValue.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/unit/ByteSizeValue.java rename to server/src/main/java/org/elasticsearch/common/unit/ByteSizeValue.java diff --git a/core/src/main/java/org/elasticsearch/common/unit/DistanceUnit.java b/server/src/main/java/org/elasticsearch/common/unit/DistanceUnit.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/unit/DistanceUnit.java rename to server/src/main/java/org/elasticsearch/common/unit/DistanceUnit.java diff --git a/core/src/main/java/org/elasticsearch/common/unit/Fuzziness.java b/server/src/main/java/org/elasticsearch/common/unit/Fuzziness.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/unit/Fuzziness.java rename to server/src/main/java/org/elasticsearch/common/unit/Fuzziness.java diff --git a/core/src/main/java/org/elasticsearch/common/unit/MemorySizeValue.java b/server/src/main/java/org/elasticsearch/common/unit/MemorySizeValue.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/unit/MemorySizeValue.java rename to server/src/main/java/org/elasticsearch/common/unit/MemorySizeValue.java diff --git a/core/src/main/java/org/elasticsearch/common/unit/RatioValue.java b/server/src/main/java/org/elasticsearch/common/unit/RatioValue.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/unit/RatioValue.java rename to server/src/main/java/org/elasticsearch/common/unit/RatioValue.java diff --git a/core/src/main/java/org/elasticsearch/common/unit/SizeUnit.java b/server/src/main/java/org/elasticsearch/common/unit/SizeUnit.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/unit/SizeUnit.java rename to server/src/main/java/org/elasticsearch/common/unit/SizeUnit.java diff --git a/core/src/main/java/org/elasticsearch/common/unit/SizeValue.java b/server/src/main/java/org/elasticsearch/common/unit/SizeValue.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/unit/SizeValue.java rename to server/src/main/java/org/elasticsearch/common/unit/SizeValue.java diff --git a/core/src/main/java/org/elasticsearch/common/unit/TimeValue.java b/server/src/main/java/org/elasticsearch/common/unit/TimeValue.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/unit/TimeValue.java rename to server/src/main/java/org/elasticsearch/common/unit/TimeValue.java diff --git a/core/src/main/java/org/elasticsearch/common/util/AbstractArray.java b/server/src/main/java/org/elasticsearch/common/util/AbstractArray.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/AbstractArray.java rename to server/src/main/java/org/elasticsearch/common/util/AbstractArray.java diff --git a/core/src/main/java/org/elasticsearch/common/util/AbstractBigArray.java b/server/src/main/java/org/elasticsearch/common/util/AbstractBigArray.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/AbstractBigArray.java rename to server/src/main/java/org/elasticsearch/common/util/AbstractBigArray.java diff --git a/core/src/main/java/org/elasticsearch/common/util/AbstractHash.java b/server/src/main/java/org/elasticsearch/common/util/AbstractHash.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/AbstractHash.java rename to server/src/main/java/org/elasticsearch/common/util/AbstractHash.java diff --git a/core/src/main/java/org/elasticsearch/common/util/AbstractPagedHashMap.java b/server/src/main/java/org/elasticsearch/common/util/AbstractPagedHashMap.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/AbstractPagedHashMap.java rename to server/src/main/java/org/elasticsearch/common/util/AbstractPagedHashMap.java diff --git a/core/src/main/java/org/elasticsearch/common/util/ArrayUtils.java b/server/src/main/java/org/elasticsearch/common/util/ArrayUtils.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/ArrayUtils.java rename to server/src/main/java/org/elasticsearch/common/util/ArrayUtils.java diff --git a/core/src/main/java/org/elasticsearch/common/util/BigArray.java b/server/src/main/java/org/elasticsearch/common/util/BigArray.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/BigArray.java rename to server/src/main/java/org/elasticsearch/common/util/BigArray.java diff --git a/core/src/main/java/org/elasticsearch/common/util/BigArrays.java b/server/src/main/java/org/elasticsearch/common/util/BigArrays.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/BigArrays.java rename to server/src/main/java/org/elasticsearch/common/util/BigArrays.java diff --git a/core/src/main/java/org/elasticsearch/common/util/BigByteArray.java b/server/src/main/java/org/elasticsearch/common/util/BigByteArray.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/BigByteArray.java rename to server/src/main/java/org/elasticsearch/common/util/BigByteArray.java diff --git a/core/src/main/java/org/elasticsearch/common/util/BigDoubleArray.java b/server/src/main/java/org/elasticsearch/common/util/BigDoubleArray.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/BigDoubleArray.java rename to server/src/main/java/org/elasticsearch/common/util/BigDoubleArray.java diff --git a/core/src/main/java/org/elasticsearch/common/util/BigFloatArray.java b/server/src/main/java/org/elasticsearch/common/util/BigFloatArray.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/BigFloatArray.java rename to server/src/main/java/org/elasticsearch/common/util/BigFloatArray.java diff --git a/core/src/main/java/org/elasticsearch/common/util/BigIntArray.java b/server/src/main/java/org/elasticsearch/common/util/BigIntArray.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/BigIntArray.java rename to server/src/main/java/org/elasticsearch/common/util/BigIntArray.java diff --git a/core/src/main/java/org/elasticsearch/common/util/BigLongArray.java b/server/src/main/java/org/elasticsearch/common/util/BigLongArray.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/BigLongArray.java rename to server/src/main/java/org/elasticsearch/common/util/BigLongArray.java diff --git a/core/src/main/java/org/elasticsearch/common/util/BigObjectArray.java b/server/src/main/java/org/elasticsearch/common/util/BigObjectArray.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/BigObjectArray.java rename to server/src/main/java/org/elasticsearch/common/util/BigObjectArray.java diff --git a/core/src/main/java/org/elasticsearch/common/util/ByteArray.java b/server/src/main/java/org/elasticsearch/common/util/ByteArray.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/ByteArray.java rename to server/src/main/java/org/elasticsearch/common/util/ByteArray.java diff --git a/core/src/main/java/org/elasticsearch/common/util/ByteUtils.java b/server/src/main/java/org/elasticsearch/common/util/ByteUtils.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/ByteUtils.java rename to server/src/main/java/org/elasticsearch/common/util/ByteUtils.java diff --git a/core/src/main/java/org/elasticsearch/common/util/BytesRefHash.java b/server/src/main/java/org/elasticsearch/common/util/BytesRefHash.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/BytesRefHash.java rename to server/src/main/java/org/elasticsearch/common/util/BytesRefHash.java diff --git a/core/src/main/java/org/elasticsearch/common/util/CancellableThreads.java b/server/src/main/java/org/elasticsearch/common/util/CancellableThreads.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/CancellableThreads.java rename to server/src/main/java/org/elasticsearch/common/util/CancellableThreads.java diff --git a/core/src/main/java/org/elasticsearch/common/util/CollectionUtils.java b/server/src/main/java/org/elasticsearch/common/util/CollectionUtils.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/CollectionUtils.java rename to server/src/main/java/org/elasticsearch/common/util/CollectionUtils.java diff --git a/core/src/main/java/org/elasticsearch/common/util/Comparators.java b/server/src/main/java/org/elasticsearch/common/util/Comparators.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/Comparators.java rename to server/src/main/java/org/elasticsearch/common/util/Comparators.java diff --git a/core/src/main/java/org/elasticsearch/common/util/DoubleArray.java b/server/src/main/java/org/elasticsearch/common/util/DoubleArray.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/DoubleArray.java rename to server/src/main/java/org/elasticsearch/common/util/DoubleArray.java diff --git a/core/src/main/java/org/elasticsearch/common/util/FloatArray.java b/server/src/main/java/org/elasticsearch/common/util/FloatArray.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/FloatArray.java rename to server/src/main/java/org/elasticsearch/common/util/FloatArray.java diff --git a/core/src/main/java/org/elasticsearch/common/util/IndexFolderUpgrader.java b/server/src/main/java/org/elasticsearch/common/util/IndexFolderUpgrader.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/IndexFolderUpgrader.java rename to server/src/main/java/org/elasticsearch/common/util/IndexFolderUpgrader.java diff --git a/core/src/main/java/org/elasticsearch/common/util/IntArray.java b/server/src/main/java/org/elasticsearch/common/util/IntArray.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/IntArray.java rename to server/src/main/java/org/elasticsearch/common/util/IntArray.java diff --git a/core/src/main/java/org/elasticsearch/common/util/LocaleUtils.java b/server/src/main/java/org/elasticsearch/common/util/LocaleUtils.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/LocaleUtils.java rename to server/src/main/java/org/elasticsearch/common/util/LocaleUtils.java diff --git a/core/src/main/java/org/elasticsearch/common/util/LongArray.java b/server/src/main/java/org/elasticsearch/common/util/LongArray.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/LongArray.java rename to server/src/main/java/org/elasticsearch/common/util/LongArray.java diff --git a/core/src/main/java/org/elasticsearch/common/util/LongHash.java b/server/src/main/java/org/elasticsearch/common/util/LongHash.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/LongHash.java rename to server/src/main/java/org/elasticsearch/common/util/LongHash.java diff --git a/core/src/main/java/org/elasticsearch/common/util/LongObjectPagedHashMap.java b/server/src/main/java/org/elasticsearch/common/util/LongObjectPagedHashMap.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/LongObjectPagedHashMap.java rename to server/src/main/java/org/elasticsearch/common/util/LongObjectPagedHashMap.java diff --git a/core/src/main/java/org/elasticsearch/common/util/ObjectArray.java b/server/src/main/java/org/elasticsearch/common/util/ObjectArray.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/ObjectArray.java rename to server/src/main/java/org/elasticsearch/common/util/ObjectArray.java diff --git a/core/src/main/java/org/elasticsearch/common/util/PageCacheRecycler.java b/server/src/main/java/org/elasticsearch/common/util/PageCacheRecycler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/PageCacheRecycler.java rename to server/src/main/java/org/elasticsearch/common/util/PageCacheRecycler.java diff --git a/core/src/main/java/org/elasticsearch/common/util/SingleObjectCache.java b/server/src/main/java/org/elasticsearch/common/util/SingleObjectCache.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/SingleObjectCache.java rename to server/src/main/java/org/elasticsearch/common/util/SingleObjectCache.java diff --git a/core/src/main/java/org/elasticsearch/common/util/URIPattern.java b/server/src/main/java/org/elasticsearch/common/util/URIPattern.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/URIPattern.java rename to server/src/main/java/org/elasticsearch/common/util/URIPattern.java diff --git a/core/src/main/java/org/elasticsearch/common/util/concurrent/AbstractLifecycleRunnable.java b/server/src/main/java/org/elasticsearch/common/util/concurrent/AbstractLifecycleRunnable.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/concurrent/AbstractLifecycleRunnable.java rename to server/src/main/java/org/elasticsearch/common/util/concurrent/AbstractLifecycleRunnable.java diff --git a/core/src/main/java/org/elasticsearch/common/util/concurrent/AbstractRefCounted.java b/server/src/main/java/org/elasticsearch/common/util/concurrent/AbstractRefCounted.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/concurrent/AbstractRefCounted.java rename to server/src/main/java/org/elasticsearch/common/util/concurrent/AbstractRefCounted.java diff --git a/core/src/main/java/org/elasticsearch/common/util/concurrent/AbstractRunnable.java b/server/src/main/java/org/elasticsearch/common/util/concurrent/AbstractRunnable.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/concurrent/AbstractRunnable.java rename to server/src/main/java/org/elasticsearch/common/util/concurrent/AbstractRunnable.java diff --git a/core/src/main/java/org/elasticsearch/common/util/concurrent/AsyncIOProcessor.java b/server/src/main/java/org/elasticsearch/common/util/concurrent/AsyncIOProcessor.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/concurrent/AsyncIOProcessor.java rename to server/src/main/java/org/elasticsearch/common/util/concurrent/AsyncIOProcessor.java diff --git a/core/src/main/java/org/elasticsearch/common/util/concurrent/AtomicArray.java b/server/src/main/java/org/elasticsearch/common/util/concurrent/AtomicArray.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/concurrent/AtomicArray.java rename to server/src/main/java/org/elasticsearch/common/util/concurrent/AtomicArray.java diff --git a/core/src/main/java/org/elasticsearch/common/util/concurrent/BaseFuture.java b/server/src/main/java/org/elasticsearch/common/util/concurrent/BaseFuture.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/concurrent/BaseFuture.java rename to server/src/main/java/org/elasticsearch/common/util/concurrent/BaseFuture.java diff --git a/core/src/main/java/org/elasticsearch/common/util/concurrent/ConcurrentCollections.java b/server/src/main/java/org/elasticsearch/common/util/concurrent/ConcurrentCollections.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/concurrent/ConcurrentCollections.java rename to server/src/main/java/org/elasticsearch/common/util/concurrent/ConcurrentCollections.java diff --git a/core/src/main/java/org/elasticsearch/common/util/concurrent/ConcurrentHashMapLong.java b/server/src/main/java/org/elasticsearch/common/util/concurrent/ConcurrentHashMapLong.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/concurrent/ConcurrentHashMapLong.java rename to server/src/main/java/org/elasticsearch/common/util/concurrent/ConcurrentHashMapLong.java diff --git a/core/src/main/java/org/elasticsearch/common/util/concurrent/ConcurrentMapLong.java b/server/src/main/java/org/elasticsearch/common/util/concurrent/ConcurrentMapLong.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/concurrent/ConcurrentMapLong.java rename to server/src/main/java/org/elasticsearch/common/util/concurrent/ConcurrentMapLong.java diff --git a/core/src/main/java/org/elasticsearch/common/util/concurrent/CountDown.java b/server/src/main/java/org/elasticsearch/common/util/concurrent/CountDown.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/concurrent/CountDown.java rename to server/src/main/java/org/elasticsearch/common/util/concurrent/CountDown.java diff --git a/core/src/main/java/org/elasticsearch/common/util/concurrent/EsAbortPolicy.java b/server/src/main/java/org/elasticsearch/common/util/concurrent/EsAbortPolicy.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/concurrent/EsAbortPolicy.java rename to server/src/main/java/org/elasticsearch/common/util/concurrent/EsAbortPolicy.java diff --git a/core/src/main/java/org/elasticsearch/common/util/concurrent/EsExecutors.java b/server/src/main/java/org/elasticsearch/common/util/concurrent/EsExecutors.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/concurrent/EsExecutors.java rename to server/src/main/java/org/elasticsearch/common/util/concurrent/EsExecutors.java diff --git a/core/src/main/java/org/elasticsearch/common/util/concurrent/EsRejectedExecutionException.java b/server/src/main/java/org/elasticsearch/common/util/concurrent/EsRejectedExecutionException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/concurrent/EsRejectedExecutionException.java rename to server/src/main/java/org/elasticsearch/common/util/concurrent/EsRejectedExecutionException.java diff --git a/core/src/main/java/org/elasticsearch/common/util/concurrent/EsThreadPoolExecutor.java b/server/src/main/java/org/elasticsearch/common/util/concurrent/EsThreadPoolExecutor.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/concurrent/EsThreadPoolExecutor.java rename to server/src/main/java/org/elasticsearch/common/util/concurrent/EsThreadPoolExecutor.java diff --git a/core/src/main/java/org/elasticsearch/common/util/concurrent/FutureUtils.java b/server/src/main/java/org/elasticsearch/common/util/concurrent/FutureUtils.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/concurrent/FutureUtils.java rename to server/src/main/java/org/elasticsearch/common/util/concurrent/FutureUtils.java diff --git a/core/src/main/java/org/elasticsearch/common/util/concurrent/KeyedLock.java b/server/src/main/java/org/elasticsearch/common/util/concurrent/KeyedLock.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/concurrent/KeyedLock.java rename to server/src/main/java/org/elasticsearch/common/util/concurrent/KeyedLock.java diff --git a/core/src/main/java/org/elasticsearch/common/util/concurrent/LoggingRunnable.java b/server/src/main/java/org/elasticsearch/common/util/concurrent/LoggingRunnable.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/concurrent/LoggingRunnable.java rename to server/src/main/java/org/elasticsearch/common/util/concurrent/LoggingRunnable.java diff --git a/core/src/main/java/org/elasticsearch/common/util/concurrent/PrioritizedCallable.java b/server/src/main/java/org/elasticsearch/common/util/concurrent/PrioritizedCallable.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/concurrent/PrioritizedCallable.java rename to server/src/main/java/org/elasticsearch/common/util/concurrent/PrioritizedCallable.java diff --git a/core/src/main/java/org/elasticsearch/common/util/concurrent/PrioritizedEsThreadPoolExecutor.java b/server/src/main/java/org/elasticsearch/common/util/concurrent/PrioritizedEsThreadPoolExecutor.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/concurrent/PrioritizedEsThreadPoolExecutor.java rename to server/src/main/java/org/elasticsearch/common/util/concurrent/PrioritizedEsThreadPoolExecutor.java diff --git a/core/src/main/java/org/elasticsearch/common/util/concurrent/PrioritizedRunnable.java b/server/src/main/java/org/elasticsearch/common/util/concurrent/PrioritizedRunnable.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/concurrent/PrioritizedRunnable.java rename to server/src/main/java/org/elasticsearch/common/util/concurrent/PrioritizedRunnable.java diff --git a/core/src/main/java/org/elasticsearch/common/util/concurrent/QueueResizingEsThreadPoolExecutor.java b/server/src/main/java/org/elasticsearch/common/util/concurrent/QueueResizingEsThreadPoolExecutor.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/concurrent/QueueResizingEsThreadPoolExecutor.java rename to server/src/main/java/org/elasticsearch/common/util/concurrent/QueueResizingEsThreadPoolExecutor.java diff --git a/core/src/main/java/org/elasticsearch/common/util/concurrent/RefCounted.java b/server/src/main/java/org/elasticsearch/common/util/concurrent/RefCounted.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/concurrent/RefCounted.java rename to server/src/main/java/org/elasticsearch/common/util/concurrent/RefCounted.java diff --git a/core/src/main/java/org/elasticsearch/common/util/concurrent/ReleasableLock.java b/server/src/main/java/org/elasticsearch/common/util/concurrent/ReleasableLock.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/concurrent/ReleasableLock.java rename to server/src/main/java/org/elasticsearch/common/util/concurrent/ReleasableLock.java diff --git a/core/src/main/java/org/elasticsearch/common/util/concurrent/ResizableBlockingQueue.java b/server/src/main/java/org/elasticsearch/common/util/concurrent/ResizableBlockingQueue.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/concurrent/ResizableBlockingQueue.java rename to server/src/main/java/org/elasticsearch/common/util/concurrent/ResizableBlockingQueue.java diff --git a/core/src/main/java/org/elasticsearch/common/util/concurrent/SizeBlockingQueue.java b/server/src/main/java/org/elasticsearch/common/util/concurrent/SizeBlockingQueue.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/concurrent/SizeBlockingQueue.java rename to server/src/main/java/org/elasticsearch/common/util/concurrent/SizeBlockingQueue.java diff --git a/core/src/main/java/org/elasticsearch/common/util/concurrent/ThreadBarrier.java b/server/src/main/java/org/elasticsearch/common/util/concurrent/ThreadBarrier.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/concurrent/ThreadBarrier.java rename to server/src/main/java/org/elasticsearch/common/util/concurrent/ThreadBarrier.java diff --git a/core/src/main/java/org/elasticsearch/common/util/concurrent/ThreadContext.java b/server/src/main/java/org/elasticsearch/common/util/concurrent/ThreadContext.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/concurrent/ThreadContext.java rename to server/src/main/java/org/elasticsearch/common/util/concurrent/ThreadContext.java diff --git a/core/src/main/java/org/elasticsearch/common/util/concurrent/TimedRunnable.java b/server/src/main/java/org/elasticsearch/common/util/concurrent/TimedRunnable.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/concurrent/TimedRunnable.java rename to server/src/main/java/org/elasticsearch/common/util/concurrent/TimedRunnable.java diff --git a/core/src/main/java/org/elasticsearch/common/util/concurrent/UncategorizedExecutionException.java b/server/src/main/java/org/elasticsearch/common/util/concurrent/UncategorizedExecutionException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/concurrent/UncategorizedExecutionException.java rename to server/src/main/java/org/elasticsearch/common/util/concurrent/UncategorizedExecutionException.java diff --git a/core/src/main/java/org/elasticsearch/common/util/concurrent/XRejectedExecutionHandler.java b/server/src/main/java/org/elasticsearch/common/util/concurrent/XRejectedExecutionHandler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/concurrent/XRejectedExecutionHandler.java rename to server/src/main/java/org/elasticsearch/common/util/concurrent/XRejectedExecutionHandler.java diff --git a/core/src/main/java/org/elasticsearch/common/util/iterable/Iterables.java b/server/src/main/java/org/elasticsearch/common/util/iterable/Iterables.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/iterable/Iterables.java rename to server/src/main/java/org/elasticsearch/common/util/iterable/Iterables.java diff --git a/core/src/main/java/org/elasticsearch/common/util/set/Sets.java b/server/src/main/java/org/elasticsearch/common/util/set/Sets.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/util/set/Sets.java rename to server/src/main/java/org/elasticsearch/common/util/set/Sets.java diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/AbstractObjectParser.java b/server/src/main/java/org/elasticsearch/common/xcontent/AbstractObjectParser.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/xcontent/AbstractObjectParser.java rename to server/src/main/java/org/elasticsearch/common/xcontent/AbstractObjectParser.java diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/ConstructingObjectParser.java b/server/src/main/java/org/elasticsearch/common/xcontent/ConstructingObjectParser.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/xcontent/ConstructingObjectParser.java rename to server/src/main/java/org/elasticsearch/common/xcontent/ConstructingObjectParser.java diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/ContextParser.java b/server/src/main/java/org/elasticsearch/common/xcontent/ContextParser.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/xcontent/ContextParser.java rename to server/src/main/java/org/elasticsearch/common/xcontent/ContextParser.java diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/NamedXContentRegistry.java b/server/src/main/java/org/elasticsearch/common/xcontent/NamedXContentRegistry.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/xcontent/NamedXContentRegistry.java rename to server/src/main/java/org/elasticsearch/common/xcontent/NamedXContentRegistry.java diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/ObjectParser.java b/server/src/main/java/org/elasticsearch/common/xcontent/ObjectParser.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/xcontent/ObjectParser.java rename to server/src/main/java/org/elasticsearch/common/xcontent/ObjectParser.java diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/ParseFieldRegistry.java b/server/src/main/java/org/elasticsearch/common/xcontent/ParseFieldRegistry.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/xcontent/ParseFieldRegistry.java rename to server/src/main/java/org/elasticsearch/common/xcontent/ParseFieldRegistry.java diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/StatusToXContentObject.java b/server/src/main/java/org/elasticsearch/common/xcontent/StatusToXContentObject.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/xcontent/StatusToXContentObject.java rename to server/src/main/java/org/elasticsearch/common/xcontent/StatusToXContentObject.java diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/ToXContent.java b/server/src/main/java/org/elasticsearch/common/xcontent/ToXContent.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/xcontent/ToXContent.java rename to server/src/main/java/org/elasticsearch/common/xcontent/ToXContent.java diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/ToXContentFragment.java b/server/src/main/java/org/elasticsearch/common/xcontent/ToXContentFragment.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/xcontent/ToXContentFragment.java rename to server/src/main/java/org/elasticsearch/common/xcontent/ToXContentFragment.java diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/ToXContentObject.java b/server/src/main/java/org/elasticsearch/common/xcontent/ToXContentObject.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/xcontent/ToXContentObject.java rename to server/src/main/java/org/elasticsearch/common/xcontent/ToXContentObject.java diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/XContent.java b/server/src/main/java/org/elasticsearch/common/xcontent/XContent.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/xcontent/XContent.java rename to server/src/main/java/org/elasticsearch/common/xcontent/XContent.java diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/XContentBuilder.java b/server/src/main/java/org/elasticsearch/common/xcontent/XContentBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/xcontent/XContentBuilder.java rename to server/src/main/java/org/elasticsearch/common/xcontent/XContentBuilder.java diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/XContentFactory.java b/server/src/main/java/org/elasticsearch/common/xcontent/XContentFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/xcontent/XContentFactory.java rename to server/src/main/java/org/elasticsearch/common/xcontent/XContentFactory.java diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/XContentGenerator.java b/server/src/main/java/org/elasticsearch/common/xcontent/XContentGenerator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/xcontent/XContentGenerator.java rename to server/src/main/java/org/elasticsearch/common/xcontent/XContentGenerator.java diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/XContentHelper.java b/server/src/main/java/org/elasticsearch/common/xcontent/XContentHelper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/xcontent/XContentHelper.java rename to server/src/main/java/org/elasticsearch/common/xcontent/XContentHelper.java diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/XContentLocation.java b/server/src/main/java/org/elasticsearch/common/xcontent/XContentLocation.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/xcontent/XContentLocation.java rename to server/src/main/java/org/elasticsearch/common/xcontent/XContentLocation.java diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/XContentParser.java b/server/src/main/java/org/elasticsearch/common/xcontent/XContentParser.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/xcontent/XContentParser.java rename to server/src/main/java/org/elasticsearch/common/xcontent/XContentParser.java diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/XContentParserUtils.java b/server/src/main/java/org/elasticsearch/common/xcontent/XContentParserUtils.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/xcontent/XContentParserUtils.java rename to server/src/main/java/org/elasticsearch/common/xcontent/XContentParserUtils.java diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/XContentType.java b/server/src/main/java/org/elasticsearch/common/xcontent/XContentType.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/xcontent/XContentType.java rename to server/src/main/java/org/elasticsearch/common/xcontent/XContentType.java diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/cbor/CborXContent.java b/server/src/main/java/org/elasticsearch/common/xcontent/cbor/CborXContent.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/xcontent/cbor/CborXContent.java rename to server/src/main/java/org/elasticsearch/common/xcontent/cbor/CborXContent.java diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/cbor/CborXContentGenerator.java b/server/src/main/java/org/elasticsearch/common/xcontent/cbor/CborXContentGenerator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/xcontent/cbor/CborXContentGenerator.java rename to server/src/main/java/org/elasticsearch/common/xcontent/cbor/CborXContentGenerator.java diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/cbor/CborXContentParser.java b/server/src/main/java/org/elasticsearch/common/xcontent/cbor/CborXContentParser.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/xcontent/cbor/CborXContentParser.java rename to server/src/main/java/org/elasticsearch/common/xcontent/cbor/CborXContentParser.java diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContent.java b/server/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContent.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContent.java rename to server/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContent.java diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContentGenerator.java b/server/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContentGenerator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContentGenerator.java rename to server/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContentGenerator.java diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContentParser.java b/server/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContentParser.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContentParser.java rename to server/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContentParser.java diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContent.java b/server/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContent.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContent.java rename to server/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContent.java diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContentGenerator.java b/server/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContentGenerator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContentGenerator.java rename to server/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContentGenerator.java diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContentParser.java b/server/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContentParser.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContentParser.java rename to server/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContentParser.java diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/support/AbstractXContentParser.java b/server/src/main/java/org/elasticsearch/common/xcontent/support/AbstractXContentParser.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/xcontent/support/AbstractXContentParser.java rename to server/src/main/java/org/elasticsearch/common/xcontent/support/AbstractXContentParser.java diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/support/XContentMapValues.java b/server/src/main/java/org/elasticsearch/common/xcontent/support/XContentMapValues.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/xcontent/support/XContentMapValues.java rename to server/src/main/java/org/elasticsearch/common/xcontent/support/XContentMapValues.java diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/support/filtering/FilterPath.java b/server/src/main/java/org/elasticsearch/common/xcontent/support/filtering/FilterPath.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/xcontent/support/filtering/FilterPath.java rename to server/src/main/java/org/elasticsearch/common/xcontent/support/filtering/FilterPath.java diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/support/filtering/FilterPathBasedFilter.java b/server/src/main/java/org/elasticsearch/common/xcontent/support/filtering/FilterPathBasedFilter.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/xcontent/support/filtering/FilterPathBasedFilter.java rename to server/src/main/java/org/elasticsearch/common/xcontent/support/filtering/FilterPathBasedFilter.java diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/yaml/YamlXContent.java b/server/src/main/java/org/elasticsearch/common/xcontent/yaml/YamlXContent.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/xcontent/yaml/YamlXContent.java rename to server/src/main/java/org/elasticsearch/common/xcontent/yaml/YamlXContent.java diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/yaml/YamlXContentGenerator.java b/server/src/main/java/org/elasticsearch/common/xcontent/yaml/YamlXContentGenerator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/xcontent/yaml/YamlXContentGenerator.java rename to server/src/main/java/org/elasticsearch/common/xcontent/yaml/YamlXContentGenerator.java diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/yaml/YamlXContentParser.java b/server/src/main/java/org/elasticsearch/common/xcontent/yaml/YamlXContentParser.java similarity index 100% rename from core/src/main/java/org/elasticsearch/common/xcontent/yaml/YamlXContentParser.java rename to server/src/main/java/org/elasticsearch/common/xcontent/yaml/YamlXContentParser.java diff --git a/core/src/main/java/org/elasticsearch/discovery/AckClusterStatePublishResponseHandler.java b/server/src/main/java/org/elasticsearch/discovery/AckClusterStatePublishResponseHandler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/discovery/AckClusterStatePublishResponseHandler.java rename to server/src/main/java/org/elasticsearch/discovery/AckClusterStatePublishResponseHandler.java diff --git a/core/src/main/java/org/elasticsearch/discovery/BlockingClusterStatePublishResponseHandler.java b/server/src/main/java/org/elasticsearch/discovery/BlockingClusterStatePublishResponseHandler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/discovery/BlockingClusterStatePublishResponseHandler.java rename to server/src/main/java/org/elasticsearch/discovery/BlockingClusterStatePublishResponseHandler.java diff --git a/core/src/main/java/org/elasticsearch/discovery/Discovery.java b/server/src/main/java/org/elasticsearch/discovery/Discovery.java similarity index 100% rename from core/src/main/java/org/elasticsearch/discovery/Discovery.java rename to server/src/main/java/org/elasticsearch/discovery/Discovery.java diff --git a/core/src/main/java/org/elasticsearch/discovery/DiscoveryModule.java b/server/src/main/java/org/elasticsearch/discovery/DiscoveryModule.java similarity index 100% rename from core/src/main/java/org/elasticsearch/discovery/DiscoveryModule.java rename to server/src/main/java/org/elasticsearch/discovery/DiscoveryModule.java diff --git a/core/src/main/java/org/elasticsearch/discovery/DiscoverySettings.java b/server/src/main/java/org/elasticsearch/discovery/DiscoverySettings.java similarity index 100% rename from core/src/main/java/org/elasticsearch/discovery/DiscoverySettings.java rename to server/src/main/java/org/elasticsearch/discovery/DiscoverySettings.java diff --git a/core/src/main/java/org/elasticsearch/discovery/DiscoveryStats.java b/server/src/main/java/org/elasticsearch/discovery/DiscoveryStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/discovery/DiscoveryStats.java rename to server/src/main/java/org/elasticsearch/discovery/DiscoveryStats.java diff --git a/core/src/main/java/org/elasticsearch/discovery/MasterNotDiscoveredException.java b/server/src/main/java/org/elasticsearch/discovery/MasterNotDiscoveredException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/discovery/MasterNotDiscoveredException.java rename to server/src/main/java/org/elasticsearch/discovery/MasterNotDiscoveredException.java diff --git a/core/src/main/java/org/elasticsearch/discovery/single/SingleNodeDiscovery.java b/server/src/main/java/org/elasticsearch/discovery/single/SingleNodeDiscovery.java similarity index 100% rename from core/src/main/java/org/elasticsearch/discovery/single/SingleNodeDiscovery.java rename to server/src/main/java/org/elasticsearch/discovery/single/SingleNodeDiscovery.java diff --git a/core/src/main/java/org/elasticsearch/discovery/zen/ElectMasterService.java b/server/src/main/java/org/elasticsearch/discovery/zen/ElectMasterService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/discovery/zen/ElectMasterService.java rename to server/src/main/java/org/elasticsearch/discovery/zen/ElectMasterService.java diff --git a/core/src/main/java/org/elasticsearch/discovery/zen/FaultDetection.java b/server/src/main/java/org/elasticsearch/discovery/zen/FaultDetection.java similarity index 100% rename from core/src/main/java/org/elasticsearch/discovery/zen/FaultDetection.java rename to server/src/main/java/org/elasticsearch/discovery/zen/FaultDetection.java diff --git a/core/src/main/java/org/elasticsearch/discovery/zen/MasterFaultDetection.java b/server/src/main/java/org/elasticsearch/discovery/zen/MasterFaultDetection.java similarity index 100% rename from core/src/main/java/org/elasticsearch/discovery/zen/MasterFaultDetection.java rename to server/src/main/java/org/elasticsearch/discovery/zen/MasterFaultDetection.java diff --git a/core/src/main/java/org/elasticsearch/discovery/zen/MembershipAction.java b/server/src/main/java/org/elasticsearch/discovery/zen/MembershipAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/discovery/zen/MembershipAction.java rename to server/src/main/java/org/elasticsearch/discovery/zen/MembershipAction.java diff --git a/core/src/main/java/org/elasticsearch/discovery/zen/NodeJoinController.java b/server/src/main/java/org/elasticsearch/discovery/zen/NodeJoinController.java similarity index 100% rename from core/src/main/java/org/elasticsearch/discovery/zen/NodeJoinController.java rename to server/src/main/java/org/elasticsearch/discovery/zen/NodeJoinController.java diff --git a/core/src/main/java/org/elasticsearch/discovery/zen/NodesFaultDetection.java b/server/src/main/java/org/elasticsearch/discovery/zen/NodesFaultDetection.java similarity index 100% rename from core/src/main/java/org/elasticsearch/discovery/zen/NodesFaultDetection.java rename to server/src/main/java/org/elasticsearch/discovery/zen/NodesFaultDetection.java diff --git a/core/src/main/java/org/elasticsearch/discovery/zen/PendingClusterStateStats.java b/server/src/main/java/org/elasticsearch/discovery/zen/PendingClusterStateStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/discovery/zen/PendingClusterStateStats.java rename to server/src/main/java/org/elasticsearch/discovery/zen/PendingClusterStateStats.java diff --git a/core/src/main/java/org/elasticsearch/discovery/zen/PendingClusterStatesQueue.java b/server/src/main/java/org/elasticsearch/discovery/zen/PendingClusterStatesQueue.java similarity index 100% rename from core/src/main/java/org/elasticsearch/discovery/zen/PendingClusterStatesQueue.java rename to server/src/main/java/org/elasticsearch/discovery/zen/PendingClusterStatesQueue.java diff --git a/core/src/main/java/org/elasticsearch/discovery/zen/PingContextProvider.java b/server/src/main/java/org/elasticsearch/discovery/zen/PingContextProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/discovery/zen/PingContextProvider.java rename to server/src/main/java/org/elasticsearch/discovery/zen/PingContextProvider.java diff --git a/core/src/main/java/org/elasticsearch/discovery/zen/PublishClusterStateAction.java b/server/src/main/java/org/elasticsearch/discovery/zen/PublishClusterStateAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/discovery/zen/PublishClusterStateAction.java rename to server/src/main/java/org/elasticsearch/discovery/zen/PublishClusterStateAction.java diff --git a/core/src/main/java/org/elasticsearch/discovery/zen/PublishClusterStateStats.java b/server/src/main/java/org/elasticsearch/discovery/zen/PublishClusterStateStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/discovery/zen/PublishClusterStateStats.java rename to server/src/main/java/org/elasticsearch/discovery/zen/PublishClusterStateStats.java diff --git a/core/src/main/java/org/elasticsearch/discovery/zen/UnicastHostsProvider.java b/server/src/main/java/org/elasticsearch/discovery/zen/UnicastHostsProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/discovery/zen/UnicastHostsProvider.java rename to server/src/main/java/org/elasticsearch/discovery/zen/UnicastHostsProvider.java diff --git a/core/src/main/java/org/elasticsearch/discovery/zen/UnicastZenPing.java b/server/src/main/java/org/elasticsearch/discovery/zen/UnicastZenPing.java similarity index 100% rename from core/src/main/java/org/elasticsearch/discovery/zen/UnicastZenPing.java rename to server/src/main/java/org/elasticsearch/discovery/zen/UnicastZenPing.java diff --git a/core/src/main/java/org/elasticsearch/discovery/zen/ZenDiscovery.java b/server/src/main/java/org/elasticsearch/discovery/zen/ZenDiscovery.java similarity index 100% rename from core/src/main/java/org/elasticsearch/discovery/zen/ZenDiscovery.java rename to server/src/main/java/org/elasticsearch/discovery/zen/ZenDiscovery.java diff --git a/core/src/main/java/org/elasticsearch/discovery/zen/ZenPing.java b/server/src/main/java/org/elasticsearch/discovery/zen/ZenPing.java similarity index 100% rename from core/src/main/java/org/elasticsearch/discovery/zen/ZenPing.java rename to server/src/main/java/org/elasticsearch/discovery/zen/ZenPing.java diff --git a/core/src/main/java/org/elasticsearch/env/ESFileStore.java b/server/src/main/java/org/elasticsearch/env/ESFileStore.java similarity index 100% rename from core/src/main/java/org/elasticsearch/env/ESFileStore.java rename to server/src/main/java/org/elasticsearch/env/ESFileStore.java diff --git a/core/src/main/java/org/elasticsearch/env/Environment.java b/server/src/main/java/org/elasticsearch/env/Environment.java similarity index 100% rename from core/src/main/java/org/elasticsearch/env/Environment.java rename to server/src/main/java/org/elasticsearch/env/Environment.java diff --git a/core/src/main/java/org/elasticsearch/env/NodeEnvironment.java b/server/src/main/java/org/elasticsearch/env/NodeEnvironment.java similarity index 100% rename from core/src/main/java/org/elasticsearch/env/NodeEnvironment.java rename to server/src/main/java/org/elasticsearch/env/NodeEnvironment.java diff --git a/core/src/main/java/org/elasticsearch/env/NodeMetaData.java b/server/src/main/java/org/elasticsearch/env/NodeMetaData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/env/NodeMetaData.java rename to server/src/main/java/org/elasticsearch/env/NodeMetaData.java diff --git a/core/src/main/java/org/elasticsearch/env/ShardLock.java b/server/src/main/java/org/elasticsearch/env/ShardLock.java similarity index 100% rename from core/src/main/java/org/elasticsearch/env/ShardLock.java rename to server/src/main/java/org/elasticsearch/env/ShardLock.java diff --git a/core/src/main/java/org/elasticsearch/env/ShardLockObtainFailedException.java b/server/src/main/java/org/elasticsearch/env/ShardLockObtainFailedException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/env/ShardLockObtainFailedException.java rename to server/src/main/java/org/elasticsearch/env/ShardLockObtainFailedException.java diff --git a/core/src/main/java/org/elasticsearch/gateway/AsyncShardFetch.java b/server/src/main/java/org/elasticsearch/gateway/AsyncShardFetch.java similarity index 100% rename from core/src/main/java/org/elasticsearch/gateway/AsyncShardFetch.java rename to server/src/main/java/org/elasticsearch/gateway/AsyncShardFetch.java diff --git a/core/src/main/java/org/elasticsearch/gateway/BaseGatewayShardAllocator.java b/server/src/main/java/org/elasticsearch/gateway/BaseGatewayShardAllocator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/gateway/BaseGatewayShardAllocator.java rename to server/src/main/java/org/elasticsearch/gateway/BaseGatewayShardAllocator.java diff --git a/core/src/main/java/org/elasticsearch/gateway/CorruptStateException.java b/server/src/main/java/org/elasticsearch/gateway/CorruptStateException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/gateway/CorruptStateException.java rename to server/src/main/java/org/elasticsearch/gateway/CorruptStateException.java diff --git a/core/src/main/java/org/elasticsearch/gateway/DanglingIndicesState.java b/server/src/main/java/org/elasticsearch/gateway/DanglingIndicesState.java similarity index 100% rename from core/src/main/java/org/elasticsearch/gateway/DanglingIndicesState.java rename to server/src/main/java/org/elasticsearch/gateway/DanglingIndicesState.java diff --git a/core/src/main/java/org/elasticsearch/gateway/Gateway.java b/server/src/main/java/org/elasticsearch/gateway/Gateway.java similarity index 100% rename from core/src/main/java/org/elasticsearch/gateway/Gateway.java rename to server/src/main/java/org/elasticsearch/gateway/Gateway.java diff --git a/core/src/main/java/org/elasticsearch/gateway/GatewayAllocator.java b/server/src/main/java/org/elasticsearch/gateway/GatewayAllocator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/gateway/GatewayAllocator.java rename to server/src/main/java/org/elasticsearch/gateway/GatewayAllocator.java diff --git a/core/src/main/java/org/elasticsearch/gateway/GatewayException.java b/server/src/main/java/org/elasticsearch/gateway/GatewayException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/gateway/GatewayException.java rename to server/src/main/java/org/elasticsearch/gateway/GatewayException.java diff --git a/core/src/main/java/org/elasticsearch/gateway/GatewayMetaState.java b/server/src/main/java/org/elasticsearch/gateway/GatewayMetaState.java similarity index 100% rename from core/src/main/java/org/elasticsearch/gateway/GatewayMetaState.java rename to server/src/main/java/org/elasticsearch/gateway/GatewayMetaState.java diff --git a/core/src/main/java/org/elasticsearch/gateway/GatewayModule.java b/server/src/main/java/org/elasticsearch/gateway/GatewayModule.java similarity index 100% rename from core/src/main/java/org/elasticsearch/gateway/GatewayModule.java rename to server/src/main/java/org/elasticsearch/gateway/GatewayModule.java diff --git a/core/src/main/java/org/elasticsearch/gateway/GatewayService.java b/server/src/main/java/org/elasticsearch/gateway/GatewayService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/gateway/GatewayService.java rename to server/src/main/java/org/elasticsearch/gateway/GatewayService.java diff --git a/core/src/main/java/org/elasticsearch/gateway/LocalAllocateDangledIndices.java b/server/src/main/java/org/elasticsearch/gateway/LocalAllocateDangledIndices.java similarity index 100% rename from core/src/main/java/org/elasticsearch/gateway/LocalAllocateDangledIndices.java rename to server/src/main/java/org/elasticsearch/gateway/LocalAllocateDangledIndices.java diff --git a/core/src/main/java/org/elasticsearch/gateway/MetaDataStateFormat.java b/server/src/main/java/org/elasticsearch/gateway/MetaDataStateFormat.java similarity index 100% rename from core/src/main/java/org/elasticsearch/gateway/MetaDataStateFormat.java rename to server/src/main/java/org/elasticsearch/gateway/MetaDataStateFormat.java diff --git a/core/src/main/java/org/elasticsearch/gateway/MetaStateService.java b/server/src/main/java/org/elasticsearch/gateway/MetaStateService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/gateway/MetaStateService.java rename to server/src/main/java/org/elasticsearch/gateway/MetaStateService.java diff --git a/core/src/main/java/org/elasticsearch/gateway/PrimaryShardAllocator.java b/server/src/main/java/org/elasticsearch/gateway/PrimaryShardAllocator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/gateway/PrimaryShardAllocator.java rename to server/src/main/java/org/elasticsearch/gateway/PrimaryShardAllocator.java diff --git a/core/src/main/java/org/elasticsearch/gateway/PriorityComparator.java b/server/src/main/java/org/elasticsearch/gateway/PriorityComparator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/gateway/PriorityComparator.java rename to server/src/main/java/org/elasticsearch/gateway/PriorityComparator.java diff --git a/core/src/main/java/org/elasticsearch/gateway/ReplicaShardAllocator.java b/server/src/main/java/org/elasticsearch/gateway/ReplicaShardAllocator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/gateway/ReplicaShardAllocator.java rename to server/src/main/java/org/elasticsearch/gateway/ReplicaShardAllocator.java diff --git a/core/src/main/java/org/elasticsearch/gateway/TransportNodesListGatewayMetaState.java b/server/src/main/java/org/elasticsearch/gateway/TransportNodesListGatewayMetaState.java similarity index 100% rename from core/src/main/java/org/elasticsearch/gateway/TransportNodesListGatewayMetaState.java rename to server/src/main/java/org/elasticsearch/gateway/TransportNodesListGatewayMetaState.java diff --git a/core/src/main/java/org/elasticsearch/gateway/TransportNodesListGatewayStartedShards.java b/server/src/main/java/org/elasticsearch/gateway/TransportNodesListGatewayStartedShards.java similarity index 100% rename from core/src/main/java/org/elasticsearch/gateway/TransportNodesListGatewayStartedShards.java rename to server/src/main/java/org/elasticsearch/gateway/TransportNodesListGatewayStartedShards.java diff --git a/core/src/main/java/org/elasticsearch/http/BindHttpException.java b/server/src/main/java/org/elasticsearch/http/BindHttpException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/http/BindHttpException.java rename to server/src/main/java/org/elasticsearch/http/BindHttpException.java diff --git a/core/src/main/java/org/elasticsearch/http/HttpException.java b/server/src/main/java/org/elasticsearch/http/HttpException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/http/HttpException.java rename to server/src/main/java/org/elasticsearch/http/HttpException.java diff --git a/core/src/main/java/org/elasticsearch/http/HttpInfo.java b/server/src/main/java/org/elasticsearch/http/HttpInfo.java similarity index 100% rename from core/src/main/java/org/elasticsearch/http/HttpInfo.java rename to server/src/main/java/org/elasticsearch/http/HttpInfo.java diff --git a/core/src/main/java/org/elasticsearch/http/HttpServerTransport.java b/server/src/main/java/org/elasticsearch/http/HttpServerTransport.java similarity index 100% rename from core/src/main/java/org/elasticsearch/http/HttpServerTransport.java rename to server/src/main/java/org/elasticsearch/http/HttpServerTransport.java diff --git a/core/src/main/java/org/elasticsearch/http/HttpStats.java b/server/src/main/java/org/elasticsearch/http/HttpStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/http/HttpStats.java rename to server/src/main/java/org/elasticsearch/http/HttpStats.java diff --git a/core/src/main/java/org/elasticsearch/http/HttpTransportSettings.java b/server/src/main/java/org/elasticsearch/http/HttpTransportSettings.java similarity index 100% rename from core/src/main/java/org/elasticsearch/http/HttpTransportSettings.java rename to server/src/main/java/org/elasticsearch/http/HttpTransportSettings.java diff --git a/core/src/main/java/org/elasticsearch/index/AbstractIndexComponent.java b/server/src/main/java/org/elasticsearch/index/AbstractIndexComponent.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/AbstractIndexComponent.java rename to server/src/main/java/org/elasticsearch/index/AbstractIndexComponent.java diff --git a/core/src/main/java/org/elasticsearch/index/CompositeIndexEventListener.java b/server/src/main/java/org/elasticsearch/index/CompositeIndexEventListener.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/CompositeIndexEventListener.java rename to server/src/main/java/org/elasticsearch/index/CompositeIndexEventListener.java diff --git a/core/src/main/java/org/elasticsearch/index/Index.java b/server/src/main/java/org/elasticsearch/index/Index.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/Index.java rename to server/src/main/java/org/elasticsearch/index/Index.java diff --git a/core/src/main/java/org/elasticsearch/index/IndexComponent.java b/server/src/main/java/org/elasticsearch/index/IndexComponent.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/IndexComponent.java rename to server/src/main/java/org/elasticsearch/index/IndexComponent.java diff --git a/core/src/main/java/org/elasticsearch/index/IndexModule.java b/server/src/main/java/org/elasticsearch/index/IndexModule.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/IndexModule.java rename to server/src/main/java/org/elasticsearch/index/IndexModule.java diff --git a/core/src/main/java/org/elasticsearch/index/IndexNotFoundException.java b/server/src/main/java/org/elasticsearch/index/IndexNotFoundException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/IndexNotFoundException.java rename to server/src/main/java/org/elasticsearch/index/IndexNotFoundException.java diff --git a/core/src/main/java/org/elasticsearch/index/IndexService.java b/server/src/main/java/org/elasticsearch/index/IndexService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/IndexService.java rename to server/src/main/java/org/elasticsearch/index/IndexService.java diff --git a/core/src/main/java/org/elasticsearch/index/IndexSettings.java b/server/src/main/java/org/elasticsearch/index/IndexSettings.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/IndexSettings.java rename to server/src/main/java/org/elasticsearch/index/IndexSettings.java diff --git a/core/src/main/java/org/elasticsearch/index/IndexSortConfig.java b/server/src/main/java/org/elasticsearch/index/IndexSortConfig.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/IndexSortConfig.java rename to server/src/main/java/org/elasticsearch/index/IndexSortConfig.java diff --git a/core/src/main/java/org/elasticsearch/index/IndexWarmer.java b/server/src/main/java/org/elasticsearch/index/IndexWarmer.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/IndexWarmer.java rename to server/src/main/java/org/elasticsearch/index/IndexWarmer.java diff --git a/core/src/main/java/org/elasticsearch/index/IndexingSlowLog.java b/server/src/main/java/org/elasticsearch/index/IndexingSlowLog.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/IndexingSlowLog.java rename to server/src/main/java/org/elasticsearch/index/IndexingSlowLog.java diff --git a/core/src/main/java/org/elasticsearch/index/MergePolicyConfig.java b/server/src/main/java/org/elasticsearch/index/MergePolicyConfig.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/MergePolicyConfig.java rename to server/src/main/java/org/elasticsearch/index/MergePolicyConfig.java diff --git a/core/src/main/java/org/elasticsearch/index/MergeSchedulerConfig.java b/server/src/main/java/org/elasticsearch/index/MergeSchedulerConfig.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/MergeSchedulerConfig.java rename to server/src/main/java/org/elasticsearch/index/MergeSchedulerConfig.java diff --git a/core/src/main/java/org/elasticsearch/index/SearchSlowLog.java b/server/src/main/java/org/elasticsearch/index/SearchSlowLog.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/SearchSlowLog.java rename to server/src/main/java/org/elasticsearch/index/SearchSlowLog.java diff --git a/core/src/main/java/org/elasticsearch/index/SlowLogLevel.java b/server/src/main/java/org/elasticsearch/index/SlowLogLevel.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/SlowLogLevel.java rename to server/src/main/java/org/elasticsearch/index/SlowLogLevel.java diff --git a/core/src/main/java/org/elasticsearch/index/VersionType.java b/server/src/main/java/org/elasticsearch/index/VersionType.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/VersionType.java rename to server/src/main/java/org/elasticsearch/index/VersionType.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/AbstractCharFilterFactory.java b/server/src/main/java/org/elasticsearch/index/analysis/AbstractCharFilterFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/AbstractCharFilterFactory.java rename to server/src/main/java/org/elasticsearch/index/analysis/AbstractCharFilterFactory.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/AbstractIndexAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/AbstractIndexAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/AbstractIndexAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/AbstractIndexAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/AbstractTokenFilterFactory.java b/server/src/main/java/org/elasticsearch/index/analysis/AbstractTokenFilterFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/AbstractTokenFilterFactory.java rename to server/src/main/java/org/elasticsearch/index/analysis/AbstractTokenFilterFactory.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/AbstractTokenizerFactory.java b/server/src/main/java/org/elasticsearch/index/analysis/AbstractTokenizerFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/AbstractTokenizerFactory.java rename to server/src/main/java/org/elasticsearch/index/analysis/AbstractTokenizerFactory.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/Analysis.java b/server/src/main/java/org/elasticsearch/index/analysis/Analysis.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/Analysis.java rename to server/src/main/java/org/elasticsearch/index/analysis/Analysis.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/AnalysisRegistry.java b/server/src/main/java/org/elasticsearch/index/analysis/AnalysisRegistry.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/AnalysisRegistry.java rename to server/src/main/java/org/elasticsearch/index/analysis/AnalysisRegistry.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/AnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/AnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/AnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/AnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/AnalyzerScope.java b/server/src/main/java/org/elasticsearch/index/analysis/AnalyzerScope.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/AnalyzerScope.java rename to server/src/main/java/org/elasticsearch/index/analysis/AnalyzerScope.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/ArabicAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/ArabicAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/ArabicAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/ArabicAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/ArmenianAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/ArmenianAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/ArmenianAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/ArmenianAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/BasqueAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/BasqueAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/BasqueAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/BasqueAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/BengaliAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/BengaliAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/BengaliAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/BengaliAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/BrazilianAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/BrazilianAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/BrazilianAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/BrazilianAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/BulgarianAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/BulgarianAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/BulgarianAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/BulgarianAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/CatalanAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/CatalanAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/CatalanAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/CatalanAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/CharFilterFactory.java b/server/src/main/java/org/elasticsearch/index/analysis/CharFilterFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/CharFilterFactory.java rename to server/src/main/java/org/elasticsearch/index/analysis/CharFilterFactory.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/CharMatcher.java b/server/src/main/java/org/elasticsearch/index/analysis/CharMatcher.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/CharMatcher.java rename to server/src/main/java/org/elasticsearch/index/analysis/CharMatcher.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/ChineseAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/ChineseAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/ChineseAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/ChineseAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/CjkAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/CjkAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/CjkAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/CjkAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/ClassicTokenizerFactory.java b/server/src/main/java/org/elasticsearch/index/analysis/ClassicTokenizerFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/ClassicTokenizerFactory.java rename to server/src/main/java/org/elasticsearch/index/analysis/ClassicTokenizerFactory.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/CustomAnalyzer.java b/server/src/main/java/org/elasticsearch/index/analysis/CustomAnalyzer.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/CustomAnalyzer.java rename to server/src/main/java/org/elasticsearch/index/analysis/CustomAnalyzer.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/CustomAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/CustomAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/CustomAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/CustomAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/CustomNormalizerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/CustomNormalizerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/CustomNormalizerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/CustomNormalizerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/CzechAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/CzechAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/CzechAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/CzechAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/DanishAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/DanishAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/DanishAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/DanishAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/DutchAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/DutchAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/DutchAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/DutchAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/EdgeNGramTokenizerFactory.java b/server/src/main/java/org/elasticsearch/index/analysis/EdgeNGramTokenizerFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/EdgeNGramTokenizerFactory.java rename to server/src/main/java/org/elasticsearch/index/analysis/EdgeNGramTokenizerFactory.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/EnglishAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/EnglishAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/EnglishAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/EnglishAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/FieldNameAnalyzer.java b/server/src/main/java/org/elasticsearch/index/analysis/FieldNameAnalyzer.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/FieldNameAnalyzer.java rename to server/src/main/java/org/elasticsearch/index/analysis/FieldNameAnalyzer.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/FingerprintAnalyzer.java b/server/src/main/java/org/elasticsearch/index/analysis/FingerprintAnalyzer.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/FingerprintAnalyzer.java rename to server/src/main/java/org/elasticsearch/index/analysis/FingerprintAnalyzer.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/FingerprintAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/FingerprintAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/FingerprintAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/FingerprintAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/FinnishAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/FinnishAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/FinnishAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/FinnishAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/FrenchAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/FrenchAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/FrenchAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/FrenchAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/GalicianAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/GalicianAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/GalicianAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/GalicianAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/GermanAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/GermanAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/GermanAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/GermanAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/GreekAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/GreekAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/GreekAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/GreekAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/HindiAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/HindiAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/HindiAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/HindiAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/HungarianAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/HungarianAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/HungarianAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/HungarianAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/HunspellTokenFilterFactory.java b/server/src/main/java/org/elasticsearch/index/analysis/HunspellTokenFilterFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/HunspellTokenFilterFactory.java rename to server/src/main/java/org/elasticsearch/index/analysis/HunspellTokenFilterFactory.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/IndexAnalyzers.java b/server/src/main/java/org/elasticsearch/index/analysis/IndexAnalyzers.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/IndexAnalyzers.java rename to server/src/main/java/org/elasticsearch/index/analysis/IndexAnalyzers.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/IndonesianAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/IndonesianAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/IndonesianAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/IndonesianAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/IrishAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/IrishAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/IrishAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/IrishAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/ItalianAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/ItalianAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/ItalianAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/ItalianAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/KeywordAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/KeywordAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/KeywordAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/KeywordAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/KeywordTokenizerFactory.java b/server/src/main/java/org/elasticsearch/index/analysis/KeywordTokenizerFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/KeywordTokenizerFactory.java rename to server/src/main/java/org/elasticsearch/index/analysis/KeywordTokenizerFactory.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/LatvianAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/LatvianAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/LatvianAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/LatvianAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/LetterTokenizerFactory.java b/server/src/main/java/org/elasticsearch/index/analysis/LetterTokenizerFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/LetterTokenizerFactory.java rename to server/src/main/java/org/elasticsearch/index/analysis/LetterTokenizerFactory.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/LithuanianAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/LithuanianAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/LithuanianAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/LithuanianAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/LowerCaseTokenizerFactory.java b/server/src/main/java/org/elasticsearch/index/analysis/LowerCaseTokenizerFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/LowerCaseTokenizerFactory.java rename to server/src/main/java/org/elasticsearch/index/analysis/LowerCaseTokenizerFactory.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/MultiTermAwareComponent.java b/server/src/main/java/org/elasticsearch/index/analysis/MultiTermAwareComponent.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/MultiTermAwareComponent.java rename to server/src/main/java/org/elasticsearch/index/analysis/MultiTermAwareComponent.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/NGramTokenizerFactory.java b/server/src/main/java/org/elasticsearch/index/analysis/NGramTokenizerFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/NGramTokenizerFactory.java rename to server/src/main/java/org/elasticsearch/index/analysis/NGramTokenizerFactory.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/NamedAnalyzer.java b/server/src/main/java/org/elasticsearch/index/analysis/NamedAnalyzer.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/NamedAnalyzer.java rename to server/src/main/java/org/elasticsearch/index/analysis/NamedAnalyzer.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/NorwegianAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/NorwegianAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/NorwegianAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/NorwegianAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/PathHierarchyTokenizerFactory.java b/server/src/main/java/org/elasticsearch/index/analysis/PathHierarchyTokenizerFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/PathHierarchyTokenizerFactory.java rename to server/src/main/java/org/elasticsearch/index/analysis/PathHierarchyTokenizerFactory.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/PatternAnalyzer.java b/server/src/main/java/org/elasticsearch/index/analysis/PatternAnalyzer.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/PatternAnalyzer.java rename to server/src/main/java/org/elasticsearch/index/analysis/PatternAnalyzer.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/PatternAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/PatternAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/PatternAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/PatternAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/PatternTokenizerFactory.java b/server/src/main/java/org/elasticsearch/index/analysis/PatternTokenizerFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/PatternTokenizerFactory.java rename to server/src/main/java/org/elasticsearch/index/analysis/PatternTokenizerFactory.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/PersianAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/PersianAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/PersianAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/PersianAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/PortugueseAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/PortugueseAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/PortugueseAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/PortugueseAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerProviderFactory.java b/server/src/main/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerProviderFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerProviderFactory.java rename to server/src/main/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerProviderFactory.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/PreConfiguredAnalysisComponent.java b/server/src/main/java/org/elasticsearch/index/analysis/PreConfiguredAnalysisComponent.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/PreConfiguredAnalysisComponent.java rename to server/src/main/java/org/elasticsearch/index/analysis/PreConfiguredAnalysisComponent.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/PreConfiguredCharFilter.java b/server/src/main/java/org/elasticsearch/index/analysis/PreConfiguredCharFilter.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/PreConfiguredCharFilter.java rename to server/src/main/java/org/elasticsearch/index/analysis/PreConfiguredCharFilter.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/PreConfiguredTokenFilter.java b/server/src/main/java/org/elasticsearch/index/analysis/PreConfiguredTokenFilter.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/PreConfiguredTokenFilter.java rename to server/src/main/java/org/elasticsearch/index/analysis/PreConfiguredTokenFilter.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/PreConfiguredTokenizer.java b/server/src/main/java/org/elasticsearch/index/analysis/PreConfiguredTokenizer.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/PreConfiguredTokenizer.java rename to server/src/main/java/org/elasticsearch/index/analysis/PreConfiguredTokenizer.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/RomanianAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/RomanianAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/RomanianAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/RomanianAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/RussianAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/RussianAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/RussianAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/RussianAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/ShingleTokenFilterFactory.java b/server/src/main/java/org/elasticsearch/index/analysis/ShingleTokenFilterFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/ShingleTokenFilterFactory.java rename to server/src/main/java/org/elasticsearch/index/analysis/ShingleTokenFilterFactory.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/SimpleAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/SimpleAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/SimpleAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/SimpleAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/SnowballAnalyzer.java b/server/src/main/java/org/elasticsearch/index/analysis/SnowballAnalyzer.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/SnowballAnalyzer.java rename to server/src/main/java/org/elasticsearch/index/analysis/SnowballAnalyzer.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/SnowballAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/SnowballAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/SnowballAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/SnowballAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/SoraniAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/SoraniAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/SoraniAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/SoraniAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/SoraniNormalizationFilterFactory.java b/server/src/main/java/org/elasticsearch/index/analysis/SoraniNormalizationFilterFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/SoraniNormalizationFilterFactory.java rename to server/src/main/java/org/elasticsearch/index/analysis/SoraniNormalizationFilterFactory.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/SpanishAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/SpanishAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/SpanishAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/SpanishAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/StandardAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/StandardAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/StandardAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/StandardAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/StandardHtmlStripAnalyzer.java b/server/src/main/java/org/elasticsearch/index/analysis/StandardHtmlStripAnalyzer.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/StandardHtmlStripAnalyzer.java rename to server/src/main/java/org/elasticsearch/index/analysis/StandardHtmlStripAnalyzer.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/StandardHtmlStripAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/StandardHtmlStripAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/StandardHtmlStripAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/StandardHtmlStripAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/StandardTokenFilterFactory.java b/server/src/main/java/org/elasticsearch/index/analysis/StandardTokenFilterFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/StandardTokenFilterFactory.java rename to server/src/main/java/org/elasticsearch/index/analysis/StandardTokenFilterFactory.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/StandardTokenizerFactory.java b/server/src/main/java/org/elasticsearch/index/analysis/StandardTokenizerFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/StandardTokenizerFactory.java rename to server/src/main/java/org/elasticsearch/index/analysis/StandardTokenizerFactory.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/StopAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/StopAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/StopAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/StopAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/StopTokenFilterFactory.java b/server/src/main/java/org/elasticsearch/index/analysis/StopTokenFilterFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/StopTokenFilterFactory.java rename to server/src/main/java/org/elasticsearch/index/analysis/StopTokenFilterFactory.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/SwedishAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/SwedishAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/SwedishAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/SwedishAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/SynonymGraphTokenFilterFactory.java b/server/src/main/java/org/elasticsearch/index/analysis/SynonymGraphTokenFilterFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/SynonymGraphTokenFilterFactory.java rename to server/src/main/java/org/elasticsearch/index/analysis/SynonymGraphTokenFilterFactory.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/SynonymTokenFilterFactory.java b/server/src/main/java/org/elasticsearch/index/analysis/SynonymTokenFilterFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/SynonymTokenFilterFactory.java rename to server/src/main/java/org/elasticsearch/index/analysis/SynonymTokenFilterFactory.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/ThaiAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/ThaiAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/ThaiAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/ThaiAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/ThaiTokenizerFactory.java b/server/src/main/java/org/elasticsearch/index/analysis/ThaiTokenizerFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/ThaiTokenizerFactory.java rename to server/src/main/java/org/elasticsearch/index/analysis/ThaiTokenizerFactory.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/TokenFilterFactory.java b/server/src/main/java/org/elasticsearch/index/analysis/TokenFilterFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/TokenFilterFactory.java rename to server/src/main/java/org/elasticsearch/index/analysis/TokenFilterFactory.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/TokenizerFactory.java b/server/src/main/java/org/elasticsearch/index/analysis/TokenizerFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/TokenizerFactory.java rename to server/src/main/java/org/elasticsearch/index/analysis/TokenizerFactory.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/TurkishAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/TurkishAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/TurkishAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/TurkishAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/UAX29URLEmailTokenizerFactory.java b/server/src/main/java/org/elasticsearch/index/analysis/UAX29URLEmailTokenizerFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/UAX29URLEmailTokenizerFactory.java rename to server/src/main/java/org/elasticsearch/index/analysis/UAX29URLEmailTokenizerFactory.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/WhitespaceAnalyzerProvider.java b/server/src/main/java/org/elasticsearch/index/analysis/WhitespaceAnalyzerProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/WhitespaceAnalyzerProvider.java rename to server/src/main/java/org/elasticsearch/index/analysis/WhitespaceAnalyzerProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/analysis/WhitespaceTokenizerFactory.java b/server/src/main/java/org/elasticsearch/index/analysis/WhitespaceTokenizerFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/analysis/WhitespaceTokenizerFactory.java rename to server/src/main/java/org/elasticsearch/index/analysis/WhitespaceTokenizerFactory.java diff --git a/core/src/main/java/org/elasticsearch/index/cache/IndexCache.java b/server/src/main/java/org/elasticsearch/index/cache/IndexCache.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/cache/IndexCache.java rename to server/src/main/java/org/elasticsearch/index/cache/IndexCache.java diff --git a/core/src/main/java/org/elasticsearch/index/cache/bitset/BitsetFilterCache.java b/server/src/main/java/org/elasticsearch/index/cache/bitset/BitsetFilterCache.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/cache/bitset/BitsetFilterCache.java rename to server/src/main/java/org/elasticsearch/index/cache/bitset/BitsetFilterCache.java diff --git a/core/src/main/java/org/elasticsearch/index/cache/bitset/ShardBitsetFilterCache.java b/server/src/main/java/org/elasticsearch/index/cache/bitset/ShardBitsetFilterCache.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/cache/bitset/ShardBitsetFilterCache.java rename to server/src/main/java/org/elasticsearch/index/cache/bitset/ShardBitsetFilterCache.java diff --git a/core/src/main/java/org/elasticsearch/index/cache/query/DisabledQueryCache.java b/server/src/main/java/org/elasticsearch/index/cache/query/DisabledQueryCache.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/cache/query/DisabledQueryCache.java rename to server/src/main/java/org/elasticsearch/index/cache/query/DisabledQueryCache.java diff --git a/core/src/main/java/org/elasticsearch/index/cache/query/IndexQueryCache.java b/server/src/main/java/org/elasticsearch/index/cache/query/IndexQueryCache.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/cache/query/IndexQueryCache.java rename to server/src/main/java/org/elasticsearch/index/cache/query/IndexQueryCache.java diff --git a/core/src/main/java/org/elasticsearch/index/cache/query/QueryCache.java b/server/src/main/java/org/elasticsearch/index/cache/query/QueryCache.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/cache/query/QueryCache.java rename to server/src/main/java/org/elasticsearch/index/cache/query/QueryCache.java diff --git a/core/src/main/java/org/elasticsearch/index/cache/query/QueryCacheStats.java b/server/src/main/java/org/elasticsearch/index/cache/query/QueryCacheStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/cache/query/QueryCacheStats.java rename to server/src/main/java/org/elasticsearch/index/cache/query/QueryCacheStats.java diff --git a/core/src/main/java/org/elasticsearch/index/cache/request/RequestCacheStats.java b/server/src/main/java/org/elasticsearch/index/cache/request/RequestCacheStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/cache/request/RequestCacheStats.java rename to server/src/main/java/org/elasticsearch/index/cache/request/RequestCacheStats.java diff --git a/core/src/main/java/org/elasticsearch/index/cache/request/ShardRequestCache.java b/server/src/main/java/org/elasticsearch/index/cache/request/ShardRequestCache.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/cache/request/ShardRequestCache.java rename to server/src/main/java/org/elasticsearch/index/cache/request/ShardRequestCache.java diff --git a/core/src/main/java/org/elasticsearch/index/codec/CodecService.java b/server/src/main/java/org/elasticsearch/index/codec/CodecService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/codec/CodecService.java rename to server/src/main/java/org/elasticsearch/index/codec/CodecService.java diff --git a/core/src/main/java/org/elasticsearch/index/codec/PerFieldMappingPostingFormatCodec.java b/server/src/main/java/org/elasticsearch/index/codec/PerFieldMappingPostingFormatCodec.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/codec/PerFieldMappingPostingFormatCodec.java rename to server/src/main/java/org/elasticsearch/index/codec/PerFieldMappingPostingFormatCodec.java diff --git a/core/src/main/java/org/elasticsearch/index/engine/CombinedDeletionPolicy.java b/server/src/main/java/org/elasticsearch/index/engine/CombinedDeletionPolicy.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/engine/CombinedDeletionPolicy.java rename to server/src/main/java/org/elasticsearch/index/engine/CombinedDeletionPolicy.java diff --git a/core/src/main/java/org/elasticsearch/index/engine/CommitStats.java b/server/src/main/java/org/elasticsearch/index/engine/CommitStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/engine/CommitStats.java rename to server/src/main/java/org/elasticsearch/index/engine/CommitStats.java diff --git a/core/src/main/java/org/elasticsearch/index/engine/DeleteVersionValue.java b/server/src/main/java/org/elasticsearch/index/engine/DeleteVersionValue.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/engine/DeleteVersionValue.java rename to server/src/main/java/org/elasticsearch/index/engine/DeleteVersionValue.java diff --git a/core/src/main/java/org/elasticsearch/index/engine/DocumentMissingException.java b/server/src/main/java/org/elasticsearch/index/engine/DocumentMissingException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/engine/DocumentMissingException.java rename to server/src/main/java/org/elasticsearch/index/engine/DocumentMissingException.java diff --git a/core/src/main/java/org/elasticsearch/index/engine/DocumentSourceMissingException.java b/server/src/main/java/org/elasticsearch/index/engine/DocumentSourceMissingException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/engine/DocumentSourceMissingException.java rename to server/src/main/java/org/elasticsearch/index/engine/DocumentSourceMissingException.java diff --git a/core/src/main/java/org/elasticsearch/index/engine/ElasticsearchConcurrentMergeScheduler.java b/server/src/main/java/org/elasticsearch/index/engine/ElasticsearchConcurrentMergeScheduler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/engine/ElasticsearchConcurrentMergeScheduler.java rename to server/src/main/java/org/elasticsearch/index/engine/ElasticsearchConcurrentMergeScheduler.java diff --git a/core/src/main/java/org/elasticsearch/index/engine/Engine.java b/server/src/main/java/org/elasticsearch/index/engine/Engine.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/engine/Engine.java rename to server/src/main/java/org/elasticsearch/index/engine/Engine.java diff --git a/core/src/main/java/org/elasticsearch/index/engine/EngineConfig.java b/server/src/main/java/org/elasticsearch/index/engine/EngineConfig.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/engine/EngineConfig.java rename to server/src/main/java/org/elasticsearch/index/engine/EngineConfig.java diff --git a/core/src/main/java/org/elasticsearch/index/engine/EngineCreationFailureException.java b/server/src/main/java/org/elasticsearch/index/engine/EngineCreationFailureException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/engine/EngineCreationFailureException.java rename to server/src/main/java/org/elasticsearch/index/engine/EngineCreationFailureException.java diff --git a/core/src/main/java/org/elasticsearch/index/engine/EngineException.java b/server/src/main/java/org/elasticsearch/index/engine/EngineException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/engine/EngineException.java rename to server/src/main/java/org/elasticsearch/index/engine/EngineException.java diff --git a/core/src/main/java/org/elasticsearch/index/engine/EngineFactory.java b/server/src/main/java/org/elasticsearch/index/engine/EngineFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/engine/EngineFactory.java rename to server/src/main/java/org/elasticsearch/index/engine/EngineFactory.java diff --git a/core/src/main/java/org/elasticsearch/index/engine/EngineSearcher.java b/server/src/main/java/org/elasticsearch/index/engine/EngineSearcher.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/engine/EngineSearcher.java rename to server/src/main/java/org/elasticsearch/index/engine/EngineSearcher.java diff --git a/core/src/main/java/org/elasticsearch/index/engine/EngineSearcherFactory.java b/server/src/main/java/org/elasticsearch/index/engine/EngineSearcherFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/engine/EngineSearcherFactory.java rename to server/src/main/java/org/elasticsearch/index/engine/EngineSearcherFactory.java diff --git a/core/src/main/java/org/elasticsearch/index/engine/FlushFailedEngineException.java b/server/src/main/java/org/elasticsearch/index/engine/FlushFailedEngineException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/engine/FlushFailedEngineException.java rename to server/src/main/java/org/elasticsearch/index/engine/FlushFailedEngineException.java diff --git a/core/src/main/java/org/elasticsearch/index/engine/InternalEngine.java b/server/src/main/java/org/elasticsearch/index/engine/InternalEngine.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/engine/InternalEngine.java rename to server/src/main/java/org/elasticsearch/index/engine/InternalEngine.java diff --git a/core/src/main/java/org/elasticsearch/index/engine/InternalEngineFactory.java b/server/src/main/java/org/elasticsearch/index/engine/InternalEngineFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/engine/InternalEngineFactory.java rename to server/src/main/java/org/elasticsearch/index/engine/InternalEngineFactory.java diff --git a/core/src/main/java/org/elasticsearch/index/engine/LiveVersionMap.java b/server/src/main/java/org/elasticsearch/index/engine/LiveVersionMap.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/engine/LiveVersionMap.java rename to server/src/main/java/org/elasticsearch/index/engine/LiveVersionMap.java diff --git a/core/src/main/java/org/elasticsearch/index/engine/RamAccountingSearcherFactory.java b/server/src/main/java/org/elasticsearch/index/engine/RamAccountingSearcherFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/engine/RamAccountingSearcherFactory.java rename to server/src/main/java/org/elasticsearch/index/engine/RamAccountingSearcherFactory.java diff --git a/core/src/main/java/org/elasticsearch/index/engine/RecoveryCounter.java b/server/src/main/java/org/elasticsearch/index/engine/RecoveryCounter.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/engine/RecoveryCounter.java rename to server/src/main/java/org/elasticsearch/index/engine/RecoveryCounter.java diff --git a/core/src/main/java/org/elasticsearch/index/engine/RecoveryEngineException.java b/server/src/main/java/org/elasticsearch/index/engine/RecoveryEngineException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/engine/RecoveryEngineException.java rename to server/src/main/java/org/elasticsearch/index/engine/RecoveryEngineException.java diff --git a/core/src/main/java/org/elasticsearch/index/engine/RefreshFailedEngineException.java b/server/src/main/java/org/elasticsearch/index/engine/RefreshFailedEngineException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/engine/RefreshFailedEngineException.java rename to server/src/main/java/org/elasticsearch/index/engine/RefreshFailedEngineException.java diff --git a/core/src/main/java/org/elasticsearch/index/engine/Segment.java b/server/src/main/java/org/elasticsearch/index/engine/Segment.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/engine/Segment.java rename to server/src/main/java/org/elasticsearch/index/engine/Segment.java diff --git a/core/src/main/java/org/elasticsearch/index/engine/SegmentsStats.java b/server/src/main/java/org/elasticsearch/index/engine/SegmentsStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/engine/SegmentsStats.java rename to server/src/main/java/org/elasticsearch/index/engine/SegmentsStats.java diff --git a/core/src/main/java/org/elasticsearch/index/engine/SnapshotFailedEngineException.java b/server/src/main/java/org/elasticsearch/index/engine/SnapshotFailedEngineException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/engine/SnapshotFailedEngineException.java rename to server/src/main/java/org/elasticsearch/index/engine/SnapshotFailedEngineException.java diff --git a/core/src/main/java/org/elasticsearch/index/engine/VersionConflictEngineException.java b/server/src/main/java/org/elasticsearch/index/engine/VersionConflictEngineException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/engine/VersionConflictEngineException.java rename to server/src/main/java/org/elasticsearch/index/engine/VersionConflictEngineException.java diff --git a/core/src/main/java/org/elasticsearch/index/engine/VersionValue.java b/server/src/main/java/org/elasticsearch/index/engine/VersionValue.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/engine/VersionValue.java rename to server/src/main/java/org/elasticsearch/index/engine/VersionValue.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/AbstractBinaryDocValues.java b/server/src/main/java/org/elasticsearch/index/fielddata/AbstractBinaryDocValues.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/AbstractBinaryDocValues.java rename to server/src/main/java/org/elasticsearch/index/fielddata/AbstractBinaryDocValues.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/AbstractNumericDocValues.java b/server/src/main/java/org/elasticsearch/index/fielddata/AbstractNumericDocValues.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/AbstractNumericDocValues.java rename to server/src/main/java/org/elasticsearch/index/fielddata/AbstractNumericDocValues.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/AbstractSortedDocValues.java b/server/src/main/java/org/elasticsearch/index/fielddata/AbstractSortedDocValues.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/AbstractSortedDocValues.java rename to server/src/main/java/org/elasticsearch/index/fielddata/AbstractSortedDocValues.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/AbstractSortedNumericDocValues.java b/server/src/main/java/org/elasticsearch/index/fielddata/AbstractSortedNumericDocValues.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/AbstractSortedNumericDocValues.java rename to server/src/main/java/org/elasticsearch/index/fielddata/AbstractSortedNumericDocValues.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/AbstractSortedSetDocValues.java b/server/src/main/java/org/elasticsearch/index/fielddata/AbstractSortedSetDocValues.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/AbstractSortedSetDocValues.java rename to server/src/main/java/org/elasticsearch/index/fielddata/AbstractSortedSetDocValues.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/AbstractSortingNumericDocValues.java b/server/src/main/java/org/elasticsearch/index/fielddata/AbstractSortingNumericDocValues.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/AbstractSortingNumericDocValues.java rename to server/src/main/java/org/elasticsearch/index/fielddata/AbstractSortingNumericDocValues.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/AtomicFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/AtomicFieldData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/AtomicFieldData.java rename to server/src/main/java/org/elasticsearch/index/fielddata/AtomicFieldData.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/AtomicGeoPointFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/AtomicGeoPointFieldData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/AtomicGeoPointFieldData.java rename to server/src/main/java/org/elasticsearch/index/fielddata/AtomicGeoPointFieldData.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/AtomicNumericFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/AtomicNumericFieldData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/AtomicNumericFieldData.java rename to server/src/main/java/org/elasticsearch/index/fielddata/AtomicNumericFieldData.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/AtomicOrdinalsFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/AtomicOrdinalsFieldData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/AtomicOrdinalsFieldData.java rename to server/src/main/java/org/elasticsearch/index/fielddata/AtomicOrdinalsFieldData.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/FieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/FieldData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/FieldData.java rename to server/src/main/java/org/elasticsearch/index/fielddata/FieldData.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/FieldDataStats.java b/server/src/main/java/org/elasticsearch/index/fielddata/FieldDataStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/FieldDataStats.java rename to server/src/main/java/org/elasticsearch/index/fielddata/FieldDataStats.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/GeoPointValues.java b/server/src/main/java/org/elasticsearch/index/fielddata/GeoPointValues.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/GeoPointValues.java rename to server/src/main/java/org/elasticsearch/index/fielddata/GeoPointValues.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/IndexFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/IndexFieldData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/IndexFieldData.java rename to server/src/main/java/org/elasticsearch/index/fielddata/IndexFieldData.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/IndexFieldDataCache.java b/server/src/main/java/org/elasticsearch/index/fielddata/IndexFieldDataCache.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/IndexFieldDataCache.java rename to server/src/main/java/org/elasticsearch/index/fielddata/IndexFieldDataCache.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/IndexFieldDataService.java b/server/src/main/java/org/elasticsearch/index/fielddata/IndexFieldDataService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/IndexFieldDataService.java rename to server/src/main/java/org/elasticsearch/index/fielddata/IndexFieldDataService.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/IndexGeoPointFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/IndexGeoPointFieldData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/IndexGeoPointFieldData.java rename to server/src/main/java/org/elasticsearch/index/fielddata/IndexGeoPointFieldData.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/IndexNumericFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/IndexNumericFieldData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/IndexNumericFieldData.java rename to server/src/main/java/org/elasticsearch/index/fielddata/IndexNumericFieldData.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/IndexOrdinalsFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/IndexOrdinalsFieldData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/IndexOrdinalsFieldData.java rename to server/src/main/java/org/elasticsearch/index/fielddata/IndexOrdinalsFieldData.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/MultiGeoPointValues.java b/server/src/main/java/org/elasticsearch/index/fielddata/MultiGeoPointValues.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/MultiGeoPointValues.java rename to server/src/main/java/org/elasticsearch/index/fielddata/MultiGeoPointValues.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/NumericDoubleValues.java b/server/src/main/java/org/elasticsearch/index/fielddata/NumericDoubleValues.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/NumericDoubleValues.java rename to server/src/main/java/org/elasticsearch/index/fielddata/NumericDoubleValues.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/RamAccountingTermsEnum.java b/server/src/main/java/org/elasticsearch/index/fielddata/RamAccountingTermsEnum.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/RamAccountingTermsEnum.java rename to server/src/main/java/org/elasticsearch/index/fielddata/RamAccountingTermsEnum.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/ScriptDocValues.java b/server/src/main/java/org/elasticsearch/index/fielddata/ScriptDocValues.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/ScriptDocValues.java rename to server/src/main/java/org/elasticsearch/index/fielddata/ScriptDocValues.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/ShardFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/ShardFieldData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/ShardFieldData.java rename to server/src/main/java/org/elasticsearch/index/fielddata/ShardFieldData.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/SingletonMultiGeoPointValues.java b/server/src/main/java/org/elasticsearch/index/fielddata/SingletonMultiGeoPointValues.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/SingletonMultiGeoPointValues.java rename to server/src/main/java/org/elasticsearch/index/fielddata/SingletonMultiGeoPointValues.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/SingletonSortedBinaryDocValues.java b/server/src/main/java/org/elasticsearch/index/fielddata/SingletonSortedBinaryDocValues.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/SingletonSortedBinaryDocValues.java rename to server/src/main/java/org/elasticsearch/index/fielddata/SingletonSortedBinaryDocValues.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/SingletonSortedNumericDoubleValues.java b/server/src/main/java/org/elasticsearch/index/fielddata/SingletonSortedNumericDoubleValues.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/SingletonSortedNumericDoubleValues.java rename to server/src/main/java/org/elasticsearch/index/fielddata/SingletonSortedNumericDoubleValues.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/SortableLongBitsNumericDocValues.java b/server/src/main/java/org/elasticsearch/index/fielddata/SortableLongBitsNumericDocValues.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/SortableLongBitsNumericDocValues.java rename to server/src/main/java/org/elasticsearch/index/fielddata/SortableLongBitsNumericDocValues.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/SortableLongBitsSortedNumericDocValues.java b/server/src/main/java/org/elasticsearch/index/fielddata/SortableLongBitsSortedNumericDocValues.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/SortableLongBitsSortedNumericDocValues.java rename to server/src/main/java/org/elasticsearch/index/fielddata/SortableLongBitsSortedNumericDocValues.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/SortableLongBitsToNumericDoubleValues.java b/server/src/main/java/org/elasticsearch/index/fielddata/SortableLongBitsToNumericDoubleValues.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/SortableLongBitsToNumericDoubleValues.java rename to server/src/main/java/org/elasticsearch/index/fielddata/SortableLongBitsToNumericDoubleValues.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/SortableLongBitsToSortedNumericDoubleValues.java b/server/src/main/java/org/elasticsearch/index/fielddata/SortableLongBitsToSortedNumericDoubleValues.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/SortableLongBitsToSortedNumericDoubleValues.java rename to server/src/main/java/org/elasticsearch/index/fielddata/SortableLongBitsToSortedNumericDoubleValues.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/SortedBinaryDocValues.java b/server/src/main/java/org/elasticsearch/index/fielddata/SortedBinaryDocValues.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/SortedBinaryDocValues.java rename to server/src/main/java/org/elasticsearch/index/fielddata/SortedBinaryDocValues.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/SortedNumericDoubleValues.java b/server/src/main/java/org/elasticsearch/index/fielddata/SortedNumericDoubleValues.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/SortedNumericDoubleValues.java rename to server/src/main/java/org/elasticsearch/index/fielddata/SortedNumericDoubleValues.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/SortingBinaryDocValues.java b/server/src/main/java/org/elasticsearch/index/fielddata/SortingBinaryDocValues.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/SortingBinaryDocValues.java rename to server/src/main/java/org/elasticsearch/index/fielddata/SortingBinaryDocValues.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/SortingNumericDocValues.java b/server/src/main/java/org/elasticsearch/index/fielddata/SortingNumericDocValues.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/SortingNumericDocValues.java rename to server/src/main/java/org/elasticsearch/index/fielddata/SortingNumericDocValues.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/SortingNumericDoubleValues.java b/server/src/main/java/org/elasticsearch/index/fielddata/SortingNumericDoubleValues.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/SortingNumericDoubleValues.java rename to server/src/main/java/org/elasticsearch/index/fielddata/SortingNumericDoubleValues.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/UidIndexFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/UidIndexFieldData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/UidIndexFieldData.java rename to server/src/main/java/org/elasticsearch/index/fielddata/UidIndexFieldData.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/BytesRefFieldComparatorSource.java b/server/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/BytesRefFieldComparatorSource.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/BytesRefFieldComparatorSource.java rename to server/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/BytesRefFieldComparatorSource.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/DoubleValuesComparatorSource.java b/server/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/DoubleValuesComparatorSource.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/DoubleValuesComparatorSource.java rename to server/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/DoubleValuesComparatorSource.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/FloatValuesComparatorSource.java b/server/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/FloatValuesComparatorSource.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/FloatValuesComparatorSource.java rename to server/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/FloatValuesComparatorSource.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/LongValuesComparatorSource.java b/server/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/LongValuesComparatorSource.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/LongValuesComparatorSource.java rename to server/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/LongValuesComparatorSource.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/ordinals/GlobalOrdinalMapping.java b/server/src/main/java/org/elasticsearch/index/fielddata/ordinals/GlobalOrdinalMapping.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/ordinals/GlobalOrdinalMapping.java rename to server/src/main/java/org/elasticsearch/index/fielddata/ordinals/GlobalOrdinalMapping.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/ordinals/GlobalOrdinalsBuilder.java b/server/src/main/java/org/elasticsearch/index/fielddata/ordinals/GlobalOrdinalsBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/ordinals/GlobalOrdinalsBuilder.java rename to server/src/main/java/org/elasticsearch/index/fielddata/ordinals/GlobalOrdinalsBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/ordinals/GlobalOrdinalsIndexFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/ordinals/GlobalOrdinalsIndexFieldData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/ordinals/GlobalOrdinalsIndexFieldData.java rename to server/src/main/java/org/elasticsearch/index/fielddata/ordinals/GlobalOrdinalsIndexFieldData.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/ordinals/MultiOrdinals.java b/server/src/main/java/org/elasticsearch/index/fielddata/ordinals/MultiOrdinals.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/ordinals/MultiOrdinals.java rename to server/src/main/java/org/elasticsearch/index/fielddata/ordinals/MultiOrdinals.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/ordinals/Ordinals.java b/server/src/main/java/org/elasticsearch/index/fielddata/ordinals/Ordinals.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/ordinals/Ordinals.java rename to server/src/main/java/org/elasticsearch/index/fielddata/ordinals/Ordinals.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/ordinals/OrdinalsBuilder.java b/server/src/main/java/org/elasticsearch/index/fielddata/ordinals/OrdinalsBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/ordinals/OrdinalsBuilder.java rename to server/src/main/java/org/elasticsearch/index/fielddata/ordinals/OrdinalsBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/ordinals/SinglePackedOrdinals.java b/server/src/main/java/org/elasticsearch/index/fielddata/ordinals/SinglePackedOrdinals.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/ordinals/SinglePackedOrdinals.java rename to server/src/main/java/org/elasticsearch/index/fielddata/ordinals/SinglePackedOrdinals.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractAtomicGeoPointFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractAtomicGeoPointFieldData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractAtomicGeoPointFieldData.java rename to server/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractAtomicGeoPointFieldData.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractAtomicOrdinalsFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractAtomicOrdinalsFieldData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractAtomicOrdinalsFieldData.java rename to server/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractAtomicOrdinalsFieldData.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractIndexFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractIndexFieldData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractIndexFieldData.java rename to server/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractIndexFieldData.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractIndexOrdinalsFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractIndexOrdinalsFieldData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractIndexOrdinalsFieldData.java rename to server/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractIndexOrdinalsFieldData.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractLatLonPointDVIndexFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractLatLonPointDVIndexFieldData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractLatLonPointDVIndexFieldData.java rename to server/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractLatLonPointDVIndexFieldData.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/plain/AtomicDoubleFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/plain/AtomicDoubleFieldData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/plain/AtomicDoubleFieldData.java rename to server/src/main/java/org/elasticsearch/index/fielddata/plain/AtomicDoubleFieldData.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/plain/AtomicLongFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/plain/AtomicLongFieldData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/plain/AtomicLongFieldData.java rename to server/src/main/java/org/elasticsearch/index/fielddata/plain/AtomicLongFieldData.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/plain/BinaryDVAtomicFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/plain/BinaryDVAtomicFieldData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/plain/BinaryDVAtomicFieldData.java rename to server/src/main/java/org/elasticsearch/index/fielddata/plain/BinaryDVAtomicFieldData.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/plain/BinaryDVIndexFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/plain/BinaryDVIndexFieldData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/plain/BinaryDVIndexFieldData.java rename to server/src/main/java/org/elasticsearch/index/fielddata/plain/BinaryDVIndexFieldData.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/plain/BytesBinaryDVAtomicFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/plain/BytesBinaryDVAtomicFieldData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/plain/BytesBinaryDVAtomicFieldData.java rename to server/src/main/java/org/elasticsearch/index/fielddata/plain/BytesBinaryDVAtomicFieldData.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/plain/BytesBinaryDVIndexFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/plain/BytesBinaryDVIndexFieldData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/plain/BytesBinaryDVIndexFieldData.java rename to server/src/main/java/org/elasticsearch/index/fielddata/plain/BytesBinaryDVIndexFieldData.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/plain/ConstantIndexFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/plain/ConstantIndexFieldData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/plain/ConstantIndexFieldData.java rename to server/src/main/java/org/elasticsearch/index/fielddata/plain/ConstantIndexFieldData.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/plain/DocValuesIndexFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/plain/DocValuesIndexFieldData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/plain/DocValuesIndexFieldData.java rename to server/src/main/java/org/elasticsearch/index/fielddata/plain/DocValuesIndexFieldData.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/plain/LatLonPointDVAtomicFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/plain/LatLonPointDVAtomicFieldData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/plain/LatLonPointDVAtomicFieldData.java rename to server/src/main/java/org/elasticsearch/index/fielddata/plain/LatLonPointDVAtomicFieldData.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/plain/NonEstimatingEstimator.java b/server/src/main/java/org/elasticsearch/index/fielddata/plain/NonEstimatingEstimator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/plain/NonEstimatingEstimator.java rename to server/src/main/java/org/elasticsearch/index/fielddata/plain/NonEstimatingEstimator.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/plain/PagedBytesAtomicFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/plain/PagedBytesAtomicFieldData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/plain/PagedBytesAtomicFieldData.java rename to server/src/main/java/org/elasticsearch/index/fielddata/plain/PagedBytesAtomicFieldData.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/plain/PagedBytesIndexFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/plain/PagedBytesIndexFieldData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/plain/PagedBytesIndexFieldData.java rename to server/src/main/java/org/elasticsearch/index/fielddata/plain/PagedBytesIndexFieldData.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/plain/SortedNumericDVIndexFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/plain/SortedNumericDVIndexFieldData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/plain/SortedNumericDVIndexFieldData.java rename to server/src/main/java/org/elasticsearch/index/fielddata/plain/SortedNumericDVIndexFieldData.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/plain/SortedSetDVBytesAtomicFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/plain/SortedSetDVBytesAtomicFieldData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/plain/SortedSetDVBytesAtomicFieldData.java rename to server/src/main/java/org/elasticsearch/index/fielddata/plain/SortedSetDVBytesAtomicFieldData.java diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/plain/SortedSetDVOrdinalsIndexFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/plain/SortedSetDVOrdinalsIndexFieldData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fielddata/plain/SortedSetDVOrdinalsIndexFieldData.java rename to server/src/main/java/org/elasticsearch/index/fielddata/plain/SortedSetDVOrdinalsIndexFieldData.java diff --git a/core/src/main/java/org/elasticsearch/index/fieldvisitor/CustomFieldsVisitor.java b/server/src/main/java/org/elasticsearch/index/fieldvisitor/CustomFieldsVisitor.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fieldvisitor/CustomFieldsVisitor.java rename to server/src/main/java/org/elasticsearch/index/fieldvisitor/CustomFieldsVisitor.java diff --git a/core/src/main/java/org/elasticsearch/index/fieldvisitor/FieldsVisitor.java b/server/src/main/java/org/elasticsearch/index/fieldvisitor/FieldsVisitor.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fieldvisitor/FieldsVisitor.java rename to server/src/main/java/org/elasticsearch/index/fieldvisitor/FieldsVisitor.java diff --git a/core/src/main/java/org/elasticsearch/index/fieldvisitor/SingleFieldsVisitor.java b/server/src/main/java/org/elasticsearch/index/fieldvisitor/SingleFieldsVisitor.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/fieldvisitor/SingleFieldsVisitor.java rename to server/src/main/java/org/elasticsearch/index/fieldvisitor/SingleFieldsVisitor.java diff --git a/core/src/main/java/org/elasticsearch/index/flush/FlushStats.java b/server/src/main/java/org/elasticsearch/index/flush/FlushStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/flush/FlushStats.java rename to server/src/main/java/org/elasticsearch/index/flush/FlushStats.java diff --git a/core/src/main/java/org/elasticsearch/index/get/GetResult.java b/server/src/main/java/org/elasticsearch/index/get/GetResult.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/get/GetResult.java rename to server/src/main/java/org/elasticsearch/index/get/GetResult.java diff --git a/core/src/main/java/org/elasticsearch/index/get/GetStats.java b/server/src/main/java/org/elasticsearch/index/get/GetStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/get/GetStats.java rename to server/src/main/java/org/elasticsearch/index/get/GetStats.java diff --git a/core/src/main/java/org/elasticsearch/index/get/ShardGetService.java b/server/src/main/java/org/elasticsearch/index/get/ShardGetService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/get/ShardGetService.java rename to server/src/main/java/org/elasticsearch/index/get/ShardGetService.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/ArrayValueMapperParser.java b/server/src/main/java/org/elasticsearch/index/mapper/ArrayValueMapperParser.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/ArrayValueMapperParser.java rename to server/src/main/java/org/elasticsearch/index/mapper/ArrayValueMapperParser.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/BinaryFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/BinaryFieldMapper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/BinaryFieldMapper.java rename to server/src/main/java/org/elasticsearch/index/mapper/BinaryFieldMapper.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/BinaryRangeUtil.java b/server/src/main/java/org/elasticsearch/index/mapper/BinaryRangeUtil.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/BinaryRangeUtil.java rename to server/src/main/java/org/elasticsearch/index/mapper/BinaryRangeUtil.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/BooleanFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/BooleanFieldMapper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/BooleanFieldMapper.java rename to server/src/main/java/org/elasticsearch/index/mapper/BooleanFieldMapper.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/CompletionFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/CompletionFieldMapper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/CompletionFieldMapper.java rename to server/src/main/java/org/elasticsearch/index/mapper/CompletionFieldMapper.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/ContentPath.java b/server/src/main/java/org/elasticsearch/index/mapper/ContentPath.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/ContentPath.java rename to server/src/main/java/org/elasticsearch/index/mapper/ContentPath.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/CustomDocValuesField.java b/server/src/main/java/org/elasticsearch/index/mapper/CustomDocValuesField.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/CustomDocValuesField.java rename to server/src/main/java/org/elasticsearch/index/mapper/CustomDocValuesField.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/DateFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/DateFieldMapper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/DateFieldMapper.java rename to server/src/main/java/org/elasticsearch/index/mapper/DateFieldMapper.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/DocumentFieldMappers.java b/server/src/main/java/org/elasticsearch/index/mapper/DocumentFieldMappers.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/DocumentFieldMappers.java rename to server/src/main/java/org/elasticsearch/index/mapper/DocumentFieldMappers.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/DocumentMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/DocumentMapper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/DocumentMapper.java rename to server/src/main/java/org/elasticsearch/index/mapper/DocumentMapper.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/DocumentMapperForType.java b/server/src/main/java/org/elasticsearch/index/mapper/DocumentMapperForType.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/DocumentMapperForType.java rename to server/src/main/java/org/elasticsearch/index/mapper/DocumentMapperForType.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/DocumentMapperParser.java b/server/src/main/java/org/elasticsearch/index/mapper/DocumentMapperParser.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/DocumentMapperParser.java rename to server/src/main/java/org/elasticsearch/index/mapper/DocumentMapperParser.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/DocumentParser.java b/server/src/main/java/org/elasticsearch/index/mapper/DocumentParser.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/DocumentParser.java rename to server/src/main/java/org/elasticsearch/index/mapper/DocumentParser.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/DynamicTemplate.java b/server/src/main/java/org/elasticsearch/index/mapper/DynamicTemplate.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/DynamicTemplate.java rename to server/src/main/java/org/elasticsearch/index/mapper/DynamicTemplate.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/EnabledAttributeMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/EnabledAttributeMapper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/EnabledAttributeMapper.java rename to server/src/main/java/org/elasticsearch/index/mapper/EnabledAttributeMapper.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/FieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/FieldMapper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/FieldMapper.java rename to server/src/main/java/org/elasticsearch/index/mapper/FieldMapper.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/FieldNamesFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/FieldNamesFieldMapper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/FieldNamesFieldMapper.java rename to server/src/main/java/org/elasticsearch/index/mapper/FieldNamesFieldMapper.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/FieldTypeLookup.java b/server/src/main/java/org/elasticsearch/index/mapper/FieldTypeLookup.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/FieldTypeLookup.java rename to server/src/main/java/org/elasticsearch/index/mapper/FieldTypeLookup.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/GeoPointFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/GeoPointFieldMapper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/GeoPointFieldMapper.java rename to server/src/main/java/org/elasticsearch/index/mapper/GeoPointFieldMapper.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/GeoShapeFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/GeoShapeFieldMapper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/GeoShapeFieldMapper.java rename to server/src/main/java/org/elasticsearch/index/mapper/GeoShapeFieldMapper.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/IdFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/IdFieldMapper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/IdFieldMapper.java rename to server/src/main/java/org/elasticsearch/index/mapper/IdFieldMapper.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/IndexFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/IndexFieldMapper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/IndexFieldMapper.java rename to server/src/main/java/org/elasticsearch/index/mapper/IndexFieldMapper.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/IpFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/IpFieldMapper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/IpFieldMapper.java rename to server/src/main/java/org/elasticsearch/index/mapper/IpFieldMapper.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/KeywordFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/KeywordFieldMapper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/KeywordFieldMapper.java rename to server/src/main/java/org/elasticsearch/index/mapper/KeywordFieldMapper.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/MappedFieldType.java b/server/src/main/java/org/elasticsearch/index/mapper/MappedFieldType.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/MappedFieldType.java rename to server/src/main/java/org/elasticsearch/index/mapper/MappedFieldType.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/Mapper.java b/server/src/main/java/org/elasticsearch/index/mapper/Mapper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/Mapper.java rename to server/src/main/java/org/elasticsearch/index/mapper/Mapper.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/MapperException.java b/server/src/main/java/org/elasticsearch/index/mapper/MapperException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/MapperException.java rename to server/src/main/java/org/elasticsearch/index/mapper/MapperException.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/MapperParsingException.java b/server/src/main/java/org/elasticsearch/index/mapper/MapperParsingException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/MapperParsingException.java rename to server/src/main/java/org/elasticsearch/index/mapper/MapperParsingException.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/MapperService.java b/server/src/main/java/org/elasticsearch/index/mapper/MapperService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/MapperService.java rename to server/src/main/java/org/elasticsearch/index/mapper/MapperService.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/MapperUtils.java b/server/src/main/java/org/elasticsearch/index/mapper/MapperUtils.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/MapperUtils.java rename to server/src/main/java/org/elasticsearch/index/mapper/MapperUtils.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/Mapping.java b/server/src/main/java/org/elasticsearch/index/mapper/Mapping.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/Mapping.java rename to server/src/main/java/org/elasticsearch/index/mapper/Mapping.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/MetadataFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/MetadataFieldMapper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/MetadataFieldMapper.java rename to server/src/main/java/org/elasticsearch/index/mapper/MetadataFieldMapper.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/NumberFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/NumberFieldMapper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/NumberFieldMapper.java rename to server/src/main/java/org/elasticsearch/index/mapper/NumberFieldMapper.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/ObjectMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/ObjectMapper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/ObjectMapper.java rename to server/src/main/java/org/elasticsearch/index/mapper/ObjectMapper.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/ParentFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/ParentFieldMapper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/ParentFieldMapper.java rename to server/src/main/java/org/elasticsearch/index/mapper/ParentFieldMapper.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/ParseContext.java b/server/src/main/java/org/elasticsearch/index/mapper/ParseContext.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/ParseContext.java rename to server/src/main/java/org/elasticsearch/index/mapper/ParseContext.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/ParsedDocument.java b/server/src/main/java/org/elasticsearch/index/mapper/ParsedDocument.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/ParsedDocument.java rename to server/src/main/java/org/elasticsearch/index/mapper/ParsedDocument.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/RangeFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/RangeFieldMapper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/RangeFieldMapper.java rename to server/src/main/java/org/elasticsearch/index/mapper/RangeFieldMapper.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/RootObjectMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/RootObjectMapper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/RootObjectMapper.java rename to server/src/main/java/org/elasticsearch/index/mapper/RootObjectMapper.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/RoutingFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/RoutingFieldMapper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/RoutingFieldMapper.java rename to server/src/main/java/org/elasticsearch/index/mapper/RoutingFieldMapper.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/SeqNoFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/SeqNoFieldMapper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/SeqNoFieldMapper.java rename to server/src/main/java/org/elasticsearch/index/mapper/SeqNoFieldMapper.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/SimpleMappedFieldType.java b/server/src/main/java/org/elasticsearch/index/mapper/SimpleMappedFieldType.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/SimpleMappedFieldType.java rename to server/src/main/java/org/elasticsearch/index/mapper/SimpleMappedFieldType.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/SourceFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/SourceFieldMapper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/SourceFieldMapper.java rename to server/src/main/java/org/elasticsearch/index/mapper/SourceFieldMapper.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/SourceToParse.java b/server/src/main/java/org/elasticsearch/index/mapper/SourceToParse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/SourceToParse.java rename to server/src/main/java/org/elasticsearch/index/mapper/SourceToParse.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/StrictDynamicMappingException.java b/server/src/main/java/org/elasticsearch/index/mapper/StrictDynamicMappingException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/StrictDynamicMappingException.java rename to server/src/main/java/org/elasticsearch/index/mapper/StrictDynamicMappingException.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/StringFieldType.java b/server/src/main/java/org/elasticsearch/index/mapper/StringFieldType.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/StringFieldType.java rename to server/src/main/java/org/elasticsearch/index/mapper/StringFieldType.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/TermBasedFieldType.java b/server/src/main/java/org/elasticsearch/index/mapper/TermBasedFieldType.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/TermBasedFieldType.java rename to server/src/main/java/org/elasticsearch/index/mapper/TermBasedFieldType.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/TextFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/TextFieldMapper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/TextFieldMapper.java rename to server/src/main/java/org/elasticsearch/index/mapper/TextFieldMapper.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/TypeFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/TypeFieldMapper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/TypeFieldMapper.java rename to server/src/main/java/org/elasticsearch/index/mapper/TypeFieldMapper.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/TypeParsers.java b/server/src/main/java/org/elasticsearch/index/mapper/TypeParsers.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/TypeParsers.java rename to server/src/main/java/org/elasticsearch/index/mapper/TypeParsers.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/Uid.java b/server/src/main/java/org/elasticsearch/index/mapper/Uid.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/Uid.java rename to server/src/main/java/org/elasticsearch/index/mapper/Uid.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/UidFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/UidFieldMapper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/UidFieldMapper.java rename to server/src/main/java/org/elasticsearch/index/mapper/UidFieldMapper.java diff --git a/core/src/main/java/org/elasticsearch/index/mapper/VersionFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/VersionFieldMapper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/VersionFieldMapper.java rename to server/src/main/java/org/elasticsearch/index/mapper/VersionFieldMapper.java diff --git a/core/src/main/java/org/elasticsearch/index/merge/MergeStats.java b/server/src/main/java/org/elasticsearch/index/merge/MergeStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/merge/MergeStats.java rename to server/src/main/java/org/elasticsearch/index/merge/MergeStats.java diff --git a/core/src/main/java/org/elasticsearch/index/merge/OnGoingMerge.java b/server/src/main/java/org/elasticsearch/index/merge/OnGoingMerge.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/merge/OnGoingMerge.java rename to server/src/main/java/org/elasticsearch/index/merge/OnGoingMerge.java diff --git a/core/src/main/java/org/elasticsearch/index/query/AbstractQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/AbstractQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/AbstractQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/AbstractQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/BaseTermQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/BaseTermQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/BaseTermQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/BaseTermQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/BoolQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/BoolQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/BoolQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/BoolQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/BoostingQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/BoostingQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/BoostingQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/BoostingQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/CommonTermsQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/CommonTermsQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/CommonTermsQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/CommonTermsQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/ConstantScoreQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/ConstantScoreQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/ConstantScoreQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/ConstantScoreQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/DisMaxQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/DisMaxQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/DisMaxQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/DisMaxQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/ExistsQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/ExistsQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/ExistsQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/ExistsQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/FieldMaskingSpanQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/FieldMaskingSpanQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/FieldMaskingSpanQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/FieldMaskingSpanQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/FuzzyQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/FuzzyQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/FuzzyQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/FuzzyQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/GeoBoundingBoxQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/GeoBoundingBoxQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/GeoBoundingBoxQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/GeoBoundingBoxQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/GeoDistanceQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/GeoDistanceQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/GeoDistanceQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/GeoDistanceQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/GeoExecType.java b/server/src/main/java/org/elasticsearch/index/query/GeoExecType.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/GeoExecType.java rename to server/src/main/java/org/elasticsearch/index/query/GeoExecType.java diff --git a/core/src/main/java/org/elasticsearch/index/query/GeoPolygonQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/GeoPolygonQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/GeoPolygonQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/GeoPolygonQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/GeoShapeQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/GeoShapeQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/GeoShapeQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/GeoShapeQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/GeoValidationMethod.java b/server/src/main/java/org/elasticsearch/index/query/GeoValidationMethod.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/GeoValidationMethod.java rename to server/src/main/java/org/elasticsearch/index/query/GeoValidationMethod.java diff --git a/core/src/main/java/org/elasticsearch/index/query/IdsQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/IdsQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/IdsQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/IdsQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/InnerHitBuilder.java b/server/src/main/java/org/elasticsearch/index/query/InnerHitBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/InnerHitBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/InnerHitBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/InnerHitContextBuilder.java b/server/src/main/java/org/elasticsearch/index/query/InnerHitContextBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/InnerHitContextBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/InnerHitContextBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/MatchAllQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/MatchAllQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/MatchAllQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/MatchAllQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/MatchNoneQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/MatchNoneQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/MatchNoneQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/MatchNoneQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/MatchPhrasePrefixQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/MatchPhrasePrefixQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/MatchPhrasePrefixQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/MatchPhrasePrefixQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/MatchPhraseQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/MatchPhraseQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/MatchPhraseQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/MatchPhraseQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/MatchQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/MatchQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/MatchQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/MatchQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/MultiMatchQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/MultiMatchQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/MultiMatchQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/MultiMatchQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/MultiTermQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/MultiTermQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/MultiTermQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/MultiTermQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/NestedQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/NestedQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/NestedQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/NestedQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/Operator.java b/server/src/main/java/org/elasticsearch/index/query/Operator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/Operator.java rename to server/src/main/java/org/elasticsearch/index/query/Operator.java diff --git a/core/src/main/java/org/elasticsearch/index/query/ParsedQuery.java b/server/src/main/java/org/elasticsearch/index/query/ParsedQuery.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/ParsedQuery.java rename to server/src/main/java/org/elasticsearch/index/query/ParsedQuery.java diff --git a/core/src/main/java/org/elasticsearch/index/query/PrefixQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/PrefixQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/PrefixQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/PrefixQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/QueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/QueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/QueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/QueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/QueryBuilders.java b/server/src/main/java/org/elasticsearch/index/query/QueryBuilders.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/QueryBuilders.java rename to server/src/main/java/org/elasticsearch/index/query/QueryBuilders.java diff --git a/core/src/main/java/org/elasticsearch/index/query/QueryParser.java b/server/src/main/java/org/elasticsearch/index/query/QueryParser.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/QueryParser.java rename to server/src/main/java/org/elasticsearch/index/query/QueryParser.java diff --git a/core/src/main/java/org/elasticsearch/index/query/QueryRewriteContext.java b/server/src/main/java/org/elasticsearch/index/query/QueryRewriteContext.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/QueryRewriteContext.java rename to server/src/main/java/org/elasticsearch/index/query/QueryRewriteContext.java diff --git a/core/src/main/java/org/elasticsearch/index/query/QueryShardContext.java b/server/src/main/java/org/elasticsearch/index/query/QueryShardContext.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/QueryShardContext.java rename to server/src/main/java/org/elasticsearch/index/query/QueryShardContext.java diff --git a/core/src/main/java/org/elasticsearch/index/query/QueryShardException.java b/server/src/main/java/org/elasticsearch/index/query/QueryShardException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/QueryShardException.java rename to server/src/main/java/org/elasticsearch/index/query/QueryShardException.java diff --git a/core/src/main/java/org/elasticsearch/index/query/QueryStringQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/QueryStringQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/QueryStringQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/QueryStringQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/QueryValidationException.java b/server/src/main/java/org/elasticsearch/index/query/QueryValidationException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/QueryValidationException.java rename to server/src/main/java/org/elasticsearch/index/query/QueryValidationException.java diff --git a/core/src/main/java/org/elasticsearch/index/query/RangeQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/RangeQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/RangeQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/RangeQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/RegexpFlag.java b/server/src/main/java/org/elasticsearch/index/query/RegexpFlag.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/RegexpFlag.java rename to server/src/main/java/org/elasticsearch/index/query/RegexpFlag.java diff --git a/core/src/main/java/org/elasticsearch/index/query/RegexpQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/RegexpQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/RegexpQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/RegexpQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/Rewriteable.java b/server/src/main/java/org/elasticsearch/index/query/Rewriteable.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/Rewriteable.java rename to server/src/main/java/org/elasticsearch/index/query/Rewriteable.java diff --git a/core/src/main/java/org/elasticsearch/index/query/ScriptQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/ScriptQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/ScriptQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/ScriptQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/SimpleQueryStringBuilder.java b/server/src/main/java/org/elasticsearch/index/query/SimpleQueryStringBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/SimpleQueryStringBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/SimpleQueryStringBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/SimpleQueryStringFlag.java b/server/src/main/java/org/elasticsearch/index/query/SimpleQueryStringFlag.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/SimpleQueryStringFlag.java rename to server/src/main/java/org/elasticsearch/index/query/SimpleQueryStringFlag.java diff --git a/core/src/main/java/org/elasticsearch/index/query/SpanContainingQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/SpanContainingQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/SpanContainingQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/SpanContainingQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/SpanFirstQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/SpanFirstQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/SpanFirstQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/SpanFirstQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/SpanMultiTermQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/SpanMultiTermQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/SpanMultiTermQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/SpanMultiTermQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/SpanNearQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/SpanNearQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/SpanNearQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/SpanNearQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/SpanNotQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/SpanNotQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/SpanNotQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/SpanNotQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/SpanOrQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/SpanOrQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/SpanOrQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/SpanOrQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/SpanQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/SpanQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/SpanQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/SpanQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/SpanTermQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/SpanTermQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/SpanTermQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/SpanTermQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/SpanWithinQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/SpanWithinQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/SpanWithinQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/SpanWithinQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/TermQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/TermQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/TermQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/TermQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/TermsQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/TermsQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/TermsQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/TermsQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/TermsSetQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/TermsSetQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/TermsSetQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/TermsSetQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/TypeQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/TypeQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/TypeQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/TypeQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/WildcardQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/WildcardQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/WildcardQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/WildcardQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/WrapperQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/WrapperQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/WrapperQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/WrapperQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/functionscore/DecayFunction.java b/server/src/main/java/org/elasticsearch/index/query/functionscore/DecayFunction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/functionscore/DecayFunction.java rename to server/src/main/java/org/elasticsearch/index/query/functionscore/DecayFunction.java diff --git a/core/src/main/java/org/elasticsearch/index/query/functionscore/DecayFunctionBuilder.java b/server/src/main/java/org/elasticsearch/index/query/functionscore/DecayFunctionBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/functionscore/DecayFunctionBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/functionscore/DecayFunctionBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/functionscore/DecayFunctionParser.java b/server/src/main/java/org/elasticsearch/index/query/functionscore/DecayFunctionParser.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/functionscore/DecayFunctionParser.java rename to server/src/main/java/org/elasticsearch/index/query/functionscore/DecayFunctionParser.java diff --git a/core/src/main/java/org/elasticsearch/index/query/functionscore/ExponentialDecayFunctionBuilder.java b/server/src/main/java/org/elasticsearch/index/query/functionscore/ExponentialDecayFunctionBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/functionscore/ExponentialDecayFunctionBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/functionscore/ExponentialDecayFunctionBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/functionscore/FieldValueFactorFunctionBuilder.java b/server/src/main/java/org/elasticsearch/index/query/functionscore/FieldValueFactorFunctionBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/functionscore/FieldValueFactorFunctionBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/functionscore/FieldValueFactorFunctionBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/functionscore/FunctionScoreQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/functionscore/FunctionScoreQueryBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/functionscore/FunctionScoreQueryBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/functionscore/FunctionScoreQueryBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/functionscore/GaussDecayFunctionBuilder.java b/server/src/main/java/org/elasticsearch/index/query/functionscore/GaussDecayFunctionBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/functionscore/GaussDecayFunctionBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/functionscore/GaussDecayFunctionBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/functionscore/LinearDecayFunctionBuilder.java b/server/src/main/java/org/elasticsearch/index/query/functionscore/LinearDecayFunctionBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/functionscore/LinearDecayFunctionBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/functionscore/LinearDecayFunctionBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/functionscore/RandomScoreFunctionBuilder.java b/server/src/main/java/org/elasticsearch/index/query/functionscore/RandomScoreFunctionBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/functionscore/RandomScoreFunctionBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/functionscore/RandomScoreFunctionBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/functionscore/ScoreFunctionBuilder.java b/server/src/main/java/org/elasticsearch/index/query/functionscore/ScoreFunctionBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/functionscore/ScoreFunctionBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/functionscore/ScoreFunctionBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/functionscore/ScoreFunctionBuilders.java b/server/src/main/java/org/elasticsearch/index/query/functionscore/ScoreFunctionBuilders.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/functionscore/ScoreFunctionBuilders.java rename to server/src/main/java/org/elasticsearch/index/query/functionscore/ScoreFunctionBuilders.java diff --git a/core/src/main/java/org/elasticsearch/index/query/functionscore/ScoreFunctionParser.java b/server/src/main/java/org/elasticsearch/index/query/functionscore/ScoreFunctionParser.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/functionscore/ScoreFunctionParser.java rename to server/src/main/java/org/elasticsearch/index/query/functionscore/ScoreFunctionParser.java diff --git a/core/src/main/java/org/elasticsearch/index/query/functionscore/ScriptScoreFunctionBuilder.java b/server/src/main/java/org/elasticsearch/index/query/functionscore/ScriptScoreFunctionBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/functionscore/ScriptScoreFunctionBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/functionscore/ScriptScoreFunctionBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/functionscore/WeightBuilder.java b/server/src/main/java/org/elasticsearch/index/query/functionscore/WeightBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/functionscore/WeightBuilder.java rename to server/src/main/java/org/elasticsearch/index/query/functionscore/WeightBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/query/support/NestedScope.java b/server/src/main/java/org/elasticsearch/index/query/support/NestedScope.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/support/NestedScope.java rename to server/src/main/java/org/elasticsearch/index/query/support/NestedScope.java diff --git a/core/src/main/java/org/elasticsearch/index/query/support/QueryParsers.java b/server/src/main/java/org/elasticsearch/index/query/support/QueryParsers.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/query/support/QueryParsers.java rename to server/src/main/java/org/elasticsearch/index/query/support/QueryParsers.java diff --git a/core/src/main/java/org/elasticsearch/index/recovery/RecoveryStats.java b/server/src/main/java/org/elasticsearch/index/recovery/RecoveryStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/recovery/RecoveryStats.java rename to server/src/main/java/org/elasticsearch/index/recovery/RecoveryStats.java diff --git a/core/src/main/java/org/elasticsearch/index/refresh/RefreshStats.java b/server/src/main/java/org/elasticsearch/index/refresh/RefreshStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/refresh/RefreshStats.java rename to server/src/main/java/org/elasticsearch/index/refresh/RefreshStats.java diff --git a/core/src/main/java/org/elasticsearch/index/reindex/AbstractBulkByScrollRequest.java b/server/src/main/java/org/elasticsearch/index/reindex/AbstractBulkByScrollRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/reindex/AbstractBulkByScrollRequest.java rename to server/src/main/java/org/elasticsearch/index/reindex/AbstractBulkByScrollRequest.java diff --git a/core/src/main/java/org/elasticsearch/index/reindex/AbstractBulkByScrollRequestBuilder.java b/server/src/main/java/org/elasticsearch/index/reindex/AbstractBulkByScrollRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/reindex/AbstractBulkByScrollRequestBuilder.java rename to server/src/main/java/org/elasticsearch/index/reindex/AbstractBulkByScrollRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/reindex/AbstractBulkIndexByScrollRequest.java b/server/src/main/java/org/elasticsearch/index/reindex/AbstractBulkIndexByScrollRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/reindex/AbstractBulkIndexByScrollRequest.java rename to server/src/main/java/org/elasticsearch/index/reindex/AbstractBulkIndexByScrollRequest.java diff --git a/core/src/main/java/org/elasticsearch/index/reindex/AbstractBulkIndexByScrollRequestBuilder.java b/server/src/main/java/org/elasticsearch/index/reindex/AbstractBulkIndexByScrollRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/reindex/AbstractBulkIndexByScrollRequestBuilder.java rename to server/src/main/java/org/elasticsearch/index/reindex/AbstractBulkIndexByScrollRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/reindex/BulkByScrollResponse.java b/server/src/main/java/org/elasticsearch/index/reindex/BulkByScrollResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/reindex/BulkByScrollResponse.java rename to server/src/main/java/org/elasticsearch/index/reindex/BulkByScrollResponse.java diff --git a/core/src/main/java/org/elasticsearch/index/reindex/BulkByScrollTask.java b/server/src/main/java/org/elasticsearch/index/reindex/BulkByScrollTask.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/reindex/BulkByScrollTask.java rename to server/src/main/java/org/elasticsearch/index/reindex/BulkByScrollTask.java diff --git a/core/src/main/java/org/elasticsearch/index/reindex/ClientScrollableHitSource.java b/server/src/main/java/org/elasticsearch/index/reindex/ClientScrollableHitSource.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/reindex/ClientScrollableHitSource.java rename to server/src/main/java/org/elasticsearch/index/reindex/ClientScrollableHitSource.java diff --git a/core/src/main/java/org/elasticsearch/index/reindex/DeleteByQueryAction.java b/server/src/main/java/org/elasticsearch/index/reindex/DeleteByQueryAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/reindex/DeleteByQueryAction.java rename to server/src/main/java/org/elasticsearch/index/reindex/DeleteByQueryAction.java diff --git a/core/src/main/java/org/elasticsearch/index/reindex/DeleteByQueryRequest.java b/server/src/main/java/org/elasticsearch/index/reindex/DeleteByQueryRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/reindex/DeleteByQueryRequest.java rename to server/src/main/java/org/elasticsearch/index/reindex/DeleteByQueryRequest.java diff --git a/core/src/main/java/org/elasticsearch/index/reindex/DeleteByQueryRequestBuilder.java b/server/src/main/java/org/elasticsearch/index/reindex/DeleteByQueryRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/reindex/DeleteByQueryRequestBuilder.java rename to server/src/main/java/org/elasticsearch/index/reindex/DeleteByQueryRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/reindex/LeaderBulkByScrollTaskState.java b/server/src/main/java/org/elasticsearch/index/reindex/LeaderBulkByScrollTaskState.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/reindex/LeaderBulkByScrollTaskState.java rename to server/src/main/java/org/elasticsearch/index/reindex/LeaderBulkByScrollTaskState.java diff --git a/core/src/main/java/org/elasticsearch/index/reindex/ReindexAction.java b/server/src/main/java/org/elasticsearch/index/reindex/ReindexAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/reindex/ReindexAction.java rename to server/src/main/java/org/elasticsearch/index/reindex/ReindexAction.java diff --git a/core/src/main/java/org/elasticsearch/index/reindex/ReindexRequest.java b/server/src/main/java/org/elasticsearch/index/reindex/ReindexRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/reindex/ReindexRequest.java rename to server/src/main/java/org/elasticsearch/index/reindex/ReindexRequest.java diff --git a/core/src/main/java/org/elasticsearch/index/reindex/ReindexRequestBuilder.java b/server/src/main/java/org/elasticsearch/index/reindex/ReindexRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/reindex/ReindexRequestBuilder.java rename to server/src/main/java/org/elasticsearch/index/reindex/ReindexRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/reindex/RemoteInfo.java b/server/src/main/java/org/elasticsearch/index/reindex/RemoteInfo.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/reindex/RemoteInfo.java rename to server/src/main/java/org/elasticsearch/index/reindex/RemoteInfo.java diff --git a/core/src/main/java/org/elasticsearch/index/reindex/ScrollableHitSource.java b/server/src/main/java/org/elasticsearch/index/reindex/ScrollableHitSource.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/reindex/ScrollableHitSource.java rename to server/src/main/java/org/elasticsearch/index/reindex/ScrollableHitSource.java diff --git a/core/src/main/java/org/elasticsearch/index/reindex/SuccessfullyProcessed.java b/server/src/main/java/org/elasticsearch/index/reindex/SuccessfullyProcessed.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/reindex/SuccessfullyProcessed.java rename to server/src/main/java/org/elasticsearch/index/reindex/SuccessfullyProcessed.java diff --git a/core/src/main/java/org/elasticsearch/index/reindex/UpdateByQueryAction.java b/server/src/main/java/org/elasticsearch/index/reindex/UpdateByQueryAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/reindex/UpdateByQueryAction.java rename to server/src/main/java/org/elasticsearch/index/reindex/UpdateByQueryAction.java diff --git a/core/src/main/java/org/elasticsearch/index/reindex/UpdateByQueryRequest.java b/server/src/main/java/org/elasticsearch/index/reindex/UpdateByQueryRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/reindex/UpdateByQueryRequest.java rename to server/src/main/java/org/elasticsearch/index/reindex/UpdateByQueryRequest.java diff --git a/core/src/main/java/org/elasticsearch/index/reindex/UpdateByQueryRequestBuilder.java b/server/src/main/java/org/elasticsearch/index/reindex/UpdateByQueryRequestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/reindex/UpdateByQueryRequestBuilder.java rename to server/src/main/java/org/elasticsearch/index/reindex/UpdateByQueryRequestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/index/reindex/WorkerBulkByScrollTaskState.java b/server/src/main/java/org/elasticsearch/index/reindex/WorkerBulkByScrollTaskState.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/reindex/WorkerBulkByScrollTaskState.java rename to server/src/main/java/org/elasticsearch/index/reindex/WorkerBulkByScrollTaskState.java diff --git a/core/src/main/java/org/elasticsearch/index/search/ESToParentBlockJoinQuery.java b/server/src/main/java/org/elasticsearch/index/search/ESToParentBlockJoinQuery.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/search/ESToParentBlockJoinQuery.java rename to server/src/main/java/org/elasticsearch/index/search/ESToParentBlockJoinQuery.java diff --git a/core/src/main/java/org/elasticsearch/index/search/MatchQuery.java b/server/src/main/java/org/elasticsearch/index/search/MatchQuery.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/search/MatchQuery.java rename to server/src/main/java/org/elasticsearch/index/search/MatchQuery.java diff --git a/core/src/main/java/org/elasticsearch/index/search/MultiMatchQuery.java b/server/src/main/java/org/elasticsearch/index/search/MultiMatchQuery.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/search/MultiMatchQuery.java rename to server/src/main/java/org/elasticsearch/index/search/MultiMatchQuery.java diff --git a/core/src/main/java/org/elasticsearch/index/search/NestedHelper.java b/server/src/main/java/org/elasticsearch/index/search/NestedHelper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/search/NestedHelper.java rename to server/src/main/java/org/elasticsearch/index/search/NestedHelper.java diff --git a/core/src/main/java/org/elasticsearch/index/search/QueryParserHelper.java b/server/src/main/java/org/elasticsearch/index/search/QueryParserHelper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/search/QueryParserHelper.java rename to server/src/main/java/org/elasticsearch/index/search/QueryParserHelper.java diff --git a/core/src/main/java/org/elasticsearch/index/search/QueryStringQueryParser.java b/server/src/main/java/org/elasticsearch/index/search/QueryStringQueryParser.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/search/QueryStringQueryParser.java rename to server/src/main/java/org/elasticsearch/index/search/QueryStringQueryParser.java diff --git a/core/src/main/java/org/elasticsearch/index/search/SimpleQueryStringQueryParser.java b/server/src/main/java/org/elasticsearch/index/search/SimpleQueryStringQueryParser.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/search/SimpleQueryStringQueryParser.java rename to server/src/main/java/org/elasticsearch/index/search/SimpleQueryStringQueryParser.java diff --git a/core/src/main/java/org/elasticsearch/index/search/stats/SearchStats.java b/server/src/main/java/org/elasticsearch/index/search/stats/SearchStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/search/stats/SearchStats.java rename to server/src/main/java/org/elasticsearch/index/search/stats/SearchStats.java diff --git a/core/src/main/java/org/elasticsearch/index/search/stats/ShardSearchStats.java b/server/src/main/java/org/elasticsearch/index/search/stats/ShardSearchStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/search/stats/ShardSearchStats.java rename to server/src/main/java/org/elasticsearch/index/search/stats/ShardSearchStats.java diff --git a/core/src/main/java/org/elasticsearch/index/seqno/CountedBitSet.java b/server/src/main/java/org/elasticsearch/index/seqno/CountedBitSet.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/seqno/CountedBitSet.java rename to server/src/main/java/org/elasticsearch/index/seqno/CountedBitSet.java diff --git a/core/src/main/java/org/elasticsearch/index/seqno/GlobalCheckpointSyncAction.java b/server/src/main/java/org/elasticsearch/index/seqno/GlobalCheckpointSyncAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/seqno/GlobalCheckpointSyncAction.java rename to server/src/main/java/org/elasticsearch/index/seqno/GlobalCheckpointSyncAction.java diff --git a/core/src/main/java/org/elasticsearch/index/seqno/GlobalCheckpointTracker.java b/server/src/main/java/org/elasticsearch/index/seqno/GlobalCheckpointTracker.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/seqno/GlobalCheckpointTracker.java rename to server/src/main/java/org/elasticsearch/index/seqno/GlobalCheckpointTracker.java diff --git a/core/src/main/java/org/elasticsearch/index/seqno/LocalCheckpointTracker.java b/server/src/main/java/org/elasticsearch/index/seqno/LocalCheckpointTracker.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/seqno/LocalCheckpointTracker.java rename to server/src/main/java/org/elasticsearch/index/seqno/LocalCheckpointTracker.java diff --git a/core/src/main/java/org/elasticsearch/index/seqno/SeqNoStats.java b/server/src/main/java/org/elasticsearch/index/seqno/SeqNoStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/seqno/SeqNoStats.java rename to server/src/main/java/org/elasticsearch/index/seqno/SeqNoStats.java diff --git a/core/src/main/java/org/elasticsearch/index/seqno/SequenceNumbers.java b/server/src/main/java/org/elasticsearch/index/seqno/SequenceNumbers.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/seqno/SequenceNumbers.java rename to server/src/main/java/org/elasticsearch/index/seqno/SequenceNumbers.java diff --git a/core/src/main/java/org/elasticsearch/index/settings/IndexDynamicSettings.java b/server/src/main/java/org/elasticsearch/index/settings/IndexDynamicSettings.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/settings/IndexDynamicSettings.java rename to server/src/main/java/org/elasticsearch/index/settings/IndexDynamicSettings.java diff --git a/core/src/main/java/org/elasticsearch/index/shard/AbstractIndexShardComponent.java b/server/src/main/java/org/elasticsearch/index/shard/AbstractIndexShardComponent.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/shard/AbstractIndexShardComponent.java rename to server/src/main/java/org/elasticsearch/index/shard/AbstractIndexShardComponent.java diff --git a/core/src/main/java/org/elasticsearch/index/shard/DocsStats.java b/server/src/main/java/org/elasticsearch/index/shard/DocsStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/shard/DocsStats.java rename to server/src/main/java/org/elasticsearch/index/shard/DocsStats.java diff --git a/core/src/main/java/org/elasticsearch/index/shard/ElasticsearchMergePolicy.java b/server/src/main/java/org/elasticsearch/index/shard/ElasticsearchMergePolicy.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/shard/ElasticsearchMergePolicy.java rename to server/src/main/java/org/elasticsearch/index/shard/ElasticsearchMergePolicy.java diff --git a/core/src/main/java/org/elasticsearch/index/shard/IllegalIndexShardStateException.java b/server/src/main/java/org/elasticsearch/index/shard/IllegalIndexShardStateException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/shard/IllegalIndexShardStateException.java rename to server/src/main/java/org/elasticsearch/index/shard/IllegalIndexShardStateException.java diff --git a/core/src/main/java/org/elasticsearch/index/shard/IndexEventListener.java b/server/src/main/java/org/elasticsearch/index/shard/IndexEventListener.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/shard/IndexEventListener.java rename to server/src/main/java/org/elasticsearch/index/shard/IndexEventListener.java diff --git a/core/src/main/java/org/elasticsearch/index/shard/IndexSearcherWrapper.java b/server/src/main/java/org/elasticsearch/index/shard/IndexSearcherWrapper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/shard/IndexSearcherWrapper.java rename to server/src/main/java/org/elasticsearch/index/shard/IndexSearcherWrapper.java diff --git a/core/src/main/java/org/elasticsearch/index/shard/IndexShard.java b/server/src/main/java/org/elasticsearch/index/shard/IndexShard.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/shard/IndexShard.java rename to server/src/main/java/org/elasticsearch/index/shard/IndexShard.java diff --git a/core/src/main/java/org/elasticsearch/index/shard/IndexShardClosedException.java b/server/src/main/java/org/elasticsearch/index/shard/IndexShardClosedException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/shard/IndexShardClosedException.java rename to server/src/main/java/org/elasticsearch/index/shard/IndexShardClosedException.java diff --git a/core/src/main/java/org/elasticsearch/index/shard/IndexShardComponent.java b/server/src/main/java/org/elasticsearch/index/shard/IndexShardComponent.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/shard/IndexShardComponent.java rename to server/src/main/java/org/elasticsearch/index/shard/IndexShardComponent.java diff --git a/core/src/main/java/org/elasticsearch/index/shard/IndexShardNotRecoveringException.java b/server/src/main/java/org/elasticsearch/index/shard/IndexShardNotRecoveringException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/shard/IndexShardNotRecoveringException.java rename to server/src/main/java/org/elasticsearch/index/shard/IndexShardNotRecoveringException.java diff --git a/core/src/main/java/org/elasticsearch/index/shard/IndexShardNotStartedException.java b/server/src/main/java/org/elasticsearch/index/shard/IndexShardNotStartedException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/shard/IndexShardNotStartedException.java rename to server/src/main/java/org/elasticsearch/index/shard/IndexShardNotStartedException.java diff --git a/core/src/main/java/org/elasticsearch/index/shard/IndexShardOperationPermits.java b/server/src/main/java/org/elasticsearch/index/shard/IndexShardOperationPermits.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/shard/IndexShardOperationPermits.java rename to server/src/main/java/org/elasticsearch/index/shard/IndexShardOperationPermits.java diff --git a/core/src/main/java/org/elasticsearch/index/shard/IndexShardRecoveringException.java b/server/src/main/java/org/elasticsearch/index/shard/IndexShardRecoveringException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/shard/IndexShardRecoveringException.java rename to server/src/main/java/org/elasticsearch/index/shard/IndexShardRecoveringException.java diff --git a/core/src/main/java/org/elasticsearch/index/shard/IndexShardRecoveryException.java b/server/src/main/java/org/elasticsearch/index/shard/IndexShardRecoveryException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/shard/IndexShardRecoveryException.java rename to server/src/main/java/org/elasticsearch/index/shard/IndexShardRecoveryException.java diff --git a/core/src/main/java/org/elasticsearch/index/shard/IndexShardRelocatedException.java b/server/src/main/java/org/elasticsearch/index/shard/IndexShardRelocatedException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/shard/IndexShardRelocatedException.java rename to server/src/main/java/org/elasticsearch/index/shard/IndexShardRelocatedException.java diff --git a/core/src/main/java/org/elasticsearch/index/shard/IndexShardStartedException.java b/server/src/main/java/org/elasticsearch/index/shard/IndexShardStartedException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/shard/IndexShardStartedException.java rename to server/src/main/java/org/elasticsearch/index/shard/IndexShardStartedException.java diff --git a/core/src/main/java/org/elasticsearch/index/shard/IndexShardState.java b/server/src/main/java/org/elasticsearch/index/shard/IndexShardState.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/shard/IndexShardState.java rename to server/src/main/java/org/elasticsearch/index/shard/IndexShardState.java diff --git a/core/src/main/java/org/elasticsearch/index/shard/IndexingOperationListener.java b/server/src/main/java/org/elasticsearch/index/shard/IndexingOperationListener.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/shard/IndexingOperationListener.java rename to server/src/main/java/org/elasticsearch/index/shard/IndexingOperationListener.java diff --git a/core/src/main/java/org/elasticsearch/index/shard/IndexingStats.java b/server/src/main/java/org/elasticsearch/index/shard/IndexingStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/shard/IndexingStats.java rename to server/src/main/java/org/elasticsearch/index/shard/IndexingStats.java diff --git a/core/src/main/java/org/elasticsearch/index/shard/InternalIndexingStats.java b/server/src/main/java/org/elasticsearch/index/shard/InternalIndexingStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/shard/InternalIndexingStats.java rename to server/src/main/java/org/elasticsearch/index/shard/InternalIndexingStats.java diff --git a/core/src/main/java/org/elasticsearch/index/shard/LocalShardSnapshot.java b/server/src/main/java/org/elasticsearch/index/shard/LocalShardSnapshot.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/shard/LocalShardSnapshot.java rename to server/src/main/java/org/elasticsearch/index/shard/LocalShardSnapshot.java diff --git a/core/src/main/java/org/elasticsearch/index/shard/PrimaryReplicaSyncer.java b/server/src/main/java/org/elasticsearch/index/shard/PrimaryReplicaSyncer.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/shard/PrimaryReplicaSyncer.java rename to server/src/main/java/org/elasticsearch/index/shard/PrimaryReplicaSyncer.java diff --git a/core/src/main/java/org/elasticsearch/index/shard/RefreshListeners.java b/server/src/main/java/org/elasticsearch/index/shard/RefreshListeners.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/shard/RefreshListeners.java rename to server/src/main/java/org/elasticsearch/index/shard/RefreshListeners.java diff --git a/core/src/main/java/org/elasticsearch/index/shard/ReplicationGroup.java b/server/src/main/java/org/elasticsearch/index/shard/ReplicationGroup.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/shard/ReplicationGroup.java rename to server/src/main/java/org/elasticsearch/index/shard/ReplicationGroup.java diff --git a/core/src/main/java/org/elasticsearch/index/shard/SearchOperationListener.java b/server/src/main/java/org/elasticsearch/index/shard/SearchOperationListener.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/shard/SearchOperationListener.java rename to server/src/main/java/org/elasticsearch/index/shard/SearchOperationListener.java diff --git a/core/src/main/java/org/elasticsearch/index/shard/ShardId.java b/server/src/main/java/org/elasticsearch/index/shard/ShardId.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/shard/ShardId.java rename to server/src/main/java/org/elasticsearch/index/shard/ShardId.java diff --git a/core/src/main/java/org/elasticsearch/index/shard/ShardNotFoundException.java b/server/src/main/java/org/elasticsearch/index/shard/ShardNotFoundException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/shard/ShardNotFoundException.java rename to server/src/main/java/org/elasticsearch/index/shard/ShardNotFoundException.java diff --git a/core/src/main/java/org/elasticsearch/index/shard/ShardPath.java b/server/src/main/java/org/elasticsearch/index/shard/ShardPath.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/shard/ShardPath.java rename to server/src/main/java/org/elasticsearch/index/shard/ShardPath.java diff --git a/core/src/main/java/org/elasticsearch/index/shard/ShardSplittingQuery.java b/server/src/main/java/org/elasticsearch/index/shard/ShardSplittingQuery.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/shard/ShardSplittingQuery.java rename to server/src/main/java/org/elasticsearch/index/shard/ShardSplittingQuery.java diff --git a/core/src/main/java/org/elasticsearch/index/shard/ShardStateMetaData.java b/server/src/main/java/org/elasticsearch/index/shard/ShardStateMetaData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/shard/ShardStateMetaData.java rename to server/src/main/java/org/elasticsearch/index/shard/ShardStateMetaData.java diff --git a/core/src/main/java/org/elasticsearch/index/shard/ShardUtils.java b/server/src/main/java/org/elasticsearch/index/shard/ShardUtils.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/shard/ShardUtils.java rename to server/src/main/java/org/elasticsearch/index/shard/ShardUtils.java diff --git a/core/src/main/java/org/elasticsearch/index/shard/StoreRecovery.java b/server/src/main/java/org/elasticsearch/index/shard/StoreRecovery.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/shard/StoreRecovery.java rename to server/src/main/java/org/elasticsearch/index/shard/StoreRecovery.java diff --git a/core/src/main/java/org/elasticsearch/index/similarity/AbstractSimilarityProvider.java b/server/src/main/java/org/elasticsearch/index/similarity/AbstractSimilarityProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/similarity/AbstractSimilarityProvider.java rename to server/src/main/java/org/elasticsearch/index/similarity/AbstractSimilarityProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/similarity/BM25SimilarityProvider.java b/server/src/main/java/org/elasticsearch/index/similarity/BM25SimilarityProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/similarity/BM25SimilarityProvider.java rename to server/src/main/java/org/elasticsearch/index/similarity/BM25SimilarityProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/similarity/BooleanSimilarityProvider.java b/server/src/main/java/org/elasticsearch/index/similarity/BooleanSimilarityProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/similarity/BooleanSimilarityProvider.java rename to server/src/main/java/org/elasticsearch/index/similarity/BooleanSimilarityProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/similarity/ClassicSimilarityProvider.java b/server/src/main/java/org/elasticsearch/index/similarity/ClassicSimilarityProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/similarity/ClassicSimilarityProvider.java rename to server/src/main/java/org/elasticsearch/index/similarity/ClassicSimilarityProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/similarity/DFISimilarityProvider.java b/server/src/main/java/org/elasticsearch/index/similarity/DFISimilarityProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/similarity/DFISimilarityProvider.java rename to server/src/main/java/org/elasticsearch/index/similarity/DFISimilarityProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/similarity/DFRSimilarityProvider.java b/server/src/main/java/org/elasticsearch/index/similarity/DFRSimilarityProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/similarity/DFRSimilarityProvider.java rename to server/src/main/java/org/elasticsearch/index/similarity/DFRSimilarityProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/similarity/IBSimilarityProvider.java b/server/src/main/java/org/elasticsearch/index/similarity/IBSimilarityProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/similarity/IBSimilarityProvider.java rename to server/src/main/java/org/elasticsearch/index/similarity/IBSimilarityProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/similarity/LMDirichletSimilarityProvider.java b/server/src/main/java/org/elasticsearch/index/similarity/LMDirichletSimilarityProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/similarity/LMDirichletSimilarityProvider.java rename to server/src/main/java/org/elasticsearch/index/similarity/LMDirichletSimilarityProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/similarity/LMJelinekMercerSimilarityProvider.java b/server/src/main/java/org/elasticsearch/index/similarity/LMJelinekMercerSimilarityProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/similarity/LMJelinekMercerSimilarityProvider.java rename to server/src/main/java/org/elasticsearch/index/similarity/LMJelinekMercerSimilarityProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/similarity/ScriptedSimilarity.java b/server/src/main/java/org/elasticsearch/index/similarity/ScriptedSimilarity.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/similarity/ScriptedSimilarity.java rename to server/src/main/java/org/elasticsearch/index/similarity/ScriptedSimilarity.java diff --git a/core/src/main/java/org/elasticsearch/index/similarity/ScriptedSimilarityProvider.java b/server/src/main/java/org/elasticsearch/index/similarity/ScriptedSimilarityProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/similarity/ScriptedSimilarityProvider.java rename to server/src/main/java/org/elasticsearch/index/similarity/ScriptedSimilarityProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/similarity/SimilarityProvider.java b/server/src/main/java/org/elasticsearch/index/similarity/SimilarityProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/similarity/SimilarityProvider.java rename to server/src/main/java/org/elasticsearch/index/similarity/SimilarityProvider.java diff --git a/core/src/main/java/org/elasticsearch/index/similarity/SimilarityService.java b/server/src/main/java/org/elasticsearch/index/similarity/SimilarityService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/similarity/SimilarityService.java rename to server/src/main/java/org/elasticsearch/index/similarity/SimilarityService.java diff --git a/core/src/main/java/org/elasticsearch/index/snapshots/IndexShardRestoreException.java b/server/src/main/java/org/elasticsearch/index/snapshots/IndexShardRestoreException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/snapshots/IndexShardRestoreException.java rename to server/src/main/java/org/elasticsearch/index/snapshots/IndexShardRestoreException.java diff --git a/core/src/main/java/org/elasticsearch/index/snapshots/IndexShardRestoreFailedException.java b/server/src/main/java/org/elasticsearch/index/snapshots/IndexShardRestoreFailedException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/snapshots/IndexShardRestoreFailedException.java rename to server/src/main/java/org/elasticsearch/index/snapshots/IndexShardRestoreFailedException.java diff --git a/core/src/main/java/org/elasticsearch/index/snapshots/IndexShardSnapshotException.java b/server/src/main/java/org/elasticsearch/index/snapshots/IndexShardSnapshotException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/snapshots/IndexShardSnapshotException.java rename to server/src/main/java/org/elasticsearch/index/snapshots/IndexShardSnapshotException.java diff --git a/core/src/main/java/org/elasticsearch/index/snapshots/IndexShardSnapshotFailedException.java b/server/src/main/java/org/elasticsearch/index/snapshots/IndexShardSnapshotFailedException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/snapshots/IndexShardSnapshotFailedException.java rename to server/src/main/java/org/elasticsearch/index/snapshots/IndexShardSnapshotFailedException.java diff --git a/core/src/main/java/org/elasticsearch/index/snapshots/IndexShardSnapshotStatus.java b/server/src/main/java/org/elasticsearch/index/snapshots/IndexShardSnapshotStatus.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/snapshots/IndexShardSnapshotStatus.java rename to server/src/main/java/org/elasticsearch/index/snapshots/IndexShardSnapshotStatus.java diff --git a/core/src/main/java/org/elasticsearch/index/snapshots/blobstore/BlobStoreIndexShardSnapshot.java b/server/src/main/java/org/elasticsearch/index/snapshots/blobstore/BlobStoreIndexShardSnapshot.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/snapshots/blobstore/BlobStoreIndexShardSnapshot.java rename to server/src/main/java/org/elasticsearch/index/snapshots/blobstore/BlobStoreIndexShardSnapshot.java diff --git a/core/src/main/java/org/elasticsearch/index/snapshots/blobstore/BlobStoreIndexShardSnapshots.java b/server/src/main/java/org/elasticsearch/index/snapshots/blobstore/BlobStoreIndexShardSnapshots.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/snapshots/blobstore/BlobStoreIndexShardSnapshots.java rename to server/src/main/java/org/elasticsearch/index/snapshots/blobstore/BlobStoreIndexShardSnapshots.java diff --git a/core/src/main/java/org/elasticsearch/index/snapshots/blobstore/RateLimitingInputStream.java b/server/src/main/java/org/elasticsearch/index/snapshots/blobstore/RateLimitingInputStream.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/snapshots/blobstore/RateLimitingInputStream.java rename to server/src/main/java/org/elasticsearch/index/snapshots/blobstore/RateLimitingInputStream.java diff --git a/core/src/main/java/org/elasticsearch/index/snapshots/blobstore/SlicedInputStream.java b/server/src/main/java/org/elasticsearch/index/snapshots/blobstore/SlicedInputStream.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/snapshots/blobstore/SlicedInputStream.java rename to server/src/main/java/org/elasticsearch/index/snapshots/blobstore/SlicedInputStream.java diff --git a/core/src/main/java/org/elasticsearch/index/snapshots/blobstore/SnapshotFiles.java b/server/src/main/java/org/elasticsearch/index/snapshots/blobstore/SnapshotFiles.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/snapshots/blobstore/SnapshotFiles.java rename to server/src/main/java/org/elasticsearch/index/snapshots/blobstore/SnapshotFiles.java diff --git a/core/src/main/java/org/elasticsearch/index/store/DirectoryService.java b/server/src/main/java/org/elasticsearch/index/store/DirectoryService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/store/DirectoryService.java rename to server/src/main/java/org/elasticsearch/index/store/DirectoryService.java diff --git a/core/src/main/java/org/elasticsearch/index/store/DirectoryUtils.java b/server/src/main/java/org/elasticsearch/index/store/DirectoryUtils.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/store/DirectoryUtils.java rename to server/src/main/java/org/elasticsearch/index/store/DirectoryUtils.java diff --git a/core/src/main/java/org/elasticsearch/index/store/FsDirectoryService.java b/server/src/main/java/org/elasticsearch/index/store/FsDirectoryService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/store/FsDirectoryService.java rename to server/src/main/java/org/elasticsearch/index/store/FsDirectoryService.java diff --git a/core/src/main/java/org/elasticsearch/index/store/IndexStore.java b/server/src/main/java/org/elasticsearch/index/store/IndexStore.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/store/IndexStore.java rename to server/src/main/java/org/elasticsearch/index/store/IndexStore.java diff --git a/core/src/main/java/org/elasticsearch/index/store/Store.java b/server/src/main/java/org/elasticsearch/index/store/Store.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/store/Store.java rename to server/src/main/java/org/elasticsearch/index/store/Store.java diff --git a/core/src/main/java/org/elasticsearch/index/store/StoreFileMetaData.java b/server/src/main/java/org/elasticsearch/index/store/StoreFileMetaData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/store/StoreFileMetaData.java rename to server/src/main/java/org/elasticsearch/index/store/StoreFileMetaData.java diff --git a/core/src/main/java/org/elasticsearch/index/store/StoreStats.java b/server/src/main/java/org/elasticsearch/index/store/StoreStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/store/StoreStats.java rename to server/src/main/java/org/elasticsearch/index/store/StoreStats.java diff --git a/core/src/main/java/org/elasticsearch/index/store/VerifyingIndexOutput.java b/server/src/main/java/org/elasticsearch/index/store/VerifyingIndexOutput.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/store/VerifyingIndexOutput.java rename to server/src/main/java/org/elasticsearch/index/store/VerifyingIndexOutput.java diff --git a/core/src/main/java/org/elasticsearch/index/termvectors/TermVectorsService.java b/server/src/main/java/org/elasticsearch/index/termvectors/TermVectorsService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/termvectors/TermVectorsService.java rename to server/src/main/java/org/elasticsearch/index/termvectors/TermVectorsService.java diff --git a/core/src/main/java/org/elasticsearch/index/translog/BaseTranslogReader.java b/server/src/main/java/org/elasticsearch/index/translog/BaseTranslogReader.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/translog/BaseTranslogReader.java rename to server/src/main/java/org/elasticsearch/index/translog/BaseTranslogReader.java diff --git a/core/src/main/java/org/elasticsearch/index/translog/BufferedChecksumStreamInput.java b/server/src/main/java/org/elasticsearch/index/translog/BufferedChecksumStreamInput.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/translog/BufferedChecksumStreamInput.java rename to server/src/main/java/org/elasticsearch/index/translog/BufferedChecksumStreamInput.java diff --git a/core/src/main/java/org/elasticsearch/index/translog/BufferedChecksumStreamOutput.java b/server/src/main/java/org/elasticsearch/index/translog/BufferedChecksumStreamOutput.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/translog/BufferedChecksumStreamOutput.java rename to server/src/main/java/org/elasticsearch/index/translog/BufferedChecksumStreamOutput.java diff --git a/core/src/main/java/org/elasticsearch/index/translog/ChannelFactory.java b/server/src/main/java/org/elasticsearch/index/translog/ChannelFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/translog/ChannelFactory.java rename to server/src/main/java/org/elasticsearch/index/translog/ChannelFactory.java diff --git a/core/src/main/java/org/elasticsearch/index/translog/Checkpoint.java b/server/src/main/java/org/elasticsearch/index/translog/Checkpoint.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/translog/Checkpoint.java rename to server/src/main/java/org/elasticsearch/index/translog/Checkpoint.java diff --git a/core/src/main/java/org/elasticsearch/index/translog/MultiSnapshot.java b/server/src/main/java/org/elasticsearch/index/translog/MultiSnapshot.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/translog/MultiSnapshot.java rename to server/src/main/java/org/elasticsearch/index/translog/MultiSnapshot.java diff --git a/core/src/main/java/org/elasticsearch/index/translog/Translog.java b/server/src/main/java/org/elasticsearch/index/translog/Translog.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/translog/Translog.java rename to server/src/main/java/org/elasticsearch/index/translog/Translog.java diff --git a/core/src/main/java/org/elasticsearch/index/translog/TranslogConfig.java b/server/src/main/java/org/elasticsearch/index/translog/TranslogConfig.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/translog/TranslogConfig.java rename to server/src/main/java/org/elasticsearch/index/translog/TranslogConfig.java diff --git a/core/src/main/java/org/elasticsearch/index/translog/TranslogCorruptedException.java b/server/src/main/java/org/elasticsearch/index/translog/TranslogCorruptedException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/translog/TranslogCorruptedException.java rename to server/src/main/java/org/elasticsearch/index/translog/TranslogCorruptedException.java diff --git a/core/src/main/java/org/elasticsearch/index/translog/TranslogDeletionPolicy.java b/server/src/main/java/org/elasticsearch/index/translog/TranslogDeletionPolicy.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/translog/TranslogDeletionPolicy.java rename to server/src/main/java/org/elasticsearch/index/translog/TranslogDeletionPolicy.java diff --git a/core/src/main/java/org/elasticsearch/index/translog/TranslogException.java b/server/src/main/java/org/elasticsearch/index/translog/TranslogException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/translog/TranslogException.java rename to server/src/main/java/org/elasticsearch/index/translog/TranslogException.java diff --git a/core/src/main/java/org/elasticsearch/index/translog/TranslogReader.java b/server/src/main/java/org/elasticsearch/index/translog/TranslogReader.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/translog/TranslogReader.java rename to server/src/main/java/org/elasticsearch/index/translog/TranslogReader.java diff --git a/core/src/main/java/org/elasticsearch/index/translog/TranslogSnapshot.java b/server/src/main/java/org/elasticsearch/index/translog/TranslogSnapshot.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/translog/TranslogSnapshot.java rename to server/src/main/java/org/elasticsearch/index/translog/TranslogSnapshot.java diff --git a/core/src/main/java/org/elasticsearch/index/translog/TranslogStats.java b/server/src/main/java/org/elasticsearch/index/translog/TranslogStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/translog/TranslogStats.java rename to server/src/main/java/org/elasticsearch/index/translog/TranslogStats.java diff --git a/core/src/main/java/org/elasticsearch/index/translog/TranslogToolCli.java b/server/src/main/java/org/elasticsearch/index/translog/TranslogToolCli.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/translog/TranslogToolCli.java rename to server/src/main/java/org/elasticsearch/index/translog/TranslogToolCli.java diff --git a/core/src/main/java/org/elasticsearch/index/translog/TranslogWriter.java b/server/src/main/java/org/elasticsearch/index/translog/TranslogWriter.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/translog/TranslogWriter.java rename to server/src/main/java/org/elasticsearch/index/translog/TranslogWriter.java diff --git a/core/src/main/java/org/elasticsearch/index/translog/TruncateTranslogCommand.java b/server/src/main/java/org/elasticsearch/index/translog/TruncateTranslogCommand.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/translog/TruncateTranslogCommand.java rename to server/src/main/java/org/elasticsearch/index/translog/TruncateTranslogCommand.java diff --git a/core/src/main/java/org/elasticsearch/index/translog/TruncatedTranslogException.java b/server/src/main/java/org/elasticsearch/index/translog/TruncatedTranslogException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/translog/TruncatedTranslogException.java rename to server/src/main/java/org/elasticsearch/index/translog/TruncatedTranslogException.java diff --git a/core/src/main/java/org/elasticsearch/index/warmer/ShardIndexWarmerService.java b/server/src/main/java/org/elasticsearch/index/warmer/ShardIndexWarmerService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/warmer/ShardIndexWarmerService.java rename to server/src/main/java/org/elasticsearch/index/warmer/ShardIndexWarmerService.java diff --git a/core/src/main/java/org/elasticsearch/index/warmer/WarmerStats.java b/server/src/main/java/org/elasticsearch/index/warmer/WarmerStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/index/warmer/WarmerStats.java rename to server/src/main/java/org/elasticsearch/index/warmer/WarmerStats.java diff --git a/core/src/main/java/org/elasticsearch/indices/AbstractIndexShardCacheEntity.java b/server/src/main/java/org/elasticsearch/indices/AbstractIndexShardCacheEntity.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/AbstractIndexShardCacheEntity.java rename to server/src/main/java/org/elasticsearch/indices/AbstractIndexShardCacheEntity.java diff --git a/core/src/main/java/org/elasticsearch/indices/AliasFilterParsingException.java b/server/src/main/java/org/elasticsearch/indices/AliasFilterParsingException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/AliasFilterParsingException.java rename to server/src/main/java/org/elasticsearch/indices/AliasFilterParsingException.java diff --git a/core/src/main/java/org/elasticsearch/indices/IndexClosedException.java b/server/src/main/java/org/elasticsearch/indices/IndexClosedException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/IndexClosedException.java rename to server/src/main/java/org/elasticsearch/indices/IndexClosedException.java diff --git a/core/src/main/java/org/elasticsearch/indices/IndexCreationException.java b/server/src/main/java/org/elasticsearch/indices/IndexCreationException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/IndexCreationException.java rename to server/src/main/java/org/elasticsearch/indices/IndexCreationException.java diff --git a/core/src/main/java/org/elasticsearch/indices/IndexPrimaryShardNotAllocatedException.java b/server/src/main/java/org/elasticsearch/indices/IndexPrimaryShardNotAllocatedException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/IndexPrimaryShardNotAllocatedException.java rename to server/src/main/java/org/elasticsearch/indices/IndexPrimaryShardNotAllocatedException.java diff --git a/core/src/main/java/org/elasticsearch/indices/IndexTemplateMissingException.java b/server/src/main/java/org/elasticsearch/indices/IndexTemplateMissingException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/IndexTemplateMissingException.java rename to server/src/main/java/org/elasticsearch/indices/IndexTemplateMissingException.java diff --git a/core/src/main/java/org/elasticsearch/indices/IndexingMemoryController.java b/server/src/main/java/org/elasticsearch/indices/IndexingMemoryController.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/IndexingMemoryController.java rename to server/src/main/java/org/elasticsearch/indices/IndexingMemoryController.java diff --git a/core/src/main/java/org/elasticsearch/indices/IndicesModule.java b/server/src/main/java/org/elasticsearch/indices/IndicesModule.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/IndicesModule.java rename to server/src/main/java/org/elasticsearch/indices/IndicesModule.java diff --git a/core/src/main/java/org/elasticsearch/indices/IndicesQueryCache.java b/server/src/main/java/org/elasticsearch/indices/IndicesQueryCache.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/IndicesQueryCache.java rename to server/src/main/java/org/elasticsearch/indices/IndicesQueryCache.java diff --git a/core/src/main/java/org/elasticsearch/indices/IndicesRequestCache.java b/server/src/main/java/org/elasticsearch/indices/IndicesRequestCache.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/IndicesRequestCache.java rename to server/src/main/java/org/elasticsearch/indices/IndicesRequestCache.java diff --git a/core/src/main/java/org/elasticsearch/indices/IndicesService.java b/server/src/main/java/org/elasticsearch/indices/IndicesService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/IndicesService.java rename to server/src/main/java/org/elasticsearch/indices/IndicesService.java diff --git a/core/src/main/java/org/elasticsearch/indices/InvalidAliasNameException.java b/server/src/main/java/org/elasticsearch/indices/InvalidAliasNameException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/InvalidAliasNameException.java rename to server/src/main/java/org/elasticsearch/indices/InvalidAliasNameException.java diff --git a/core/src/main/java/org/elasticsearch/indices/InvalidIndexNameException.java b/server/src/main/java/org/elasticsearch/indices/InvalidIndexNameException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/InvalidIndexNameException.java rename to server/src/main/java/org/elasticsearch/indices/InvalidIndexNameException.java diff --git a/core/src/main/java/org/elasticsearch/indices/InvalidIndexTemplateException.java b/server/src/main/java/org/elasticsearch/indices/InvalidIndexTemplateException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/InvalidIndexTemplateException.java rename to server/src/main/java/org/elasticsearch/indices/InvalidIndexTemplateException.java diff --git a/core/src/main/java/org/elasticsearch/indices/InvalidTypeNameException.java b/server/src/main/java/org/elasticsearch/indices/InvalidTypeNameException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/InvalidTypeNameException.java rename to server/src/main/java/org/elasticsearch/indices/InvalidTypeNameException.java diff --git a/core/src/main/java/org/elasticsearch/indices/NodeIndicesStats.java b/server/src/main/java/org/elasticsearch/indices/NodeIndicesStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/NodeIndicesStats.java rename to server/src/main/java/org/elasticsearch/indices/NodeIndicesStats.java diff --git a/core/src/main/java/org/elasticsearch/indices/TermsLookup.java b/server/src/main/java/org/elasticsearch/indices/TermsLookup.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/TermsLookup.java rename to server/src/main/java/org/elasticsearch/indices/TermsLookup.java diff --git a/core/src/main/java/org/elasticsearch/indices/TypeMissingException.java b/server/src/main/java/org/elasticsearch/indices/TypeMissingException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/TypeMissingException.java rename to server/src/main/java/org/elasticsearch/indices/TypeMissingException.java diff --git a/core/src/main/java/org/elasticsearch/indices/analysis/AnalysisModule.java b/server/src/main/java/org/elasticsearch/indices/analysis/AnalysisModule.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/analysis/AnalysisModule.java rename to server/src/main/java/org/elasticsearch/indices/analysis/AnalysisModule.java diff --git a/core/src/main/java/org/elasticsearch/indices/analysis/HunspellService.java b/server/src/main/java/org/elasticsearch/indices/analysis/HunspellService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/analysis/HunspellService.java rename to server/src/main/java/org/elasticsearch/indices/analysis/HunspellService.java diff --git a/core/src/main/java/org/elasticsearch/indices/analysis/PreBuiltAnalyzers.java b/server/src/main/java/org/elasticsearch/indices/analysis/PreBuiltAnalyzers.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/analysis/PreBuiltAnalyzers.java rename to server/src/main/java/org/elasticsearch/indices/analysis/PreBuiltAnalyzers.java diff --git a/core/src/main/java/org/elasticsearch/indices/analysis/PreBuiltCacheFactory.java b/server/src/main/java/org/elasticsearch/indices/analysis/PreBuiltCacheFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/analysis/PreBuiltCacheFactory.java rename to server/src/main/java/org/elasticsearch/indices/analysis/PreBuiltCacheFactory.java diff --git a/core/src/main/java/org/elasticsearch/indices/analysis/PreBuiltTokenizers.java b/server/src/main/java/org/elasticsearch/indices/analysis/PreBuiltTokenizers.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/analysis/PreBuiltTokenizers.java rename to server/src/main/java/org/elasticsearch/indices/analysis/PreBuiltTokenizers.java diff --git a/core/src/main/java/org/elasticsearch/indices/breaker/AllCircuitBreakerStats.java b/server/src/main/java/org/elasticsearch/indices/breaker/AllCircuitBreakerStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/breaker/AllCircuitBreakerStats.java rename to server/src/main/java/org/elasticsearch/indices/breaker/AllCircuitBreakerStats.java diff --git a/core/src/main/java/org/elasticsearch/indices/breaker/BreakerSettings.java b/server/src/main/java/org/elasticsearch/indices/breaker/BreakerSettings.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/breaker/BreakerSettings.java rename to server/src/main/java/org/elasticsearch/indices/breaker/BreakerSettings.java diff --git a/core/src/main/java/org/elasticsearch/indices/breaker/CircuitBreakerService.java b/server/src/main/java/org/elasticsearch/indices/breaker/CircuitBreakerService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/breaker/CircuitBreakerService.java rename to server/src/main/java/org/elasticsearch/indices/breaker/CircuitBreakerService.java diff --git a/core/src/main/java/org/elasticsearch/indices/breaker/CircuitBreakerStats.java b/server/src/main/java/org/elasticsearch/indices/breaker/CircuitBreakerStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/breaker/CircuitBreakerStats.java rename to server/src/main/java/org/elasticsearch/indices/breaker/CircuitBreakerStats.java diff --git a/core/src/main/java/org/elasticsearch/indices/breaker/HierarchyCircuitBreakerService.java b/server/src/main/java/org/elasticsearch/indices/breaker/HierarchyCircuitBreakerService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/breaker/HierarchyCircuitBreakerService.java rename to server/src/main/java/org/elasticsearch/indices/breaker/HierarchyCircuitBreakerService.java diff --git a/core/src/main/java/org/elasticsearch/indices/breaker/NoneCircuitBreakerService.java b/server/src/main/java/org/elasticsearch/indices/breaker/NoneCircuitBreakerService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/breaker/NoneCircuitBreakerService.java rename to server/src/main/java/org/elasticsearch/indices/breaker/NoneCircuitBreakerService.java diff --git a/core/src/main/java/org/elasticsearch/indices/cluster/IndicesClusterStateService.java b/server/src/main/java/org/elasticsearch/indices/cluster/IndicesClusterStateService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/cluster/IndicesClusterStateService.java rename to server/src/main/java/org/elasticsearch/indices/cluster/IndicesClusterStateService.java diff --git a/core/src/main/java/org/elasticsearch/indices/fielddata/cache/IndicesFieldDataCache.java b/server/src/main/java/org/elasticsearch/indices/fielddata/cache/IndicesFieldDataCache.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/fielddata/cache/IndicesFieldDataCache.java rename to server/src/main/java/org/elasticsearch/indices/fielddata/cache/IndicesFieldDataCache.java diff --git a/core/src/main/java/org/elasticsearch/indices/fielddata/cache/IndicesFieldDataCacheListener.java b/server/src/main/java/org/elasticsearch/indices/fielddata/cache/IndicesFieldDataCacheListener.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/fielddata/cache/IndicesFieldDataCacheListener.java rename to server/src/main/java/org/elasticsearch/indices/fielddata/cache/IndicesFieldDataCacheListener.java diff --git a/core/src/main/java/org/elasticsearch/indices/flush/ShardsSyncedFlushResult.java b/server/src/main/java/org/elasticsearch/indices/flush/ShardsSyncedFlushResult.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/flush/ShardsSyncedFlushResult.java rename to server/src/main/java/org/elasticsearch/indices/flush/ShardsSyncedFlushResult.java diff --git a/core/src/main/java/org/elasticsearch/indices/flush/SyncedFlushService.java b/server/src/main/java/org/elasticsearch/indices/flush/SyncedFlushService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/flush/SyncedFlushService.java rename to server/src/main/java/org/elasticsearch/indices/flush/SyncedFlushService.java diff --git a/core/src/main/java/org/elasticsearch/indices/mapper/MapperRegistry.java b/server/src/main/java/org/elasticsearch/indices/mapper/MapperRegistry.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/mapper/MapperRegistry.java rename to server/src/main/java/org/elasticsearch/indices/mapper/MapperRegistry.java diff --git a/core/src/main/java/org/elasticsearch/indices/recovery/DelayRecoveryException.java b/server/src/main/java/org/elasticsearch/indices/recovery/DelayRecoveryException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/recovery/DelayRecoveryException.java rename to server/src/main/java/org/elasticsearch/indices/recovery/DelayRecoveryException.java diff --git a/core/src/main/java/org/elasticsearch/indices/recovery/PeerRecoverySourceService.java b/server/src/main/java/org/elasticsearch/indices/recovery/PeerRecoverySourceService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/recovery/PeerRecoverySourceService.java rename to server/src/main/java/org/elasticsearch/indices/recovery/PeerRecoverySourceService.java diff --git a/core/src/main/java/org/elasticsearch/indices/recovery/PeerRecoveryTargetService.java b/server/src/main/java/org/elasticsearch/indices/recovery/PeerRecoveryTargetService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/recovery/PeerRecoveryTargetService.java rename to server/src/main/java/org/elasticsearch/indices/recovery/PeerRecoveryTargetService.java diff --git a/core/src/main/java/org/elasticsearch/indices/recovery/RecoverFilesRecoveryException.java b/server/src/main/java/org/elasticsearch/indices/recovery/RecoverFilesRecoveryException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/recovery/RecoverFilesRecoveryException.java rename to server/src/main/java/org/elasticsearch/indices/recovery/RecoverFilesRecoveryException.java diff --git a/core/src/main/java/org/elasticsearch/indices/recovery/RecoveriesCollection.java b/server/src/main/java/org/elasticsearch/indices/recovery/RecoveriesCollection.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/recovery/RecoveriesCollection.java rename to server/src/main/java/org/elasticsearch/indices/recovery/RecoveriesCollection.java diff --git a/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryCleanFilesRequest.java b/server/src/main/java/org/elasticsearch/indices/recovery/RecoveryCleanFilesRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/recovery/RecoveryCleanFilesRequest.java rename to server/src/main/java/org/elasticsearch/indices/recovery/RecoveryCleanFilesRequest.java diff --git a/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryFailedException.java b/server/src/main/java/org/elasticsearch/indices/recovery/RecoveryFailedException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/recovery/RecoveryFailedException.java rename to server/src/main/java/org/elasticsearch/indices/recovery/RecoveryFailedException.java diff --git a/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryFileChunkRequest.java b/server/src/main/java/org/elasticsearch/indices/recovery/RecoveryFileChunkRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/recovery/RecoveryFileChunkRequest.java rename to server/src/main/java/org/elasticsearch/indices/recovery/RecoveryFileChunkRequest.java diff --git a/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryFilesInfoRequest.java b/server/src/main/java/org/elasticsearch/indices/recovery/RecoveryFilesInfoRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/recovery/RecoveryFilesInfoRequest.java rename to server/src/main/java/org/elasticsearch/indices/recovery/RecoveryFilesInfoRequest.java diff --git a/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryFinalizeRecoveryRequest.java b/server/src/main/java/org/elasticsearch/indices/recovery/RecoveryFinalizeRecoveryRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/recovery/RecoveryFinalizeRecoveryRequest.java rename to server/src/main/java/org/elasticsearch/indices/recovery/RecoveryFinalizeRecoveryRequest.java diff --git a/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryHandoffPrimaryContextRequest.java b/server/src/main/java/org/elasticsearch/indices/recovery/RecoveryHandoffPrimaryContextRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/recovery/RecoveryHandoffPrimaryContextRequest.java rename to server/src/main/java/org/elasticsearch/indices/recovery/RecoveryHandoffPrimaryContextRequest.java diff --git a/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryPrepareForTranslogOperationsRequest.java b/server/src/main/java/org/elasticsearch/indices/recovery/RecoveryPrepareForTranslogOperationsRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/recovery/RecoveryPrepareForTranslogOperationsRequest.java rename to server/src/main/java/org/elasticsearch/indices/recovery/RecoveryPrepareForTranslogOperationsRequest.java diff --git a/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryResponse.java b/server/src/main/java/org/elasticsearch/indices/recovery/RecoveryResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/recovery/RecoveryResponse.java rename to server/src/main/java/org/elasticsearch/indices/recovery/RecoveryResponse.java diff --git a/core/src/main/java/org/elasticsearch/indices/recovery/RecoverySettings.java b/server/src/main/java/org/elasticsearch/indices/recovery/RecoverySettings.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/recovery/RecoverySettings.java rename to server/src/main/java/org/elasticsearch/indices/recovery/RecoverySettings.java diff --git a/core/src/main/java/org/elasticsearch/indices/recovery/RecoverySourceHandler.java b/server/src/main/java/org/elasticsearch/indices/recovery/RecoverySourceHandler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/recovery/RecoverySourceHandler.java rename to server/src/main/java/org/elasticsearch/indices/recovery/RecoverySourceHandler.java diff --git a/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryState.java b/server/src/main/java/org/elasticsearch/indices/recovery/RecoveryState.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/recovery/RecoveryState.java rename to server/src/main/java/org/elasticsearch/indices/recovery/RecoveryState.java diff --git a/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryTarget.java b/server/src/main/java/org/elasticsearch/indices/recovery/RecoveryTarget.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/recovery/RecoveryTarget.java rename to server/src/main/java/org/elasticsearch/indices/recovery/RecoveryTarget.java diff --git a/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryTargetHandler.java b/server/src/main/java/org/elasticsearch/indices/recovery/RecoveryTargetHandler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/recovery/RecoveryTargetHandler.java rename to server/src/main/java/org/elasticsearch/indices/recovery/RecoveryTargetHandler.java diff --git a/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryTranslogOperationsRequest.java b/server/src/main/java/org/elasticsearch/indices/recovery/RecoveryTranslogOperationsRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/recovery/RecoveryTranslogOperationsRequest.java rename to server/src/main/java/org/elasticsearch/indices/recovery/RecoveryTranslogOperationsRequest.java diff --git a/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryTranslogOperationsResponse.java b/server/src/main/java/org/elasticsearch/indices/recovery/RecoveryTranslogOperationsResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/recovery/RecoveryTranslogOperationsResponse.java rename to server/src/main/java/org/elasticsearch/indices/recovery/RecoveryTranslogOperationsResponse.java diff --git a/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryWaitForClusterStateRequest.java b/server/src/main/java/org/elasticsearch/indices/recovery/RecoveryWaitForClusterStateRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/recovery/RecoveryWaitForClusterStateRequest.java rename to server/src/main/java/org/elasticsearch/indices/recovery/RecoveryWaitForClusterStateRequest.java diff --git a/core/src/main/java/org/elasticsearch/indices/recovery/RemoteRecoveryTargetHandler.java b/server/src/main/java/org/elasticsearch/indices/recovery/RemoteRecoveryTargetHandler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/recovery/RemoteRecoveryTargetHandler.java rename to server/src/main/java/org/elasticsearch/indices/recovery/RemoteRecoveryTargetHandler.java diff --git a/core/src/main/java/org/elasticsearch/indices/recovery/StartRecoveryRequest.java b/server/src/main/java/org/elasticsearch/indices/recovery/StartRecoveryRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/recovery/StartRecoveryRequest.java rename to server/src/main/java/org/elasticsearch/indices/recovery/StartRecoveryRequest.java diff --git a/core/src/main/java/org/elasticsearch/indices/store/IndicesStore.java b/server/src/main/java/org/elasticsearch/indices/store/IndicesStore.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/store/IndicesStore.java rename to server/src/main/java/org/elasticsearch/indices/store/IndicesStore.java diff --git a/core/src/main/java/org/elasticsearch/indices/store/TransportNodesListShardStoreMetaData.java b/server/src/main/java/org/elasticsearch/indices/store/TransportNodesListShardStoreMetaData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/indices/store/TransportNodesListShardStoreMetaData.java rename to server/src/main/java/org/elasticsearch/indices/store/TransportNodesListShardStoreMetaData.java diff --git a/core/src/main/java/org/elasticsearch/ingest/AbstractProcessor.java b/server/src/main/java/org/elasticsearch/ingest/AbstractProcessor.java similarity index 100% rename from core/src/main/java/org/elasticsearch/ingest/AbstractProcessor.java rename to server/src/main/java/org/elasticsearch/ingest/AbstractProcessor.java diff --git a/core/src/main/java/org/elasticsearch/ingest/CompoundProcessor.java b/server/src/main/java/org/elasticsearch/ingest/CompoundProcessor.java similarity index 100% rename from core/src/main/java/org/elasticsearch/ingest/CompoundProcessor.java rename to server/src/main/java/org/elasticsearch/ingest/CompoundProcessor.java diff --git a/core/src/main/java/org/elasticsearch/ingest/ConfigurationUtils.java b/server/src/main/java/org/elasticsearch/ingest/ConfigurationUtils.java similarity index 100% rename from core/src/main/java/org/elasticsearch/ingest/ConfigurationUtils.java rename to server/src/main/java/org/elasticsearch/ingest/ConfigurationUtils.java diff --git a/core/src/main/java/org/elasticsearch/ingest/IngestDocument.java b/server/src/main/java/org/elasticsearch/ingest/IngestDocument.java similarity index 100% rename from core/src/main/java/org/elasticsearch/ingest/IngestDocument.java rename to server/src/main/java/org/elasticsearch/ingest/IngestDocument.java diff --git a/core/src/main/java/org/elasticsearch/ingest/IngestInfo.java b/server/src/main/java/org/elasticsearch/ingest/IngestInfo.java similarity index 100% rename from core/src/main/java/org/elasticsearch/ingest/IngestInfo.java rename to server/src/main/java/org/elasticsearch/ingest/IngestInfo.java diff --git a/core/src/main/java/org/elasticsearch/ingest/IngestMetadata.java b/server/src/main/java/org/elasticsearch/ingest/IngestMetadata.java similarity index 100% rename from core/src/main/java/org/elasticsearch/ingest/IngestMetadata.java rename to server/src/main/java/org/elasticsearch/ingest/IngestMetadata.java diff --git a/core/src/main/java/org/elasticsearch/ingest/IngestService.java b/server/src/main/java/org/elasticsearch/ingest/IngestService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/ingest/IngestService.java rename to server/src/main/java/org/elasticsearch/ingest/IngestService.java diff --git a/core/src/main/java/org/elasticsearch/ingest/IngestStats.java b/server/src/main/java/org/elasticsearch/ingest/IngestStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/ingest/IngestStats.java rename to server/src/main/java/org/elasticsearch/ingest/IngestStats.java diff --git a/core/src/main/java/org/elasticsearch/ingest/Pipeline.java b/server/src/main/java/org/elasticsearch/ingest/Pipeline.java similarity index 100% rename from core/src/main/java/org/elasticsearch/ingest/Pipeline.java rename to server/src/main/java/org/elasticsearch/ingest/Pipeline.java diff --git a/core/src/main/java/org/elasticsearch/ingest/PipelineConfiguration.java b/server/src/main/java/org/elasticsearch/ingest/PipelineConfiguration.java similarity index 100% rename from core/src/main/java/org/elasticsearch/ingest/PipelineConfiguration.java rename to server/src/main/java/org/elasticsearch/ingest/PipelineConfiguration.java diff --git a/core/src/main/java/org/elasticsearch/ingest/PipelineExecutionService.java b/server/src/main/java/org/elasticsearch/ingest/PipelineExecutionService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/ingest/PipelineExecutionService.java rename to server/src/main/java/org/elasticsearch/ingest/PipelineExecutionService.java diff --git a/core/src/main/java/org/elasticsearch/ingest/PipelineStore.java b/server/src/main/java/org/elasticsearch/ingest/PipelineStore.java similarity index 100% rename from core/src/main/java/org/elasticsearch/ingest/PipelineStore.java rename to server/src/main/java/org/elasticsearch/ingest/PipelineStore.java diff --git a/core/src/main/java/org/elasticsearch/ingest/Processor.java b/server/src/main/java/org/elasticsearch/ingest/Processor.java similarity index 100% rename from core/src/main/java/org/elasticsearch/ingest/Processor.java rename to server/src/main/java/org/elasticsearch/ingest/Processor.java diff --git a/core/src/main/java/org/elasticsearch/ingest/ProcessorInfo.java b/server/src/main/java/org/elasticsearch/ingest/ProcessorInfo.java similarity index 100% rename from core/src/main/java/org/elasticsearch/ingest/ProcessorInfo.java rename to server/src/main/java/org/elasticsearch/ingest/ProcessorInfo.java diff --git a/core/src/main/java/org/elasticsearch/ingest/ValueSource.java b/server/src/main/java/org/elasticsearch/ingest/ValueSource.java similarity index 100% rename from core/src/main/java/org/elasticsearch/ingest/ValueSource.java rename to server/src/main/java/org/elasticsearch/ingest/ValueSource.java diff --git a/core/src/main/java/org/elasticsearch/monitor/MonitorService.java b/server/src/main/java/org/elasticsearch/monitor/MonitorService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/monitor/MonitorService.java rename to server/src/main/java/org/elasticsearch/monitor/MonitorService.java diff --git a/core/src/main/java/org/elasticsearch/monitor/Probes.java b/server/src/main/java/org/elasticsearch/monitor/Probes.java similarity index 100% rename from core/src/main/java/org/elasticsearch/monitor/Probes.java rename to server/src/main/java/org/elasticsearch/monitor/Probes.java diff --git a/core/src/main/java/org/elasticsearch/monitor/fs/FsInfo.java b/server/src/main/java/org/elasticsearch/monitor/fs/FsInfo.java similarity index 100% rename from core/src/main/java/org/elasticsearch/monitor/fs/FsInfo.java rename to server/src/main/java/org/elasticsearch/monitor/fs/FsInfo.java diff --git a/core/src/main/java/org/elasticsearch/monitor/fs/FsProbe.java b/server/src/main/java/org/elasticsearch/monitor/fs/FsProbe.java similarity index 100% rename from core/src/main/java/org/elasticsearch/monitor/fs/FsProbe.java rename to server/src/main/java/org/elasticsearch/monitor/fs/FsProbe.java diff --git a/core/src/main/java/org/elasticsearch/monitor/fs/FsService.java b/server/src/main/java/org/elasticsearch/monitor/fs/FsService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/monitor/fs/FsService.java rename to server/src/main/java/org/elasticsearch/monitor/fs/FsService.java diff --git a/core/src/main/java/org/elasticsearch/monitor/jvm/DeadlockAnalyzer.java b/server/src/main/java/org/elasticsearch/monitor/jvm/DeadlockAnalyzer.java similarity index 100% rename from core/src/main/java/org/elasticsearch/monitor/jvm/DeadlockAnalyzer.java rename to server/src/main/java/org/elasticsearch/monitor/jvm/DeadlockAnalyzer.java diff --git a/core/src/main/java/org/elasticsearch/monitor/jvm/GcNames.java b/server/src/main/java/org/elasticsearch/monitor/jvm/GcNames.java similarity index 100% rename from core/src/main/java/org/elasticsearch/monitor/jvm/GcNames.java rename to server/src/main/java/org/elasticsearch/monitor/jvm/GcNames.java diff --git a/core/src/main/java/org/elasticsearch/monitor/jvm/HotThreads.java b/server/src/main/java/org/elasticsearch/monitor/jvm/HotThreads.java similarity index 100% rename from core/src/main/java/org/elasticsearch/monitor/jvm/HotThreads.java rename to server/src/main/java/org/elasticsearch/monitor/jvm/HotThreads.java diff --git a/core/src/main/java/org/elasticsearch/monitor/jvm/JvmGcMonitorService.java b/server/src/main/java/org/elasticsearch/monitor/jvm/JvmGcMonitorService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/monitor/jvm/JvmGcMonitorService.java rename to server/src/main/java/org/elasticsearch/monitor/jvm/JvmGcMonitorService.java diff --git a/core/src/main/java/org/elasticsearch/monitor/jvm/JvmInfo.java b/server/src/main/java/org/elasticsearch/monitor/jvm/JvmInfo.java similarity index 100% rename from core/src/main/java/org/elasticsearch/monitor/jvm/JvmInfo.java rename to server/src/main/java/org/elasticsearch/monitor/jvm/JvmInfo.java diff --git a/core/src/main/java/org/elasticsearch/monitor/jvm/JvmService.java b/server/src/main/java/org/elasticsearch/monitor/jvm/JvmService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/monitor/jvm/JvmService.java rename to server/src/main/java/org/elasticsearch/monitor/jvm/JvmService.java diff --git a/core/src/main/java/org/elasticsearch/monitor/jvm/JvmStats.java b/server/src/main/java/org/elasticsearch/monitor/jvm/JvmStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/monitor/jvm/JvmStats.java rename to server/src/main/java/org/elasticsearch/monitor/jvm/JvmStats.java diff --git a/core/src/main/java/org/elasticsearch/monitor/os/DummyOsInfo.java b/server/src/main/java/org/elasticsearch/monitor/os/DummyOsInfo.java similarity index 100% rename from core/src/main/java/org/elasticsearch/monitor/os/DummyOsInfo.java rename to server/src/main/java/org/elasticsearch/monitor/os/DummyOsInfo.java diff --git a/core/src/main/java/org/elasticsearch/monitor/os/OsInfo.java b/server/src/main/java/org/elasticsearch/monitor/os/OsInfo.java similarity index 100% rename from core/src/main/java/org/elasticsearch/monitor/os/OsInfo.java rename to server/src/main/java/org/elasticsearch/monitor/os/OsInfo.java diff --git a/core/src/main/java/org/elasticsearch/monitor/os/OsProbe.java b/server/src/main/java/org/elasticsearch/monitor/os/OsProbe.java similarity index 100% rename from core/src/main/java/org/elasticsearch/monitor/os/OsProbe.java rename to server/src/main/java/org/elasticsearch/monitor/os/OsProbe.java diff --git a/core/src/main/java/org/elasticsearch/monitor/os/OsService.java b/server/src/main/java/org/elasticsearch/monitor/os/OsService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/monitor/os/OsService.java rename to server/src/main/java/org/elasticsearch/monitor/os/OsService.java diff --git a/core/src/main/java/org/elasticsearch/monitor/os/OsStats.java b/server/src/main/java/org/elasticsearch/monitor/os/OsStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/monitor/os/OsStats.java rename to server/src/main/java/org/elasticsearch/monitor/os/OsStats.java diff --git a/core/src/main/java/org/elasticsearch/monitor/package-info.java b/server/src/main/java/org/elasticsearch/monitor/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/monitor/package-info.java rename to server/src/main/java/org/elasticsearch/monitor/package-info.java diff --git a/core/src/main/java/org/elasticsearch/monitor/process/ProcessInfo.java b/server/src/main/java/org/elasticsearch/monitor/process/ProcessInfo.java similarity index 100% rename from core/src/main/java/org/elasticsearch/monitor/process/ProcessInfo.java rename to server/src/main/java/org/elasticsearch/monitor/process/ProcessInfo.java diff --git a/core/src/main/java/org/elasticsearch/monitor/process/ProcessProbe.java b/server/src/main/java/org/elasticsearch/monitor/process/ProcessProbe.java similarity index 100% rename from core/src/main/java/org/elasticsearch/monitor/process/ProcessProbe.java rename to server/src/main/java/org/elasticsearch/monitor/process/ProcessProbe.java diff --git a/core/src/main/java/org/elasticsearch/monitor/process/ProcessService.java b/server/src/main/java/org/elasticsearch/monitor/process/ProcessService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/monitor/process/ProcessService.java rename to server/src/main/java/org/elasticsearch/monitor/process/ProcessService.java diff --git a/core/src/main/java/org/elasticsearch/monitor/process/ProcessStats.java b/server/src/main/java/org/elasticsearch/monitor/process/ProcessStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/monitor/process/ProcessStats.java rename to server/src/main/java/org/elasticsearch/monitor/process/ProcessStats.java diff --git a/core/src/main/java/org/elasticsearch/node/AdaptiveSelectionStats.java b/server/src/main/java/org/elasticsearch/node/AdaptiveSelectionStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/node/AdaptiveSelectionStats.java rename to server/src/main/java/org/elasticsearch/node/AdaptiveSelectionStats.java diff --git a/core/src/main/java/org/elasticsearch/node/InternalSettingsPreparer.java b/server/src/main/java/org/elasticsearch/node/InternalSettingsPreparer.java similarity index 100% rename from core/src/main/java/org/elasticsearch/node/InternalSettingsPreparer.java rename to server/src/main/java/org/elasticsearch/node/InternalSettingsPreparer.java diff --git a/core/src/main/java/org/elasticsearch/node/Node.java b/server/src/main/java/org/elasticsearch/node/Node.java similarity index 100% rename from core/src/main/java/org/elasticsearch/node/Node.java rename to server/src/main/java/org/elasticsearch/node/Node.java diff --git a/core/src/main/java/org/elasticsearch/node/NodeClosedException.java b/server/src/main/java/org/elasticsearch/node/NodeClosedException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/node/NodeClosedException.java rename to server/src/main/java/org/elasticsearch/node/NodeClosedException.java diff --git a/core/src/main/java/org/elasticsearch/node/NodeService.java b/server/src/main/java/org/elasticsearch/node/NodeService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/node/NodeService.java rename to server/src/main/java/org/elasticsearch/node/NodeService.java diff --git a/core/src/main/java/org/elasticsearch/node/NodeValidationException.java b/server/src/main/java/org/elasticsearch/node/NodeValidationException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/node/NodeValidationException.java rename to server/src/main/java/org/elasticsearch/node/NodeValidationException.java diff --git a/core/src/main/java/org/elasticsearch/node/ResponseCollectorService.java b/server/src/main/java/org/elasticsearch/node/ResponseCollectorService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/node/ResponseCollectorService.java rename to server/src/main/java/org/elasticsearch/node/ResponseCollectorService.java diff --git a/core/src/main/java/org/elasticsearch/node/package-info.java b/server/src/main/java/org/elasticsearch/node/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/node/package-info.java rename to server/src/main/java/org/elasticsearch/node/package-info.java diff --git a/core/src/main/java/org/elasticsearch/package-info.java b/server/src/main/java/org/elasticsearch/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/package-info.java rename to server/src/main/java/org/elasticsearch/package-info.java diff --git a/core/src/main/java/org/elasticsearch/plugins/ActionPlugin.java b/server/src/main/java/org/elasticsearch/plugins/ActionPlugin.java similarity index 100% rename from core/src/main/java/org/elasticsearch/plugins/ActionPlugin.java rename to server/src/main/java/org/elasticsearch/plugins/ActionPlugin.java diff --git a/core/src/main/java/org/elasticsearch/plugins/AnalysisPlugin.java b/server/src/main/java/org/elasticsearch/plugins/AnalysisPlugin.java similarity index 100% rename from core/src/main/java/org/elasticsearch/plugins/AnalysisPlugin.java rename to server/src/main/java/org/elasticsearch/plugins/AnalysisPlugin.java diff --git a/core/src/main/java/org/elasticsearch/plugins/ClusterPlugin.java b/server/src/main/java/org/elasticsearch/plugins/ClusterPlugin.java similarity index 100% rename from core/src/main/java/org/elasticsearch/plugins/ClusterPlugin.java rename to server/src/main/java/org/elasticsearch/plugins/ClusterPlugin.java diff --git a/core/src/main/java/org/elasticsearch/plugins/DiscoveryPlugin.java b/server/src/main/java/org/elasticsearch/plugins/DiscoveryPlugin.java similarity index 100% rename from core/src/main/java/org/elasticsearch/plugins/DiscoveryPlugin.java rename to server/src/main/java/org/elasticsearch/plugins/DiscoveryPlugin.java diff --git a/core/src/main/java/org/elasticsearch/plugins/ExtensiblePlugin.java b/server/src/main/java/org/elasticsearch/plugins/ExtensiblePlugin.java similarity index 100% rename from core/src/main/java/org/elasticsearch/plugins/ExtensiblePlugin.java rename to server/src/main/java/org/elasticsearch/plugins/ExtensiblePlugin.java diff --git a/core/src/main/java/org/elasticsearch/plugins/IngestPlugin.java b/server/src/main/java/org/elasticsearch/plugins/IngestPlugin.java similarity index 100% rename from core/src/main/java/org/elasticsearch/plugins/IngestPlugin.java rename to server/src/main/java/org/elasticsearch/plugins/IngestPlugin.java diff --git a/core/src/main/java/org/elasticsearch/plugins/MapperPlugin.java b/server/src/main/java/org/elasticsearch/plugins/MapperPlugin.java similarity index 100% rename from core/src/main/java/org/elasticsearch/plugins/MapperPlugin.java rename to server/src/main/java/org/elasticsearch/plugins/MapperPlugin.java diff --git a/core/src/main/java/org/elasticsearch/plugins/MetaDataUpgrader.java b/server/src/main/java/org/elasticsearch/plugins/MetaDataUpgrader.java similarity index 100% rename from core/src/main/java/org/elasticsearch/plugins/MetaDataUpgrader.java rename to server/src/main/java/org/elasticsearch/plugins/MetaDataUpgrader.java diff --git a/core/src/main/java/org/elasticsearch/plugins/MetaPluginInfo.java b/server/src/main/java/org/elasticsearch/plugins/MetaPluginInfo.java similarity index 100% rename from core/src/main/java/org/elasticsearch/plugins/MetaPluginInfo.java rename to server/src/main/java/org/elasticsearch/plugins/MetaPluginInfo.java diff --git a/core/src/main/java/org/elasticsearch/plugins/NetworkPlugin.java b/server/src/main/java/org/elasticsearch/plugins/NetworkPlugin.java similarity index 100% rename from core/src/main/java/org/elasticsearch/plugins/NetworkPlugin.java rename to server/src/main/java/org/elasticsearch/plugins/NetworkPlugin.java diff --git a/core/src/main/java/org/elasticsearch/plugins/Platforms.java b/server/src/main/java/org/elasticsearch/plugins/Platforms.java similarity index 100% rename from core/src/main/java/org/elasticsearch/plugins/Platforms.java rename to server/src/main/java/org/elasticsearch/plugins/Platforms.java diff --git a/core/src/main/java/org/elasticsearch/plugins/Plugin.java b/server/src/main/java/org/elasticsearch/plugins/Plugin.java similarity index 100% rename from core/src/main/java/org/elasticsearch/plugins/Plugin.java rename to server/src/main/java/org/elasticsearch/plugins/Plugin.java diff --git a/core/src/main/java/org/elasticsearch/plugins/PluginInfo.java b/server/src/main/java/org/elasticsearch/plugins/PluginInfo.java similarity index 100% rename from core/src/main/java/org/elasticsearch/plugins/PluginInfo.java rename to server/src/main/java/org/elasticsearch/plugins/PluginInfo.java diff --git a/core/src/main/java/org/elasticsearch/plugins/PluginLoaderIndirection.java b/server/src/main/java/org/elasticsearch/plugins/PluginLoaderIndirection.java similarity index 100% rename from core/src/main/java/org/elasticsearch/plugins/PluginLoaderIndirection.java rename to server/src/main/java/org/elasticsearch/plugins/PluginLoaderIndirection.java diff --git a/core/src/main/java/org/elasticsearch/plugins/PluginSecurity.java b/server/src/main/java/org/elasticsearch/plugins/PluginSecurity.java similarity index 100% rename from core/src/main/java/org/elasticsearch/plugins/PluginSecurity.java rename to server/src/main/java/org/elasticsearch/plugins/PluginSecurity.java diff --git a/core/src/main/java/org/elasticsearch/plugins/PluginsService.java b/server/src/main/java/org/elasticsearch/plugins/PluginsService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/plugins/PluginsService.java rename to server/src/main/java/org/elasticsearch/plugins/PluginsService.java diff --git a/core/src/main/java/org/elasticsearch/plugins/RepositoryPlugin.java b/server/src/main/java/org/elasticsearch/plugins/RepositoryPlugin.java similarity index 100% rename from core/src/main/java/org/elasticsearch/plugins/RepositoryPlugin.java rename to server/src/main/java/org/elasticsearch/plugins/RepositoryPlugin.java diff --git a/core/src/main/java/org/elasticsearch/plugins/ScriptPlugin.java b/server/src/main/java/org/elasticsearch/plugins/ScriptPlugin.java similarity index 100% rename from core/src/main/java/org/elasticsearch/plugins/ScriptPlugin.java rename to server/src/main/java/org/elasticsearch/plugins/ScriptPlugin.java diff --git a/core/src/main/java/org/elasticsearch/plugins/SearchPlugin.java b/server/src/main/java/org/elasticsearch/plugins/SearchPlugin.java similarity index 100% rename from core/src/main/java/org/elasticsearch/plugins/SearchPlugin.java rename to server/src/main/java/org/elasticsearch/plugins/SearchPlugin.java diff --git a/core/src/main/java/org/elasticsearch/plugins/package-info.java b/server/src/main/java/org/elasticsearch/plugins/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/plugins/package-info.java rename to server/src/main/java/org/elasticsearch/plugins/package-info.java diff --git a/core/src/main/java/org/elasticsearch/plugins/spi/NamedXContentProvider.java b/server/src/main/java/org/elasticsearch/plugins/spi/NamedXContentProvider.java similarity index 100% rename from core/src/main/java/org/elasticsearch/plugins/spi/NamedXContentProvider.java rename to server/src/main/java/org/elasticsearch/plugins/spi/NamedXContentProvider.java diff --git a/core/src/main/java/org/elasticsearch/plugins/spi/package-info.java b/server/src/main/java/org/elasticsearch/plugins/spi/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/plugins/spi/package-info.java rename to server/src/main/java/org/elasticsearch/plugins/spi/package-info.java diff --git a/core/src/main/java/org/elasticsearch/repositories/IndexId.java b/server/src/main/java/org/elasticsearch/repositories/IndexId.java similarity index 100% rename from core/src/main/java/org/elasticsearch/repositories/IndexId.java rename to server/src/main/java/org/elasticsearch/repositories/IndexId.java diff --git a/core/src/main/java/org/elasticsearch/repositories/RepositoriesModule.java b/server/src/main/java/org/elasticsearch/repositories/RepositoriesModule.java similarity index 100% rename from core/src/main/java/org/elasticsearch/repositories/RepositoriesModule.java rename to server/src/main/java/org/elasticsearch/repositories/RepositoriesModule.java diff --git a/core/src/main/java/org/elasticsearch/repositories/RepositoriesService.java b/server/src/main/java/org/elasticsearch/repositories/RepositoriesService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/repositories/RepositoriesService.java rename to server/src/main/java/org/elasticsearch/repositories/RepositoriesService.java diff --git a/core/src/main/java/org/elasticsearch/repositories/Repository.java b/server/src/main/java/org/elasticsearch/repositories/Repository.java similarity index 100% rename from core/src/main/java/org/elasticsearch/repositories/Repository.java rename to server/src/main/java/org/elasticsearch/repositories/Repository.java diff --git a/core/src/main/java/org/elasticsearch/repositories/RepositoryData.java b/server/src/main/java/org/elasticsearch/repositories/RepositoryData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/repositories/RepositoryData.java rename to server/src/main/java/org/elasticsearch/repositories/RepositoryData.java diff --git a/core/src/main/java/org/elasticsearch/repositories/RepositoryException.java b/server/src/main/java/org/elasticsearch/repositories/RepositoryException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/repositories/RepositoryException.java rename to server/src/main/java/org/elasticsearch/repositories/RepositoryException.java diff --git a/core/src/main/java/org/elasticsearch/repositories/RepositoryMissingException.java b/server/src/main/java/org/elasticsearch/repositories/RepositoryMissingException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/repositories/RepositoryMissingException.java rename to server/src/main/java/org/elasticsearch/repositories/RepositoryMissingException.java diff --git a/core/src/main/java/org/elasticsearch/repositories/RepositoryVerificationException.java b/server/src/main/java/org/elasticsearch/repositories/RepositoryVerificationException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/repositories/RepositoryVerificationException.java rename to server/src/main/java/org/elasticsearch/repositories/RepositoryVerificationException.java diff --git a/core/src/main/java/org/elasticsearch/repositories/VerificationFailure.java b/server/src/main/java/org/elasticsearch/repositories/VerificationFailure.java similarity index 100% rename from core/src/main/java/org/elasticsearch/repositories/VerificationFailure.java rename to server/src/main/java/org/elasticsearch/repositories/VerificationFailure.java diff --git a/core/src/main/java/org/elasticsearch/repositories/VerifyNodeRepositoryAction.java b/server/src/main/java/org/elasticsearch/repositories/VerifyNodeRepositoryAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/repositories/VerifyNodeRepositoryAction.java rename to server/src/main/java/org/elasticsearch/repositories/VerifyNodeRepositoryAction.java diff --git a/core/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreFormat.java b/server/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreFormat.java similarity index 100% rename from core/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreFormat.java rename to server/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreFormat.java diff --git a/core/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreRepository.java b/server/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreRepository.java similarity index 100% rename from core/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreRepository.java rename to server/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreRepository.java diff --git a/core/src/main/java/org/elasticsearch/repositories/blobstore/ChecksumBlobStoreFormat.java b/server/src/main/java/org/elasticsearch/repositories/blobstore/ChecksumBlobStoreFormat.java similarity index 100% rename from core/src/main/java/org/elasticsearch/repositories/blobstore/ChecksumBlobStoreFormat.java rename to server/src/main/java/org/elasticsearch/repositories/blobstore/ChecksumBlobStoreFormat.java diff --git a/core/src/main/java/org/elasticsearch/repositories/fs/FsRepository.java b/server/src/main/java/org/elasticsearch/repositories/fs/FsRepository.java similarity index 100% rename from core/src/main/java/org/elasticsearch/repositories/fs/FsRepository.java rename to server/src/main/java/org/elasticsearch/repositories/fs/FsRepository.java diff --git a/core/src/main/java/org/elasticsearch/repositories/package-info.java b/server/src/main/java/org/elasticsearch/repositories/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/repositories/package-info.java rename to server/src/main/java/org/elasticsearch/repositories/package-info.java diff --git a/core/src/main/java/org/elasticsearch/rest/AbstractRestChannel.java b/server/src/main/java/org/elasticsearch/rest/AbstractRestChannel.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/AbstractRestChannel.java rename to server/src/main/java/org/elasticsearch/rest/AbstractRestChannel.java diff --git a/core/src/main/java/org/elasticsearch/rest/BaseRestHandler.java b/server/src/main/java/org/elasticsearch/rest/BaseRestHandler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/BaseRestHandler.java rename to server/src/main/java/org/elasticsearch/rest/BaseRestHandler.java diff --git a/core/src/main/java/org/elasticsearch/rest/BytesRestResponse.java b/server/src/main/java/org/elasticsearch/rest/BytesRestResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/BytesRestResponse.java rename to server/src/main/java/org/elasticsearch/rest/BytesRestResponse.java diff --git a/core/src/main/java/org/elasticsearch/rest/DeprecationRestHandler.java b/server/src/main/java/org/elasticsearch/rest/DeprecationRestHandler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/DeprecationRestHandler.java rename to server/src/main/java/org/elasticsearch/rest/DeprecationRestHandler.java diff --git a/core/src/main/java/org/elasticsearch/rest/MethodHandlers.java b/server/src/main/java/org/elasticsearch/rest/MethodHandlers.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/MethodHandlers.java rename to server/src/main/java/org/elasticsearch/rest/MethodHandlers.java diff --git a/core/src/main/java/org/elasticsearch/rest/RestChannel.java b/server/src/main/java/org/elasticsearch/rest/RestChannel.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/RestChannel.java rename to server/src/main/java/org/elasticsearch/rest/RestChannel.java diff --git a/core/src/main/java/org/elasticsearch/rest/RestController.java b/server/src/main/java/org/elasticsearch/rest/RestController.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/RestController.java rename to server/src/main/java/org/elasticsearch/rest/RestController.java diff --git a/core/src/main/java/org/elasticsearch/rest/RestHandler.java b/server/src/main/java/org/elasticsearch/rest/RestHandler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/RestHandler.java rename to server/src/main/java/org/elasticsearch/rest/RestHandler.java diff --git a/core/src/main/java/org/elasticsearch/rest/RestRequest.java b/server/src/main/java/org/elasticsearch/rest/RestRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/RestRequest.java rename to server/src/main/java/org/elasticsearch/rest/RestRequest.java diff --git a/core/src/main/java/org/elasticsearch/rest/RestResponse.java b/server/src/main/java/org/elasticsearch/rest/RestResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/RestResponse.java rename to server/src/main/java/org/elasticsearch/rest/RestResponse.java diff --git a/core/src/main/java/org/elasticsearch/rest/RestStatus.java b/server/src/main/java/org/elasticsearch/rest/RestStatus.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/RestStatus.java rename to server/src/main/java/org/elasticsearch/rest/RestStatus.java diff --git a/core/src/main/java/org/elasticsearch/rest/RestUtils.java b/server/src/main/java/org/elasticsearch/rest/RestUtils.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/RestUtils.java rename to server/src/main/java/org/elasticsearch/rest/RestUtils.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/AcknowledgedRestListener.java b/server/src/main/java/org/elasticsearch/rest/action/AcknowledgedRestListener.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/AcknowledgedRestListener.java rename to server/src/main/java/org/elasticsearch/rest/action/AcknowledgedRestListener.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/RestActionListener.java b/server/src/main/java/org/elasticsearch/rest/action/RestActionListener.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/RestActionListener.java rename to server/src/main/java/org/elasticsearch/rest/action/RestActionListener.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/RestActions.java b/server/src/main/java/org/elasticsearch/rest/action/RestActions.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/RestActions.java rename to server/src/main/java/org/elasticsearch/rest/action/RestActions.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/RestBuilderListener.java b/server/src/main/java/org/elasticsearch/rest/action/RestBuilderListener.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/RestBuilderListener.java rename to server/src/main/java/org/elasticsearch/rest/action/RestBuilderListener.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/RestFieldCapabilitiesAction.java b/server/src/main/java/org/elasticsearch/rest/action/RestFieldCapabilitiesAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/RestFieldCapabilitiesAction.java rename to server/src/main/java/org/elasticsearch/rest/action/RestFieldCapabilitiesAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/RestMainAction.java b/server/src/main/java/org/elasticsearch/rest/action/RestMainAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/RestMainAction.java rename to server/src/main/java/org/elasticsearch/rest/action/RestMainAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/RestResponseListener.java b/server/src/main/java/org/elasticsearch/rest/action/RestResponseListener.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/RestResponseListener.java rename to server/src/main/java/org/elasticsearch/rest/action/RestResponseListener.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/RestStatusToXContentListener.java b/server/src/main/java/org/elasticsearch/rest/action/RestStatusToXContentListener.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/RestStatusToXContentListener.java rename to server/src/main/java/org/elasticsearch/rest/action/RestStatusToXContentListener.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/RestToXContentListener.java b/server/src/main/java/org/elasticsearch/rest/action/RestToXContentListener.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/RestToXContentListener.java rename to server/src/main/java/org/elasticsearch/rest/action/RestToXContentListener.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestCancelTasksAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestCancelTasksAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestCancelTasksAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestCancelTasksAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterAllocationExplainAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterAllocationExplainAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterAllocationExplainAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterAllocationExplainAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterGetSettingsAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterGetSettingsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterGetSettingsAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterGetSettingsAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterHealthAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterHealthAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterHealthAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterHealthAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterRerouteAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterRerouteAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterRerouteAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterRerouteAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterSearchShardsAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterSearchShardsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterSearchShardsAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterSearchShardsAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterStateAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterStateAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterStateAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterStateAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterStatsAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterStatsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterStatsAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterStatsAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterUpdateSettingsAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterUpdateSettingsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterUpdateSettingsAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterUpdateSettingsAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestCreateSnapshotAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestCreateSnapshotAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestCreateSnapshotAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestCreateSnapshotAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestDeleteRepositoryAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestDeleteRepositoryAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestDeleteRepositoryAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestDeleteRepositoryAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestDeleteSnapshotAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestDeleteSnapshotAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestDeleteSnapshotAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestDeleteSnapshotAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestDeleteStoredScriptAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestDeleteStoredScriptAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestDeleteStoredScriptAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestDeleteStoredScriptAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestGetRepositoriesAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestGetRepositoriesAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestGetRepositoriesAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestGetRepositoriesAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestGetSnapshotsAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestGetSnapshotsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestGetSnapshotsAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestGetSnapshotsAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestGetStoredScriptAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestGetStoredScriptAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestGetStoredScriptAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestGetStoredScriptAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestGetTaskAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestGetTaskAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestGetTaskAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestGetTaskAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestListTasksAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestListTasksAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestListTasksAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestListTasksAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestNodesHotThreadsAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestNodesHotThreadsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestNodesHotThreadsAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestNodesHotThreadsAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestNodesInfoAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestNodesInfoAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestNodesInfoAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestNodesInfoAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestNodesStatsAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestNodesStatsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestNodesStatsAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestNodesStatsAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestNodesUsageAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestNodesUsageAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestNodesUsageAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestNodesUsageAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestPendingClusterTasksAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestPendingClusterTasksAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestPendingClusterTasksAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestPendingClusterTasksAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestPutRepositoryAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestPutRepositoryAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestPutRepositoryAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestPutRepositoryAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestPutStoredScriptAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestPutStoredScriptAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestPutStoredScriptAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestPutStoredScriptAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestRemoteClusterInfoAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestRemoteClusterInfoAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestRemoteClusterInfoAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestRemoteClusterInfoAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestRestoreSnapshotAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestRestoreSnapshotAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestRestoreSnapshotAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestRestoreSnapshotAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestSnapshotsStatusAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestSnapshotsStatusAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestSnapshotsStatusAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestSnapshotsStatusAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestVerifyRepositoryAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestVerifyRepositoryAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestVerifyRepositoryAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestVerifyRepositoryAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/package-info.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/cluster/package-info.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/cluster/package-info.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/AliasesNotFoundException.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/AliasesNotFoundException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/AliasesNotFoundException.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/AliasesNotFoundException.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestAnalyzeAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestAnalyzeAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestAnalyzeAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestAnalyzeAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestClearIndicesCacheAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestClearIndicesCacheAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestClearIndicesCacheAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestClearIndicesCacheAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestCloseIndexAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestCloseIndexAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestCloseIndexAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestCloseIndexAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestCreateIndexAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestCreateIndexAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestCreateIndexAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestCreateIndexAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestDeleteIndexAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestDeleteIndexAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestDeleteIndexAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestDeleteIndexAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestDeleteIndexTemplateAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestDeleteIndexTemplateAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestDeleteIndexTemplateAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestDeleteIndexTemplateAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestFlushAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestFlushAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestFlushAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestFlushAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestForceMergeAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestForceMergeAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestForceMergeAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestForceMergeAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetAliasesAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetAliasesAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetAliasesAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetAliasesAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetAllAliasesAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetAllAliasesAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetAllAliasesAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetAllAliasesAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetAllMappingsAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetAllMappingsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetAllMappingsAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetAllMappingsAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetAllSettingsAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetAllSettingsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetAllSettingsAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetAllSettingsAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetFieldMappingAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetFieldMappingAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetFieldMappingAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetFieldMappingAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetIndexTemplateAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetIndexTemplateAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetIndexTemplateAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetIndexTemplateAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetIndicesAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetIndicesAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetIndicesAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetIndicesAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetMappingAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetMappingAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetMappingAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetMappingAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetSettingsAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetSettingsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetSettingsAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetSettingsAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestIndexDeleteAliasesAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestIndexDeleteAliasesAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestIndexDeleteAliasesAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestIndexDeleteAliasesAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestIndexPutAliasAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestIndexPutAliasAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestIndexPutAliasAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestIndexPutAliasAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestIndicesAliasesAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestIndicesAliasesAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestIndicesAliasesAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestIndicesAliasesAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestIndicesSegmentsAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestIndicesSegmentsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestIndicesSegmentsAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestIndicesSegmentsAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestIndicesShardStoresAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestIndicesShardStoresAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestIndicesShardStoresAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestIndicesShardStoresAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestIndicesStatsAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestIndicesStatsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestIndicesStatsAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestIndicesStatsAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestOpenIndexAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestOpenIndexAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestOpenIndexAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestOpenIndexAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestPutIndexTemplateAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestPutIndexTemplateAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestPutIndexTemplateAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestPutIndexTemplateAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestPutMappingAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestPutMappingAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestPutMappingAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestPutMappingAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestRecoveryAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestRecoveryAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestRecoveryAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestRecoveryAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestRefreshAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestRefreshAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestRefreshAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestRefreshAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestRolloverIndexAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestRolloverIndexAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestRolloverIndexAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestRolloverIndexAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestShrinkIndexAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestShrinkIndexAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestShrinkIndexAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestShrinkIndexAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestSplitIndexAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestSplitIndexAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestSplitIndexAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestSplitIndexAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestSyncedFlushAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestSyncedFlushAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestSyncedFlushAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestSyncedFlushAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestUpdateSettingsAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestUpdateSettingsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestUpdateSettingsAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestUpdateSettingsAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestUpgradeAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestUpgradeAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestUpgradeAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestUpgradeAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestValidateQueryAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestValidateQueryAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestValidateQueryAction.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestValidateQueryAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/package-info.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/admin/indices/package-info.java rename to server/src/main/java/org/elasticsearch/rest/action/admin/indices/package-info.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/cat/AbstractCatAction.java b/server/src/main/java/org/elasticsearch/rest/action/cat/AbstractCatAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/cat/AbstractCatAction.java rename to server/src/main/java/org/elasticsearch/rest/action/cat/AbstractCatAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/cat/RestAliasAction.java b/server/src/main/java/org/elasticsearch/rest/action/cat/RestAliasAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/cat/RestAliasAction.java rename to server/src/main/java/org/elasticsearch/rest/action/cat/RestAliasAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/cat/RestAllocationAction.java b/server/src/main/java/org/elasticsearch/rest/action/cat/RestAllocationAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/cat/RestAllocationAction.java rename to server/src/main/java/org/elasticsearch/rest/action/cat/RestAllocationAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/cat/RestCatAction.java b/server/src/main/java/org/elasticsearch/rest/action/cat/RestCatAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/cat/RestCatAction.java rename to server/src/main/java/org/elasticsearch/rest/action/cat/RestCatAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/cat/RestCountAction.java b/server/src/main/java/org/elasticsearch/rest/action/cat/RestCountAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/cat/RestCountAction.java rename to server/src/main/java/org/elasticsearch/rest/action/cat/RestCountAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/cat/RestFielddataAction.java b/server/src/main/java/org/elasticsearch/rest/action/cat/RestFielddataAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/cat/RestFielddataAction.java rename to server/src/main/java/org/elasticsearch/rest/action/cat/RestFielddataAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/cat/RestHealthAction.java b/server/src/main/java/org/elasticsearch/rest/action/cat/RestHealthAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/cat/RestHealthAction.java rename to server/src/main/java/org/elasticsearch/rest/action/cat/RestHealthAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/cat/RestIndicesAction.java b/server/src/main/java/org/elasticsearch/rest/action/cat/RestIndicesAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/cat/RestIndicesAction.java rename to server/src/main/java/org/elasticsearch/rest/action/cat/RestIndicesAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/cat/RestMasterAction.java b/server/src/main/java/org/elasticsearch/rest/action/cat/RestMasterAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/cat/RestMasterAction.java rename to server/src/main/java/org/elasticsearch/rest/action/cat/RestMasterAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/cat/RestNodeAttrsAction.java b/server/src/main/java/org/elasticsearch/rest/action/cat/RestNodeAttrsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/cat/RestNodeAttrsAction.java rename to server/src/main/java/org/elasticsearch/rest/action/cat/RestNodeAttrsAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/cat/RestNodesAction.java b/server/src/main/java/org/elasticsearch/rest/action/cat/RestNodesAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/cat/RestNodesAction.java rename to server/src/main/java/org/elasticsearch/rest/action/cat/RestNodesAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/cat/RestPendingClusterTasksAction.java b/server/src/main/java/org/elasticsearch/rest/action/cat/RestPendingClusterTasksAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/cat/RestPendingClusterTasksAction.java rename to server/src/main/java/org/elasticsearch/rest/action/cat/RestPendingClusterTasksAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/cat/RestPluginsAction.java b/server/src/main/java/org/elasticsearch/rest/action/cat/RestPluginsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/cat/RestPluginsAction.java rename to server/src/main/java/org/elasticsearch/rest/action/cat/RestPluginsAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/cat/RestRecoveryAction.java b/server/src/main/java/org/elasticsearch/rest/action/cat/RestRecoveryAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/cat/RestRecoveryAction.java rename to server/src/main/java/org/elasticsearch/rest/action/cat/RestRecoveryAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/cat/RestRepositoriesAction.java b/server/src/main/java/org/elasticsearch/rest/action/cat/RestRepositoriesAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/cat/RestRepositoriesAction.java rename to server/src/main/java/org/elasticsearch/rest/action/cat/RestRepositoriesAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/cat/RestSegmentsAction.java b/server/src/main/java/org/elasticsearch/rest/action/cat/RestSegmentsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/cat/RestSegmentsAction.java rename to server/src/main/java/org/elasticsearch/rest/action/cat/RestSegmentsAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/cat/RestShardsAction.java b/server/src/main/java/org/elasticsearch/rest/action/cat/RestShardsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/cat/RestShardsAction.java rename to server/src/main/java/org/elasticsearch/rest/action/cat/RestShardsAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/cat/RestSnapshotAction.java b/server/src/main/java/org/elasticsearch/rest/action/cat/RestSnapshotAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/cat/RestSnapshotAction.java rename to server/src/main/java/org/elasticsearch/rest/action/cat/RestSnapshotAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/cat/RestTable.java b/server/src/main/java/org/elasticsearch/rest/action/cat/RestTable.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/cat/RestTable.java rename to server/src/main/java/org/elasticsearch/rest/action/cat/RestTable.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/cat/RestTasksAction.java b/server/src/main/java/org/elasticsearch/rest/action/cat/RestTasksAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/cat/RestTasksAction.java rename to server/src/main/java/org/elasticsearch/rest/action/cat/RestTasksAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/cat/RestTemplatesAction.java b/server/src/main/java/org/elasticsearch/rest/action/cat/RestTemplatesAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/cat/RestTemplatesAction.java rename to server/src/main/java/org/elasticsearch/rest/action/cat/RestTemplatesAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/cat/RestThreadPoolAction.java b/server/src/main/java/org/elasticsearch/rest/action/cat/RestThreadPoolAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/cat/RestThreadPoolAction.java rename to server/src/main/java/org/elasticsearch/rest/action/cat/RestThreadPoolAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/cat/package-info.java b/server/src/main/java/org/elasticsearch/rest/action/cat/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/cat/package-info.java rename to server/src/main/java/org/elasticsearch/rest/action/cat/package-info.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/document/RestBulkAction.java b/server/src/main/java/org/elasticsearch/rest/action/document/RestBulkAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/document/RestBulkAction.java rename to server/src/main/java/org/elasticsearch/rest/action/document/RestBulkAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/document/RestCountAction.java b/server/src/main/java/org/elasticsearch/rest/action/document/RestCountAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/document/RestCountAction.java rename to server/src/main/java/org/elasticsearch/rest/action/document/RestCountAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/document/RestDeleteAction.java b/server/src/main/java/org/elasticsearch/rest/action/document/RestDeleteAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/document/RestDeleteAction.java rename to server/src/main/java/org/elasticsearch/rest/action/document/RestDeleteAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/document/RestGetAction.java b/server/src/main/java/org/elasticsearch/rest/action/document/RestGetAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/document/RestGetAction.java rename to server/src/main/java/org/elasticsearch/rest/action/document/RestGetAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/document/RestGetSourceAction.java b/server/src/main/java/org/elasticsearch/rest/action/document/RestGetSourceAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/document/RestGetSourceAction.java rename to server/src/main/java/org/elasticsearch/rest/action/document/RestGetSourceAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/document/RestIndexAction.java b/server/src/main/java/org/elasticsearch/rest/action/document/RestIndexAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/document/RestIndexAction.java rename to server/src/main/java/org/elasticsearch/rest/action/document/RestIndexAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/document/RestMultiGetAction.java b/server/src/main/java/org/elasticsearch/rest/action/document/RestMultiGetAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/document/RestMultiGetAction.java rename to server/src/main/java/org/elasticsearch/rest/action/document/RestMultiGetAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/document/RestMultiTermVectorsAction.java b/server/src/main/java/org/elasticsearch/rest/action/document/RestMultiTermVectorsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/document/RestMultiTermVectorsAction.java rename to server/src/main/java/org/elasticsearch/rest/action/document/RestMultiTermVectorsAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/document/RestTermVectorsAction.java b/server/src/main/java/org/elasticsearch/rest/action/document/RestTermVectorsAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/document/RestTermVectorsAction.java rename to server/src/main/java/org/elasticsearch/rest/action/document/RestTermVectorsAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/document/RestUpdateAction.java b/server/src/main/java/org/elasticsearch/rest/action/document/RestUpdateAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/document/RestUpdateAction.java rename to server/src/main/java/org/elasticsearch/rest/action/document/RestUpdateAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/document/package-info.java b/server/src/main/java/org/elasticsearch/rest/action/document/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/document/package-info.java rename to server/src/main/java/org/elasticsearch/rest/action/document/package-info.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/ingest/RestDeletePipelineAction.java b/server/src/main/java/org/elasticsearch/rest/action/ingest/RestDeletePipelineAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/ingest/RestDeletePipelineAction.java rename to server/src/main/java/org/elasticsearch/rest/action/ingest/RestDeletePipelineAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/ingest/RestGetPipelineAction.java b/server/src/main/java/org/elasticsearch/rest/action/ingest/RestGetPipelineAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/ingest/RestGetPipelineAction.java rename to server/src/main/java/org/elasticsearch/rest/action/ingest/RestGetPipelineAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/ingest/RestPutPipelineAction.java b/server/src/main/java/org/elasticsearch/rest/action/ingest/RestPutPipelineAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/ingest/RestPutPipelineAction.java rename to server/src/main/java/org/elasticsearch/rest/action/ingest/RestPutPipelineAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/ingest/RestSimulatePipelineAction.java b/server/src/main/java/org/elasticsearch/rest/action/ingest/RestSimulatePipelineAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/ingest/RestSimulatePipelineAction.java rename to server/src/main/java/org/elasticsearch/rest/action/ingest/RestSimulatePipelineAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/ingest/package-info.java b/server/src/main/java/org/elasticsearch/rest/action/ingest/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/ingest/package-info.java rename to server/src/main/java/org/elasticsearch/rest/action/ingest/package-info.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/package-info.java b/server/src/main/java/org/elasticsearch/rest/action/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/package-info.java rename to server/src/main/java/org/elasticsearch/rest/action/package-info.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/search/RestClearScrollAction.java b/server/src/main/java/org/elasticsearch/rest/action/search/RestClearScrollAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/search/RestClearScrollAction.java rename to server/src/main/java/org/elasticsearch/rest/action/search/RestClearScrollAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/search/RestExplainAction.java b/server/src/main/java/org/elasticsearch/rest/action/search/RestExplainAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/search/RestExplainAction.java rename to server/src/main/java/org/elasticsearch/rest/action/search/RestExplainAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/search/RestMultiSearchAction.java b/server/src/main/java/org/elasticsearch/rest/action/search/RestMultiSearchAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/search/RestMultiSearchAction.java rename to server/src/main/java/org/elasticsearch/rest/action/search/RestMultiSearchAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/search/RestSearchAction.java b/server/src/main/java/org/elasticsearch/rest/action/search/RestSearchAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/search/RestSearchAction.java rename to server/src/main/java/org/elasticsearch/rest/action/search/RestSearchAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/search/RestSearchScrollAction.java b/server/src/main/java/org/elasticsearch/rest/action/search/RestSearchScrollAction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/search/RestSearchScrollAction.java rename to server/src/main/java/org/elasticsearch/rest/action/search/RestSearchScrollAction.java diff --git a/core/src/main/java/org/elasticsearch/rest/action/search/package-info.java b/server/src/main/java/org/elasticsearch/rest/action/search/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/action/search/package-info.java rename to server/src/main/java/org/elasticsearch/rest/action/search/package-info.java diff --git a/core/src/main/java/org/elasticsearch/rest/package-info.java b/server/src/main/java/org/elasticsearch/rest/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/rest/package-info.java rename to server/src/main/java/org/elasticsearch/rest/package-info.java diff --git a/core/src/main/java/org/elasticsearch/script/ClassPermission.java b/server/src/main/java/org/elasticsearch/script/ClassPermission.java similarity index 100% rename from core/src/main/java/org/elasticsearch/script/ClassPermission.java rename to server/src/main/java/org/elasticsearch/script/ClassPermission.java diff --git a/core/src/main/java/org/elasticsearch/script/ExecutableScript.java b/server/src/main/java/org/elasticsearch/script/ExecutableScript.java similarity index 100% rename from core/src/main/java/org/elasticsearch/script/ExecutableScript.java rename to server/src/main/java/org/elasticsearch/script/ExecutableScript.java diff --git a/core/src/main/java/org/elasticsearch/script/ExplainableSearchScript.java b/server/src/main/java/org/elasticsearch/script/ExplainableSearchScript.java similarity index 100% rename from core/src/main/java/org/elasticsearch/script/ExplainableSearchScript.java rename to server/src/main/java/org/elasticsearch/script/ExplainableSearchScript.java diff --git a/core/src/main/java/org/elasticsearch/script/FilterScript.java b/server/src/main/java/org/elasticsearch/script/FilterScript.java similarity index 100% rename from core/src/main/java/org/elasticsearch/script/FilterScript.java rename to server/src/main/java/org/elasticsearch/script/FilterScript.java diff --git a/core/src/main/java/org/elasticsearch/script/GeneralScriptException.java b/server/src/main/java/org/elasticsearch/script/GeneralScriptException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/script/GeneralScriptException.java rename to server/src/main/java/org/elasticsearch/script/GeneralScriptException.java diff --git a/core/src/main/java/org/elasticsearch/script/ScoreAccessor.java b/server/src/main/java/org/elasticsearch/script/ScoreAccessor.java similarity index 100% rename from core/src/main/java/org/elasticsearch/script/ScoreAccessor.java rename to server/src/main/java/org/elasticsearch/script/ScoreAccessor.java diff --git a/core/src/main/java/org/elasticsearch/script/Script.java b/server/src/main/java/org/elasticsearch/script/Script.java similarity index 100% rename from core/src/main/java/org/elasticsearch/script/Script.java rename to server/src/main/java/org/elasticsearch/script/Script.java diff --git a/core/src/main/java/org/elasticsearch/script/ScriptContext.java b/server/src/main/java/org/elasticsearch/script/ScriptContext.java similarity index 100% rename from core/src/main/java/org/elasticsearch/script/ScriptContext.java rename to server/src/main/java/org/elasticsearch/script/ScriptContext.java diff --git a/core/src/main/java/org/elasticsearch/script/ScriptEngine.java b/server/src/main/java/org/elasticsearch/script/ScriptEngine.java similarity index 100% rename from core/src/main/java/org/elasticsearch/script/ScriptEngine.java rename to server/src/main/java/org/elasticsearch/script/ScriptEngine.java diff --git a/core/src/main/java/org/elasticsearch/script/ScriptException.java b/server/src/main/java/org/elasticsearch/script/ScriptException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/script/ScriptException.java rename to server/src/main/java/org/elasticsearch/script/ScriptException.java diff --git a/core/src/main/java/org/elasticsearch/script/ScriptMetaData.java b/server/src/main/java/org/elasticsearch/script/ScriptMetaData.java similarity index 100% rename from core/src/main/java/org/elasticsearch/script/ScriptMetaData.java rename to server/src/main/java/org/elasticsearch/script/ScriptMetaData.java diff --git a/core/src/main/java/org/elasticsearch/script/ScriptMetrics.java b/server/src/main/java/org/elasticsearch/script/ScriptMetrics.java similarity index 100% rename from core/src/main/java/org/elasticsearch/script/ScriptMetrics.java rename to server/src/main/java/org/elasticsearch/script/ScriptMetrics.java diff --git a/core/src/main/java/org/elasticsearch/script/ScriptModule.java b/server/src/main/java/org/elasticsearch/script/ScriptModule.java similarity index 100% rename from core/src/main/java/org/elasticsearch/script/ScriptModule.java rename to server/src/main/java/org/elasticsearch/script/ScriptModule.java diff --git a/core/src/main/java/org/elasticsearch/script/ScriptService.java b/server/src/main/java/org/elasticsearch/script/ScriptService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/script/ScriptService.java rename to server/src/main/java/org/elasticsearch/script/ScriptService.java diff --git a/core/src/main/java/org/elasticsearch/script/ScriptStats.java b/server/src/main/java/org/elasticsearch/script/ScriptStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/script/ScriptStats.java rename to server/src/main/java/org/elasticsearch/script/ScriptStats.java diff --git a/core/src/main/java/org/elasticsearch/script/ScriptType.java b/server/src/main/java/org/elasticsearch/script/ScriptType.java similarity index 100% rename from core/src/main/java/org/elasticsearch/script/ScriptType.java rename to server/src/main/java/org/elasticsearch/script/ScriptType.java diff --git a/core/src/main/java/org/elasticsearch/script/SearchScript.java b/server/src/main/java/org/elasticsearch/script/SearchScript.java similarity index 100% rename from core/src/main/java/org/elasticsearch/script/SearchScript.java rename to server/src/main/java/org/elasticsearch/script/SearchScript.java diff --git a/core/src/main/java/org/elasticsearch/script/SimilarityScript.java b/server/src/main/java/org/elasticsearch/script/SimilarityScript.java similarity index 100% rename from core/src/main/java/org/elasticsearch/script/SimilarityScript.java rename to server/src/main/java/org/elasticsearch/script/SimilarityScript.java diff --git a/core/src/main/java/org/elasticsearch/script/SimilarityWeightScript.java b/server/src/main/java/org/elasticsearch/script/SimilarityWeightScript.java similarity index 100% rename from core/src/main/java/org/elasticsearch/script/SimilarityWeightScript.java rename to server/src/main/java/org/elasticsearch/script/SimilarityWeightScript.java diff --git a/core/src/main/java/org/elasticsearch/script/StoredScriptSource.java b/server/src/main/java/org/elasticsearch/script/StoredScriptSource.java similarity index 100% rename from core/src/main/java/org/elasticsearch/script/StoredScriptSource.java rename to server/src/main/java/org/elasticsearch/script/StoredScriptSource.java diff --git a/core/src/main/java/org/elasticsearch/script/TemplateScript.java b/server/src/main/java/org/elasticsearch/script/TemplateScript.java similarity index 100% rename from core/src/main/java/org/elasticsearch/script/TemplateScript.java rename to server/src/main/java/org/elasticsearch/script/TemplateScript.java diff --git a/core/src/main/java/org/elasticsearch/script/package-info.java b/server/src/main/java/org/elasticsearch/script/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/script/package-info.java rename to server/src/main/java/org/elasticsearch/script/package-info.java diff --git a/core/src/main/java/org/elasticsearch/search/DefaultSearchContext.java b/server/src/main/java/org/elasticsearch/search/DefaultSearchContext.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/DefaultSearchContext.java rename to server/src/main/java/org/elasticsearch/search/DefaultSearchContext.java diff --git a/core/src/main/java/org/elasticsearch/search/DocValueFormat.java b/server/src/main/java/org/elasticsearch/search/DocValueFormat.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/DocValueFormat.java rename to server/src/main/java/org/elasticsearch/search/DocValueFormat.java diff --git a/core/src/main/java/org/elasticsearch/search/MultiValueMode.java b/server/src/main/java/org/elasticsearch/search/MultiValueMode.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/MultiValueMode.java rename to server/src/main/java/org/elasticsearch/search/MultiValueMode.java diff --git a/core/src/main/java/org/elasticsearch/search/Scroll.java b/server/src/main/java/org/elasticsearch/search/Scroll.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/Scroll.java rename to server/src/main/java/org/elasticsearch/search/Scroll.java diff --git a/core/src/main/java/org/elasticsearch/search/SearchContextException.java b/server/src/main/java/org/elasticsearch/search/SearchContextException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/SearchContextException.java rename to server/src/main/java/org/elasticsearch/search/SearchContextException.java diff --git a/core/src/main/java/org/elasticsearch/search/SearchContextMissingException.java b/server/src/main/java/org/elasticsearch/search/SearchContextMissingException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/SearchContextMissingException.java rename to server/src/main/java/org/elasticsearch/search/SearchContextMissingException.java diff --git a/core/src/main/java/org/elasticsearch/search/SearchException.java b/server/src/main/java/org/elasticsearch/search/SearchException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/SearchException.java rename to server/src/main/java/org/elasticsearch/search/SearchException.java diff --git a/core/src/main/java/org/elasticsearch/search/SearchExtBuilder.java b/server/src/main/java/org/elasticsearch/search/SearchExtBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/SearchExtBuilder.java rename to server/src/main/java/org/elasticsearch/search/SearchExtBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/SearchHit.java b/server/src/main/java/org/elasticsearch/search/SearchHit.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/SearchHit.java rename to server/src/main/java/org/elasticsearch/search/SearchHit.java diff --git a/core/src/main/java/org/elasticsearch/search/SearchHits.java b/server/src/main/java/org/elasticsearch/search/SearchHits.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/SearchHits.java rename to server/src/main/java/org/elasticsearch/search/SearchHits.java diff --git a/core/src/main/java/org/elasticsearch/search/SearchModule.java b/server/src/main/java/org/elasticsearch/search/SearchModule.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/SearchModule.java rename to server/src/main/java/org/elasticsearch/search/SearchModule.java diff --git a/core/src/main/java/org/elasticsearch/search/SearchParseException.java b/server/src/main/java/org/elasticsearch/search/SearchParseException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/SearchParseException.java rename to server/src/main/java/org/elasticsearch/search/SearchParseException.java diff --git a/core/src/main/java/org/elasticsearch/search/SearchPhase.java b/server/src/main/java/org/elasticsearch/search/SearchPhase.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/SearchPhase.java rename to server/src/main/java/org/elasticsearch/search/SearchPhase.java diff --git a/core/src/main/java/org/elasticsearch/search/SearchPhaseResult.java b/server/src/main/java/org/elasticsearch/search/SearchPhaseResult.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/SearchPhaseResult.java rename to server/src/main/java/org/elasticsearch/search/SearchPhaseResult.java diff --git a/core/src/main/java/org/elasticsearch/search/SearchService.java b/server/src/main/java/org/elasticsearch/search/SearchService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/SearchService.java rename to server/src/main/java/org/elasticsearch/search/SearchService.java diff --git a/core/src/main/java/org/elasticsearch/search/SearchShardTarget.java b/server/src/main/java/org/elasticsearch/search/SearchShardTarget.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/SearchShardTarget.java rename to server/src/main/java/org/elasticsearch/search/SearchShardTarget.java diff --git a/core/src/main/java/org/elasticsearch/search/SearchSortValues.java b/server/src/main/java/org/elasticsearch/search/SearchSortValues.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/SearchSortValues.java rename to server/src/main/java/org/elasticsearch/search/SearchSortValues.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/AbstractAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/AbstractAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/AbstractAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/AbstractAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/Aggregation.java b/server/src/main/java/org/elasticsearch/search/aggregations/Aggregation.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/Aggregation.java rename to server/src/main/java/org/elasticsearch/search/aggregations/Aggregation.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/AggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/AggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/AggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/AggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/AggregationBuilders.java b/server/src/main/java/org/elasticsearch/search/aggregations/AggregationBuilders.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/AggregationBuilders.java rename to server/src/main/java/org/elasticsearch/search/aggregations/AggregationBuilders.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/AggregationExecutionException.java b/server/src/main/java/org/elasticsearch/search/aggregations/AggregationExecutionException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/AggregationExecutionException.java rename to server/src/main/java/org/elasticsearch/search/aggregations/AggregationExecutionException.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/AggregationInitializationException.java b/server/src/main/java/org/elasticsearch/search/aggregations/AggregationInitializationException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/AggregationInitializationException.java rename to server/src/main/java/org/elasticsearch/search/aggregations/AggregationInitializationException.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/AggregationPhase.java b/server/src/main/java/org/elasticsearch/search/aggregations/AggregationPhase.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/AggregationPhase.java rename to server/src/main/java/org/elasticsearch/search/aggregations/AggregationPhase.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/Aggregations.java b/server/src/main/java/org/elasticsearch/search/aggregations/Aggregations.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/Aggregations.java rename to server/src/main/java/org/elasticsearch/search/aggregations/Aggregations.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/Aggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/Aggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/Aggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/Aggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/AggregatorBase.java b/server/src/main/java/org/elasticsearch/search/aggregations/AggregatorBase.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/AggregatorBase.java rename to server/src/main/java/org/elasticsearch/search/aggregations/AggregatorBase.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/AggregatorFactories.java b/server/src/main/java/org/elasticsearch/search/aggregations/AggregatorFactories.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/AggregatorFactories.java rename to server/src/main/java/org/elasticsearch/search/aggregations/AggregatorFactories.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/AggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/AggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/AggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/AggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/BaseAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/BaseAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/BaseAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/BaseAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/BucketCollector.java b/server/src/main/java/org/elasticsearch/search/aggregations/BucketCollector.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/BucketCollector.java rename to server/src/main/java/org/elasticsearch/search/aggregations/BucketCollector.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/BucketOrder.java b/server/src/main/java/org/elasticsearch/search/aggregations/BucketOrder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/BucketOrder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/BucketOrder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/HasAggregations.java b/server/src/main/java/org/elasticsearch/search/aggregations/HasAggregations.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/HasAggregations.java rename to server/src/main/java/org/elasticsearch/search/aggregations/HasAggregations.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/InternalAggregation.java b/server/src/main/java/org/elasticsearch/search/aggregations/InternalAggregation.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/InternalAggregation.java rename to server/src/main/java/org/elasticsearch/search/aggregations/InternalAggregation.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/InternalAggregations.java b/server/src/main/java/org/elasticsearch/search/aggregations/InternalAggregations.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/InternalAggregations.java rename to server/src/main/java/org/elasticsearch/search/aggregations/InternalAggregations.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/InternalMultiBucketAggregation.java b/server/src/main/java/org/elasticsearch/search/aggregations/InternalMultiBucketAggregation.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/InternalMultiBucketAggregation.java rename to server/src/main/java/org/elasticsearch/search/aggregations/InternalMultiBucketAggregation.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/InternalOrder.java b/server/src/main/java/org/elasticsearch/search/aggregations/InternalOrder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/InternalOrder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/InternalOrder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/InvalidAggregationPathException.java b/server/src/main/java/org/elasticsearch/search/aggregations/InvalidAggregationPathException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/InvalidAggregationPathException.java rename to server/src/main/java/org/elasticsearch/search/aggregations/InvalidAggregationPathException.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/KeyComparable.java b/server/src/main/java/org/elasticsearch/search/aggregations/KeyComparable.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/KeyComparable.java rename to server/src/main/java/org/elasticsearch/search/aggregations/KeyComparable.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/LeafBucketCollector.java b/server/src/main/java/org/elasticsearch/search/aggregations/LeafBucketCollector.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/LeafBucketCollector.java rename to server/src/main/java/org/elasticsearch/search/aggregations/LeafBucketCollector.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/LeafBucketCollectorBase.java b/server/src/main/java/org/elasticsearch/search/aggregations/LeafBucketCollectorBase.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/LeafBucketCollectorBase.java rename to server/src/main/java/org/elasticsearch/search/aggregations/LeafBucketCollectorBase.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/MultiBucketConsumerService.java b/server/src/main/java/org/elasticsearch/search/aggregations/MultiBucketConsumerService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/MultiBucketConsumerService.java rename to server/src/main/java/org/elasticsearch/search/aggregations/MultiBucketConsumerService.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/NonCollectingAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/NonCollectingAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/NonCollectingAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/NonCollectingAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/ParsedAggregation.java b/server/src/main/java/org/elasticsearch/search/aggregations/ParsedAggregation.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/ParsedAggregation.java rename to server/src/main/java/org/elasticsearch/search/aggregations/ParsedAggregation.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/ParsedMultiBucketAggregation.java b/server/src/main/java/org/elasticsearch/search/aggregations/ParsedMultiBucketAggregation.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/ParsedMultiBucketAggregation.java rename to server/src/main/java/org/elasticsearch/search/aggregations/ParsedMultiBucketAggregation.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/PipelineAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/PipelineAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/PipelineAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/PipelineAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/SearchContextAggregations.java b/server/src/main/java/org/elasticsearch/search/aggregations/SearchContextAggregations.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/SearchContextAggregations.java rename to server/src/main/java/org/elasticsearch/search/aggregations/SearchContextAggregations.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/BestBucketsDeferringCollector.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/BestBucketsDeferringCollector.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/BestBucketsDeferringCollector.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/BestBucketsDeferringCollector.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/BucketUtils.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/BucketUtils.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/BucketUtils.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/BucketUtils.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/BucketsAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/BucketsAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/BucketsAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/BucketsAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/DeferableBucketAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/DeferableBucketAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/DeferableBucketAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/DeferableBucketAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/DeferringBucketCollector.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/DeferringBucketCollector.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/DeferringBucketCollector.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/DeferringBucketCollector.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/InternalSingleBucketAggregation.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/InternalSingleBucketAggregation.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/InternalSingleBucketAggregation.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/InternalSingleBucketAggregation.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/MultiBucketAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/MultiBucketAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/MultiBucketAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/MultiBucketAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/MultiBucketsAggregation.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/MultiBucketsAggregation.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/MultiBucketsAggregation.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/MultiBucketsAggregation.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/ParsedSingleBucketAggregation.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/ParsedSingleBucketAggregation.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/ParsedSingleBucketAggregation.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/ParsedSingleBucketAggregation.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/SingleBucketAggregation.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/SingleBucketAggregation.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/SingleBucketAggregation.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/SingleBucketAggregation.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/SingleBucketAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/SingleBucketAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/SingleBucketAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/SingleBucketAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/adjacency/AdjacencyMatrix.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/adjacency/AdjacencyMatrix.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/adjacency/AdjacencyMatrix.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/adjacency/AdjacencyMatrix.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/adjacency/AdjacencyMatrixAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/adjacency/AdjacencyMatrixAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/adjacency/AdjacencyMatrixAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/adjacency/AdjacencyMatrixAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/adjacency/AdjacencyMatrixAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/adjacency/AdjacencyMatrixAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/adjacency/AdjacencyMatrixAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/adjacency/AdjacencyMatrixAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/adjacency/AdjacencyMatrixAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/adjacency/AdjacencyMatrixAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/adjacency/AdjacencyMatrixAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/adjacency/AdjacencyMatrixAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/adjacency/InternalAdjacencyMatrix.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/adjacency/InternalAdjacencyMatrix.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/adjacency/InternalAdjacencyMatrix.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/adjacency/InternalAdjacencyMatrix.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/adjacency/ParsedAdjacencyMatrix.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/adjacency/ParsedAdjacencyMatrix.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/adjacency/ParsedAdjacencyMatrix.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/adjacency/ParsedAdjacencyMatrix.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregation.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregation.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregation.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregation.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregationFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregationFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregationFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregationFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregationPlugin.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregationPlugin.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregationPlugin.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregationPlugin.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeKey.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeKey.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeKey.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeKey.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesComparator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesComparator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesComparator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesComparator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesSource.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesSource.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesSource.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesSource.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesSourceBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesSourceBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesSourceBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesSourceBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesSourceConfig.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesSourceConfig.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesSourceConfig.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesSourceConfig.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesSourceParserHelper.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesSourceParserHelper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesSourceParserHelper.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesSourceParserHelper.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/DateHistogramValuesSourceBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/DateHistogramValuesSourceBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/DateHistogramValuesSourceBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/DateHistogramValuesSourceBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/HistogramValuesSource.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/HistogramValuesSource.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/HistogramValuesSource.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/HistogramValuesSource.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/HistogramValuesSourceBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/HistogramValuesSourceBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/HistogramValuesSourceBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/HistogramValuesSourceBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/InternalComposite.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/InternalComposite.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/InternalComposite.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/InternalComposite.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/ParsedComposite.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/ParsedComposite.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/ParsedComposite.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/ParsedComposite.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/RoundingValuesSource.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/RoundingValuesSource.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/RoundingValuesSource.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/RoundingValuesSource.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/TermsValuesSourceBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/TermsValuesSourceBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/TermsValuesSourceBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/TermsValuesSourceBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/Filter.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/Filter.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/Filter.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/Filter.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FilterAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FilterAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FilterAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FilterAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FilterAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FilterAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FilterAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FilterAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FilterAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FilterAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FilterAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FilterAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/Filters.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/Filters.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/Filters.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/Filters.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FiltersAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FiltersAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FiltersAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FiltersAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FiltersAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FiltersAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FiltersAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FiltersAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FiltersAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FiltersAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FiltersAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FiltersAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/InternalFilter.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/InternalFilter.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/InternalFilter.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/InternalFilter.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/InternalFilters.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/InternalFilters.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/InternalFilters.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/InternalFilters.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/ParsedFilter.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/ParsedFilter.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/ParsedFilter.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/ParsedFilter.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/ParsedFilters.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/ParsedFilters.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/ParsedFilters.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/ParsedFilters.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoGridAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoGridAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoGridAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoGridAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGrid.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGrid.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGrid.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGrid.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridParams.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridParams.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridParams.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridParams.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/InternalGeoHashGrid.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/InternalGeoHashGrid.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/InternalGeoHashGrid.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/InternalGeoHashGrid.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/ParsedGeoHashGrid.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/ParsedGeoHashGrid.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/ParsedGeoHashGrid.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/ParsedGeoHashGrid.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/global/Global.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/global/Global.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/global/Global.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/global/Global.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/global/GlobalAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/global/GlobalAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/global/GlobalAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/global/GlobalAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/global/GlobalAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/global/GlobalAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/global/GlobalAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/global/GlobalAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/global/GlobalAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/global/GlobalAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/global/GlobalAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/global/GlobalAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/global/InternalGlobal.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/global/InternalGlobal.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/global/InternalGlobal.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/global/InternalGlobal.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/global/ParsedGlobal.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/global/ParsedGlobal.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/global/ParsedGlobal.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/global/ParsedGlobal.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramInterval.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramInterval.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramInterval.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramInterval.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/ExtendedBounds.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/ExtendedBounds.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/ExtendedBounds.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/ExtendedBounds.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/Histogram.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/Histogram.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/Histogram.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/Histogram.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalDateHistogram.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalDateHistogram.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalDateHistogram.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalDateHistogram.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalHistogram.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalHistogram.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalHistogram.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalHistogram.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/ParsedDateHistogram.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/ParsedDateHistogram.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/ParsedDateHistogram.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/ParsedDateHistogram.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/ParsedHistogram.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/ParsedHistogram.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/ParsedHistogram.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/ParsedHistogram.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/InternalMissing.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/InternalMissing.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/InternalMissing.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/InternalMissing.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/Missing.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/Missing.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/Missing.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/Missing.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/MissingAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/MissingAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/MissingAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/MissingAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/MissingAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/MissingAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/MissingAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/MissingAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/MissingAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/MissingAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/MissingAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/MissingAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/ParsedMissing.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/ParsedMissing.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/ParsedMissing.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/ParsedMissing.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/InternalNested.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/InternalNested.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/InternalNested.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/InternalNested.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/InternalReverseNested.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/InternalReverseNested.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/InternalReverseNested.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/InternalReverseNested.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/Nested.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/Nested.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/Nested.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/Nested.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ParsedNested.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ParsedNested.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ParsedNested.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ParsedNested.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ParsedReverseNested.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ParsedReverseNested.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ParsedReverseNested.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ParsedReverseNested.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNested.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNested.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNested.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNested.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/package-info b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/package-info similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/package-info rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/package-info diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/AbstractRangeAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/AbstractRangeAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/AbstractRangeAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/AbstractRangeAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/AbstractRangeBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/AbstractRangeBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/AbstractRangeBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/AbstractRangeBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/BinaryRangeAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/BinaryRangeAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/BinaryRangeAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/BinaryRangeAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/BinaryRangeAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/BinaryRangeAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/BinaryRangeAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/BinaryRangeAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/DateRangeAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/DateRangeAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/DateRangeAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/DateRangeAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/DateRangeAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/DateRangeAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/DateRangeAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/DateRangeAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/GeoDistanceAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/GeoDistanceAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/GeoDistanceAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/GeoDistanceAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/GeoDistanceRangeAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/GeoDistanceRangeAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/GeoDistanceRangeAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/GeoDistanceRangeAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/InternalBinaryRange.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/InternalBinaryRange.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/InternalBinaryRange.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/InternalBinaryRange.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/InternalDateRange.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/InternalDateRange.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/InternalDateRange.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/InternalDateRange.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/InternalGeoDistance.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/InternalGeoDistance.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/InternalGeoDistance.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/InternalGeoDistance.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/InternalRange.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/InternalRange.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/InternalRange.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/InternalRange.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/IpRangeAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/IpRangeAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/IpRangeAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/IpRangeAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/ParsedBinaryRange.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/ParsedBinaryRange.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/ParsedBinaryRange.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/ParsedBinaryRange.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/ParsedDateRange.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/ParsedDateRange.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/ParsedDateRange.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/ParsedDateRange.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/ParsedGeoDistance.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/ParsedGeoDistance.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/ParsedGeoDistance.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/ParsedGeoDistance.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/ParsedRange.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/ParsedRange.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/ParsedRange.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/ParsedRange.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/Range.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/Range.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/Range.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/Range.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/RangeAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/RangeAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/RangeAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/RangeAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/RangeAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/RangeAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/RangeAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/RangeAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/RangeAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/RangeAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/RangeAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/RangeAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/BestDocsDeferringCollector.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/BestDocsDeferringCollector.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/BestDocsDeferringCollector.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/BestDocsDeferringCollector.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedBytesHashSamplerAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedBytesHashSamplerAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedBytesHashSamplerAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedBytesHashSamplerAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedMapSamplerAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedMapSamplerAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedMapSamplerAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedMapSamplerAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedNumericSamplerAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedNumericSamplerAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedNumericSamplerAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedNumericSamplerAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedOrdinalsSamplerAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedOrdinalsSamplerAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedOrdinalsSamplerAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedOrdinalsSamplerAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/InternalSampler.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/InternalSampler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/InternalSampler.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/InternalSampler.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/ParsedSampler.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/ParsedSampler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/ParsedSampler.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/ParsedSampler.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/Sampler.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/Sampler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/Sampler.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/Sampler.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/SamplerAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/SamplerAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/SamplerAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/SamplerAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/SamplerAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/SamplerAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/SamplerAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/SamplerAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/SamplerAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/SamplerAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/SamplerAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/SamplerAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/UnmappedSampler.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/UnmappedSampler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/UnmappedSampler.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/UnmappedSampler.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/BucketSignificancePriorityQueue.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/BucketSignificancePriorityQueue.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/BucketSignificancePriorityQueue.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/BucketSignificancePriorityQueue.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/GlobalOrdinalsSignificantTermsAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/GlobalOrdinalsSignificantTermsAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/GlobalOrdinalsSignificantTermsAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/GlobalOrdinalsSignificantTermsAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/InternalMappedSignificantTerms.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/InternalMappedSignificantTerms.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/InternalMappedSignificantTerms.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/InternalMappedSignificantTerms.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/InternalSignificantTerms.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/InternalSignificantTerms.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/InternalSignificantTerms.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/InternalSignificantTerms.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/ParsedSignificantLongTerms.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/ParsedSignificantLongTerms.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/ParsedSignificantLongTerms.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/ParsedSignificantLongTerms.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/ParsedSignificantStringTerms.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/ParsedSignificantStringTerms.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/ParsedSignificantStringTerms.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/ParsedSignificantStringTerms.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/ParsedSignificantTerms.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/ParsedSignificantTerms.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/ParsedSignificantTerms.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/ParsedSignificantTerms.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantLongTerms.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantLongTerms.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantLongTerms.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantLongTerms.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantLongTermsAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantLongTermsAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantLongTermsAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantLongTermsAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantStringTerms.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantStringTerms.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantStringTerms.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantStringTerms.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantStringTermsAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantStringTermsAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantStringTermsAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantStringTermsAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTerms.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTerms.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTerms.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTerms.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTermsAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTermsAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTermsAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTermsAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTermsAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTermsAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTermsAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTermsAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTextAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTextAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTextAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTextAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTextAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTextAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTextAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTextAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTextAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTextAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTextAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTextAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/UnmappedSignificantTerms.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/UnmappedSignificantTerms.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/UnmappedSignificantTerms.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/UnmappedSignificantTerms.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/ChiSquare.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/ChiSquare.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/ChiSquare.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/ChiSquare.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/GND.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/GND.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/GND.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/GND.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/JLHScore.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/JLHScore.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/JLHScore.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/JLHScore.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/MutualInformation.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/MutualInformation.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/MutualInformation.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/MutualInformation.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/NXYSignificanceHeuristic.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/NXYSignificanceHeuristic.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/NXYSignificanceHeuristic.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/NXYSignificanceHeuristic.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/PercentageScore.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/PercentageScore.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/PercentageScore.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/PercentageScore.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/ScriptHeuristic.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/ScriptHeuristic.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/ScriptHeuristic.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/ScriptHeuristic.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificanceHeuristic.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificanceHeuristic.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificanceHeuristic.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificanceHeuristic.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificanceHeuristicBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificanceHeuristicBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificanceHeuristicBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificanceHeuristicBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificanceHeuristicParser.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificanceHeuristicParser.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificanceHeuristicParser.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificanceHeuristicParser.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/AbstractStringTermsAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/AbstractStringTermsAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/AbstractStringTermsAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/AbstractStringTermsAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/BucketPriorityQueue.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/BucketPriorityQueue.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/BucketPriorityQueue.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/BucketPriorityQueue.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/DoubleTerms.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/DoubleTerms.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/DoubleTerms.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/DoubleTerms.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/DoubleTermsAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/DoubleTermsAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/DoubleTermsAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/DoubleTermsAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/GlobalOrdinalsStringTermsAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/GlobalOrdinalsStringTermsAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/GlobalOrdinalsStringTermsAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/GlobalOrdinalsStringTermsAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/IncludeExclude.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/IncludeExclude.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/IncludeExclude.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/IncludeExclude.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/InternalMappedTerms.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/InternalMappedTerms.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/InternalMappedTerms.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/InternalMappedTerms.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/InternalTerms.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/InternalTerms.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/InternalTerms.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/InternalTerms.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/LongTerms.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/LongTerms.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/LongTerms.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/LongTerms.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/LongTermsAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/LongTermsAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/LongTermsAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/LongTermsAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/ParsedDoubleTerms.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/ParsedDoubleTerms.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/ParsedDoubleTerms.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/ParsedDoubleTerms.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/ParsedLongTerms.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/ParsedLongTerms.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/ParsedLongTerms.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/ParsedLongTerms.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/ParsedStringTerms.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/ParsedStringTerms.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/ParsedStringTerms.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/ParsedStringTerms.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/ParsedTerms.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/ParsedTerms.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/ParsedTerms.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/ParsedTerms.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/StringTerms.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/StringTerms.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/StringTerms.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/StringTerms.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/StringTermsAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/StringTermsAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/StringTermsAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/StringTermsAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/Terms.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/Terms.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/Terms.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/Terms.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/UnmappedTerms.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/UnmappedTerms.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/UnmappedTerms.java rename to server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/UnmappedTerms.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/InternalNumericMetricsAggregation.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/InternalNumericMetricsAggregation.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/InternalNumericMetricsAggregation.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/InternalNumericMetricsAggregation.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/MetricsAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/MetricsAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/MetricsAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/MetricsAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/NumericMetricsAggregation.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/NumericMetricsAggregation.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/NumericMetricsAggregation.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/NumericMetricsAggregation.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/NumericMetricsAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/NumericMetricsAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/NumericMetricsAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/NumericMetricsAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/ParsedSingleValueNumericMetricsAggregation.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/ParsedSingleValueNumericMetricsAggregation.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/ParsedSingleValueNumericMetricsAggregation.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/ParsedSingleValueNumericMetricsAggregation.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/Avg.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/Avg.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/Avg.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/Avg.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/AvgAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/AvgAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/AvgAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/AvgAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/AvgAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/AvgAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/AvgAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/AvgAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/AvgAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/AvgAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/AvgAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/AvgAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/InternalAvg.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/InternalAvg.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/InternalAvg.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/InternalAvg.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/ParsedAvg.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/ParsedAvg.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/ParsedAvg.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/ParsedAvg.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/Cardinality.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/Cardinality.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/Cardinality.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/Cardinality.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/CardinalityAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/CardinalityAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/CardinalityAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/CardinalityAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/CardinalityAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/CardinalityAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/CardinalityAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/CardinalityAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/CardinalityAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/CardinalityAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/CardinalityAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/CardinalityAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/HyperLogLogPlusPlus.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/HyperLogLogPlusPlus.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/HyperLogLogPlusPlus.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/HyperLogLogPlusPlus.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/InternalCardinality.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/InternalCardinality.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/InternalCardinality.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/InternalCardinality.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/ParsedCardinality.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/ParsedCardinality.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/ParsedCardinality.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/ParsedCardinality.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/GeoBounds.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/GeoBounds.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/GeoBounds.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/GeoBounds.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/GeoBoundsAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/GeoBoundsAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/GeoBoundsAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/GeoBoundsAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/GeoBoundsAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/GeoBoundsAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/GeoBoundsAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/GeoBoundsAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/GeoBoundsAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/GeoBoundsAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/GeoBoundsAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/GeoBoundsAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/InternalGeoBounds.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/InternalGeoBounds.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/InternalGeoBounds.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/InternalGeoBounds.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/ParsedGeoBounds.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/ParsedGeoBounds.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/ParsedGeoBounds.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/ParsedGeoBounds.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/geocentroid/GeoCentroid.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/geocentroid/GeoCentroid.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/geocentroid/GeoCentroid.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/geocentroid/GeoCentroid.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/geocentroid/GeoCentroidAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/geocentroid/GeoCentroidAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/geocentroid/GeoCentroidAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/geocentroid/GeoCentroidAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/geocentroid/GeoCentroidAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/geocentroid/GeoCentroidAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/geocentroid/GeoCentroidAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/geocentroid/GeoCentroidAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/geocentroid/GeoCentroidAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/geocentroid/GeoCentroidAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/geocentroid/GeoCentroidAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/geocentroid/GeoCentroidAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/geocentroid/InternalGeoCentroid.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/geocentroid/InternalGeoCentroid.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/geocentroid/InternalGeoCentroid.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/geocentroid/InternalGeoCentroid.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/geocentroid/ParsedGeoCentroid.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/geocentroid/ParsedGeoCentroid.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/geocentroid/ParsedGeoCentroid.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/geocentroid/ParsedGeoCentroid.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/max/InternalMax.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/max/InternalMax.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/max/InternalMax.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/max/InternalMax.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/max/Max.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/max/Max.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/max/Max.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/max/Max.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/max/MaxAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/max/MaxAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/max/MaxAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/max/MaxAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/max/MaxAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/max/MaxAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/max/MaxAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/max/MaxAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/max/MaxAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/max/MaxAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/max/MaxAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/max/MaxAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/max/ParsedMax.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/max/ParsedMax.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/max/ParsedMax.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/max/ParsedMax.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/min/InternalMin.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/min/InternalMin.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/min/InternalMin.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/min/InternalMin.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/min/Min.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/min/Min.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/min/Min.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/min/Min.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/min/MinAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/min/MinAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/min/MinAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/min/MinAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/min/MinAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/min/MinAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/min/MinAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/min/MinAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/min/MinAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/min/MinAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/min/MinAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/min/MinAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/min/ParsedMin.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/min/ParsedMin.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/min/ParsedMin.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/min/ParsedMin.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/package-info.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/package-info.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/package-info.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/ParsedPercentileRanks.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/ParsedPercentileRanks.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/ParsedPercentileRanks.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/ParsedPercentileRanks.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/ParsedPercentiles.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/ParsedPercentiles.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/ParsedPercentiles.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/ParsedPercentiles.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/Percentile.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/Percentile.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/Percentile.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/Percentile.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentileRanks.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentileRanks.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentileRanks.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentileRanks.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentileRanksAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentileRanksAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentileRanksAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentileRanksAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/Percentiles.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/Percentiles.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/Percentiles.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/Percentiles.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentilesAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentilesAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentilesAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentilesAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentilesMethod.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentilesMethod.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentilesMethod.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentilesMethod.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/AbstractHDRPercentilesAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/AbstractHDRPercentilesAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/AbstractHDRPercentilesAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/AbstractHDRPercentilesAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/AbstractInternalHDRPercentiles.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/AbstractInternalHDRPercentiles.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/AbstractInternalHDRPercentiles.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/AbstractInternalHDRPercentiles.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/HDRPercentileRanksAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/HDRPercentileRanksAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/HDRPercentileRanksAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/HDRPercentileRanksAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/HDRPercentileRanksAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/HDRPercentileRanksAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/HDRPercentileRanksAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/HDRPercentileRanksAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/HDRPercentilesAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/HDRPercentilesAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/HDRPercentilesAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/HDRPercentilesAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/HDRPercentilesAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/HDRPercentilesAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/HDRPercentilesAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/HDRPercentilesAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/InternalHDRPercentileRanks.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/InternalHDRPercentileRanks.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/InternalHDRPercentileRanks.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/InternalHDRPercentileRanks.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/InternalHDRPercentiles.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/InternalHDRPercentiles.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/InternalHDRPercentiles.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/InternalHDRPercentiles.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/ParsedHDRPercentileRanks.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/ParsedHDRPercentileRanks.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/ParsedHDRPercentileRanks.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/ParsedHDRPercentileRanks.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/ParsedHDRPercentiles.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/ParsedHDRPercentiles.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/ParsedHDRPercentiles.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/ParsedHDRPercentiles.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/AbstractInternalTDigestPercentiles.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/AbstractInternalTDigestPercentiles.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/AbstractInternalTDigestPercentiles.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/AbstractInternalTDigestPercentiles.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/AbstractTDigestPercentilesAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/AbstractTDigestPercentilesAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/AbstractTDigestPercentilesAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/AbstractTDigestPercentilesAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/InternalTDigestPercentileRanks.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/InternalTDigestPercentileRanks.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/InternalTDigestPercentileRanks.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/InternalTDigestPercentileRanks.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/InternalTDigestPercentiles.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/InternalTDigestPercentiles.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/InternalTDigestPercentiles.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/InternalTDigestPercentiles.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/ParsedTDigestPercentileRanks.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/ParsedTDigestPercentileRanks.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/ParsedTDigestPercentileRanks.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/ParsedTDigestPercentileRanks.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/ParsedTDigestPercentiles.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/ParsedTDigestPercentiles.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/ParsedTDigestPercentiles.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/ParsedTDigestPercentiles.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestPercentileRanksAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestPercentileRanksAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestPercentileRanksAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestPercentileRanksAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestPercentileRanksAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestPercentileRanksAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestPercentileRanksAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestPercentileRanksAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestPercentilesAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestPercentilesAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestPercentilesAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestPercentilesAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestPercentilesAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestPercentilesAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestPercentilesAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestPercentilesAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestState.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestState.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestState.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestState.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/InternalScriptedMetric.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/InternalScriptedMetric.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/InternalScriptedMetric.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/InternalScriptedMetric.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ParsedScriptedMetric.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ParsedScriptedMetric.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ParsedScriptedMetric.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ParsedScriptedMetric.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetric.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetric.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetric.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetric.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/InternalStats.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/InternalStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/InternalStats.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/InternalStats.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/ParsedStats.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/ParsedStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/ParsedStats.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/ParsedStats.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/Stats.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/Stats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/Stats.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/Stats.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/StatsAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/StatsAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/StatsAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/StatsAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/StatsAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/StatsAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/StatsAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/StatsAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/StatsAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/StatsAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/StatsAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/StatsAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ExtendedStats.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ExtendedStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ExtendedStats.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ExtendedStats.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ExtendedStatsAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ExtendedStatsAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ExtendedStatsAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ExtendedStatsAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ExtendedStatsAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ExtendedStatsAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ExtendedStatsAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ExtendedStatsAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ExtendedStatsAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ExtendedStatsAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ExtendedStatsAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ExtendedStatsAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/InternalExtendedStats.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/InternalExtendedStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/InternalExtendedStats.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/InternalExtendedStats.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ParsedExtendedStats.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ParsedExtendedStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ParsedExtendedStats.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ParsedExtendedStats.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/InternalSum.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/InternalSum.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/InternalSum.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/InternalSum.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/ParsedSum.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/ParsedSum.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/ParsedSum.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/ParsedSum.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/Sum.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/Sum.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/Sum.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/Sum.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/SumAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/SumAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/SumAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/SumAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/SumAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/SumAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/SumAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/SumAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/SumAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/SumAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/SumAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/SumAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/InternalTopHits.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/InternalTopHits.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/InternalTopHits.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/InternalTopHits.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/ParsedTopHits.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/ParsedTopHits.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/ParsedTopHits.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/ParsedTopHits.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHits.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHits.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHits.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHits.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHitsAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHitsAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHitsAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHitsAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHitsAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHitsAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHitsAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHitsAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHitsAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHitsAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHitsAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHitsAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/InternalValueCount.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/InternalValueCount.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/InternalValueCount.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/InternalValueCount.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/ParsedValueCount.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/ParsedValueCount.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/ParsedValueCount.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/ParsedValueCount.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/ValueCount.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/ValueCount.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/ValueCount.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/ValueCount.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/ValueCountAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/ValueCountAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/ValueCountAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/ValueCountAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/ValueCountAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/ValueCountAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/ValueCountAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/ValueCountAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/ValueCountAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/ValueCountAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/ValueCountAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/ValueCountAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/package-info.java b/server/src/main/java/org/elasticsearch/search/aggregations/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/package-info.java rename to server/src/main/java/org/elasticsearch/search/aggregations/package-info.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/AbstractPipelineAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/AbstractPipelineAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/AbstractPipelineAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/AbstractPipelineAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/BucketHelpers.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/BucketHelpers.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/BucketHelpers.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/BucketHelpers.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/InternalSimpleValue.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/InternalSimpleValue.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/InternalSimpleValue.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/InternalSimpleValue.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/ParsedSimpleValue.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/ParsedSimpleValue.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/ParsedSimpleValue.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/ParsedSimpleValue.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/PipelineAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/PipelineAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/PipelineAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/PipelineAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/PipelineAggregatorBuilders.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/PipelineAggregatorBuilders.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/PipelineAggregatorBuilders.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/PipelineAggregatorBuilders.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/SiblingPipelineAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/SiblingPipelineAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/SiblingPipelineAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/SiblingPipelineAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/SimpleValue.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/SimpleValue.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/SimpleValue.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/SimpleValue.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/BucketMetricValue.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/BucketMetricValue.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/BucketMetricValue.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/BucketMetricValue.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/BucketMetricsParser.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/BucketMetricsParser.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/BucketMetricsParser.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/BucketMetricsParser.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/BucketMetricsPipelineAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/BucketMetricsPipelineAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/BucketMetricsPipelineAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/BucketMetricsPipelineAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/BucketMetricsPipelineAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/BucketMetricsPipelineAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/BucketMetricsPipelineAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/BucketMetricsPipelineAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/InternalBucketMetricValue.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/InternalBucketMetricValue.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/InternalBucketMetricValue.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/InternalBucketMetricValue.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/ParsedBucketMetricValue.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/ParsedBucketMetricValue.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/ParsedBucketMetricValue.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/ParsedBucketMetricValue.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/avg/AvgBucketPipelineAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/avg/AvgBucketPipelineAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/avg/AvgBucketPipelineAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/avg/AvgBucketPipelineAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/avg/AvgBucketPipelineAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/avg/AvgBucketPipelineAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/avg/AvgBucketPipelineAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/avg/AvgBucketPipelineAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/max/MaxBucketPipelineAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/max/MaxBucketPipelineAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/max/MaxBucketPipelineAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/max/MaxBucketPipelineAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/max/MaxBucketPipelineAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/max/MaxBucketPipelineAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/max/MaxBucketPipelineAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/max/MaxBucketPipelineAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/min/MinBucketPipelineAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/min/MinBucketPipelineAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/min/MinBucketPipelineAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/min/MinBucketPipelineAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/min/MinBucketPipelineAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/min/MinBucketPipelineAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/min/MinBucketPipelineAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/min/MinBucketPipelineAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/percentile/InternalPercentilesBucket.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/percentile/InternalPercentilesBucket.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/percentile/InternalPercentilesBucket.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/percentile/InternalPercentilesBucket.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/percentile/ParsedPercentilesBucket.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/percentile/ParsedPercentilesBucket.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/percentile/ParsedPercentilesBucket.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/percentile/ParsedPercentilesBucket.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/percentile/PercentilesBucket.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/percentile/PercentilesBucket.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/percentile/PercentilesBucket.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/percentile/PercentilesBucket.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/percentile/PercentilesBucketPipelineAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/percentile/PercentilesBucketPipelineAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/percentile/PercentilesBucketPipelineAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/percentile/PercentilesBucketPipelineAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/percentile/PercentilesBucketPipelineAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/percentile/PercentilesBucketPipelineAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/percentile/PercentilesBucketPipelineAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/percentile/PercentilesBucketPipelineAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/InternalStatsBucket.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/InternalStatsBucket.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/InternalStatsBucket.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/InternalStatsBucket.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/ParsedStatsBucket.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/ParsedStatsBucket.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/ParsedStatsBucket.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/ParsedStatsBucket.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/StatsBucket.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/StatsBucket.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/StatsBucket.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/StatsBucket.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/StatsBucketPipelineAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/StatsBucketPipelineAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/StatsBucketPipelineAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/StatsBucketPipelineAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/StatsBucketPipelineAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/StatsBucketPipelineAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/StatsBucketPipelineAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/StatsBucketPipelineAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/ExtendedStatsBucket.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/ExtendedStatsBucket.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/ExtendedStatsBucket.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/ExtendedStatsBucket.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/ExtendedStatsBucketParser.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/ExtendedStatsBucketParser.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/ExtendedStatsBucketParser.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/ExtendedStatsBucketParser.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/ExtendedStatsBucketPipelineAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/ExtendedStatsBucketPipelineAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/ExtendedStatsBucketPipelineAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/ExtendedStatsBucketPipelineAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/ExtendedStatsBucketPipelineAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/ExtendedStatsBucketPipelineAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/ExtendedStatsBucketPipelineAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/ExtendedStatsBucketPipelineAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/InternalExtendedStatsBucket.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/InternalExtendedStatsBucket.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/InternalExtendedStatsBucket.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/InternalExtendedStatsBucket.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/ParsedExtendedStatsBucket.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/ParsedExtendedStatsBucket.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/ParsedExtendedStatsBucket.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/ParsedExtendedStatsBucket.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/sum/SumBucketPipelineAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/sum/SumBucketPipelineAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/sum/SumBucketPipelineAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/sum/SumBucketPipelineAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/sum/SumBucketPipelineAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/sum/SumBucketPipelineAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/sum/SumBucketPipelineAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/sum/SumBucketPipelineAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketscript/BucketScriptPipelineAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketscript/BucketScriptPipelineAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketscript/BucketScriptPipelineAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketscript/BucketScriptPipelineAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketscript/BucketScriptPipelineAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketscript/BucketScriptPipelineAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketscript/BucketScriptPipelineAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketscript/BucketScriptPipelineAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketselector/BucketSelectorPipelineAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketselector/BucketSelectorPipelineAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketselector/BucketSelectorPipelineAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketselector/BucketSelectorPipelineAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketselector/BucketSelectorPipelineAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketselector/BucketSelectorPipelineAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketselector/BucketSelectorPipelineAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketselector/BucketSelectorPipelineAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketsort/BucketSortPipelineAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketsort/BucketSortPipelineAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketsort/BucketSortPipelineAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketsort/BucketSortPipelineAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketsort/BucketSortPipelineAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketsort/BucketSortPipelineAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketsort/BucketSortPipelineAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketsort/BucketSortPipelineAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/cumulativesum/CumulativeSumPipelineAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/cumulativesum/CumulativeSumPipelineAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/cumulativesum/CumulativeSumPipelineAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/cumulativesum/CumulativeSumPipelineAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/cumulativesum/CumulativeSumPipelineAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/cumulativesum/CumulativeSumPipelineAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/cumulativesum/CumulativeSumPipelineAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/cumulativesum/CumulativeSumPipelineAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/Derivative.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/Derivative.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/Derivative.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/Derivative.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/DerivativePipelineAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/DerivativePipelineAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/DerivativePipelineAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/DerivativePipelineAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/DerivativePipelineAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/DerivativePipelineAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/DerivativePipelineAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/DerivativePipelineAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/InternalDerivative.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/InternalDerivative.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/InternalDerivative.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/InternalDerivative.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/ParsedDerivative.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/ParsedDerivative.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/ParsedDerivative.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/ParsedDerivative.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/MovAvgPipelineAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/MovAvgPipelineAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/MovAvgPipelineAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/MovAvgPipelineAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/MovAvgPipelineAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/MovAvgPipelineAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/MovAvgPipelineAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/MovAvgPipelineAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/SimulatedAnealingMinimizer.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/SimulatedAnealingMinimizer.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/SimulatedAnealingMinimizer.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/SimulatedAnealingMinimizer.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/EwmaModel.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/EwmaModel.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/EwmaModel.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/EwmaModel.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/HoltLinearModel.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/HoltLinearModel.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/HoltLinearModel.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/HoltLinearModel.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/HoltWintersModel.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/HoltWintersModel.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/HoltWintersModel.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/HoltWintersModel.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/LinearModel.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/LinearModel.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/LinearModel.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/LinearModel.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/MovAvgModel.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/MovAvgModel.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/MovAvgModel.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/MovAvgModel.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/MovAvgModelBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/MovAvgModelBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/MovAvgModelBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/MovAvgModelBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/SimpleModel.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/SimpleModel.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/SimpleModel.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/SimpleModel.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/serialdiff/SerialDiffPipelineAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/serialdiff/SerialDiffPipelineAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/serialdiff/SerialDiffPipelineAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/serialdiff/SerialDiffPipelineAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/serialdiff/SerialDiffPipelineAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/serialdiff/SerialDiffPipelineAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/pipeline/serialdiff/SerialDiffPipelineAggregator.java rename to server/src/main/java/org/elasticsearch/search/aggregations/pipeline/serialdiff/SerialDiffPipelineAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/support/AggregationPath.java b/server/src/main/java/org/elasticsearch/search/aggregations/support/AggregationPath.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/support/AggregationPath.java rename to server/src/main/java/org/elasticsearch/search/aggregations/support/AggregationPath.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/support/FieldContext.java b/server/src/main/java/org/elasticsearch/search/aggregations/support/FieldContext.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/support/FieldContext.java rename to server/src/main/java/org/elasticsearch/search/aggregations/support/FieldContext.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/support/MissingValues.java b/server/src/main/java/org/elasticsearch/search/aggregations/support/MissingValues.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/support/MissingValues.java rename to server/src/main/java/org/elasticsearch/search/aggregations/support/MissingValues.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/support/ValueType.java b/server/src/main/java/org/elasticsearch/search/aggregations/support/ValueType.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/support/ValueType.java rename to server/src/main/java/org/elasticsearch/search/aggregations/support/ValueType.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSource.java b/server/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSource.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSource.java rename to server/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSource.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceAggregationBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceAggregationBuilder.java rename to server/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceAggregationBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceAggregatorFactory.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceAggregatorFactory.java rename to server/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceAggregatorFactory.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceConfig.java b/server/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceConfig.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceConfig.java rename to server/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceConfig.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceParserHelper.java b/server/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceParserHelper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceParserHelper.java rename to server/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceParserHelper.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceType.java b/server/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceType.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceType.java rename to server/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceType.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/support/values/ScriptBytesValues.java b/server/src/main/java/org/elasticsearch/search/aggregations/support/values/ScriptBytesValues.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/support/values/ScriptBytesValues.java rename to server/src/main/java/org/elasticsearch/search/aggregations/support/values/ScriptBytesValues.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/support/values/ScriptDoubleValues.java b/server/src/main/java/org/elasticsearch/search/aggregations/support/values/ScriptDoubleValues.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/support/values/ScriptDoubleValues.java rename to server/src/main/java/org/elasticsearch/search/aggregations/support/values/ScriptDoubleValues.java diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/support/values/ScriptLongValues.java b/server/src/main/java/org/elasticsearch/search/aggregations/support/values/ScriptLongValues.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/aggregations/support/values/ScriptLongValues.java rename to server/src/main/java/org/elasticsearch/search/aggregations/support/values/ScriptLongValues.java diff --git a/core/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java b/server/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java rename to server/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilderException.java b/server/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilderException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilderException.java rename to server/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilderException.java diff --git a/core/src/main/java/org/elasticsearch/search/collapse/CollapseBuilder.java b/server/src/main/java/org/elasticsearch/search/collapse/CollapseBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/collapse/CollapseBuilder.java rename to server/src/main/java/org/elasticsearch/search/collapse/CollapseBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/collapse/CollapseContext.java b/server/src/main/java/org/elasticsearch/search/collapse/CollapseContext.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/collapse/CollapseContext.java rename to server/src/main/java/org/elasticsearch/search/collapse/CollapseContext.java diff --git a/core/src/main/java/org/elasticsearch/search/dfs/AggregatedDfs.java b/server/src/main/java/org/elasticsearch/search/dfs/AggregatedDfs.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/dfs/AggregatedDfs.java rename to server/src/main/java/org/elasticsearch/search/dfs/AggregatedDfs.java diff --git a/core/src/main/java/org/elasticsearch/search/dfs/DfsPhase.java b/server/src/main/java/org/elasticsearch/search/dfs/DfsPhase.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/dfs/DfsPhase.java rename to server/src/main/java/org/elasticsearch/search/dfs/DfsPhase.java diff --git a/core/src/main/java/org/elasticsearch/search/dfs/DfsPhaseExecutionException.java b/server/src/main/java/org/elasticsearch/search/dfs/DfsPhaseExecutionException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/dfs/DfsPhaseExecutionException.java rename to server/src/main/java/org/elasticsearch/search/dfs/DfsPhaseExecutionException.java diff --git a/core/src/main/java/org/elasticsearch/search/dfs/DfsSearchResult.java b/server/src/main/java/org/elasticsearch/search/dfs/DfsSearchResult.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/dfs/DfsSearchResult.java rename to server/src/main/java/org/elasticsearch/search/dfs/DfsSearchResult.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/FetchPhase.java b/server/src/main/java/org/elasticsearch/search/fetch/FetchPhase.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/FetchPhase.java rename to server/src/main/java/org/elasticsearch/search/fetch/FetchPhase.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/FetchPhaseExecutionException.java b/server/src/main/java/org/elasticsearch/search/fetch/FetchPhaseExecutionException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/FetchPhaseExecutionException.java rename to server/src/main/java/org/elasticsearch/search/fetch/FetchPhaseExecutionException.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/FetchSearchResult.java b/server/src/main/java/org/elasticsearch/search/fetch/FetchSearchResult.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/FetchSearchResult.java rename to server/src/main/java/org/elasticsearch/search/fetch/FetchSearchResult.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/FetchSubPhase.java b/server/src/main/java/org/elasticsearch/search/fetch/FetchSubPhase.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/FetchSubPhase.java rename to server/src/main/java/org/elasticsearch/search/fetch/FetchSubPhase.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/QueryFetchSearchResult.java b/server/src/main/java/org/elasticsearch/search/fetch/QueryFetchSearchResult.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/QueryFetchSearchResult.java rename to server/src/main/java/org/elasticsearch/search/fetch/QueryFetchSearchResult.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/ScrollQueryFetchSearchResult.java b/server/src/main/java/org/elasticsearch/search/fetch/ScrollQueryFetchSearchResult.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/ScrollQueryFetchSearchResult.java rename to server/src/main/java/org/elasticsearch/search/fetch/ScrollQueryFetchSearchResult.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/ShardFetchRequest.java b/server/src/main/java/org/elasticsearch/search/fetch/ShardFetchRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/ShardFetchRequest.java rename to server/src/main/java/org/elasticsearch/search/fetch/ShardFetchRequest.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/ShardFetchSearchRequest.java b/server/src/main/java/org/elasticsearch/search/fetch/ShardFetchSearchRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/ShardFetchSearchRequest.java rename to server/src/main/java/org/elasticsearch/search/fetch/ShardFetchSearchRequest.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/StoredFieldsContext.java b/server/src/main/java/org/elasticsearch/search/fetch/StoredFieldsContext.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/StoredFieldsContext.java rename to server/src/main/java/org/elasticsearch/search/fetch/StoredFieldsContext.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/package-info.java b/server/src/main/java/org/elasticsearch/search/fetch/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/package-info.java rename to server/src/main/java/org/elasticsearch/search/fetch/package-info.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/subphase/DocValueFieldsContext.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/DocValueFieldsContext.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/subphase/DocValueFieldsContext.java rename to server/src/main/java/org/elasticsearch/search/fetch/subphase/DocValueFieldsContext.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/subphase/DocValueFieldsFetchSubPhase.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/DocValueFieldsFetchSubPhase.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/subphase/DocValueFieldsFetchSubPhase.java rename to server/src/main/java/org/elasticsearch/search/fetch/subphase/DocValueFieldsFetchSubPhase.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/subphase/ExplainFetchSubPhase.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/ExplainFetchSubPhase.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/subphase/ExplainFetchSubPhase.java rename to server/src/main/java/org/elasticsearch/search/fetch/subphase/ExplainFetchSubPhase.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/subphase/FetchSourceContext.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/FetchSourceContext.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/subphase/FetchSourceContext.java rename to server/src/main/java/org/elasticsearch/search/fetch/subphase/FetchSourceContext.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/subphase/FetchSourceSubPhase.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/FetchSourceSubPhase.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/subphase/FetchSourceSubPhase.java rename to server/src/main/java/org/elasticsearch/search/fetch/subphase/FetchSourceSubPhase.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/subphase/InnerHitsContext.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/InnerHitsContext.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/subphase/InnerHitsContext.java rename to server/src/main/java/org/elasticsearch/search/fetch/subphase/InnerHitsContext.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/subphase/InnerHitsFetchSubPhase.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/InnerHitsFetchSubPhase.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/subphase/InnerHitsFetchSubPhase.java rename to server/src/main/java/org/elasticsearch/search/fetch/subphase/InnerHitsFetchSubPhase.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/subphase/MatchedQueriesFetchSubPhase.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/MatchedQueriesFetchSubPhase.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/subphase/MatchedQueriesFetchSubPhase.java rename to server/src/main/java/org/elasticsearch/search/fetch/subphase/MatchedQueriesFetchSubPhase.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/subphase/ParentFieldSubFetchPhase.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/ParentFieldSubFetchPhase.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/subphase/ParentFieldSubFetchPhase.java rename to server/src/main/java/org/elasticsearch/search/fetch/subphase/ParentFieldSubFetchPhase.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/subphase/ScriptFieldsContext.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/ScriptFieldsContext.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/subphase/ScriptFieldsContext.java rename to server/src/main/java/org/elasticsearch/search/fetch/subphase/ScriptFieldsContext.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/subphase/ScriptFieldsFetchSubPhase.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/ScriptFieldsFetchSubPhase.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/subphase/ScriptFieldsFetchSubPhase.java rename to server/src/main/java/org/elasticsearch/search/fetch/subphase/ScriptFieldsFetchSubPhase.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/subphase/VersionFetchSubPhase.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/VersionFetchSubPhase.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/subphase/VersionFetchSubPhase.java rename to server/src/main/java/org/elasticsearch/search/fetch/subphase/VersionFetchSubPhase.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/AbstractHighlighterBuilder.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/AbstractHighlighterBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/AbstractHighlighterBuilder.java rename to server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/AbstractHighlighterBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/CustomQueryScorer.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/CustomQueryScorer.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/CustomQueryScorer.java rename to server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/CustomQueryScorer.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/FastVectorHighlighter.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/FastVectorHighlighter.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/FastVectorHighlighter.java rename to server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/FastVectorHighlighter.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/FragmentBuilderHelper.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/FragmentBuilderHelper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/FragmentBuilderHelper.java rename to server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/FragmentBuilderHelper.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightBuilder.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightBuilder.java rename to server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightField.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightField.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightField.java rename to server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightField.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightPhase.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightPhase.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightPhase.java rename to server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightPhase.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightUtils.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightUtils.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightUtils.java rename to server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightUtils.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/Highlighter.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/Highlighter.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/Highlighter.java rename to server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/Highlighter.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlighterContext.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlighterContext.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlighterContext.java rename to server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlighterContext.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/PlainHighlighter.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/PlainHighlighter.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/PlainHighlighter.java rename to server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/PlainHighlighter.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/SearchContextHighlight.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/SearchContextHighlight.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/SearchContextHighlight.java rename to server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/SearchContextHighlight.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/SimpleFragmentsBuilder.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/SimpleFragmentsBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/SimpleFragmentsBuilder.java rename to server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/SimpleFragmentsBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/SourceScoreOrderFragmentsBuilder.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/SourceScoreOrderFragmentsBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/SourceScoreOrderFragmentsBuilder.java rename to server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/SourceScoreOrderFragmentsBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/SourceSimpleFragmentsBuilder.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/SourceSimpleFragmentsBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/SourceSimpleFragmentsBuilder.java rename to server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/SourceSimpleFragmentsBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/UnifiedHighlighter.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/UnifiedHighlighter.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/UnifiedHighlighter.java rename to server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/UnifiedHighlighter.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/package-info.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/package-info.java rename to server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/package-info.java diff --git a/core/src/main/java/org/elasticsearch/search/fetch/subphase/package-info.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/fetch/subphase/package-info.java rename to server/src/main/java/org/elasticsearch/search/fetch/subphase/package-info.java diff --git a/core/src/main/java/org/elasticsearch/search/internal/AliasFilter.java b/server/src/main/java/org/elasticsearch/search/internal/AliasFilter.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/internal/AliasFilter.java rename to server/src/main/java/org/elasticsearch/search/internal/AliasFilter.java diff --git a/core/src/main/java/org/elasticsearch/search/internal/CancellableBulkScorer.java b/server/src/main/java/org/elasticsearch/search/internal/CancellableBulkScorer.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/internal/CancellableBulkScorer.java rename to server/src/main/java/org/elasticsearch/search/internal/CancellableBulkScorer.java diff --git a/core/src/main/java/org/elasticsearch/search/internal/ContextIndexSearcher.java b/server/src/main/java/org/elasticsearch/search/internal/ContextIndexSearcher.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/internal/ContextIndexSearcher.java rename to server/src/main/java/org/elasticsearch/search/internal/ContextIndexSearcher.java diff --git a/core/src/main/java/org/elasticsearch/search/internal/FilteredSearchContext.java b/server/src/main/java/org/elasticsearch/search/internal/FilteredSearchContext.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/internal/FilteredSearchContext.java rename to server/src/main/java/org/elasticsearch/search/internal/FilteredSearchContext.java diff --git a/core/src/main/java/org/elasticsearch/search/internal/InternalScrollSearchRequest.java b/server/src/main/java/org/elasticsearch/search/internal/InternalScrollSearchRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/internal/InternalScrollSearchRequest.java rename to server/src/main/java/org/elasticsearch/search/internal/InternalScrollSearchRequest.java diff --git a/core/src/main/java/org/elasticsearch/search/internal/InternalSearchResponse.java b/server/src/main/java/org/elasticsearch/search/internal/InternalSearchResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/internal/InternalSearchResponse.java rename to server/src/main/java/org/elasticsearch/search/internal/InternalSearchResponse.java diff --git a/core/src/main/java/org/elasticsearch/search/internal/ScrollContext.java b/server/src/main/java/org/elasticsearch/search/internal/ScrollContext.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/internal/ScrollContext.java rename to server/src/main/java/org/elasticsearch/search/internal/ScrollContext.java diff --git a/core/src/main/java/org/elasticsearch/search/internal/SearchContext.java b/server/src/main/java/org/elasticsearch/search/internal/SearchContext.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/internal/SearchContext.java rename to server/src/main/java/org/elasticsearch/search/internal/SearchContext.java diff --git a/core/src/main/java/org/elasticsearch/search/internal/ShardSearchLocalRequest.java b/server/src/main/java/org/elasticsearch/search/internal/ShardSearchLocalRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/internal/ShardSearchLocalRequest.java rename to server/src/main/java/org/elasticsearch/search/internal/ShardSearchLocalRequest.java diff --git a/core/src/main/java/org/elasticsearch/search/internal/ShardSearchRequest.java b/server/src/main/java/org/elasticsearch/search/internal/ShardSearchRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/internal/ShardSearchRequest.java rename to server/src/main/java/org/elasticsearch/search/internal/ShardSearchRequest.java diff --git a/core/src/main/java/org/elasticsearch/search/internal/ShardSearchTransportRequest.java b/server/src/main/java/org/elasticsearch/search/internal/ShardSearchTransportRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/internal/ShardSearchTransportRequest.java rename to server/src/main/java/org/elasticsearch/search/internal/ShardSearchTransportRequest.java diff --git a/core/src/main/java/org/elasticsearch/search/internal/SubSearchContext.java b/server/src/main/java/org/elasticsearch/search/internal/SubSearchContext.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/internal/SubSearchContext.java rename to server/src/main/java/org/elasticsearch/search/internal/SubSearchContext.java diff --git a/core/src/main/java/org/elasticsearch/search/lookup/DocLookup.java b/server/src/main/java/org/elasticsearch/search/lookup/DocLookup.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/lookup/DocLookup.java rename to server/src/main/java/org/elasticsearch/search/lookup/DocLookup.java diff --git a/core/src/main/java/org/elasticsearch/search/lookup/FieldLookup.java b/server/src/main/java/org/elasticsearch/search/lookup/FieldLookup.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/lookup/FieldLookup.java rename to server/src/main/java/org/elasticsearch/search/lookup/FieldLookup.java diff --git a/core/src/main/java/org/elasticsearch/search/lookup/FieldsLookup.java b/server/src/main/java/org/elasticsearch/search/lookup/FieldsLookup.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/lookup/FieldsLookup.java rename to server/src/main/java/org/elasticsearch/search/lookup/FieldsLookup.java diff --git a/core/src/main/java/org/elasticsearch/search/lookup/LeafDocLookup.java b/server/src/main/java/org/elasticsearch/search/lookup/LeafDocLookup.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/lookup/LeafDocLookup.java rename to server/src/main/java/org/elasticsearch/search/lookup/LeafDocLookup.java diff --git a/core/src/main/java/org/elasticsearch/search/lookup/LeafFieldsLookup.java b/server/src/main/java/org/elasticsearch/search/lookup/LeafFieldsLookup.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/lookup/LeafFieldsLookup.java rename to server/src/main/java/org/elasticsearch/search/lookup/LeafFieldsLookup.java diff --git a/core/src/main/java/org/elasticsearch/search/lookup/LeafSearchLookup.java b/server/src/main/java/org/elasticsearch/search/lookup/LeafSearchLookup.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/lookup/LeafSearchLookup.java rename to server/src/main/java/org/elasticsearch/search/lookup/LeafSearchLookup.java diff --git a/core/src/main/java/org/elasticsearch/search/lookup/SearchLookup.java b/server/src/main/java/org/elasticsearch/search/lookup/SearchLookup.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/lookup/SearchLookup.java rename to server/src/main/java/org/elasticsearch/search/lookup/SearchLookup.java diff --git a/core/src/main/java/org/elasticsearch/search/lookup/SourceLookup.java b/server/src/main/java/org/elasticsearch/search/lookup/SourceLookup.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/lookup/SourceLookup.java rename to server/src/main/java/org/elasticsearch/search/lookup/SourceLookup.java diff --git a/core/src/main/java/org/elasticsearch/search/profile/AbstractInternalProfileTree.java b/server/src/main/java/org/elasticsearch/search/profile/AbstractInternalProfileTree.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/profile/AbstractInternalProfileTree.java rename to server/src/main/java/org/elasticsearch/search/profile/AbstractInternalProfileTree.java diff --git a/core/src/main/java/org/elasticsearch/search/profile/AbstractProfileBreakdown.java b/server/src/main/java/org/elasticsearch/search/profile/AbstractProfileBreakdown.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/profile/AbstractProfileBreakdown.java rename to server/src/main/java/org/elasticsearch/search/profile/AbstractProfileBreakdown.java diff --git a/core/src/main/java/org/elasticsearch/search/profile/AbstractProfiler.java b/server/src/main/java/org/elasticsearch/search/profile/AbstractProfiler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/profile/AbstractProfiler.java rename to server/src/main/java/org/elasticsearch/search/profile/AbstractProfiler.java diff --git a/core/src/main/java/org/elasticsearch/search/profile/ProfileResult.java b/server/src/main/java/org/elasticsearch/search/profile/ProfileResult.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/profile/ProfileResult.java rename to server/src/main/java/org/elasticsearch/search/profile/ProfileResult.java diff --git a/core/src/main/java/org/elasticsearch/search/profile/ProfileShardResult.java b/server/src/main/java/org/elasticsearch/search/profile/ProfileShardResult.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/profile/ProfileShardResult.java rename to server/src/main/java/org/elasticsearch/search/profile/ProfileShardResult.java diff --git a/core/src/main/java/org/elasticsearch/search/profile/Profilers.java b/server/src/main/java/org/elasticsearch/search/profile/Profilers.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/profile/Profilers.java rename to server/src/main/java/org/elasticsearch/search/profile/Profilers.java diff --git a/core/src/main/java/org/elasticsearch/search/profile/SearchProfileShardResults.java b/server/src/main/java/org/elasticsearch/search/profile/SearchProfileShardResults.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/profile/SearchProfileShardResults.java rename to server/src/main/java/org/elasticsearch/search/profile/SearchProfileShardResults.java diff --git a/core/src/main/java/org/elasticsearch/search/profile/Timer.java b/server/src/main/java/org/elasticsearch/search/profile/Timer.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/profile/Timer.java rename to server/src/main/java/org/elasticsearch/search/profile/Timer.java diff --git a/core/src/main/java/org/elasticsearch/search/profile/aggregation/AggregationProfileBreakdown.java b/server/src/main/java/org/elasticsearch/search/profile/aggregation/AggregationProfileBreakdown.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/profile/aggregation/AggregationProfileBreakdown.java rename to server/src/main/java/org/elasticsearch/search/profile/aggregation/AggregationProfileBreakdown.java diff --git a/core/src/main/java/org/elasticsearch/search/profile/aggregation/AggregationProfileShardResult.java b/server/src/main/java/org/elasticsearch/search/profile/aggregation/AggregationProfileShardResult.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/profile/aggregation/AggregationProfileShardResult.java rename to server/src/main/java/org/elasticsearch/search/profile/aggregation/AggregationProfileShardResult.java diff --git a/core/src/main/java/org/elasticsearch/search/profile/aggregation/AggregationProfiler.java b/server/src/main/java/org/elasticsearch/search/profile/aggregation/AggregationProfiler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/profile/aggregation/AggregationProfiler.java rename to server/src/main/java/org/elasticsearch/search/profile/aggregation/AggregationProfiler.java diff --git a/core/src/main/java/org/elasticsearch/search/profile/aggregation/AggregationTimingType.java b/server/src/main/java/org/elasticsearch/search/profile/aggregation/AggregationTimingType.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/profile/aggregation/AggregationTimingType.java rename to server/src/main/java/org/elasticsearch/search/profile/aggregation/AggregationTimingType.java diff --git a/core/src/main/java/org/elasticsearch/search/profile/aggregation/InternalAggregationProfileTree.java b/server/src/main/java/org/elasticsearch/search/profile/aggregation/InternalAggregationProfileTree.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/profile/aggregation/InternalAggregationProfileTree.java rename to server/src/main/java/org/elasticsearch/search/profile/aggregation/InternalAggregationProfileTree.java diff --git a/core/src/main/java/org/elasticsearch/search/profile/aggregation/ProfilingAggregator.java b/server/src/main/java/org/elasticsearch/search/profile/aggregation/ProfilingAggregator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/profile/aggregation/ProfilingAggregator.java rename to server/src/main/java/org/elasticsearch/search/profile/aggregation/ProfilingAggregator.java diff --git a/core/src/main/java/org/elasticsearch/search/profile/aggregation/ProfilingLeafBucketCollector.java b/server/src/main/java/org/elasticsearch/search/profile/aggregation/ProfilingLeafBucketCollector.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/profile/aggregation/ProfilingLeafBucketCollector.java rename to server/src/main/java/org/elasticsearch/search/profile/aggregation/ProfilingLeafBucketCollector.java diff --git a/core/src/main/java/org/elasticsearch/search/profile/aggregation/package-info.java b/server/src/main/java/org/elasticsearch/search/profile/aggregation/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/profile/aggregation/package-info.java rename to server/src/main/java/org/elasticsearch/search/profile/aggregation/package-info.java diff --git a/core/src/main/java/org/elasticsearch/search/profile/package-info.java b/server/src/main/java/org/elasticsearch/search/profile/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/profile/package-info.java rename to server/src/main/java/org/elasticsearch/search/profile/package-info.java diff --git a/core/src/main/java/org/elasticsearch/search/profile/query/CollectorResult.java b/server/src/main/java/org/elasticsearch/search/profile/query/CollectorResult.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/profile/query/CollectorResult.java rename to server/src/main/java/org/elasticsearch/search/profile/query/CollectorResult.java diff --git a/core/src/main/java/org/elasticsearch/search/profile/query/InternalProfileCollector.java b/server/src/main/java/org/elasticsearch/search/profile/query/InternalProfileCollector.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/profile/query/InternalProfileCollector.java rename to server/src/main/java/org/elasticsearch/search/profile/query/InternalProfileCollector.java diff --git a/core/src/main/java/org/elasticsearch/search/profile/query/InternalQueryProfileTree.java b/server/src/main/java/org/elasticsearch/search/profile/query/InternalQueryProfileTree.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/profile/query/InternalQueryProfileTree.java rename to server/src/main/java/org/elasticsearch/search/profile/query/InternalQueryProfileTree.java diff --git a/core/src/main/java/org/elasticsearch/search/profile/query/ProfileCollector.java b/server/src/main/java/org/elasticsearch/search/profile/query/ProfileCollector.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/profile/query/ProfileCollector.java rename to server/src/main/java/org/elasticsearch/search/profile/query/ProfileCollector.java diff --git a/core/src/main/java/org/elasticsearch/search/profile/query/ProfileScorer.java b/server/src/main/java/org/elasticsearch/search/profile/query/ProfileScorer.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/profile/query/ProfileScorer.java rename to server/src/main/java/org/elasticsearch/search/profile/query/ProfileScorer.java diff --git a/core/src/main/java/org/elasticsearch/search/profile/query/ProfileWeight.java b/server/src/main/java/org/elasticsearch/search/profile/query/ProfileWeight.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/profile/query/ProfileWeight.java rename to server/src/main/java/org/elasticsearch/search/profile/query/ProfileWeight.java diff --git a/core/src/main/java/org/elasticsearch/search/profile/query/QueryProfileBreakdown.java b/server/src/main/java/org/elasticsearch/search/profile/query/QueryProfileBreakdown.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/profile/query/QueryProfileBreakdown.java rename to server/src/main/java/org/elasticsearch/search/profile/query/QueryProfileBreakdown.java diff --git a/core/src/main/java/org/elasticsearch/search/profile/query/QueryProfileShardResult.java b/server/src/main/java/org/elasticsearch/search/profile/query/QueryProfileShardResult.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/profile/query/QueryProfileShardResult.java rename to server/src/main/java/org/elasticsearch/search/profile/query/QueryProfileShardResult.java diff --git a/core/src/main/java/org/elasticsearch/search/profile/query/QueryProfiler.java b/server/src/main/java/org/elasticsearch/search/profile/query/QueryProfiler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/profile/query/QueryProfiler.java rename to server/src/main/java/org/elasticsearch/search/profile/query/QueryProfiler.java diff --git a/core/src/main/java/org/elasticsearch/search/profile/query/QueryTimingType.java b/server/src/main/java/org/elasticsearch/search/profile/query/QueryTimingType.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/profile/query/QueryTimingType.java rename to server/src/main/java/org/elasticsearch/search/profile/query/QueryTimingType.java diff --git a/core/src/main/java/org/elasticsearch/search/profile/query/package-info.java b/server/src/main/java/org/elasticsearch/search/profile/query/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/profile/query/package-info.java rename to server/src/main/java/org/elasticsearch/search/profile/query/package-info.java diff --git a/core/src/main/java/org/elasticsearch/search/query/CancellableCollector.java b/server/src/main/java/org/elasticsearch/search/query/CancellableCollector.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/query/CancellableCollector.java rename to server/src/main/java/org/elasticsearch/search/query/CancellableCollector.java diff --git a/core/src/main/java/org/elasticsearch/search/query/EarlyTerminatingCollector.java b/server/src/main/java/org/elasticsearch/search/query/EarlyTerminatingCollector.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/query/EarlyTerminatingCollector.java rename to server/src/main/java/org/elasticsearch/search/query/EarlyTerminatingCollector.java diff --git a/core/src/main/java/org/elasticsearch/search/query/QueryCollectorContext.java b/server/src/main/java/org/elasticsearch/search/query/QueryCollectorContext.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/query/QueryCollectorContext.java rename to server/src/main/java/org/elasticsearch/search/query/QueryCollectorContext.java diff --git a/core/src/main/java/org/elasticsearch/search/query/QueryPhase.java b/server/src/main/java/org/elasticsearch/search/query/QueryPhase.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/query/QueryPhase.java rename to server/src/main/java/org/elasticsearch/search/query/QueryPhase.java diff --git a/core/src/main/java/org/elasticsearch/search/query/QueryPhaseExecutionException.java b/server/src/main/java/org/elasticsearch/search/query/QueryPhaseExecutionException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/query/QueryPhaseExecutionException.java rename to server/src/main/java/org/elasticsearch/search/query/QueryPhaseExecutionException.java diff --git a/core/src/main/java/org/elasticsearch/search/query/QuerySearchRequest.java b/server/src/main/java/org/elasticsearch/search/query/QuerySearchRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/query/QuerySearchRequest.java rename to server/src/main/java/org/elasticsearch/search/query/QuerySearchRequest.java diff --git a/core/src/main/java/org/elasticsearch/search/query/QuerySearchResult.java b/server/src/main/java/org/elasticsearch/search/query/QuerySearchResult.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/query/QuerySearchResult.java rename to server/src/main/java/org/elasticsearch/search/query/QuerySearchResult.java diff --git a/core/src/main/java/org/elasticsearch/search/query/ScrollQuerySearchResult.java b/server/src/main/java/org/elasticsearch/search/query/ScrollQuerySearchResult.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/query/ScrollQuerySearchResult.java rename to server/src/main/java/org/elasticsearch/search/query/ScrollQuerySearchResult.java diff --git a/core/src/main/java/org/elasticsearch/search/query/TopDocsCollectorContext.java b/server/src/main/java/org/elasticsearch/search/query/TopDocsCollectorContext.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/query/TopDocsCollectorContext.java rename to server/src/main/java/org/elasticsearch/search/query/TopDocsCollectorContext.java diff --git a/core/src/main/java/org/elasticsearch/search/rescore/QueryRescoreMode.java b/server/src/main/java/org/elasticsearch/search/rescore/QueryRescoreMode.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/rescore/QueryRescoreMode.java rename to server/src/main/java/org/elasticsearch/search/rescore/QueryRescoreMode.java diff --git a/core/src/main/java/org/elasticsearch/search/rescore/QueryRescorer.java b/server/src/main/java/org/elasticsearch/search/rescore/QueryRescorer.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/rescore/QueryRescorer.java rename to server/src/main/java/org/elasticsearch/search/rescore/QueryRescorer.java diff --git a/core/src/main/java/org/elasticsearch/search/rescore/QueryRescorerBuilder.java b/server/src/main/java/org/elasticsearch/search/rescore/QueryRescorerBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/rescore/QueryRescorerBuilder.java rename to server/src/main/java/org/elasticsearch/search/rescore/QueryRescorerBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/rescore/RescoreContext.java b/server/src/main/java/org/elasticsearch/search/rescore/RescoreContext.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/rescore/RescoreContext.java rename to server/src/main/java/org/elasticsearch/search/rescore/RescoreContext.java diff --git a/core/src/main/java/org/elasticsearch/search/rescore/RescorePhase.java b/server/src/main/java/org/elasticsearch/search/rescore/RescorePhase.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/rescore/RescorePhase.java rename to server/src/main/java/org/elasticsearch/search/rescore/RescorePhase.java diff --git a/core/src/main/java/org/elasticsearch/search/rescore/Rescorer.java b/server/src/main/java/org/elasticsearch/search/rescore/Rescorer.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/rescore/Rescorer.java rename to server/src/main/java/org/elasticsearch/search/rescore/Rescorer.java diff --git a/core/src/main/java/org/elasticsearch/search/rescore/RescorerBuilder.java b/server/src/main/java/org/elasticsearch/search/rescore/RescorerBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/rescore/RescorerBuilder.java rename to server/src/main/java/org/elasticsearch/search/rescore/RescorerBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/searchafter/SearchAfterBuilder.java b/server/src/main/java/org/elasticsearch/search/searchafter/SearchAfterBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/searchafter/SearchAfterBuilder.java rename to server/src/main/java/org/elasticsearch/search/searchafter/SearchAfterBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/slice/DocValuesSliceQuery.java b/server/src/main/java/org/elasticsearch/search/slice/DocValuesSliceQuery.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/slice/DocValuesSliceQuery.java rename to server/src/main/java/org/elasticsearch/search/slice/DocValuesSliceQuery.java diff --git a/core/src/main/java/org/elasticsearch/search/slice/SliceBuilder.java b/server/src/main/java/org/elasticsearch/search/slice/SliceBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/slice/SliceBuilder.java rename to server/src/main/java/org/elasticsearch/search/slice/SliceBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/slice/SliceQuery.java b/server/src/main/java/org/elasticsearch/search/slice/SliceQuery.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/slice/SliceQuery.java rename to server/src/main/java/org/elasticsearch/search/slice/SliceQuery.java diff --git a/core/src/main/java/org/elasticsearch/search/slice/TermsSliceQuery.java b/server/src/main/java/org/elasticsearch/search/slice/TermsSliceQuery.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/slice/TermsSliceQuery.java rename to server/src/main/java/org/elasticsearch/search/slice/TermsSliceQuery.java diff --git a/core/src/main/java/org/elasticsearch/search/sort/FieldSortBuilder.java b/server/src/main/java/org/elasticsearch/search/sort/FieldSortBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/sort/FieldSortBuilder.java rename to server/src/main/java/org/elasticsearch/search/sort/FieldSortBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/sort/GeoDistanceSortBuilder.java b/server/src/main/java/org/elasticsearch/search/sort/GeoDistanceSortBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/sort/GeoDistanceSortBuilder.java rename to server/src/main/java/org/elasticsearch/search/sort/GeoDistanceSortBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/sort/NestedSortBuilder.java b/server/src/main/java/org/elasticsearch/search/sort/NestedSortBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/sort/NestedSortBuilder.java rename to server/src/main/java/org/elasticsearch/search/sort/NestedSortBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/sort/ScoreSortBuilder.java b/server/src/main/java/org/elasticsearch/search/sort/ScoreSortBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/sort/ScoreSortBuilder.java rename to server/src/main/java/org/elasticsearch/search/sort/ScoreSortBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/sort/ScriptSortBuilder.java b/server/src/main/java/org/elasticsearch/search/sort/ScriptSortBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/sort/ScriptSortBuilder.java rename to server/src/main/java/org/elasticsearch/search/sort/ScriptSortBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/sort/SortAndFormats.java b/server/src/main/java/org/elasticsearch/search/sort/SortAndFormats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/sort/SortAndFormats.java rename to server/src/main/java/org/elasticsearch/search/sort/SortAndFormats.java diff --git a/core/src/main/java/org/elasticsearch/search/sort/SortBuilder.java b/server/src/main/java/org/elasticsearch/search/sort/SortBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/sort/SortBuilder.java rename to server/src/main/java/org/elasticsearch/search/sort/SortBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/sort/SortBuilders.java b/server/src/main/java/org/elasticsearch/search/sort/SortBuilders.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/sort/SortBuilders.java rename to server/src/main/java/org/elasticsearch/search/sort/SortBuilders.java diff --git a/core/src/main/java/org/elasticsearch/search/sort/SortFieldAndFormat.java b/server/src/main/java/org/elasticsearch/search/sort/SortFieldAndFormat.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/sort/SortFieldAndFormat.java rename to server/src/main/java/org/elasticsearch/search/sort/SortFieldAndFormat.java diff --git a/core/src/main/java/org/elasticsearch/search/sort/SortMode.java b/server/src/main/java/org/elasticsearch/search/sort/SortMode.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/sort/SortMode.java rename to server/src/main/java/org/elasticsearch/search/sort/SortMode.java diff --git a/core/src/main/java/org/elasticsearch/search/sort/SortOrder.java b/server/src/main/java/org/elasticsearch/search/sort/SortOrder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/sort/SortOrder.java rename to server/src/main/java/org/elasticsearch/search/sort/SortOrder.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/DirectSpellcheckerSettings.java b/server/src/main/java/org/elasticsearch/search/suggest/DirectSpellcheckerSettings.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/DirectSpellcheckerSettings.java rename to server/src/main/java/org/elasticsearch/search/suggest/DirectSpellcheckerSettings.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/SortBy.java b/server/src/main/java/org/elasticsearch/search/suggest/SortBy.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/SortBy.java rename to server/src/main/java/org/elasticsearch/search/suggest/SortBy.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/Suggest.java b/server/src/main/java/org/elasticsearch/search/suggest/Suggest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/Suggest.java rename to server/src/main/java/org/elasticsearch/search/suggest/Suggest.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/SuggestBuilder.java b/server/src/main/java/org/elasticsearch/search/suggest/SuggestBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/SuggestBuilder.java rename to server/src/main/java/org/elasticsearch/search/suggest/SuggestBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/SuggestBuilders.java b/server/src/main/java/org/elasticsearch/search/suggest/SuggestBuilders.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/SuggestBuilders.java rename to server/src/main/java/org/elasticsearch/search/suggest/SuggestBuilders.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/SuggestPhase.java b/server/src/main/java/org/elasticsearch/search/suggest/SuggestPhase.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/SuggestPhase.java rename to server/src/main/java/org/elasticsearch/search/suggest/SuggestPhase.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/Suggester.java b/server/src/main/java/org/elasticsearch/search/suggest/Suggester.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/Suggester.java rename to server/src/main/java/org/elasticsearch/search/suggest/Suggester.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/SuggestionBuilder.java b/server/src/main/java/org/elasticsearch/search/suggest/SuggestionBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/SuggestionBuilder.java rename to server/src/main/java/org/elasticsearch/search/suggest/SuggestionBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/SuggestionSearchContext.java b/server/src/main/java/org/elasticsearch/search/suggest/SuggestionSearchContext.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/SuggestionSearchContext.java rename to server/src/main/java/org/elasticsearch/search/suggest/SuggestionSearchContext.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/completion/CompletionFieldStats.java b/server/src/main/java/org/elasticsearch/search/suggest/completion/CompletionFieldStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/completion/CompletionFieldStats.java rename to server/src/main/java/org/elasticsearch/search/suggest/completion/CompletionFieldStats.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/completion/CompletionStats.java b/server/src/main/java/org/elasticsearch/search/suggest/completion/CompletionStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/completion/CompletionStats.java rename to server/src/main/java/org/elasticsearch/search/suggest/completion/CompletionStats.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggester.java b/server/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggester.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggester.java rename to server/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggester.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestion.java b/server/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestion.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestion.java rename to server/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestion.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestionBuilder.java b/server/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestionBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestionBuilder.java rename to server/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestionBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestionContext.java b/server/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestionContext.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestionContext.java rename to server/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestionContext.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/completion/FuzzyOptions.java b/server/src/main/java/org/elasticsearch/search/suggest/completion/FuzzyOptions.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/completion/FuzzyOptions.java rename to server/src/main/java/org/elasticsearch/search/suggest/completion/FuzzyOptions.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/completion/RegexOptions.java b/server/src/main/java/org/elasticsearch/search/suggest/completion/RegexOptions.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/completion/RegexOptions.java rename to server/src/main/java/org/elasticsearch/search/suggest/completion/RegexOptions.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/completion/context/CategoryContextMapping.java b/server/src/main/java/org/elasticsearch/search/suggest/completion/context/CategoryContextMapping.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/completion/context/CategoryContextMapping.java rename to server/src/main/java/org/elasticsearch/search/suggest/completion/context/CategoryContextMapping.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/completion/context/CategoryQueryContext.java b/server/src/main/java/org/elasticsearch/search/suggest/completion/context/CategoryQueryContext.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/completion/context/CategoryQueryContext.java rename to server/src/main/java/org/elasticsearch/search/suggest/completion/context/CategoryQueryContext.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/completion/context/ContextBuilder.java b/server/src/main/java/org/elasticsearch/search/suggest/completion/context/ContextBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/completion/context/ContextBuilder.java rename to server/src/main/java/org/elasticsearch/search/suggest/completion/context/ContextBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/completion/context/ContextMapping.java b/server/src/main/java/org/elasticsearch/search/suggest/completion/context/ContextMapping.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/completion/context/ContextMapping.java rename to server/src/main/java/org/elasticsearch/search/suggest/completion/context/ContextMapping.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/completion/context/ContextMappings.java b/server/src/main/java/org/elasticsearch/search/suggest/completion/context/ContextMappings.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/completion/context/ContextMappings.java rename to server/src/main/java/org/elasticsearch/search/suggest/completion/context/ContextMappings.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/completion/context/GeoContextMapping.java b/server/src/main/java/org/elasticsearch/search/suggest/completion/context/GeoContextMapping.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/completion/context/GeoContextMapping.java rename to server/src/main/java/org/elasticsearch/search/suggest/completion/context/GeoContextMapping.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/completion/context/GeoQueryContext.java b/server/src/main/java/org/elasticsearch/search/suggest/completion/context/GeoQueryContext.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/completion/context/GeoQueryContext.java rename to server/src/main/java/org/elasticsearch/search/suggest/completion/context/GeoQueryContext.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/completion/context/package-info.java b/server/src/main/java/org/elasticsearch/search/suggest/completion/context/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/completion/context/package-info.java rename to server/src/main/java/org/elasticsearch/search/suggest/completion/context/package-info.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/completion/package-info.java b/server/src/main/java/org/elasticsearch/search/suggest/completion/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/completion/package-info.java rename to server/src/main/java/org/elasticsearch/search/suggest/completion/package-info.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/package-info.java b/server/src/main/java/org/elasticsearch/search/suggest/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/package-info.java rename to server/src/main/java/org/elasticsearch/search/suggest/package-info.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/phrase/CandidateGenerator.java b/server/src/main/java/org/elasticsearch/search/suggest/phrase/CandidateGenerator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/phrase/CandidateGenerator.java rename to server/src/main/java/org/elasticsearch/search/suggest/phrase/CandidateGenerator.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/phrase/CandidateScorer.java b/server/src/main/java/org/elasticsearch/search/suggest/phrase/CandidateScorer.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/phrase/CandidateScorer.java rename to server/src/main/java/org/elasticsearch/search/suggest/phrase/CandidateScorer.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/phrase/Correction.java b/server/src/main/java/org/elasticsearch/search/suggest/phrase/Correction.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/phrase/Correction.java rename to server/src/main/java/org/elasticsearch/search/suggest/phrase/Correction.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/phrase/DirectCandidateGenerator.java b/server/src/main/java/org/elasticsearch/search/suggest/phrase/DirectCandidateGenerator.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/phrase/DirectCandidateGenerator.java rename to server/src/main/java/org/elasticsearch/search/suggest/phrase/DirectCandidateGenerator.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/phrase/DirectCandidateGeneratorBuilder.java b/server/src/main/java/org/elasticsearch/search/suggest/phrase/DirectCandidateGeneratorBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/phrase/DirectCandidateGeneratorBuilder.java rename to server/src/main/java/org/elasticsearch/search/suggest/phrase/DirectCandidateGeneratorBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/phrase/Laplace.java b/server/src/main/java/org/elasticsearch/search/suggest/phrase/Laplace.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/phrase/Laplace.java rename to server/src/main/java/org/elasticsearch/search/suggest/phrase/Laplace.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/phrase/LaplaceScorer.java b/server/src/main/java/org/elasticsearch/search/suggest/phrase/LaplaceScorer.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/phrase/LaplaceScorer.java rename to server/src/main/java/org/elasticsearch/search/suggest/phrase/LaplaceScorer.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/phrase/LinearInterpolatingScorer.java b/server/src/main/java/org/elasticsearch/search/suggest/phrase/LinearInterpolatingScorer.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/phrase/LinearInterpolatingScorer.java rename to server/src/main/java/org/elasticsearch/search/suggest/phrase/LinearInterpolatingScorer.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/phrase/LinearInterpolation.java b/server/src/main/java/org/elasticsearch/search/suggest/phrase/LinearInterpolation.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/phrase/LinearInterpolation.java rename to server/src/main/java/org/elasticsearch/search/suggest/phrase/LinearInterpolation.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/phrase/MultiCandidateGeneratorWrapper.java b/server/src/main/java/org/elasticsearch/search/suggest/phrase/MultiCandidateGeneratorWrapper.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/phrase/MultiCandidateGeneratorWrapper.java rename to server/src/main/java/org/elasticsearch/search/suggest/phrase/MultiCandidateGeneratorWrapper.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/phrase/NoisyChannelSpellChecker.java b/server/src/main/java/org/elasticsearch/search/suggest/phrase/NoisyChannelSpellChecker.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/phrase/NoisyChannelSpellChecker.java rename to server/src/main/java/org/elasticsearch/search/suggest/phrase/NoisyChannelSpellChecker.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggester.java b/server/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggester.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggester.java rename to server/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggester.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestion.java b/server/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestion.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestion.java rename to server/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestion.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilder.java b/server/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilder.java rename to server/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionContext.java b/server/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionContext.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionContext.java rename to server/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionContext.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/phrase/SmoothingModel.java b/server/src/main/java/org/elasticsearch/search/suggest/phrase/SmoothingModel.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/phrase/SmoothingModel.java rename to server/src/main/java/org/elasticsearch/search/suggest/phrase/SmoothingModel.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/phrase/StupidBackoff.java b/server/src/main/java/org/elasticsearch/search/suggest/phrase/StupidBackoff.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/phrase/StupidBackoff.java rename to server/src/main/java/org/elasticsearch/search/suggest/phrase/StupidBackoff.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/phrase/StupidBackoffScorer.java b/server/src/main/java/org/elasticsearch/search/suggest/phrase/StupidBackoffScorer.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/phrase/StupidBackoffScorer.java rename to server/src/main/java/org/elasticsearch/search/suggest/phrase/StupidBackoffScorer.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/phrase/WordScorer.java b/server/src/main/java/org/elasticsearch/search/suggest/phrase/WordScorer.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/phrase/WordScorer.java rename to server/src/main/java/org/elasticsearch/search/suggest/phrase/WordScorer.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/phrase/package-info.java b/server/src/main/java/org/elasticsearch/search/suggest/phrase/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/phrase/package-info.java rename to server/src/main/java/org/elasticsearch/search/suggest/phrase/package-info.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/term/TermSuggester.java b/server/src/main/java/org/elasticsearch/search/suggest/term/TermSuggester.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/term/TermSuggester.java rename to server/src/main/java/org/elasticsearch/search/suggest/term/TermSuggester.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/term/TermSuggestion.java b/server/src/main/java/org/elasticsearch/search/suggest/term/TermSuggestion.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/term/TermSuggestion.java rename to server/src/main/java/org/elasticsearch/search/suggest/term/TermSuggestion.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/term/TermSuggestionBuilder.java b/server/src/main/java/org/elasticsearch/search/suggest/term/TermSuggestionBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/term/TermSuggestionBuilder.java rename to server/src/main/java/org/elasticsearch/search/suggest/term/TermSuggestionBuilder.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/term/TermSuggestionContext.java b/server/src/main/java/org/elasticsearch/search/suggest/term/TermSuggestionContext.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/term/TermSuggestionContext.java rename to server/src/main/java/org/elasticsearch/search/suggest/term/TermSuggestionContext.java diff --git a/core/src/main/java/org/elasticsearch/search/suggest/term/package-info.java b/server/src/main/java/org/elasticsearch/search/suggest/term/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/search/suggest/term/package-info.java rename to server/src/main/java/org/elasticsearch/search/suggest/term/package-info.java diff --git a/core/src/main/java/org/elasticsearch/snapshots/ConcurrentSnapshotExecutionException.java b/server/src/main/java/org/elasticsearch/snapshots/ConcurrentSnapshotExecutionException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/snapshots/ConcurrentSnapshotExecutionException.java rename to server/src/main/java/org/elasticsearch/snapshots/ConcurrentSnapshotExecutionException.java diff --git a/core/src/main/java/org/elasticsearch/snapshots/InvalidSnapshotNameException.java b/server/src/main/java/org/elasticsearch/snapshots/InvalidSnapshotNameException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/snapshots/InvalidSnapshotNameException.java rename to server/src/main/java/org/elasticsearch/snapshots/InvalidSnapshotNameException.java diff --git a/core/src/main/java/org/elasticsearch/snapshots/RestoreInfo.java b/server/src/main/java/org/elasticsearch/snapshots/RestoreInfo.java similarity index 100% rename from core/src/main/java/org/elasticsearch/snapshots/RestoreInfo.java rename to server/src/main/java/org/elasticsearch/snapshots/RestoreInfo.java diff --git a/core/src/main/java/org/elasticsearch/snapshots/RestoreService.java b/server/src/main/java/org/elasticsearch/snapshots/RestoreService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/snapshots/RestoreService.java rename to server/src/main/java/org/elasticsearch/snapshots/RestoreService.java diff --git a/core/src/main/java/org/elasticsearch/snapshots/Snapshot.java b/server/src/main/java/org/elasticsearch/snapshots/Snapshot.java similarity index 100% rename from core/src/main/java/org/elasticsearch/snapshots/Snapshot.java rename to server/src/main/java/org/elasticsearch/snapshots/Snapshot.java diff --git a/core/src/main/java/org/elasticsearch/snapshots/SnapshotCreationException.java b/server/src/main/java/org/elasticsearch/snapshots/SnapshotCreationException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/snapshots/SnapshotCreationException.java rename to server/src/main/java/org/elasticsearch/snapshots/SnapshotCreationException.java diff --git a/core/src/main/java/org/elasticsearch/snapshots/SnapshotException.java b/server/src/main/java/org/elasticsearch/snapshots/SnapshotException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/snapshots/SnapshotException.java rename to server/src/main/java/org/elasticsearch/snapshots/SnapshotException.java diff --git a/core/src/main/java/org/elasticsearch/snapshots/SnapshotId.java b/server/src/main/java/org/elasticsearch/snapshots/SnapshotId.java similarity index 100% rename from core/src/main/java/org/elasticsearch/snapshots/SnapshotId.java rename to server/src/main/java/org/elasticsearch/snapshots/SnapshotId.java diff --git a/core/src/main/java/org/elasticsearch/snapshots/SnapshotInfo.java b/server/src/main/java/org/elasticsearch/snapshots/SnapshotInfo.java similarity index 100% rename from core/src/main/java/org/elasticsearch/snapshots/SnapshotInfo.java rename to server/src/main/java/org/elasticsearch/snapshots/SnapshotInfo.java diff --git a/core/src/main/java/org/elasticsearch/snapshots/SnapshotMissingException.java b/server/src/main/java/org/elasticsearch/snapshots/SnapshotMissingException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/snapshots/SnapshotMissingException.java rename to server/src/main/java/org/elasticsearch/snapshots/SnapshotMissingException.java diff --git a/core/src/main/java/org/elasticsearch/snapshots/SnapshotRestoreException.java b/server/src/main/java/org/elasticsearch/snapshots/SnapshotRestoreException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/snapshots/SnapshotRestoreException.java rename to server/src/main/java/org/elasticsearch/snapshots/SnapshotRestoreException.java diff --git a/core/src/main/java/org/elasticsearch/snapshots/SnapshotShardFailure.java b/server/src/main/java/org/elasticsearch/snapshots/SnapshotShardFailure.java similarity index 100% rename from core/src/main/java/org/elasticsearch/snapshots/SnapshotShardFailure.java rename to server/src/main/java/org/elasticsearch/snapshots/SnapshotShardFailure.java diff --git a/core/src/main/java/org/elasticsearch/snapshots/SnapshotShardsService.java b/server/src/main/java/org/elasticsearch/snapshots/SnapshotShardsService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/snapshots/SnapshotShardsService.java rename to server/src/main/java/org/elasticsearch/snapshots/SnapshotShardsService.java diff --git a/core/src/main/java/org/elasticsearch/snapshots/SnapshotState.java b/server/src/main/java/org/elasticsearch/snapshots/SnapshotState.java similarity index 100% rename from core/src/main/java/org/elasticsearch/snapshots/SnapshotState.java rename to server/src/main/java/org/elasticsearch/snapshots/SnapshotState.java diff --git a/core/src/main/java/org/elasticsearch/snapshots/SnapshotUtils.java b/server/src/main/java/org/elasticsearch/snapshots/SnapshotUtils.java similarity index 100% rename from core/src/main/java/org/elasticsearch/snapshots/SnapshotUtils.java rename to server/src/main/java/org/elasticsearch/snapshots/SnapshotUtils.java diff --git a/core/src/main/java/org/elasticsearch/snapshots/SnapshotsService.java b/server/src/main/java/org/elasticsearch/snapshots/SnapshotsService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/snapshots/SnapshotsService.java rename to server/src/main/java/org/elasticsearch/snapshots/SnapshotsService.java diff --git a/core/src/main/java/org/elasticsearch/tasks/CancellableTask.java b/server/src/main/java/org/elasticsearch/tasks/CancellableTask.java similarity index 100% rename from core/src/main/java/org/elasticsearch/tasks/CancellableTask.java rename to server/src/main/java/org/elasticsearch/tasks/CancellableTask.java diff --git a/core/src/main/java/org/elasticsearch/tasks/LoggingTaskListener.java b/server/src/main/java/org/elasticsearch/tasks/LoggingTaskListener.java similarity index 100% rename from core/src/main/java/org/elasticsearch/tasks/LoggingTaskListener.java rename to server/src/main/java/org/elasticsearch/tasks/LoggingTaskListener.java diff --git a/core/src/main/java/org/elasticsearch/tasks/RawTaskStatus.java b/server/src/main/java/org/elasticsearch/tasks/RawTaskStatus.java similarity index 100% rename from core/src/main/java/org/elasticsearch/tasks/RawTaskStatus.java rename to server/src/main/java/org/elasticsearch/tasks/RawTaskStatus.java diff --git a/core/src/main/java/org/elasticsearch/tasks/Task.java b/server/src/main/java/org/elasticsearch/tasks/Task.java similarity index 100% rename from core/src/main/java/org/elasticsearch/tasks/Task.java rename to server/src/main/java/org/elasticsearch/tasks/Task.java diff --git a/core/src/main/java/org/elasticsearch/tasks/TaskAwareRequest.java b/server/src/main/java/org/elasticsearch/tasks/TaskAwareRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/tasks/TaskAwareRequest.java rename to server/src/main/java/org/elasticsearch/tasks/TaskAwareRequest.java diff --git a/core/src/main/java/org/elasticsearch/tasks/TaskCancelledException.java b/server/src/main/java/org/elasticsearch/tasks/TaskCancelledException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/tasks/TaskCancelledException.java rename to server/src/main/java/org/elasticsearch/tasks/TaskCancelledException.java diff --git a/core/src/main/java/org/elasticsearch/tasks/TaskId.java b/server/src/main/java/org/elasticsearch/tasks/TaskId.java similarity index 100% rename from core/src/main/java/org/elasticsearch/tasks/TaskId.java rename to server/src/main/java/org/elasticsearch/tasks/TaskId.java diff --git a/core/src/main/java/org/elasticsearch/tasks/TaskInfo.java b/server/src/main/java/org/elasticsearch/tasks/TaskInfo.java similarity index 100% rename from core/src/main/java/org/elasticsearch/tasks/TaskInfo.java rename to server/src/main/java/org/elasticsearch/tasks/TaskInfo.java diff --git a/core/src/main/java/org/elasticsearch/tasks/TaskListener.java b/server/src/main/java/org/elasticsearch/tasks/TaskListener.java similarity index 100% rename from core/src/main/java/org/elasticsearch/tasks/TaskListener.java rename to server/src/main/java/org/elasticsearch/tasks/TaskListener.java diff --git a/core/src/main/java/org/elasticsearch/tasks/TaskManager.java b/server/src/main/java/org/elasticsearch/tasks/TaskManager.java similarity index 100% rename from core/src/main/java/org/elasticsearch/tasks/TaskManager.java rename to server/src/main/java/org/elasticsearch/tasks/TaskManager.java diff --git a/core/src/main/java/org/elasticsearch/tasks/TaskResult.java b/server/src/main/java/org/elasticsearch/tasks/TaskResult.java similarity index 100% rename from core/src/main/java/org/elasticsearch/tasks/TaskResult.java rename to server/src/main/java/org/elasticsearch/tasks/TaskResult.java diff --git a/core/src/main/java/org/elasticsearch/tasks/TaskResultsService.java b/server/src/main/java/org/elasticsearch/tasks/TaskResultsService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/tasks/TaskResultsService.java rename to server/src/main/java/org/elasticsearch/tasks/TaskResultsService.java diff --git a/core/src/main/java/org/elasticsearch/tasks/package-info.java b/server/src/main/java/org/elasticsearch/tasks/package-info.java similarity index 100% rename from core/src/main/java/org/elasticsearch/tasks/package-info.java rename to server/src/main/java/org/elasticsearch/tasks/package-info.java diff --git a/core/src/main/java/org/elasticsearch/threadpool/AutoQueueAdjustingExecutorBuilder.java b/server/src/main/java/org/elasticsearch/threadpool/AutoQueueAdjustingExecutorBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/threadpool/AutoQueueAdjustingExecutorBuilder.java rename to server/src/main/java/org/elasticsearch/threadpool/AutoQueueAdjustingExecutorBuilder.java diff --git a/core/src/main/java/org/elasticsearch/threadpool/ExecutorBuilder.java b/server/src/main/java/org/elasticsearch/threadpool/ExecutorBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/threadpool/ExecutorBuilder.java rename to server/src/main/java/org/elasticsearch/threadpool/ExecutorBuilder.java diff --git a/core/src/main/java/org/elasticsearch/threadpool/FixedExecutorBuilder.java b/server/src/main/java/org/elasticsearch/threadpool/FixedExecutorBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/threadpool/FixedExecutorBuilder.java rename to server/src/main/java/org/elasticsearch/threadpool/FixedExecutorBuilder.java diff --git a/core/src/main/java/org/elasticsearch/threadpool/ScalingExecutorBuilder.java b/server/src/main/java/org/elasticsearch/threadpool/ScalingExecutorBuilder.java similarity index 100% rename from core/src/main/java/org/elasticsearch/threadpool/ScalingExecutorBuilder.java rename to server/src/main/java/org/elasticsearch/threadpool/ScalingExecutorBuilder.java diff --git a/core/src/main/java/org/elasticsearch/threadpool/Scheduler.java b/server/src/main/java/org/elasticsearch/threadpool/Scheduler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/threadpool/Scheduler.java rename to server/src/main/java/org/elasticsearch/threadpool/Scheduler.java diff --git a/core/src/main/java/org/elasticsearch/threadpool/ThreadPool.java b/server/src/main/java/org/elasticsearch/threadpool/ThreadPool.java similarity index 100% rename from core/src/main/java/org/elasticsearch/threadpool/ThreadPool.java rename to server/src/main/java/org/elasticsearch/threadpool/ThreadPool.java diff --git a/core/src/main/java/org/elasticsearch/threadpool/ThreadPoolInfo.java b/server/src/main/java/org/elasticsearch/threadpool/ThreadPoolInfo.java similarity index 100% rename from core/src/main/java/org/elasticsearch/threadpool/ThreadPoolInfo.java rename to server/src/main/java/org/elasticsearch/threadpool/ThreadPoolInfo.java diff --git a/core/src/main/java/org/elasticsearch/threadpool/ThreadPoolStats.java b/server/src/main/java/org/elasticsearch/threadpool/ThreadPoolStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/threadpool/ThreadPoolStats.java rename to server/src/main/java/org/elasticsearch/threadpool/ThreadPoolStats.java diff --git a/core/src/main/java/org/elasticsearch/transport/ActionNotFoundTransportException.java b/server/src/main/java/org/elasticsearch/transport/ActionNotFoundTransportException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/ActionNotFoundTransportException.java rename to server/src/main/java/org/elasticsearch/transport/ActionNotFoundTransportException.java diff --git a/core/src/main/java/org/elasticsearch/transport/ActionTransportException.java b/server/src/main/java/org/elasticsearch/transport/ActionTransportException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/ActionTransportException.java rename to server/src/main/java/org/elasticsearch/transport/ActionTransportException.java diff --git a/core/src/main/java/org/elasticsearch/transport/BindTransportException.java b/server/src/main/java/org/elasticsearch/transport/BindTransportException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/BindTransportException.java rename to server/src/main/java/org/elasticsearch/transport/BindTransportException.java diff --git a/core/src/main/java/org/elasticsearch/transport/BytesTransportRequest.java b/server/src/main/java/org/elasticsearch/transport/BytesTransportRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/BytesTransportRequest.java rename to server/src/main/java/org/elasticsearch/transport/BytesTransportRequest.java diff --git a/core/src/main/java/org/elasticsearch/transport/CompressibleBytesOutputStream.java b/server/src/main/java/org/elasticsearch/transport/CompressibleBytesOutputStream.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/CompressibleBytesOutputStream.java rename to server/src/main/java/org/elasticsearch/transport/CompressibleBytesOutputStream.java diff --git a/core/src/main/java/org/elasticsearch/transport/ConnectTransportException.java b/server/src/main/java/org/elasticsearch/transport/ConnectTransportException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/ConnectTransportException.java rename to server/src/main/java/org/elasticsearch/transport/ConnectTransportException.java diff --git a/core/src/main/java/org/elasticsearch/transport/ConnectionProfile.java b/server/src/main/java/org/elasticsearch/transport/ConnectionProfile.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/ConnectionProfile.java rename to server/src/main/java/org/elasticsearch/transport/ConnectionProfile.java diff --git a/core/src/main/java/org/elasticsearch/transport/EmptyTransportResponseHandler.java b/server/src/main/java/org/elasticsearch/transport/EmptyTransportResponseHandler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/EmptyTransportResponseHandler.java rename to server/src/main/java/org/elasticsearch/transport/EmptyTransportResponseHandler.java diff --git a/core/src/main/java/org/elasticsearch/transport/FutureTransportResponseHandler.java b/server/src/main/java/org/elasticsearch/transport/FutureTransportResponseHandler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/FutureTransportResponseHandler.java rename to server/src/main/java/org/elasticsearch/transport/FutureTransportResponseHandler.java diff --git a/core/src/main/java/org/elasticsearch/transport/NodeDisconnectedException.java b/server/src/main/java/org/elasticsearch/transport/NodeDisconnectedException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/NodeDisconnectedException.java rename to server/src/main/java/org/elasticsearch/transport/NodeDisconnectedException.java diff --git a/core/src/main/java/org/elasticsearch/transport/NodeNotConnectedException.java b/server/src/main/java/org/elasticsearch/transport/NodeNotConnectedException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/NodeNotConnectedException.java rename to server/src/main/java/org/elasticsearch/transport/NodeNotConnectedException.java diff --git a/core/src/main/java/org/elasticsearch/transport/NodeShouldNotConnectException.java b/server/src/main/java/org/elasticsearch/transport/NodeShouldNotConnectException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/NodeShouldNotConnectException.java rename to server/src/main/java/org/elasticsearch/transport/NodeShouldNotConnectException.java diff --git a/core/src/main/java/org/elasticsearch/transport/NotSerializableTransportException.java b/server/src/main/java/org/elasticsearch/transport/NotSerializableTransportException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/NotSerializableTransportException.java rename to server/src/main/java/org/elasticsearch/transport/NotSerializableTransportException.java diff --git a/core/src/main/java/org/elasticsearch/transport/PlainTransportFuture.java b/server/src/main/java/org/elasticsearch/transport/PlainTransportFuture.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/PlainTransportFuture.java rename to server/src/main/java/org/elasticsearch/transport/PlainTransportFuture.java diff --git a/core/src/main/java/org/elasticsearch/transport/ReceiveTimeoutTransportException.java b/server/src/main/java/org/elasticsearch/transport/ReceiveTimeoutTransportException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/ReceiveTimeoutTransportException.java rename to server/src/main/java/org/elasticsearch/transport/ReceiveTimeoutTransportException.java diff --git a/core/src/main/java/org/elasticsearch/transport/RemoteClusterAware.java b/server/src/main/java/org/elasticsearch/transport/RemoteClusterAware.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/RemoteClusterAware.java rename to server/src/main/java/org/elasticsearch/transport/RemoteClusterAware.java diff --git a/core/src/main/java/org/elasticsearch/transport/RemoteClusterConnection.java b/server/src/main/java/org/elasticsearch/transport/RemoteClusterConnection.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/RemoteClusterConnection.java rename to server/src/main/java/org/elasticsearch/transport/RemoteClusterConnection.java diff --git a/core/src/main/java/org/elasticsearch/transport/RemoteClusterService.java b/server/src/main/java/org/elasticsearch/transport/RemoteClusterService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/RemoteClusterService.java rename to server/src/main/java/org/elasticsearch/transport/RemoteClusterService.java diff --git a/core/src/main/java/org/elasticsearch/transport/RemoteConnectionInfo.java b/server/src/main/java/org/elasticsearch/transport/RemoteConnectionInfo.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/RemoteConnectionInfo.java rename to server/src/main/java/org/elasticsearch/transport/RemoteConnectionInfo.java diff --git a/core/src/main/java/org/elasticsearch/transport/RemoteTransportException.java b/server/src/main/java/org/elasticsearch/transport/RemoteTransportException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/RemoteTransportException.java rename to server/src/main/java/org/elasticsearch/transport/RemoteTransportException.java diff --git a/core/src/main/java/org/elasticsearch/transport/RequestHandlerRegistry.java b/server/src/main/java/org/elasticsearch/transport/RequestHandlerRegistry.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/RequestHandlerRegistry.java rename to server/src/main/java/org/elasticsearch/transport/RequestHandlerRegistry.java diff --git a/core/src/main/java/org/elasticsearch/transport/ResponseHandlerFailureTransportException.java b/server/src/main/java/org/elasticsearch/transport/ResponseHandlerFailureTransportException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/ResponseHandlerFailureTransportException.java rename to server/src/main/java/org/elasticsearch/transport/ResponseHandlerFailureTransportException.java diff --git a/core/src/main/java/org/elasticsearch/transport/SendRequestTransportException.java b/server/src/main/java/org/elasticsearch/transport/SendRequestTransportException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/SendRequestTransportException.java rename to server/src/main/java/org/elasticsearch/transport/SendRequestTransportException.java diff --git a/core/src/main/java/org/elasticsearch/transport/TaskAwareTransportRequestHandler.java b/server/src/main/java/org/elasticsearch/transport/TaskAwareTransportRequestHandler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/TaskAwareTransportRequestHandler.java rename to server/src/main/java/org/elasticsearch/transport/TaskAwareTransportRequestHandler.java diff --git a/core/src/main/java/org/elasticsearch/transport/TaskTransportChannel.java b/server/src/main/java/org/elasticsearch/transport/TaskTransportChannel.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/TaskTransportChannel.java rename to server/src/main/java/org/elasticsearch/transport/TaskTransportChannel.java diff --git a/core/src/main/java/org/elasticsearch/transport/TcpChannel.java b/server/src/main/java/org/elasticsearch/transport/TcpChannel.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/TcpChannel.java rename to server/src/main/java/org/elasticsearch/transport/TcpChannel.java diff --git a/core/src/main/java/org/elasticsearch/transport/TcpHeader.java b/server/src/main/java/org/elasticsearch/transport/TcpHeader.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/TcpHeader.java rename to server/src/main/java/org/elasticsearch/transport/TcpHeader.java diff --git a/core/src/main/java/org/elasticsearch/transport/TcpTransport.java b/server/src/main/java/org/elasticsearch/transport/TcpTransport.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/TcpTransport.java rename to server/src/main/java/org/elasticsearch/transport/TcpTransport.java diff --git a/core/src/main/java/org/elasticsearch/transport/TcpTransportChannel.java b/server/src/main/java/org/elasticsearch/transport/TcpTransportChannel.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/TcpTransportChannel.java rename to server/src/main/java/org/elasticsearch/transport/TcpTransportChannel.java diff --git a/core/src/main/java/org/elasticsearch/transport/Transport.java b/server/src/main/java/org/elasticsearch/transport/Transport.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/Transport.java rename to server/src/main/java/org/elasticsearch/transport/Transport.java diff --git a/core/src/main/java/org/elasticsearch/transport/TransportActionProxy.java b/server/src/main/java/org/elasticsearch/transport/TransportActionProxy.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/TransportActionProxy.java rename to server/src/main/java/org/elasticsearch/transport/TransportActionProxy.java diff --git a/core/src/main/java/org/elasticsearch/transport/TransportChannel.java b/server/src/main/java/org/elasticsearch/transport/TransportChannel.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/TransportChannel.java rename to server/src/main/java/org/elasticsearch/transport/TransportChannel.java diff --git a/core/src/main/java/org/elasticsearch/transport/TransportChannelResponseHandler.java b/server/src/main/java/org/elasticsearch/transport/TransportChannelResponseHandler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/TransportChannelResponseHandler.java rename to server/src/main/java/org/elasticsearch/transport/TransportChannelResponseHandler.java diff --git a/core/src/main/java/org/elasticsearch/transport/TransportConnectionListener.java b/server/src/main/java/org/elasticsearch/transport/TransportConnectionListener.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/TransportConnectionListener.java rename to server/src/main/java/org/elasticsearch/transport/TransportConnectionListener.java diff --git a/core/src/main/java/org/elasticsearch/transport/TransportException.java b/server/src/main/java/org/elasticsearch/transport/TransportException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/TransportException.java rename to server/src/main/java/org/elasticsearch/transport/TransportException.java diff --git a/core/src/main/java/org/elasticsearch/transport/TransportFuture.java b/server/src/main/java/org/elasticsearch/transport/TransportFuture.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/TransportFuture.java rename to server/src/main/java/org/elasticsearch/transport/TransportFuture.java diff --git a/core/src/main/java/org/elasticsearch/transport/TransportInfo.java b/server/src/main/java/org/elasticsearch/transport/TransportInfo.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/TransportInfo.java rename to server/src/main/java/org/elasticsearch/transport/TransportInfo.java diff --git a/core/src/main/java/org/elasticsearch/transport/TransportInterceptor.java b/server/src/main/java/org/elasticsearch/transport/TransportInterceptor.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/TransportInterceptor.java rename to server/src/main/java/org/elasticsearch/transport/TransportInterceptor.java diff --git a/core/src/main/java/org/elasticsearch/transport/TransportMessage.java b/server/src/main/java/org/elasticsearch/transport/TransportMessage.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/TransportMessage.java rename to server/src/main/java/org/elasticsearch/transport/TransportMessage.java diff --git a/core/src/main/java/org/elasticsearch/transport/TransportRequest.java b/server/src/main/java/org/elasticsearch/transport/TransportRequest.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/TransportRequest.java rename to server/src/main/java/org/elasticsearch/transport/TransportRequest.java diff --git a/core/src/main/java/org/elasticsearch/transport/TransportRequestHandler.java b/server/src/main/java/org/elasticsearch/transport/TransportRequestHandler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/TransportRequestHandler.java rename to server/src/main/java/org/elasticsearch/transport/TransportRequestHandler.java diff --git a/core/src/main/java/org/elasticsearch/transport/TransportRequestOptions.java b/server/src/main/java/org/elasticsearch/transport/TransportRequestOptions.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/TransportRequestOptions.java rename to server/src/main/java/org/elasticsearch/transport/TransportRequestOptions.java diff --git a/core/src/main/java/org/elasticsearch/transport/TransportResponse.java b/server/src/main/java/org/elasticsearch/transport/TransportResponse.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/TransportResponse.java rename to server/src/main/java/org/elasticsearch/transport/TransportResponse.java diff --git a/core/src/main/java/org/elasticsearch/transport/TransportResponseHandler.java b/server/src/main/java/org/elasticsearch/transport/TransportResponseHandler.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/TransportResponseHandler.java rename to server/src/main/java/org/elasticsearch/transport/TransportResponseHandler.java diff --git a/core/src/main/java/org/elasticsearch/transport/TransportResponseOptions.java b/server/src/main/java/org/elasticsearch/transport/TransportResponseOptions.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/TransportResponseOptions.java rename to server/src/main/java/org/elasticsearch/transport/TransportResponseOptions.java diff --git a/core/src/main/java/org/elasticsearch/transport/TransportSerializationException.java b/server/src/main/java/org/elasticsearch/transport/TransportSerializationException.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/TransportSerializationException.java rename to server/src/main/java/org/elasticsearch/transport/TransportSerializationException.java diff --git a/core/src/main/java/org/elasticsearch/transport/TransportService.java b/server/src/main/java/org/elasticsearch/transport/TransportService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/TransportService.java rename to server/src/main/java/org/elasticsearch/transport/TransportService.java diff --git a/core/src/main/java/org/elasticsearch/transport/TransportStats.java b/server/src/main/java/org/elasticsearch/transport/TransportStats.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/TransportStats.java rename to server/src/main/java/org/elasticsearch/transport/TransportStats.java diff --git a/core/src/main/java/org/elasticsearch/transport/TransportStatus.java b/server/src/main/java/org/elasticsearch/transport/TransportStatus.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/TransportStatus.java rename to server/src/main/java/org/elasticsearch/transport/TransportStatus.java diff --git a/core/src/main/java/org/elasticsearch/transport/Transports.java b/server/src/main/java/org/elasticsearch/transport/Transports.java similarity index 100% rename from core/src/main/java/org/elasticsearch/transport/Transports.java rename to server/src/main/java/org/elasticsearch/transport/Transports.java diff --git a/core/src/main/java/org/elasticsearch/usage/UsageService.java b/server/src/main/java/org/elasticsearch/usage/UsageService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/usage/UsageService.java rename to server/src/main/java/org/elasticsearch/usage/UsageService.java diff --git a/core/src/main/java/org/elasticsearch/watcher/AbstractResourceWatcher.java b/server/src/main/java/org/elasticsearch/watcher/AbstractResourceWatcher.java similarity index 100% rename from core/src/main/java/org/elasticsearch/watcher/AbstractResourceWatcher.java rename to server/src/main/java/org/elasticsearch/watcher/AbstractResourceWatcher.java diff --git a/core/src/main/java/org/elasticsearch/watcher/FileChangesListener.java b/server/src/main/java/org/elasticsearch/watcher/FileChangesListener.java similarity index 100% rename from core/src/main/java/org/elasticsearch/watcher/FileChangesListener.java rename to server/src/main/java/org/elasticsearch/watcher/FileChangesListener.java diff --git a/core/src/main/java/org/elasticsearch/watcher/FileWatcher.java b/server/src/main/java/org/elasticsearch/watcher/FileWatcher.java similarity index 100% rename from core/src/main/java/org/elasticsearch/watcher/FileWatcher.java rename to server/src/main/java/org/elasticsearch/watcher/FileWatcher.java diff --git a/core/src/main/java/org/elasticsearch/watcher/ResourceWatcher.java b/server/src/main/java/org/elasticsearch/watcher/ResourceWatcher.java similarity index 100% rename from core/src/main/java/org/elasticsearch/watcher/ResourceWatcher.java rename to server/src/main/java/org/elasticsearch/watcher/ResourceWatcher.java diff --git a/core/src/main/java/org/elasticsearch/watcher/ResourceWatcherService.java b/server/src/main/java/org/elasticsearch/watcher/ResourceWatcherService.java similarity index 100% rename from core/src/main/java/org/elasticsearch/watcher/ResourceWatcherService.java rename to server/src/main/java/org/elasticsearch/watcher/ResourceWatcherService.java diff --git a/core/src/main/java/org/elasticsearch/watcher/WatcherHandle.java b/server/src/main/java/org/elasticsearch/watcher/WatcherHandle.java similarity index 100% rename from core/src/main/java/org/elasticsearch/watcher/WatcherHandle.java rename to server/src/main/java/org/elasticsearch/watcher/WatcherHandle.java diff --git a/core/src/main/java/org/joda/time/format/StrictISODateTimeFormat.java b/server/src/main/java/org/joda/time/format/StrictISODateTimeFormat.java similarity index 100% rename from core/src/main/java/org/joda/time/format/StrictISODateTimeFormat.java rename to server/src/main/java/org/joda/time/format/StrictISODateTimeFormat.java diff --git a/core/src/main/resources/META-INF/services/org.apache.lucene.codecs.Codec b/server/src/main/resources/META-INF/services/org.apache.lucene.codecs.Codec similarity index 100% rename from core/src/main/resources/META-INF/services/org.apache.lucene.codecs.Codec rename to server/src/main/resources/META-INF/services/org.apache.lucene.codecs.Codec diff --git a/core/src/main/resources/META-INF/services/org.apache.lucene.codecs.DocValuesFormat b/server/src/main/resources/META-INF/services/org.apache.lucene.codecs.DocValuesFormat similarity index 100% rename from core/src/main/resources/META-INF/services/org.apache.lucene.codecs.DocValuesFormat rename to server/src/main/resources/META-INF/services/org.apache.lucene.codecs.DocValuesFormat diff --git a/core/src/main/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat b/server/src/main/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat similarity index 100% rename from core/src/main/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat rename to server/src/main/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat diff --git a/core/src/main/resources/config/favicon.ico b/server/src/main/resources/config/favicon.ico similarity index 100% rename from core/src/main/resources/config/favicon.ico rename to server/src/main/resources/config/favicon.ico diff --git a/core/src/main/resources/org/elasticsearch/bootstrap/security.policy b/server/src/main/resources/org/elasticsearch/bootstrap/security.policy similarity index 100% rename from core/src/main/resources/org/elasticsearch/bootstrap/security.policy rename to server/src/main/resources/org/elasticsearch/bootstrap/security.policy diff --git a/core/src/main/resources/org/elasticsearch/bootstrap/test-framework.policy b/server/src/main/resources/org/elasticsearch/bootstrap/test-framework.policy similarity index 100% rename from core/src/main/resources/org/elasticsearch/bootstrap/test-framework.policy rename to server/src/main/resources/org/elasticsearch/bootstrap/test-framework.policy diff --git a/core/src/main/resources/org/elasticsearch/bootstrap/untrusted.policy b/server/src/main/resources/org/elasticsearch/bootstrap/untrusted.policy similarity index 100% rename from core/src/main/resources/org/elasticsearch/bootstrap/untrusted.policy rename to server/src/main/resources/org/elasticsearch/bootstrap/untrusted.policy diff --git a/core/src/main/resources/org/elasticsearch/index/mapper/default-mapping.json b/server/src/main/resources/org/elasticsearch/index/mapper/default-mapping.json similarity index 100% rename from core/src/main/resources/org/elasticsearch/index/mapper/default-mapping.json rename to server/src/main/resources/org/elasticsearch/index/mapper/default-mapping.json diff --git a/core/src/main/resources/org/elasticsearch/index/mapper/script-mapping.json b/server/src/main/resources/org/elasticsearch/index/mapper/script-mapping.json similarity index 100% rename from core/src/main/resources/org/elasticsearch/index/mapper/script-mapping.json rename to server/src/main/resources/org/elasticsearch/index/mapper/script-mapping.json diff --git a/core/src/main/resources/org/elasticsearch/tasks/task-index-mapping.json b/server/src/main/resources/org/elasticsearch/tasks/task-index-mapping.json similarity index 100% rename from core/src/main/resources/org/elasticsearch/tasks/task-index-mapping.json rename to server/src/main/resources/org/elasticsearch/tasks/task-index-mapping.json diff --git a/core/src/test/eclipse-build.gradle b/server/src/test/eclipse-build.gradle similarity index 81% rename from core/src/test/eclipse-build.gradle rename to server/src/test/eclipse-build.gradle index f180aec428757..dd380e342b638 100644 --- a/core/src/test/eclipse-build.gradle +++ b/server/src/test/eclipse-build.gradle @@ -3,5 +3,5 @@ apply from: '../../build.gradle' dependencies { - testCompile project(':core') + testCompile project(':server') } diff --git a/core/src/test/java/org/apache/lucene/analysis/miscellaneous/DeDuplicatingTokenFilterTests.java b/server/src/test/java/org/apache/lucene/analysis/miscellaneous/DeDuplicatingTokenFilterTests.java similarity index 100% rename from core/src/test/java/org/apache/lucene/analysis/miscellaneous/DeDuplicatingTokenFilterTests.java rename to server/src/test/java/org/apache/lucene/analysis/miscellaneous/DeDuplicatingTokenFilterTests.java diff --git a/core/src/test/java/org/apache/lucene/analysis/miscellaneous/TruncateTokenFilterTests.java b/server/src/test/java/org/apache/lucene/analysis/miscellaneous/TruncateTokenFilterTests.java similarity index 100% rename from core/src/test/java/org/apache/lucene/analysis/miscellaneous/TruncateTokenFilterTests.java rename to server/src/test/java/org/apache/lucene/analysis/miscellaneous/TruncateTokenFilterTests.java diff --git a/core/src/test/java/org/apache/lucene/grouping/CollapsingTopDocsCollectorTests.java b/server/src/test/java/org/apache/lucene/grouping/CollapsingTopDocsCollectorTests.java similarity index 100% rename from core/src/test/java/org/apache/lucene/grouping/CollapsingTopDocsCollectorTests.java rename to server/src/test/java/org/apache/lucene/grouping/CollapsingTopDocsCollectorTests.java diff --git a/core/src/test/java/org/apache/lucene/queries/BaseRandomBinaryDocValuesRangeQueryTestCase.java b/server/src/test/java/org/apache/lucene/queries/BaseRandomBinaryDocValuesRangeQueryTestCase.java similarity index 100% rename from core/src/test/java/org/apache/lucene/queries/BaseRandomBinaryDocValuesRangeQueryTestCase.java rename to server/src/test/java/org/apache/lucene/queries/BaseRandomBinaryDocValuesRangeQueryTestCase.java diff --git a/core/src/test/java/org/apache/lucene/queries/BinaryDocValuesRangeQueryTests.java b/server/src/test/java/org/apache/lucene/queries/BinaryDocValuesRangeQueryTests.java similarity index 100% rename from core/src/test/java/org/apache/lucene/queries/BinaryDocValuesRangeQueryTests.java rename to server/src/test/java/org/apache/lucene/queries/BinaryDocValuesRangeQueryTests.java diff --git a/core/src/test/java/org/apache/lucene/queries/BlendedTermQueryTests.java b/server/src/test/java/org/apache/lucene/queries/BlendedTermQueryTests.java similarity index 100% rename from core/src/test/java/org/apache/lucene/queries/BlendedTermQueryTests.java rename to server/src/test/java/org/apache/lucene/queries/BlendedTermQueryTests.java diff --git a/core/src/test/java/org/apache/lucene/queries/DoubleRandomBinaryDocValuesRangeQueryTests.java b/server/src/test/java/org/apache/lucene/queries/DoubleRandomBinaryDocValuesRangeQueryTests.java similarity index 100% rename from core/src/test/java/org/apache/lucene/queries/DoubleRandomBinaryDocValuesRangeQueryTests.java rename to server/src/test/java/org/apache/lucene/queries/DoubleRandomBinaryDocValuesRangeQueryTests.java diff --git a/core/src/test/java/org/apache/lucene/queries/FloatRandomBinaryDocValuesRangeQueryTests.java b/server/src/test/java/org/apache/lucene/queries/FloatRandomBinaryDocValuesRangeQueryTests.java similarity index 100% rename from core/src/test/java/org/apache/lucene/queries/FloatRandomBinaryDocValuesRangeQueryTests.java rename to server/src/test/java/org/apache/lucene/queries/FloatRandomBinaryDocValuesRangeQueryTests.java diff --git a/core/src/test/java/org/apache/lucene/queries/InetAddressRandomBinaryDocValuesRangeQueryTests.java b/server/src/test/java/org/apache/lucene/queries/InetAddressRandomBinaryDocValuesRangeQueryTests.java similarity index 100% rename from core/src/test/java/org/apache/lucene/queries/InetAddressRandomBinaryDocValuesRangeQueryTests.java rename to server/src/test/java/org/apache/lucene/queries/InetAddressRandomBinaryDocValuesRangeQueryTests.java diff --git a/core/src/test/java/org/apache/lucene/queries/IntegerRandomBinaryDocValuesRangeQueryTests.java b/server/src/test/java/org/apache/lucene/queries/IntegerRandomBinaryDocValuesRangeQueryTests.java similarity index 100% rename from core/src/test/java/org/apache/lucene/queries/IntegerRandomBinaryDocValuesRangeQueryTests.java rename to server/src/test/java/org/apache/lucene/queries/IntegerRandomBinaryDocValuesRangeQueryTests.java diff --git a/core/src/test/java/org/apache/lucene/queries/LongRandomBinaryDocValuesRangeQueryTests.java b/server/src/test/java/org/apache/lucene/queries/LongRandomBinaryDocValuesRangeQueryTests.java similarity index 100% rename from core/src/test/java/org/apache/lucene/queries/LongRandomBinaryDocValuesRangeQueryTests.java rename to server/src/test/java/org/apache/lucene/queries/LongRandomBinaryDocValuesRangeQueryTests.java diff --git a/core/src/test/java/org/apache/lucene/queries/MinDocQueryTests.java b/server/src/test/java/org/apache/lucene/queries/MinDocQueryTests.java similarity index 100% rename from core/src/test/java/org/apache/lucene/queries/MinDocQueryTests.java rename to server/src/test/java/org/apache/lucene/queries/MinDocQueryTests.java diff --git a/core/src/test/java/org/apache/lucene/queries/SearchAfterSortedDocQueryTests.java b/server/src/test/java/org/apache/lucene/queries/SearchAfterSortedDocQueryTests.java similarity index 100% rename from core/src/test/java/org/apache/lucene/queries/SearchAfterSortedDocQueryTests.java rename to server/src/test/java/org/apache/lucene/queries/SearchAfterSortedDocQueryTests.java diff --git a/core/src/test/java/org/apache/lucene/search/QueriesTests.java b/server/src/test/java/org/apache/lucene/search/QueriesTests.java similarity index 100% rename from core/src/test/java/org/apache/lucene/search/QueriesTests.java rename to server/src/test/java/org/apache/lucene/search/QueriesTests.java diff --git a/core/src/test/java/org/apache/lucene/search/uhighlight/BoundedBreakIteratorScannerTests.java b/server/src/test/java/org/apache/lucene/search/uhighlight/BoundedBreakIteratorScannerTests.java similarity index 100% rename from core/src/test/java/org/apache/lucene/search/uhighlight/BoundedBreakIteratorScannerTests.java rename to server/src/test/java/org/apache/lucene/search/uhighlight/BoundedBreakIteratorScannerTests.java diff --git a/core/src/test/java/org/apache/lucene/search/uhighlight/CustomPassageFormatterTests.java b/server/src/test/java/org/apache/lucene/search/uhighlight/CustomPassageFormatterTests.java similarity index 100% rename from core/src/test/java/org/apache/lucene/search/uhighlight/CustomPassageFormatterTests.java rename to server/src/test/java/org/apache/lucene/search/uhighlight/CustomPassageFormatterTests.java diff --git a/core/src/test/java/org/apache/lucene/search/uhighlight/CustomUnifiedHighlighterTests.java b/server/src/test/java/org/apache/lucene/search/uhighlight/CustomUnifiedHighlighterTests.java similarity index 100% rename from core/src/test/java/org/apache/lucene/search/uhighlight/CustomUnifiedHighlighterTests.java rename to server/src/test/java/org/apache/lucene/search/uhighlight/CustomUnifiedHighlighterTests.java diff --git a/core/src/test/java/org/elasticsearch/BuildTests.java b/server/src/test/java/org/elasticsearch/BuildTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/BuildTests.java rename to server/src/test/java/org/elasticsearch/BuildTests.java diff --git a/core/src/test/java/org/elasticsearch/ElasticsearchExceptionTests.java b/server/src/test/java/org/elasticsearch/ElasticsearchExceptionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/ElasticsearchExceptionTests.java rename to server/src/test/java/org/elasticsearch/ElasticsearchExceptionTests.java diff --git a/core/src/test/java/org/elasticsearch/ExceptionSerializationTests.java b/server/src/test/java/org/elasticsearch/ExceptionSerializationTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/ExceptionSerializationTests.java rename to server/src/test/java/org/elasticsearch/ExceptionSerializationTests.java diff --git a/core/src/test/java/org/elasticsearch/SpecialPermissionTests.java b/server/src/test/java/org/elasticsearch/SpecialPermissionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/SpecialPermissionTests.java rename to server/src/test/java/org/elasticsearch/SpecialPermissionTests.java diff --git a/core/src/test/java/org/elasticsearch/VersionTests.java b/server/src/test/java/org/elasticsearch/VersionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/VersionTests.java rename to server/src/test/java/org/elasticsearch/VersionTests.java diff --git a/core/src/test/java/org/elasticsearch/action/ActionListenerTests.java b/server/src/test/java/org/elasticsearch/action/ActionListenerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/ActionListenerTests.java rename to server/src/test/java/org/elasticsearch/action/ActionListenerTests.java diff --git a/core/src/test/java/org/elasticsearch/action/ActionModuleTests.java b/server/src/test/java/org/elasticsearch/action/ActionModuleTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/ActionModuleTests.java rename to server/src/test/java/org/elasticsearch/action/ActionModuleTests.java diff --git a/core/src/test/java/org/elasticsearch/action/DocWriteResponseTests.java b/server/src/test/java/org/elasticsearch/action/DocWriteResponseTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/DocWriteResponseTests.java rename to server/src/test/java/org/elasticsearch/action/DocWriteResponseTests.java diff --git a/core/src/test/java/org/elasticsearch/action/ExplainRequestTests.java b/server/src/test/java/org/elasticsearch/action/ExplainRequestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/ExplainRequestTests.java rename to server/src/test/java/org/elasticsearch/action/ExplainRequestTests.java diff --git a/core/src/test/java/org/elasticsearch/action/IndicesRequestIT.java b/server/src/test/java/org/elasticsearch/action/IndicesRequestIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/IndicesRequestIT.java rename to server/src/test/java/org/elasticsearch/action/IndicesRequestIT.java diff --git a/core/src/test/java/org/elasticsearch/action/ListenerActionIT.java b/server/src/test/java/org/elasticsearch/action/ListenerActionIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/ListenerActionIT.java rename to server/src/test/java/org/elasticsearch/action/ListenerActionIT.java diff --git a/core/src/test/java/org/elasticsearch/action/NotifyOnceListenerTests.java b/server/src/test/java/org/elasticsearch/action/NotifyOnceListenerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/NotifyOnceListenerTests.java rename to server/src/test/java/org/elasticsearch/action/NotifyOnceListenerTests.java diff --git a/core/src/test/java/org/elasticsearch/action/OriginalIndicesTests.java b/server/src/test/java/org/elasticsearch/action/OriginalIndicesTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/OriginalIndicesTests.java rename to server/src/test/java/org/elasticsearch/action/OriginalIndicesTests.java diff --git a/core/src/test/java/org/elasticsearch/action/RejectionActionIT.java b/server/src/test/java/org/elasticsearch/action/RejectionActionIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/RejectionActionIT.java rename to server/src/test/java/org/elasticsearch/action/RejectionActionIT.java diff --git a/core/src/test/java/org/elasticsearch/action/ShardValidateQueryRequestTests.java b/server/src/test/java/org/elasticsearch/action/ShardValidateQueryRequestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/ShardValidateQueryRequestTests.java rename to server/src/test/java/org/elasticsearch/action/ShardValidateQueryRequestTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/HotThreadsIT.java b/server/src/test/java/org/elasticsearch/action/admin/HotThreadsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/HotThreadsIT.java rename to server/src/test/java/org/elasticsearch/action/admin/HotThreadsIT.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainActionTests.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainActionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainActionTests.java rename to server/src/test/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainActionTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainIT.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainIT.java rename to server/src/test/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainIT.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainRequestTests.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainRequestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainRequestTests.java rename to server/src/test/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainRequestTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplanationTests.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplanationTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplanationTests.java rename to server/src/test/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplanationTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequestTests.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequestTests.java rename to server/src/test/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequestTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthResponsesTests.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthResponsesTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthResponsesTests.java rename to server/src/test/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthResponsesTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthActionTests.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthActionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthActionTests.java rename to server/src/test/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthActionTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/node/stats/NodeStatsTests.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/node/stats/NodeStatsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/cluster/node/stats/NodeStatsTests.java rename to server/src/test/java/org/elasticsearch/action/admin/cluster/node/stats/NodeStatsTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/CancellableTasksTests.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/CancellableTasksTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/CancellableTasksTests.java rename to server/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/CancellableTasksTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/RecordingTaskManagerListener.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/RecordingTaskManagerListener.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/RecordingTaskManagerListener.java rename to server/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/RecordingTaskManagerListener.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TaskManagerTestCase.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TaskManagerTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TaskManagerTestCase.java rename to server/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TaskManagerTestCase.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TaskTests.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TaskTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TaskTests.java rename to server/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TaskTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TasksIT.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TasksIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TasksIT.java rename to server/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TasksIT.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TestTaskPlugin.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TestTaskPlugin.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TestTaskPlugin.java rename to server/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TestTaskPlugin.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TransportTasksActionTests.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TransportTasksActionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TransportTasksActionTests.java rename to server/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TransportTasksActionTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/repositories/RepositoryBlocksIT.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/repositories/RepositoryBlocksIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/cluster/repositories/RepositoryBlocksIT.java rename to server/src/test/java/org/elasticsearch/action/admin/cluster/repositories/RepositoryBlocksIT.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteRequestTests.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteRequestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteRequestTests.java rename to server/src/test/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteRequestTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteTests.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteTests.java rename to server/src/test/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/settings/SettingsUpdaterTests.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/settings/SettingsUpdaterTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/cluster/settings/SettingsUpdaterTests.java rename to server/src/test/java/org/elasticsearch/action/admin/cluster/settings/SettingsUpdaterTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsRequestTests.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsRequestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsRequestTests.java rename to server/src/test/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsRequestTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsResponseTests.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsResponseTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsResponseTests.java rename to server/src/test/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsResponseTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/snapshots/SnapshotBlocksIT.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/snapshots/SnapshotBlocksIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/cluster/snapshots/SnapshotBlocksIT.java rename to server/src/test/java/org/elasticsearch/action/admin/cluster/snapshots/SnapshotBlocksIT.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotStatusTests.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotStatusTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotStatusTests.java rename to server/src/test/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotStatusTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequestTests.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequestTests.java rename to server/src/test/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequestTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsIT.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsIT.java rename to server/src/test/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsIT.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsNodesTests.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsNodesTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsNodesTests.java rename to server/src/test/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsNodesTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/storedscripts/GetStoredScriptRequestTests.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/storedscripts/GetStoredScriptRequestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/cluster/storedscripts/GetStoredScriptRequestTests.java rename to server/src/test/java/org/elasticsearch/action/admin/cluster/storedscripts/GetStoredScriptRequestTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/storedscripts/PutStoredScriptRequestTests.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/storedscripts/PutStoredScriptRequestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/cluster/storedscripts/PutStoredScriptRequestTests.java rename to server/src/test/java/org/elasticsearch/action/admin/cluster/storedscripts/PutStoredScriptRequestTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/tasks/PendingTasksBlocksIT.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/tasks/PendingTasksBlocksIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/cluster/tasks/PendingTasksBlocksIT.java rename to server/src/test/java/org/elasticsearch/action/admin/cluster/tasks/PendingTasksBlocksIT.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/TransportAnalyzeActionTests.java b/server/src/test/java/org/elasticsearch/action/admin/indices/TransportAnalyzeActionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/indices/TransportAnalyzeActionTests.java rename to server/src/test/java/org/elasticsearch/action/admin/indices/TransportAnalyzeActionTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/alias/AliasActionsTests.java b/server/src/test/java/org/elasticsearch/action/admin/indices/alias/AliasActionsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/indices/alias/AliasActionsTests.java rename to server/src/test/java/org/elasticsearch/action/admin/indices/alias/AliasActionsTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeRequestTests.java b/server/src/test/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeRequestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeRequestTests.java rename to server/src/test/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeRequestTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheBlocksIT.java b/server/src/test/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheBlocksIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheBlocksIT.java rename to server/src/test/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheBlocksIT.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexIT.java b/server/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexIT.java rename to server/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexIT.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequestBuilderTests.java b/server/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequestBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequestBuilderTests.java rename to server/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequestBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequestTests.java b/server/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequestTests.java rename to server/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequestTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexResponseTests.java b/server/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexResponseTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexResponseTests.java rename to server/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexResponseTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/create/ShrinkIndexIT.java b/server/src/test/java/org/elasticsearch/action/admin/indices/create/ShrinkIndexIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/indices/create/ShrinkIndexIT.java rename to server/src/test/java/org/elasticsearch/action/admin/indices/create/ShrinkIndexIT.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/create/SplitIndexIT.java b/server/src/test/java/org/elasticsearch/action/admin/indices/create/SplitIndexIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/indices/create/SplitIndexIT.java rename to server/src/test/java/org/elasticsearch/action/admin/indices/create/SplitIndexIT.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexBlocksIT.java b/server/src/test/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexBlocksIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexBlocksIT.java rename to server/src/test/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexBlocksIT.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexResponseTests.java b/server/src/test/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexResponseTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexResponseTests.java rename to server/src/test/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexResponseTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/exists/IndicesExistsIT.java b/server/src/test/java/org/elasticsearch/action/admin/indices/exists/IndicesExistsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/indices/exists/IndicesExistsIT.java rename to server/src/test/java/org/elasticsearch/action/admin/indices/exists/IndicesExistsIT.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/flush/FlushBlocksIT.java b/server/src/test/java/org/elasticsearch/action/admin/indices/flush/FlushBlocksIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/indices/flush/FlushBlocksIT.java rename to server/src/test/java/org/elasticsearch/action/admin/indices/flush/FlushBlocksIT.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/flush/SyncedFlushUnitTests.java b/server/src/test/java/org/elasticsearch/action/admin/indices/flush/SyncedFlushUnitTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/indices/flush/SyncedFlushUnitTests.java rename to server/src/test/java/org/elasticsearch/action/admin/indices/flush/SyncedFlushUnitTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/forcemerge/ForceMergeBlocksIT.java b/server/src/test/java/org/elasticsearch/action/admin/indices/forcemerge/ForceMergeBlocksIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/indices/forcemerge/ForceMergeBlocksIT.java rename to server/src/test/java/org/elasticsearch/action/admin/indices/forcemerge/ForceMergeBlocksIT.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/get/GetIndexIT.java b/server/src/test/java/org/elasticsearch/action/admin/indices/get/GetIndexIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/indices/get/GetIndexIT.java rename to server/src/test/java/org/elasticsearch/action/admin/indices/get/GetIndexIT.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsResponseTests.java b/server/src/test/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsResponseTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsResponseTests.java rename to server/src/test/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsResponseTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequestTests.java b/server/src/test/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequestTests.java rename to server/src/test/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequestTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/open/OpenIndexResponseTests.java b/server/src/test/java/org/elasticsearch/action/admin/indices/open/OpenIndexResponseTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/indices/open/OpenIndexResponseTests.java rename to server/src/test/java/org/elasticsearch/action/admin/indices/open/OpenIndexResponseTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/refresh/RefreshBlocksIT.java b/server/src/test/java/org/elasticsearch/action/admin/indices/refresh/RefreshBlocksIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/indices/refresh/RefreshBlocksIT.java rename to server/src/test/java/org/elasticsearch/action/admin/indices/refresh/RefreshBlocksIT.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/rollover/ConditionTests.java b/server/src/test/java/org/elasticsearch/action/admin/indices/rollover/ConditionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/indices/rollover/ConditionTests.java rename to server/src/test/java/org/elasticsearch/action/admin/indices/rollover/ConditionTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/rollover/RolloverIT.java b/server/src/test/java/org/elasticsearch/action/admin/indices/rollover/RolloverIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/indices/rollover/RolloverIT.java rename to server/src/test/java/org/elasticsearch/action/admin/indices/rollover/RolloverIT.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/rollover/RolloverRequestTests.java b/server/src/test/java/org/elasticsearch/action/admin/indices/rollover/RolloverRequestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/indices/rollover/RolloverRequestTests.java rename to server/src/test/java/org/elasticsearch/action/admin/indices/rollover/RolloverRequestTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/rollover/TransportRolloverActionTests.java b/server/src/test/java/org/elasticsearch/action/admin/indices/rollover/TransportRolloverActionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/indices/rollover/TransportRolloverActionTests.java rename to server/src/test/java/org/elasticsearch/action/admin/indices/rollover/TransportRolloverActionTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsBlocksIT.java b/server/src/test/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsBlocksIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsBlocksIT.java rename to server/src/test/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsBlocksIT.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequestTests.java b/server/src/test/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequestTests.java rename to server/src/test/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequestTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoreRequestIT.java b/server/src/test/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoreRequestIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoreRequestIT.java rename to server/src/test/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoreRequestIT.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoreResponseTests.java b/server/src/test/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoreResponseTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoreResponseTests.java rename to server/src/test/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoreResponseTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/shrink/TransportResizeActionTests.java b/server/src/test/java/org/elasticsearch/action/admin/indices/shrink/TransportResizeActionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/indices/shrink/TransportResizeActionTests.java rename to server/src/test/java/org/elasticsearch/action/admin/indices/shrink/TransportResizeActionTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsBlocksIT.java b/server/src/test/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsBlocksIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsBlocksIT.java rename to server/src/test/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsBlocksIT.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsResponseTests.java b/server/src/test/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsResponseTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsResponseTests.java rename to server/src/test/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsResponseTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsTests.java b/server/src/test/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsTests.java rename to server/src/test/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/template/put/MetaDataIndexTemplateServiceTests.java b/server/src/test/java/org/elasticsearch/action/admin/indices/template/put/MetaDataIndexTemplateServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/indices/template/put/MetaDataIndexTemplateServiceTests.java rename to server/src/test/java/org/elasticsearch/action/admin/indices/template/put/MetaDataIndexTemplateServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequestTests.java b/server/src/test/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequestTests.java rename to server/src/test/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequestTests.java diff --git a/core/src/test/java/org/elasticsearch/action/bulk/BackoffPolicyTests.java b/server/src/test/java/org/elasticsearch/action/bulk/BackoffPolicyTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/bulk/BackoffPolicyTests.java rename to server/src/test/java/org/elasticsearch/action/bulk/BackoffPolicyTests.java diff --git a/core/src/test/java/org/elasticsearch/action/bulk/BulkIntegrationIT.java b/server/src/test/java/org/elasticsearch/action/bulk/BulkIntegrationIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/bulk/BulkIntegrationIT.java rename to server/src/test/java/org/elasticsearch/action/bulk/BulkIntegrationIT.java diff --git a/core/src/test/java/org/elasticsearch/action/bulk/BulkItemResponseTests.java b/server/src/test/java/org/elasticsearch/action/bulk/BulkItemResponseTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/bulk/BulkItemResponseTests.java rename to server/src/test/java/org/elasticsearch/action/bulk/BulkItemResponseTests.java diff --git a/core/src/test/java/org/elasticsearch/action/bulk/BulkProcessorClusterSettingsIT.java b/server/src/test/java/org/elasticsearch/action/bulk/BulkProcessorClusterSettingsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/bulk/BulkProcessorClusterSettingsIT.java rename to server/src/test/java/org/elasticsearch/action/bulk/BulkProcessorClusterSettingsIT.java diff --git a/core/src/test/java/org/elasticsearch/action/bulk/BulkProcessorIT.java b/server/src/test/java/org/elasticsearch/action/bulk/BulkProcessorIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/bulk/BulkProcessorIT.java rename to server/src/test/java/org/elasticsearch/action/bulk/BulkProcessorIT.java diff --git a/core/src/test/java/org/elasticsearch/action/bulk/BulkProcessorRetryIT.java b/server/src/test/java/org/elasticsearch/action/bulk/BulkProcessorRetryIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/bulk/BulkProcessorRetryIT.java rename to server/src/test/java/org/elasticsearch/action/bulk/BulkProcessorRetryIT.java diff --git a/core/src/test/java/org/elasticsearch/action/bulk/BulkProcessorTests.java b/server/src/test/java/org/elasticsearch/action/bulk/BulkProcessorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/bulk/BulkProcessorTests.java rename to server/src/test/java/org/elasticsearch/action/bulk/BulkProcessorTests.java diff --git a/core/src/test/java/org/elasticsearch/action/bulk/BulkRequestModifierTests.java b/server/src/test/java/org/elasticsearch/action/bulk/BulkRequestModifierTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/bulk/BulkRequestModifierTests.java rename to server/src/test/java/org/elasticsearch/action/bulk/BulkRequestModifierTests.java diff --git a/core/src/test/java/org/elasticsearch/action/bulk/BulkRequestTests.java b/server/src/test/java/org/elasticsearch/action/bulk/BulkRequestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/bulk/BulkRequestTests.java rename to server/src/test/java/org/elasticsearch/action/bulk/BulkRequestTests.java diff --git a/core/src/test/java/org/elasticsearch/action/bulk/BulkResponseTests.java b/server/src/test/java/org/elasticsearch/action/bulk/BulkResponseTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/bulk/BulkResponseTests.java rename to server/src/test/java/org/elasticsearch/action/bulk/BulkResponseTests.java diff --git a/core/src/test/java/org/elasticsearch/action/bulk/BulkShardRequestTests.java b/server/src/test/java/org/elasticsearch/action/bulk/BulkShardRequestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/bulk/BulkShardRequestTests.java rename to server/src/test/java/org/elasticsearch/action/bulk/BulkShardRequestTests.java diff --git a/core/src/test/java/org/elasticsearch/action/bulk/BulkWithUpdatesIT.java b/server/src/test/java/org/elasticsearch/action/bulk/BulkWithUpdatesIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/bulk/BulkWithUpdatesIT.java rename to server/src/test/java/org/elasticsearch/action/bulk/BulkWithUpdatesIT.java diff --git a/core/src/test/java/org/elasticsearch/action/bulk/RetryTests.java b/server/src/test/java/org/elasticsearch/action/bulk/RetryTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/bulk/RetryTests.java rename to server/src/test/java/org/elasticsearch/action/bulk/RetryTests.java diff --git a/core/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionIndicesThatCannotBeCreatedTests.java b/server/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionIndicesThatCannotBeCreatedTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionIndicesThatCannotBeCreatedTests.java rename to server/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionIndicesThatCannotBeCreatedTests.java diff --git a/core/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionIngestTests.java b/server/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionIngestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionIngestTests.java rename to server/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionIngestTests.java diff --git a/core/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionTests.java b/server/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionTests.java rename to server/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionTests.java diff --git a/core/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionTookTests.java b/server/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionTookTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionTookTests.java rename to server/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionTookTests.java diff --git a/core/src/test/java/org/elasticsearch/action/bulk/TransportShardBulkActionTests.java b/server/src/test/java/org/elasticsearch/action/bulk/TransportShardBulkActionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/bulk/TransportShardBulkActionTests.java rename to server/src/test/java/org/elasticsearch/action/bulk/TransportShardBulkActionTests.java diff --git a/core/src/test/java/org/elasticsearch/action/delete/DeleteResponseTests.java b/server/src/test/java/org/elasticsearch/action/delete/DeleteResponseTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/delete/DeleteResponseTests.java rename to server/src/test/java/org/elasticsearch/action/delete/DeleteResponseTests.java diff --git a/core/src/test/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesRequestTests.java b/server/src/test/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesRequestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesRequestTests.java rename to server/src/test/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesRequestTests.java diff --git a/core/src/test/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesResponseTests.java b/server/src/test/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesResponseTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesResponseTests.java rename to server/src/test/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesResponseTests.java diff --git a/core/src/test/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesTests.java b/server/src/test/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesTests.java rename to server/src/test/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesTests.java diff --git a/core/src/test/java/org/elasticsearch/action/get/GetResponseTests.java b/server/src/test/java/org/elasticsearch/action/get/GetResponseTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/get/GetResponseTests.java rename to server/src/test/java/org/elasticsearch/action/get/GetResponseTests.java diff --git a/core/src/test/java/org/elasticsearch/action/get/MultiGetRequestTests.java b/server/src/test/java/org/elasticsearch/action/get/MultiGetRequestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/get/MultiGetRequestTests.java rename to server/src/test/java/org/elasticsearch/action/get/MultiGetRequestTests.java diff --git a/core/src/test/java/org/elasticsearch/action/get/MultiGetShardRequestTests.java b/server/src/test/java/org/elasticsearch/action/get/MultiGetShardRequestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/get/MultiGetShardRequestTests.java rename to server/src/test/java/org/elasticsearch/action/get/MultiGetShardRequestTests.java diff --git a/core/src/test/java/org/elasticsearch/action/index/IndexRequestBuilderTests.java b/server/src/test/java/org/elasticsearch/action/index/IndexRequestBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/index/IndexRequestBuilderTests.java rename to server/src/test/java/org/elasticsearch/action/index/IndexRequestBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/action/index/IndexRequestTests.java b/server/src/test/java/org/elasticsearch/action/index/IndexRequestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/index/IndexRequestTests.java rename to server/src/test/java/org/elasticsearch/action/index/IndexRequestTests.java diff --git a/core/src/test/java/org/elasticsearch/action/index/IndexResponseTests.java b/server/src/test/java/org/elasticsearch/action/index/IndexResponseTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/index/IndexResponseTests.java rename to server/src/test/java/org/elasticsearch/action/index/IndexResponseTests.java diff --git a/core/src/test/java/org/elasticsearch/action/ingest/PutPipelineRequestTests.java b/server/src/test/java/org/elasticsearch/action/ingest/PutPipelineRequestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/ingest/PutPipelineRequestTests.java rename to server/src/test/java/org/elasticsearch/action/ingest/PutPipelineRequestTests.java diff --git a/core/src/test/java/org/elasticsearch/action/ingest/SimulateDocumentSimpleResultTests.java b/server/src/test/java/org/elasticsearch/action/ingest/SimulateDocumentSimpleResultTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/ingest/SimulateDocumentSimpleResultTests.java rename to server/src/test/java/org/elasticsearch/action/ingest/SimulateDocumentSimpleResultTests.java diff --git a/core/src/test/java/org/elasticsearch/action/ingest/SimulateExecutionServiceTests.java b/server/src/test/java/org/elasticsearch/action/ingest/SimulateExecutionServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/ingest/SimulateExecutionServiceTests.java rename to server/src/test/java/org/elasticsearch/action/ingest/SimulateExecutionServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/action/ingest/SimulatePipelineRequestParsingTests.java b/server/src/test/java/org/elasticsearch/action/ingest/SimulatePipelineRequestParsingTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/ingest/SimulatePipelineRequestParsingTests.java rename to server/src/test/java/org/elasticsearch/action/ingest/SimulatePipelineRequestParsingTests.java diff --git a/core/src/test/java/org/elasticsearch/action/ingest/SimulatePipelineRequestTests.java b/server/src/test/java/org/elasticsearch/action/ingest/SimulatePipelineRequestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/ingest/SimulatePipelineRequestTests.java rename to server/src/test/java/org/elasticsearch/action/ingest/SimulatePipelineRequestTests.java diff --git a/core/src/test/java/org/elasticsearch/action/ingest/SimulatePipelineResponseTests.java b/server/src/test/java/org/elasticsearch/action/ingest/SimulatePipelineResponseTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/ingest/SimulatePipelineResponseTests.java rename to server/src/test/java/org/elasticsearch/action/ingest/SimulatePipelineResponseTests.java diff --git a/core/src/test/java/org/elasticsearch/action/ingest/SimulateProcessorResultTests.java b/server/src/test/java/org/elasticsearch/action/ingest/SimulateProcessorResultTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/ingest/SimulateProcessorResultTests.java rename to server/src/test/java/org/elasticsearch/action/ingest/SimulateProcessorResultTests.java diff --git a/core/src/test/java/org/elasticsearch/action/ingest/TrackingResultProcessorTests.java b/server/src/test/java/org/elasticsearch/action/ingest/TrackingResultProcessorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/ingest/TrackingResultProcessorTests.java rename to server/src/test/java/org/elasticsearch/action/ingest/TrackingResultProcessorTests.java diff --git a/core/src/test/java/org/elasticsearch/action/ingest/WritePipelineResponseTests.java b/server/src/test/java/org/elasticsearch/action/ingest/WritePipelineResponseTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/ingest/WritePipelineResponseTests.java rename to server/src/test/java/org/elasticsearch/action/ingest/WritePipelineResponseTests.java diff --git a/core/src/test/java/org/elasticsearch/action/ingest/WriteableIngestDocumentTests.java b/server/src/test/java/org/elasticsearch/action/ingest/WriteableIngestDocumentTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/ingest/WriteableIngestDocumentTests.java rename to server/src/test/java/org/elasticsearch/action/ingest/WriteableIngestDocumentTests.java diff --git a/core/src/test/java/org/elasticsearch/action/main/MainActionTests.java b/server/src/test/java/org/elasticsearch/action/main/MainActionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/main/MainActionTests.java rename to server/src/test/java/org/elasticsearch/action/main/MainActionTests.java diff --git a/core/src/test/java/org/elasticsearch/action/main/MainResponseTests.java b/server/src/test/java/org/elasticsearch/action/main/MainResponseTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/main/MainResponseTests.java rename to server/src/test/java/org/elasticsearch/action/main/MainResponseTests.java diff --git a/core/src/test/java/org/elasticsearch/action/resync/ResyncReplicationRequestTests.java b/server/src/test/java/org/elasticsearch/action/resync/ResyncReplicationRequestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/resync/ResyncReplicationRequestTests.java rename to server/src/test/java/org/elasticsearch/action/resync/ResyncReplicationRequestTests.java diff --git a/core/src/test/java/org/elasticsearch/action/search/AbstractSearchAsyncActionTests.java b/server/src/test/java/org/elasticsearch/action/search/AbstractSearchAsyncActionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/search/AbstractSearchAsyncActionTests.java rename to server/src/test/java/org/elasticsearch/action/search/AbstractSearchAsyncActionTests.java diff --git a/core/src/test/java/org/elasticsearch/action/search/CanMatchPreFilterSearchPhaseTests.java b/server/src/test/java/org/elasticsearch/action/search/CanMatchPreFilterSearchPhaseTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/search/CanMatchPreFilterSearchPhaseTests.java rename to server/src/test/java/org/elasticsearch/action/search/CanMatchPreFilterSearchPhaseTests.java diff --git a/core/src/test/java/org/elasticsearch/action/search/ClearScrollControllerTests.java b/server/src/test/java/org/elasticsearch/action/search/ClearScrollControllerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/search/ClearScrollControllerTests.java rename to server/src/test/java/org/elasticsearch/action/search/ClearScrollControllerTests.java diff --git a/core/src/test/java/org/elasticsearch/action/search/ClearScrollRequestTests.java b/server/src/test/java/org/elasticsearch/action/search/ClearScrollRequestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/search/ClearScrollRequestTests.java rename to server/src/test/java/org/elasticsearch/action/search/ClearScrollRequestTests.java diff --git a/core/src/test/java/org/elasticsearch/action/search/CountedCollectorTests.java b/server/src/test/java/org/elasticsearch/action/search/CountedCollectorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/search/CountedCollectorTests.java rename to server/src/test/java/org/elasticsearch/action/search/CountedCollectorTests.java diff --git a/core/src/test/java/org/elasticsearch/action/search/DfsQueryPhaseTests.java b/server/src/test/java/org/elasticsearch/action/search/DfsQueryPhaseTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/search/DfsQueryPhaseTests.java rename to server/src/test/java/org/elasticsearch/action/search/DfsQueryPhaseTests.java diff --git a/core/src/test/java/org/elasticsearch/action/search/ExpandSearchPhaseTests.java b/server/src/test/java/org/elasticsearch/action/search/ExpandSearchPhaseTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/search/ExpandSearchPhaseTests.java rename to server/src/test/java/org/elasticsearch/action/search/ExpandSearchPhaseTests.java diff --git a/core/src/test/java/org/elasticsearch/action/search/FetchSearchPhaseTests.java b/server/src/test/java/org/elasticsearch/action/search/FetchSearchPhaseTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/search/FetchSearchPhaseTests.java rename to server/src/test/java/org/elasticsearch/action/search/FetchSearchPhaseTests.java diff --git a/core/src/test/java/org/elasticsearch/action/search/MockSearchPhaseContext.java b/server/src/test/java/org/elasticsearch/action/search/MockSearchPhaseContext.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/search/MockSearchPhaseContext.java rename to server/src/test/java/org/elasticsearch/action/search/MockSearchPhaseContext.java diff --git a/core/src/test/java/org/elasticsearch/action/search/MultiSearchActionTookTests.java b/server/src/test/java/org/elasticsearch/action/search/MultiSearchActionTookTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/search/MultiSearchActionTookTests.java rename to server/src/test/java/org/elasticsearch/action/search/MultiSearchActionTookTests.java diff --git a/core/src/test/java/org/elasticsearch/action/search/MultiSearchRequestTests.java b/server/src/test/java/org/elasticsearch/action/search/MultiSearchRequestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/search/MultiSearchRequestTests.java rename to server/src/test/java/org/elasticsearch/action/search/MultiSearchRequestTests.java diff --git a/core/src/test/java/org/elasticsearch/action/search/MultiSearchResponseTests.java b/server/src/test/java/org/elasticsearch/action/search/MultiSearchResponseTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/search/MultiSearchResponseTests.java rename to server/src/test/java/org/elasticsearch/action/search/MultiSearchResponseTests.java diff --git a/core/src/test/java/org/elasticsearch/action/search/SearchAsyncActionTests.java b/server/src/test/java/org/elasticsearch/action/search/SearchAsyncActionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/search/SearchAsyncActionTests.java rename to server/src/test/java/org/elasticsearch/action/search/SearchAsyncActionTests.java diff --git a/core/src/test/java/org/elasticsearch/action/search/SearchPhaseControllerTests.java b/server/src/test/java/org/elasticsearch/action/search/SearchPhaseControllerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/search/SearchPhaseControllerTests.java rename to server/src/test/java/org/elasticsearch/action/search/SearchPhaseControllerTests.java diff --git a/core/src/test/java/org/elasticsearch/action/search/SearchPhaseExecutionExceptionTests.java b/server/src/test/java/org/elasticsearch/action/search/SearchPhaseExecutionExceptionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/search/SearchPhaseExecutionExceptionTests.java rename to server/src/test/java/org/elasticsearch/action/search/SearchPhaseExecutionExceptionTests.java diff --git a/core/src/test/java/org/elasticsearch/action/search/SearchRequestBuilderTests.java b/server/src/test/java/org/elasticsearch/action/search/SearchRequestBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/search/SearchRequestBuilderTests.java rename to server/src/test/java/org/elasticsearch/action/search/SearchRequestBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/action/search/SearchResponseTests.java b/server/src/test/java/org/elasticsearch/action/search/SearchResponseTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/search/SearchResponseTests.java rename to server/src/test/java/org/elasticsearch/action/search/SearchResponseTests.java diff --git a/core/src/test/java/org/elasticsearch/action/search/SearchScrollAsyncActionTests.java b/server/src/test/java/org/elasticsearch/action/search/SearchScrollAsyncActionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/search/SearchScrollAsyncActionTests.java rename to server/src/test/java/org/elasticsearch/action/search/SearchScrollAsyncActionTests.java diff --git a/core/src/test/java/org/elasticsearch/action/search/SearchScrollRequestTests.java b/server/src/test/java/org/elasticsearch/action/search/SearchScrollRequestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/search/SearchScrollRequestTests.java rename to server/src/test/java/org/elasticsearch/action/search/SearchScrollRequestTests.java diff --git a/core/src/test/java/org/elasticsearch/action/search/ShardSearchFailureTests.java b/server/src/test/java/org/elasticsearch/action/search/ShardSearchFailureTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/search/ShardSearchFailureTests.java rename to server/src/test/java/org/elasticsearch/action/search/ShardSearchFailureTests.java diff --git a/core/src/test/java/org/elasticsearch/action/search/TransportMultiSearchActionTests.java b/server/src/test/java/org/elasticsearch/action/search/TransportMultiSearchActionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/search/TransportMultiSearchActionTests.java rename to server/src/test/java/org/elasticsearch/action/search/TransportMultiSearchActionTests.java diff --git a/core/src/test/java/org/elasticsearch/action/search/TransportSearchActionTests.java b/server/src/test/java/org/elasticsearch/action/search/TransportSearchActionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/search/TransportSearchActionTests.java rename to server/src/test/java/org/elasticsearch/action/search/TransportSearchActionTests.java diff --git a/core/src/test/java/org/elasticsearch/action/search/TransportSearchHelperTests.java b/server/src/test/java/org/elasticsearch/action/search/TransportSearchHelperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/search/TransportSearchHelperTests.java rename to server/src/test/java/org/elasticsearch/action/search/TransportSearchHelperTests.java diff --git a/core/src/test/java/org/elasticsearch/action/search/TransportSearchIT.java b/server/src/test/java/org/elasticsearch/action/search/TransportSearchIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/search/TransportSearchIT.java rename to server/src/test/java/org/elasticsearch/action/search/TransportSearchIT.java diff --git a/core/src/test/java/org/elasticsearch/action/support/ActiveShardCountTests.java b/server/src/test/java/org/elasticsearch/action/support/ActiveShardCountTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/support/ActiveShardCountTests.java rename to server/src/test/java/org/elasticsearch/action/support/ActiveShardCountTests.java diff --git a/core/src/test/java/org/elasticsearch/action/support/ActiveShardsObserverIT.java b/server/src/test/java/org/elasticsearch/action/support/ActiveShardsObserverIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/support/ActiveShardsObserverIT.java rename to server/src/test/java/org/elasticsearch/action/support/ActiveShardsObserverIT.java diff --git a/core/src/test/java/org/elasticsearch/action/support/AdapterActionFutureTests.java b/server/src/test/java/org/elasticsearch/action/support/AdapterActionFutureTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/support/AdapterActionFutureTests.java rename to server/src/test/java/org/elasticsearch/action/support/AdapterActionFutureTests.java diff --git a/core/src/test/java/org/elasticsearch/action/support/AutoCreateIndexTests.java b/server/src/test/java/org/elasticsearch/action/support/AutoCreateIndexTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/support/AutoCreateIndexTests.java rename to server/src/test/java/org/elasticsearch/action/support/AutoCreateIndexTests.java diff --git a/core/src/test/java/org/elasticsearch/action/support/ContextPreservingActionListenerTests.java b/server/src/test/java/org/elasticsearch/action/support/ContextPreservingActionListenerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/support/ContextPreservingActionListenerTests.java rename to server/src/test/java/org/elasticsearch/action/support/ContextPreservingActionListenerTests.java diff --git a/core/src/test/java/org/elasticsearch/action/support/GroupedActionListenerTests.java b/server/src/test/java/org/elasticsearch/action/support/GroupedActionListenerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/support/GroupedActionListenerTests.java rename to server/src/test/java/org/elasticsearch/action/support/GroupedActionListenerTests.java diff --git a/core/src/test/java/org/elasticsearch/action/support/IndicesOptionsTests.java b/server/src/test/java/org/elasticsearch/action/support/IndicesOptionsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/support/IndicesOptionsTests.java rename to server/src/test/java/org/elasticsearch/action/support/IndicesOptionsTests.java diff --git a/core/src/test/java/org/elasticsearch/action/support/ListenableActionFutureTests.java b/server/src/test/java/org/elasticsearch/action/support/ListenableActionFutureTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/support/ListenableActionFutureTests.java rename to server/src/test/java/org/elasticsearch/action/support/ListenableActionFutureTests.java diff --git a/core/src/test/java/org/elasticsearch/action/support/RefreshPolicyTests.java b/server/src/test/java/org/elasticsearch/action/support/RefreshPolicyTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/support/RefreshPolicyTests.java rename to server/src/test/java/org/elasticsearch/action/support/RefreshPolicyTests.java diff --git a/core/src/test/java/org/elasticsearch/action/support/TransportActionFilterChainTests.java b/server/src/test/java/org/elasticsearch/action/support/TransportActionFilterChainTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/support/TransportActionFilterChainTests.java rename to server/src/test/java/org/elasticsearch/action/support/TransportActionFilterChainTests.java diff --git a/core/src/test/java/org/elasticsearch/action/support/WaitActiveShardCountIT.java b/server/src/test/java/org/elasticsearch/action/support/WaitActiveShardCountIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/support/WaitActiveShardCountIT.java rename to server/src/test/java/org/elasticsearch/action/support/WaitActiveShardCountIT.java diff --git a/core/src/test/java/org/elasticsearch/action/support/broadcast/node/TransportBroadcastByNodeActionTests.java b/server/src/test/java/org/elasticsearch/action/support/broadcast/node/TransportBroadcastByNodeActionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/support/broadcast/node/TransportBroadcastByNodeActionTests.java rename to server/src/test/java/org/elasticsearch/action/support/broadcast/node/TransportBroadcastByNodeActionTests.java diff --git a/core/src/test/java/org/elasticsearch/action/support/master/IndexingMasterFailoverIT.java b/server/src/test/java/org/elasticsearch/action/support/master/IndexingMasterFailoverIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/support/master/IndexingMasterFailoverIT.java rename to server/src/test/java/org/elasticsearch/action/support/master/IndexingMasterFailoverIT.java diff --git a/core/src/test/java/org/elasticsearch/action/support/master/TransportMasterNodeActionTests.java b/server/src/test/java/org/elasticsearch/action/support/master/TransportMasterNodeActionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/support/master/TransportMasterNodeActionTests.java rename to server/src/test/java/org/elasticsearch/action/support/master/TransportMasterNodeActionTests.java diff --git a/core/src/test/java/org/elasticsearch/action/support/master/TransportMasterNodeActionUtils.java b/server/src/test/java/org/elasticsearch/action/support/master/TransportMasterNodeActionUtils.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/support/master/TransportMasterNodeActionUtils.java rename to server/src/test/java/org/elasticsearch/action/support/master/TransportMasterNodeActionUtils.java diff --git a/core/src/test/java/org/elasticsearch/action/support/nodes/TransportNodesActionTests.java b/server/src/test/java/org/elasticsearch/action/support/nodes/TransportNodesActionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/support/nodes/TransportNodesActionTests.java rename to server/src/test/java/org/elasticsearch/action/support/nodes/TransportNodesActionTests.java diff --git a/core/src/test/java/org/elasticsearch/action/support/replication/BroadcastReplicationTests.java b/server/src/test/java/org/elasticsearch/action/support/replication/BroadcastReplicationTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/support/replication/BroadcastReplicationTests.java rename to server/src/test/java/org/elasticsearch/action/support/replication/BroadcastReplicationTests.java diff --git a/core/src/test/java/org/elasticsearch/action/support/replication/ClusterStateCreationUtils.java b/server/src/test/java/org/elasticsearch/action/support/replication/ClusterStateCreationUtils.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/support/replication/ClusterStateCreationUtils.java rename to server/src/test/java/org/elasticsearch/action/support/replication/ClusterStateCreationUtils.java diff --git a/core/src/test/java/org/elasticsearch/action/support/replication/ReplicationOperationTests.java b/server/src/test/java/org/elasticsearch/action/support/replication/ReplicationOperationTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/support/replication/ReplicationOperationTests.java rename to server/src/test/java/org/elasticsearch/action/support/replication/ReplicationOperationTests.java diff --git a/core/src/test/java/org/elasticsearch/action/support/replication/ReplicationResponseTests.java b/server/src/test/java/org/elasticsearch/action/support/replication/ReplicationResponseTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/support/replication/ReplicationResponseTests.java rename to server/src/test/java/org/elasticsearch/action/support/replication/ReplicationResponseTests.java diff --git a/core/src/test/java/org/elasticsearch/action/support/replication/TransportReplicationActionTests.java b/server/src/test/java/org/elasticsearch/action/support/replication/TransportReplicationActionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/support/replication/TransportReplicationActionTests.java rename to server/src/test/java/org/elasticsearch/action/support/replication/TransportReplicationActionTests.java diff --git a/core/src/test/java/org/elasticsearch/action/support/replication/TransportWriteActionTestHelper.java b/server/src/test/java/org/elasticsearch/action/support/replication/TransportWriteActionTestHelper.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/support/replication/TransportWriteActionTestHelper.java rename to server/src/test/java/org/elasticsearch/action/support/replication/TransportWriteActionTestHelper.java diff --git a/core/src/test/java/org/elasticsearch/action/support/replication/TransportWriteActionTests.java b/server/src/test/java/org/elasticsearch/action/support/replication/TransportWriteActionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/support/replication/TransportWriteActionTests.java rename to server/src/test/java/org/elasticsearch/action/support/replication/TransportWriteActionTests.java diff --git a/core/src/test/java/org/elasticsearch/action/support/single/instance/TransportInstanceSingleOperationActionTests.java b/server/src/test/java/org/elasticsearch/action/support/single/instance/TransportInstanceSingleOperationActionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/support/single/instance/TransportInstanceSingleOperationActionTests.java rename to server/src/test/java/org/elasticsearch/action/support/single/instance/TransportInstanceSingleOperationActionTests.java diff --git a/core/src/test/java/org/elasticsearch/action/termvectors/AbstractTermVectorsTestCase.java b/server/src/test/java/org/elasticsearch/action/termvectors/AbstractTermVectorsTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/termvectors/AbstractTermVectorsTestCase.java rename to server/src/test/java/org/elasticsearch/action/termvectors/AbstractTermVectorsTestCase.java diff --git a/core/src/test/java/org/elasticsearch/action/termvectors/GetTermVectorsIT.java b/server/src/test/java/org/elasticsearch/action/termvectors/GetTermVectorsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/termvectors/GetTermVectorsIT.java rename to server/src/test/java/org/elasticsearch/action/termvectors/GetTermVectorsIT.java diff --git a/core/src/test/java/org/elasticsearch/action/termvectors/GetTermVectorsTests.java b/server/src/test/java/org/elasticsearch/action/termvectors/GetTermVectorsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/termvectors/GetTermVectorsTests.java rename to server/src/test/java/org/elasticsearch/action/termvectors/GetTermVectorsTests.java diff --git a/core/src/test/java/org/elasticsearch/action/termvectors/MultiTermVectorsIT.java b/server/src/test/java/org/elasticsearch/action/termvectors/MultiTermVectorsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/termvectors/MultiTermVectorsIT.java rename to server/src/test/java/org/elasticsearch/action/termvectors/MultiTermVectorsIT.java diff --git a/core/src/test/java/org/elasticsearch/action/termvectors/TermVectorsUnitTests.java b/server/src/test/java/org/elasticsearch/action/termvectors/TermVectorsUnitTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/termvectors/TermVectorsUnitTests.java rename to server/src/test/java/org/elasticsearch/action/termvectors/TermVectorsUnitTests.java diff --git a/core/src/test/java/org/elasticsearch/action/update/UpdateRequestTests.java b/server/src/test/java/org/elasticsearch/action/update/UpdateRequestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/update/UpdateRequestTests.java rename to server/src/test/java/org/elasticsearch/action/update/UpdateRequestTests.java diff --git a/core/src/test/java/org/elasticsearch/action/update/UpdateResponseTests.java b/server/src/test/java/org/elasticsearch/action/update/UpdateResponseTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/action/update/UpdateResponseTests.java rename to server/src/test/java/org/elasticsearch/action/update/UpdateResponseTests.java diff --git a/core/src/test/java/org/elasticsearch/aliases/IndexAliasesIT.java b/server/src/test/java/org/elasticsearch/aliases/IndexAliasesIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/aliases/IndexAliasesIT.java rename to server/src/test/java/org/elasticsearch/aliases/IndexAliasesIT.java diff --git a/core/src/test/java/org/elasticsearch/blocks/SimpleBlocksIT.java b/server/src/test/java/org/elasticsearch/blocks/SimpleBlocksIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/blocks/SimpleBlocksIT.java rename to server/src/test/java/org/elasticsearch/blocks/SimpleBlocksIT.java diff --git a/core/src/test/java/org/elasticsearch/bootstrap/BootstrapChecksTests.java b/server/src/test/java/org/elasticsearch/bootstrap/BootstrapChecksTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/bootstrap/BootstrapChecksTests.java rename to server/src/test/java/org/elasticsearch/bootstrap/BootstrapChecksTests.java diff --git a/core/src/test/java/org/elasticsearch/bootstrap/BootstrapSettingsTests.java b/server/src/test/java/org/elasticsearch/bootstrap/BootstrapSettingsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/bootstrap/BootstrapSettingsTests.java rename to server/src/test/java/org/elasticsearch/bootstrap/BootstrapSettingsTests.java diff --git a/core/src/test/java/org/elasticsearch/bootstrap/BootstrapTests.java b/server/src/test/java/org/elasticsearch/bootstrap/BootstrapTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/bootstrap/BootstrapTests.java rename to server/src/test/java/org/elasticsearch/bootstrap/BootstrapTests.java diff --git a/core/src/test/java/org/elasticsearch/bootstrap/ESPolicyTests.java b/server/src/test/java/org/elasticsearch/bootstrap/ESPolicyTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/bootstrap/ESPolicyTests.java rename to server/src/test/java/org/elasticsearch/bootstrap/ESPolicyTests.java diff --git a/core/src/test/java/org/elasticsearch/bootstrap/ElasticsearchCliTests.java b/server/src/test/java/org/elasticsearch/bootstrap/ElasticsearchCliTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/bootstrap/ElasticsearchCliTests.java rename to server/src/test/java/org/elasticsearch/bootstrap/ElasticsearchCliTests.java diff --git a/core/src/test/java/org/elasticsearch/bootstrap/ElasticsearchUncaughtExceptionHandlerTests.java b/server/src/test/java/org/elasticsearch/bootstrap/ElasticsearchUncaughtExceptionHandlerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/bootstrap/ElasticsearchUncaughtExceptionHandlerTests.java rename to server/src/test/java/org/elasticsearch/bootstrap/ElasticsearchUncaughtExceptionHandlerTests.java diff --git a/core/src/test/java/org/elasticsearch/bootstrap/JNANativesTests.java b/server/src/test/java/org/elasticsearch/bootstrap/JNANativesTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/bootstrap/JNANativesTests.java rename to server/src/test/java/org/elasticsearch/bootstrap/JNANativesTests.java diff --git a/core/src/test/java/org/elasticsearch/bootstrap/JarHellTests.java b/server/src/test/java/org/elasticsearch/bootstrap/JarHellTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/bootstrap/JarHellTests.java rename to server/src/test/java/org/elasticsearch/bootstrap/JarHellTests.java diff --git a/core/src/test/java/org/elasticsearch/bootstrap/JavaVersionTests.java b/server/src/test/java/org/elasticsearch/bootstrap/JavaVersionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/bootstrap/JavaVersionTests.java rename to server/src/test/java/org/elasticsearch/bootstrap/JavaVersionTests.java diff --git a/core/src/test/java/org/elasticsearch/bootstrap/MaxMapCountCheckTests.java b/server/src/test/java/org/elasticsearch/bootstrap/MaxMapCountCheckTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/bootstrap/MaxMapCountCheckTests.java rename to server/src/test/java/org/elasticsearch/bootstrap/MaxMapCountCheckTests.java diff --git a/core/src/test/java/org/elasticsearch/bootstrap/SecurityTests.java b/server/src/test/java/org/elasticsearch/bootstrap/SecurityTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/bootstrap/SecurityTests.java rename to server/src/test/java/org/elasticsearch/bootstrap/SecurityTests.java diff --git a/core/src/test/java/org/elasticsearch/broadcast/BroadcastActionsIT.java b/server/src/test/java/org/elasticsearch/broadcast/BroadcastActionsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/broadcast/BroadcastActionsIT.java rename to server/src/test/java/org/elasticsearch/broadcast/BroadcastActionsIT.java diff --git a/core/src/test/java/org/elasticsearch/bwcompat/RecoveryWithUnsupportedIndicesIT.java b/server/src/test/java/org/elasticsearch/bwcompat/RecoveryWithUnsupportedIndicesIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/bwcompat/RecoveryWithUnsupportedIndicesIT.java rename to server/src/test/java/org/elasticsearch/bwcompat/RecoveryWithUnsupportedIndicesIT.java diff --git a/core/src/test/java/org/elasticsearch/bwcompat/RestoreBackwardsCompatIT.java b/server/src/test/java/org/elasticsearch/bwcompat/RestoreBackwardsCompatIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/bwcompat/RestoreBackwardsCompatIT.java rename to server/src/test/java/org/elasticsearch/bwcompat/RestoreBackwardsCompatIT.java diff --git a/core/src/test/java/org/elasticsearch/cli/CommandTests.java b/server/src/test/java/org/elasticsearch/cli/CommandTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cli/CommandTests.java rename to server/src/test/java/org/elasticsearch/cli/CommandTests.java diff --git a/core/src/test/java/org/elasticsearch/cli/MultiCommandTests.java b/server/src/test/java/org/elasticsearch/cli/MultiCommandTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cli/MultiCommandTests.java rename to server/src/test/java/org/elasticsearch/cli/MultiCommandTests.java diff --git a/core/src/test/java/org/elasticsearch/cli/TerminalTests.java b/server/src/test/java/org/elasticsearch/cli/TerminalTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cli/TerminalTests.java rename to server/src/test/java/org/elasticsearch/cli/TerminalTests.java diff --git a/core/src/test/java/org/elasticsearch/client/AbstractClientHeadersTestCase.java b/server/src/test/java/org/elasticsearch/client/AbstractClientHeadersTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/client/AbstractClientHeadersTestCase.java rename to server/src/test/java/org/elasticsearch/client/AbstractClientHeadersTestCase.java diff --git a/core/src/test/java/org/elasticsearch/client/ParentTaskAssigningClientTests.java b/server/src/test/java/org/elasticsearch/client/ParentTaskAssigningClientTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/client/ParentTaskAssigningClientTests.java rename to server/src/test/java/org/elasticsearch/client/ParentTaskAssigningClientTests.java diff --git a/core/src/test/java/org/elasticsearch/client/node/NodeClientHeadersTests.java b/server/src/test/java/org/elasticsearch/client/node/NodeClientHeadersTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/client/node/NodeClientHeadersTests.java rename to server/src/test/java/org/elasticsearch/client/node/NodeClientHeadersTests.java diff --git a/core/src/test/java/org/elasticsearch/client/node/NodeClientIT.java b/server/src/test/java/org/elasticsearch/client/node/NodeClientIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/client/node/NodeClientIT.java rename to server/src/test/java/org/elasticsearch/client/node/NodeClientIT.java diff --git a/core/src/test/java/org/elasticsearch/client/transport/FailAndRetryMockTransport.java b/server/src/test/java/org/elasticsearch/client/transport/FailAndRetryMockTransport.java similarity index 100% rename from core/src/test/java/org/elasticsearch/client/transport/FailAndRetryMockTransport.java rename to server/src/test/java/org/elasticsearch/client/transport/FailAndRetryMockTransport.java diff --git a/core/src/test/java/org/elasticsearch/client/transport/NodeDisconnectIT.java b/server/src/test/java/org/elasticsearch/client/transport/NodeDisconnectIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/client/transport/NodeDisconnectIT.java rename to server/src/test/java/org/elasticsearch/client/transport/NodeDisconnectIT.java diff --git a/core/src/test/java/org/elasticsearch/client/transport/TransportClientHeadersTests.java b/server/src/test/java/org/elasticsearch/client/transport/TransportClientHeadersTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/client/transport/TransportClientHeadersTests.java rename to server/src/test/java/org/elasticsearch/client/transport/TransportClientHeadersTests.java diff --git a/core/src/test/java/org/elasticsearch/client/transport/TransportClientIT.java b/server/src/test/java/org/elasticsearch/client/transport/TransportClientIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/client/transport/TransportClientIT.java rename to server/src/test/java/org/elasticsearch/client/transport/TransportClientIT.java diff --git a/core/src/test/java/org/elasticsearch/client/transport/TransportClientNodesServiceTests.java b/server/src/test/java/org/elasticsearch/client/transport/TransportClientNodesServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/client/transport/TransportClientNodesServiceTests.java rename to server/src/test/java/org/elasticsearch/client/transport/TransportClientNodesServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/client/transport/TransportClientRetryIT.java b/server/src/test/java/org/elasticsearch/client/transport/TransportClientRetryIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/client/transport/TransportClientRetryIT.java rename to server/src/test/java/org/elasticsearch/client/transport/TransportClientRetryIT.java diff --git a/core/src/test/java/org/elasticsearch/client/transport/TransportClientTests.java b/server/src/test/java/org/elasticsearch/client/transport/TransportClientTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/client/transport/TransportClientTests.java rename to server/src/test/java/org/elasticsearch/client/transport/TransportClientTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/ClusterChangedEventTests.java b/server/src/test/java/org/elasticsearch/cluster/ClusterChangedEventTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/ClusterChangedEventTests.java rename to server/src/test/java/org/elasticsearch/cluster/ClusterChangedEventTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/ClusterHealthIT.java b/server/src/test/java/org/elasticsearch/cluster/ClusterHealthIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/ClusterHealthIT.java rename to server/src/test/java/org/elasticsearch/cluster/ClusterHealthIT.java diff --git a/core/src/test/java/org/elasticsearch/cluster/ClusterInfoServiceIT.java b/server/src/test/java/org/elasticsearch/cluster/ClusterInfoServiceIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/ClusterInfoServiceIT.java rename to server/src/test/java/org/elasticsearch/cluster/ClusterInfoServiceIT.java diff --git a/core/src/test/java/org/elasticsearch/cluster/ClusterInfoTests.java b/server/src/test/java/org/elasticsearch/cluster/ClusterInfoTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/ClusterInfoTests.java rename to server/src/test/java/org/elasticsearch/cluster/ClusterInfoTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/ClusterModuleTests.java b/server/src/test/java/org/elasticsearch/cluster/ClusterModuleTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/ClusterModuleTests.java rename to server/src/test/java/org/elasticsearch/cluster/ClusterModuleTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/ClusterStateDiffIT.java b/server/src/test/java/org/elasticsearch/cluster/ClusterStateDiffIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/ClusterStateDiffIT.java rename to server/src/test/java/org/elasticsearch/cluster/ClusterStateDiffIT.java diff --git a/core/src/test/java/org/elasticsearch/cluster/ClusterStateTests.java b/server/src/test/java/org/elasticsearch/cluster/ClusterStateTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/ClusterStateTests.java rename to server/src/test/java/org/elasticsearch/cluster/ClusterStateTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/DiskUsageTests.java b/server/src/test/java/org/elasticsearch/cluster/DiskUsageTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/DiskUsageTests.java rename to server/src/test/java/org/elasticsearch/cluster/DiskUsageTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/GetClusterStateTests.java b/server/src/test/java/org/elasticsearch/cluster/GetClusterStateTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/GetClusterStateTests.java rename to server/src/test/java/org/elasticsearch/cluster/GetClusterStateTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/MinimumMasterNodesIT.java b/server/src/test/java/org/elasticsearch/cluster/MinimumMasterNodesIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/MinimumMasterNodesIT.java rename to server/src/test/java/org/elasticsearch/cluster/MinimumMasterNodesIT.java diff --git a/core/src/test/java/org/elasticsearch/cluster/NoMasterNodeIT.java b/server/src/test/java/org/elasticsearch/cluster/NoMasterNodeIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/NoMasterNodeIT.java rename to server/src/test/java/org/elasticsearch/cluster/NoMasterNodeIT.java diff --git a/core/src/test/java/org/elasticsearch/cluster/NodeConnectionsServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/NodeConnectionsServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/NodeConnectionsServiceTests.java rename to server/src/test/java/org/elasticsearch/cluster/NodeConnectionsServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/SimpleClusterStateIT.java b/server/src/test/java/org/elasticsearch/cluster/SimpleClusterStateIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/SimpleClusterStateIT.java rename to server/src/test/java/org/elasticsearch/cluster/SimpleClusterStateIT.java diff --git a/core/src/test/java/org/elasticsearch/cluster/SimpleDataNodesIT.java b/server/src/test/java/org/elasticsearch/cluster/SimpleDataNodesIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/SimpleDataNodesIT.java rename to server/src/test/java/org/elasticsearch/cluster/SimpleDataNodesIT.java diff --git a/core/src/test/java/org/elasticsearch/cluster/SnapshotsInProgressTests.java b/server/src/test/java/org/elasticsearch/cluster/SnapshotsInProgressTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/SnapshotsInProgressTests.java rename to server/src/test/java/org/elasticsearch/cluster/SnapshotsInProgressTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/SpecificMasterNodesIT.java b/server/src/test/java/org/elasticsearch/cluster/SpecificMasterNodesIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/SpecificMasterNodesIT.java rename to server/src/test/java/org/elasticsearch/cluster/SpecificMasterNodesIT.java diff --git a/core/src/test/java/org/elasticsearch/cluster/UpdateSettingsValidationIT.java b/server/src/test/java/org/elasticsearch/cluster/UpdateSettingsValidationIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/UpdateSettingsValidationIT.java rename to server/src/test/java/org/elasticsearch/cluster/UpdateSettingsValidationIT.java diff --git a/core/src/test/java/org/elasticsearch/cluster/ack/AckClusterUpdateSettingsIT.java b/server/src/test/java/org/elasticsearch/cluster/ack/AckClusterUpdateSettingsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/ack/AckClusterUpdateSettingsIT.java rename to server/src/test/java/org/elasticsearch/cluster/ack/AckClusterUpdateSettingsIT.java diff --git a/core/src/test/java/org/elasticsearch/cluster/ack/AckIT.java b/server/src/test/java/org/elasticsearch/cluster/ack/AckIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/ack/AckIT.java rename to server/src/test/java/org/elasticsearch/cluster/ack/AckIT.java diff --git a/core/src/test/java/org/elasticsearch/cluster/action/shard/ShardFailedClusterStateTaskExecutorTests.java b/server/src/test/java/org/elasticsearch/cluster/action/shard/ShardFailedClusterStateTaskExecutorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/action/shard/ShardFailedClusterStateTaskExecutorTests.java rename to server/src/test/java/org/elasticsearch/cluster/action/shard/ShardFailedClusterStateTaskExecutorTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/action/shard/ShardStateActionTests.java b/server/src/test/java/org/elasticsearch/cluster/action/shard/ShardStateActionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/action/shard/ShardStateActionTests.java rename to server/src/test/java/org/elasticsearch/cluster/action/shard/ShardStateActionTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/allocation/AwarenessAllocationIT.java b/server/src/test/java/org/elasticsearch/cluster/allocation/AwarenessAllocationIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/allocation/AwarenessAllocationIT.java rename to server/src/test/java/org/elasticsearch/cluster/allocation/AwarenessAllocationIT.java diff --git a/core/src/test/java/org/elasticsearch/cluster/allocation/ClusterRerouteIT.java b/server/src/test/java/org/elasticsearch/cluster/allocation/ClusterRerouteIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/allocation/ClusterRerouteIT.java rename to server/src/test/java/org/elasticsearch/cluster/allocation/ClusterRerouteIT.java diff --git a/core/src/test/java/org/elasticsearch/cluster/allocation/FilteringAllocationIT.java b/server/src/test/java/org/elasticsearch/cluster/allocation/FilteringAllocationIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/allocation/FilteringAllocationIT.java rename to server/src/test/java/org/elasticsearch/cluster/allocation/FilteringAllocationIT.java diff --git a/core/src/test/java/org/elasticsearch/cluster/allocation/SimpleAllocationIT.java b/server/src/test/java/org/elasticsearch/cluster/allocation/SimpleAllocationIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/allocation/SimpleAllocationIT.java rename to server/src/test/java/org/elasticsearch/cluster/allocation/SimpleAllocationIT.java diff --git a/core/src/test/java/org/elasticsearch/cluster/block/ClusterBlockTests.java b/server/src/test/java/org/elasticsearch/cluster/block/ClusterBlockTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/block/ClusterBlockTests.java rename to server/src/test/java/org/elasticsearch/cluster/block/ClusterBlockTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/health/ClusterIndexHealthTests.java b/server/src/test/java/org/elasticsearch/cluster/health/ClusterIndexHealthTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/health/ClusterIndexHealthTests.java rename to server/src/test/java/org/elasticsearch/cluster/health/ClusterIndexHealthTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/health/ClusterStateHealthTests.java b/server/src/test/java/org/elasticsearch/cluster/health/ClusterStateHealthTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/health/ClusterStateHealthTests.java rename to server/src/test/java/org/elasticsearch/cluster/health/ClusterStateHealthTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/metadata/AliasMetaDataTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/AliasMetaDataTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/metadata/AliasMetaDataTests.java rename to server/src/test/java/org/elasticsearch/cluster/metadata/AliasMetaDataTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/metadata/AliasValidatorTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/AliasValidatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/metadata/AliasValidatorTests.java rename to server/src/test/java/org/elasticsearch/cluster/metadata/AliasValidatorTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/metadata/AutoExpandReplicasTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/AutoExpandReplicasTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/metadata/AutoExpandReplicasTests.java rename to server/src/test/java/org/elasticsearch/cluster/metadata/AutoExpandReplicasTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/metadata/ClusterNameExpressionResolverTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/ClusterNameExpressionResolverTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/metadata/ClusterNameExpressionResolverTests.java rename to server/src/test/java/org/elasticsearch/cluster/metadata/ClusterNameExpressionResolverTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/metadata/DateMathExpressionResolverTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/DateMathExpressionResolverTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/metadata/DateMathExpressionResolverTests.java rename to server/src/test/java/org/elasticsearch/cluster/metadata/DateMathExpressionResolverTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/metadata/HumanReadableIndexSettingsTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/HumanReadableIndexSettingsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/metadata/HumanReadableIndexSettingsTests.java rename to server/src/test/java/org/elasticsearch/cluster/metadata/HumanReadableIndexSettingsTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/metadata/IndexCreationTaskTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/IndexCreationTaskTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/metadata/IndexCreationTaskTests.java rename to server/src/test/java/org/elasticsearch/cluster/metadata/IndexCreationTaskTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/metadata/IndexGraveyardTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/IndexGraveyardTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/metadata/IndexGraveyardTests.java rename to server/src/test/java/org/elasticsearch/cluster/metadata/IndexGraveyardTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/metadata/IndexMetaDataTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/IndexMetaDataTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/metadata/IndexMetaDataTests.java rename to server/src/test/java/org/elasticsearch/cluster/metadata/IndexMetaDataTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolverTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolverTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolverTests.java rename to server/src/test/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolverTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/metadata/IndexTemplateMetaDataTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/IndexTemplateMetaDataTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/metadata/IndexTemplateMetaDataTests.java rename to server/src/test/java/org/elasticsearch/cluster/metadata/IndexTemplateMetaDataTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexServiceTests.java rename to server/src/test/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/metadata/MetaDataDeleteIndexServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/MetaDataDeleteIndexServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/metadata/MetaDataDeleteIndexServiceTests.java rename to server/src/test/java/org/elasticsearch/cluster/metadata/MetaDataDeleteIndexServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/metadata/MetaDataIndexAliasesServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/MetaDataIndexAliasesServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/metadata/MetaDataIndexAliasesServiceTests.java rename to server/src/test/java/org/elasticsearch/cluster/metadata/MetaDataIndexAliasesServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/metadata/MetaDataIndexUpgradeServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/MetaDataIndexUpgradeServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/metadata/MetaDataIndexUpgradeServiceTests.java rename to server/src/test/java/org/elasticsearch/cluster/metadata/MetaDataIndexUpgradeServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/metadata/MetaDataMappingServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/MetaDataMappingServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/metadata/MetaDataMappingServiceTests.java rename to server/src/test/java/org/elasticsearch/cluster/metadata/MetaDataMappingServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/metadata/MetaDataTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/MetaDataTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/metadata/MetaDataTests.java rename to server/src/test/java/org/elasticsearch/cluster/metadata/MetaDataTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/metadata/TemplateUpgradeServiceIT.java b/server/src/test/java/org/elasticsearch/cluster/metadata/TemplateUpgradeServiceIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/metadata/TemplateUpgradeServiceIT.java rename to server/src/test/java/org/elasticsearch/cluster/metadata/TemplateUpgradeServiceIT.java diff --git a/core/src/test/java/org/elasticsearch/cluster/metadata/TemplateUpgradeServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/TemplateUpgradeServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/metadata/TemplateUpgradeServiceTests.java rename to server/src/test/java/org/elasticsearch/cluster/metadata/TemplateUpgradeServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/metadata/ToAndFromJsonMetaDataTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/ToAndFromJsonMetaDataTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/metadata/ToAndFromJsonMetaDataTests.java rename to server/src/test/java/org/elasticsearch/cluster/metadata/ToAndFromJsonMetaDataTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/metadata/WildcardExpressionResolverTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/WildcardExpressionResolverTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/metadata/WildcardExpressionResolverTests.java rename to server/src/test/java/org/elasticsearch/cluster/metadata/WildcardExpressionResolverTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeFiltersTests.java b/server/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeFiltersTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeFiltersTests.java rename to server/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeFiltersTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeTests.java b/server/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeTests.java rename to server/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodesTests.java b/server/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodesTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodesTests.java rename to server/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodesTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/AllocationIdTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/AllocationIdTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/AllocationIdTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/AllocationIdTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/DelayedAllocationIT.java b/server/src/test/java/org/elasticsearch/cluster/routing/DelayedAllocationIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/DelayedAllocationIT.java rename to server/src/test/java/org/elasticsearch/cluster/routing/DelayedAllocationIT.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/DelayedAllocationServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/DelayedAllocationServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/DelayedAllocationServiceTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/DelayedAllocationServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/GroupShardsIteratorTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/GroupShardsIteratorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/GroupShardsIteratorTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/GroupShardsIteratorTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/OperationRoutingTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/OperationRoutingTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/OperationRoutingTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/OperationRoutingTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/PrimaryAllocationIT.java b/server/src/test/java/org/elasticsearch/cluster/routing/PrimaryAllocationIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/PrimaryAllocationIT.java rename to server/src/test/java/org/elasticsearch/cluster/routing/PrimaryAllocationIT.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/PrimaryTermsTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/PrimaryTermsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/PrimaryTermsTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/PrimaryTermsTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/RandomShardRoutingMutator.java b/server/src/test/java/org/elasticsearch/cluster/routing/RandomShardRoutingMutator.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/RandomShardRoutingMutator.java rename to server/src/test/java/org/elasticsearch/cluster/routing/RandomShardRoutingMutator.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/RecoverySourceTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/RecoverySourceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/RecoverySourceTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/RecoverySourceTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/RoutingServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/RoutingServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/RoutingServiceTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/RoutingServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/RoutingTableGenerator.java b/server/src/test/java/org/elasticsearch/cluster/routing/RoutingTableGenerator.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/RoutingTableGenerator.java rename to server/src/test/java/org/elasticsearch/cluster/routing/RoutingTableGenerator.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/RoutingTableTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/RoutingTableTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/RoutingTableTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/RoutingTableTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/ShardRoutingTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/ShardRoutingTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/ShardRoutingTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/ShardRoutingTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/UnassignedInfoTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/UnassignedInfoTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/UnassignedInfoTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/UnassignedInfoTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/AddIncrementallyTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/AddIncrementallyTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/AddIncrementallyTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/AddIncrementallyTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocateUnassignedDecisionTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocateUnassignedDecisionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocateUnassignedDecisionTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocateUnassignedDecisionTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationCommandsTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationCommandsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationCommandsTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationCommandsTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationDecisionTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationDecisionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationDecisionTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationDecisionTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationPriorityTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationPriorityTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationPriorityTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationPriorityTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/AwarenessAllocationTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/AwarenessAllocationTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/AwarenessAllocationTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/AwarenessAllocationTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/BalanceConfigurationTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/BalanceConfigurationTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/BalanceConfigurationTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/BalanceConfigurationTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/BalanceUnbalancedClusterTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/BalanceUnbalancedClusterTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/BalanceUnbalancedClusterTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/BalanceUnbalancedClusterTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/BalancedSingleShardTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/BalancedSingleShardTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/BalancedSingleShardTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/BalancedSingleShardTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/CatAllocationTestCase.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/CatAllocationTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/CatAllocationTestCase.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/CatAllocationTestCase.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/ClusterRebalanceRoutingTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ClusterRebalanceRoutingTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/ClusterRebalanceRoutingTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/ClusterRebalanceRoutingTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/ConcurrentRebalanceRoutingTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ConcurrentRebalanceRoutingTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/ConcurrentRebalanceRoutingTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/ConcurrentRebalanceRoutingTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/DeadNodesAllocationTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/DeadNodesAllocationTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/DeadNodesAllocationTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/DeadNodesAllocationTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/DecisionsImpactOnClusterHealthTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/DecisionsImpactOnClusterHealthTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/DecisionsImpactOnClusterHealthTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/DecisionsImpactOnClusterHealthTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdMonitorTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdMonitorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdMonitorTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdMonitorTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdSettingsTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdSettingsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdSettingsTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdSettingsTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/ElectReplicaAsPrimaryDuringRelocationTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ElectReplicaAsPrimaryDuringRelocationTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/ElectReplicaAsPrimaryDuringRelocationTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/ElectReplicaAsPrimaryDuringRelocationTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/ExpectedShardSizeAllocationTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ExpectedShardSizeAllocationTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/ExpectedShardSizeAllocationTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/ExpectedShardSizeAllocationTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedNodeRoutingTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedNodeRoutingTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedNodeRoutingTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedNodeRoutingTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedShardsRoutingTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedShardsRoutingTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedShardsRoutingTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedShardsRoutingTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/FilterRoutingTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/FilterRoutingTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/FilterRoutingTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/FilterRoutingTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/InSyncAllocationIdTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/InSyncAllocationIdTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/InSyncAllocationIdTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/InSyncAllocationIdTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/IndexBalanceTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/IndexBalanceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/IndexBalanceTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/IndexBalanceTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/MaxRetryAllocationDeciderTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/MaxRetryAllocationDeciderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/MaxRetryAllocationDeciderTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/MaxRetryAllocationDeciderTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/MoveDecisionTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/MoveDecisionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/MoveDecisionTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/MoveDecisionTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/NodeAllocationResultTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/NodeAllocationResultTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/NodeAllocationResultTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/NodeAllocationResultTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/NodeVersionAllocationDeciderTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/NodeVersionAllocationDeciderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/NodeVersionAllocationDeciderTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/NodeVersionAllocationDeciderTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/PreferLocalPrimariesToRelocatingPrimariesTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/PreferLocalPrimariesToRelocatingPrimariesTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/PreferLocalPrimariesToRelocatingPrimariesTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/PreferLocalPrimariesToRelocatingPrimariesTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/PreferPrimaryAllocationTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/PreferPrimaryAllocationTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/PreferPrimaryAllocationTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/PreferPrimaryAllocationTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryElectionRoutingTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryElectionRoutingTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryElectionRoutingTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryElectionRoutingTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryNotRelocatedWhileBeingRecoveredTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryNotRelocatedWhileBeingRecoveredTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryNotRelocatedWhileBeingRecoveredTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryNotRelocatedWhileBeingRecoveredTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/RandomAllocationDeciderTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/RandomAllocationDeciderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/RandomAllocationDeciderTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/RandomAllocationDeciderTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/RebalanceAfterActiveTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/RebalanceAfterActiveTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/RebalanceAfterActiveTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/RebalanceAfterActiveTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/ReplicaAllocatedAfterPrimaryTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ReplicaAllocatedAfterPrimaryTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/ReplicaAllocatedAfterPrimaryTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/ReplicaAllocatedAfterPrimaryTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/ResizeAllocationDeciderTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ResizeAllocationDeciderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/ResizeAllocationDeciderTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/ResizeAllocationDeciderTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/RoutingNodesIntegrityTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/RoutingNodesIntegrityTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/RoutingNodesIntegrityTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/RoutingNodesIntegrityTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/RoutingNodesUtils.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/RoutingNodesUtils.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/RoutingNodesUtils.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/RoutingNodesUtils.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/SameShardRoutingTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/SameShardRoutingTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/SameShardRoutingTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/SameShardRoutingTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardStateIT.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardStateIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardStateIT.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardStateIT.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardVersioningTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardVersioningTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardVersioningTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardVersioningTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardsLimitAllocationTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardsLimitAllocationTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardsLimitAllocationTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardsLimitAllocationTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardNoReplicasRoutingTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardNoReplicasRoutingTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardNoReplicasRoutingTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardNoReplicasRoutingTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardOneReplicaRoutingTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardOneReplicaRoutingTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardOneReplicaRoutingTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardOneReplicaRoutingTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/StartedShardsRoutingTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/StartedShardsRoutingTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/StartedShardsRoutingTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/StartedShardsRoutingTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/TenShardsOneReplicaRoutingTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/TenShardsOneReplicaRoutingTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/TenShardsOneReplicaRoutingTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/TenShardsOneReplicaRoutingTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/ThrottlingAllocationTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ThrottlingAllocationTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/ThrottlingAllocationTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/ThrottlingAllocationTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/UpdateNumberOfReplicasTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/UpdateNumberOfReplicasTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/UpdateNumberOfReplicasTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/UpdateNumberOfReplicasTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DecisionTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DecisionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DecisionTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DecisionTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderUnitTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderUnitTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderUnitTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderUnitTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/EnableAllocationTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/EnableAllocationTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/EnableAllocationTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/EnableAllocationTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/FilterAllocationDeciderTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/FilterAllocationDeciderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/FilterAllocationDeciderTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/FilterAllocationDeciderTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/MockDiskUsagesIT.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/MockDiskUsagesIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/MockDiskUsagesIT.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/MockDiskUsagesIT.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/RestoreInProgressAllocationDeciderTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/RestoreInProgressAllocationDeciderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/RestoreInProgressAllocationDeciderTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/RestoreInProgressAllocationDeciderTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/UpdateShardAllocationSettingsIT.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/UpdateShardAllocationSettingsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/UpdateShardAllocationSettingsIT.java rename to server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/UpdateShardAllocationSettingsIT.java diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/operation/hash/murmur3/Murmur3HashFunctionTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/operation/hash/murmur3/Murmur3HashFunctionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/routing/operation/hash/murmur3/Murmur3HashFunctionTests.java rename to server/src/test/java/org/elasticsearch/cluster/routing/operation/hash/murmur3/Murmur3HashFunctionTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/serialization/ClusterSerializationTests.java b/server/src/test/java/org/elasticsearch/cluster/serialization/ClusterSerializationTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/serialization/ClusterSerializationTests.java rename to server/src/test/java/org/elasticsearch/cluster/serialization/ClusterSerializationTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/serialization/ClusterStateToStringTests.java b/server/src/test/java/org/elasticsearch/cluster/serialization/ClusterStateToStringTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/serialization/ClusterStateToStringTests.java rename to server/src/test/java/org/elasticsearch/cluster/serialization/ClusterStateToStringTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/serialization/DiffableTests.java b/server/src/test/java/org/elasticsearch/cluster/serialization/DiffableTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/serialization/DiffableTests.java rename to server/src/test/java/org/elasticsearch/cluster/serialization/DiffableTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/service/ClusterApplierServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/service/ClusterApplierServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/service/ClusterApplierServiceTests.java rename to server/src/test/java/org/elasticsearch/cluster/service/ClusterApplierServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/service/ClusterSerivceTests.java b/server/src/test/java/org/elasticsearch/cluster/service/ClusterSerivceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/service/ClusterSerivceTests.java rename to server/src/test/java/org/elasticsearch/cluster/service/ClusterSerivceTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/service/ClusterServiceIT.java b/server/src/test/java/org/elasticsearch/cluster/service/ClusterServiceIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/service/ClusterServiceIT.java rename to server/src/test/java/org/elasticsearch/cluster/service/ClusterServiceIT.java diff --git a/core/src/test/java/org/elasticsearch/cluster/service/MasterServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/service/MasterServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/service/MasterServiceTests.java rename to server/src/test/java/org/elasticsearch/cluster/service/MasterServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/service/TaskBatcherTests.java b/server/src/test/java/org/elasticsearch/cluster/service/TaskBatcherTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/service/TaskBatcherTests.java rename to server/src/test/java/org/elasticsearch/cluster/service/TaskBatcherTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/service/TaskExecutorTests.java b/server/src/test/java/org/elasticsearch/cluster/service/TaskExecutorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/service/TaskExecutorTests.java rename to server/src/test/java/org/elasticsearch/cluster/service/TaskExecutorTests.java diff --git a/core/src/test/java/org/elasticsearch/cluster/settings/ClusterSettingsIT.java b/server/src/test/java/org/elasticsearch/cluster/settings/ClusterSettingsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/settings/ClusterSettingsIT.java rename to server/src/test/java/org/elasticsearch/cluster/settings/ClusterSettingsIT.java diff --git a/core/src/test/java/org/elasticsearch/cluster/settings/SettingsFilteringIT.java b/server/src/test/java/org/elasticsearch/cluster/settings/SettingsFilteringIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/settings/SettingsFilteringIT.java rename to server/src/test/java/org/elasticsearch/cluster/settings/SettingsFilteringIT.java diff --git a/core/src/test/java/org/elasticsearch/cluster/shards/ClusterSearchShardsIT.java b/server/src/test/java/org/elasticsearch/cluster/shards/ClusterSearchShardsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/shards/ClusterSearchShardsIT.java rename to server/src/test/java/org/elasticsearch/cluster/shards/ClusterSearchShardsIT.java diff --git a/core/src/test/java/org/elasticsearch/cluster/structure/RoutingIteratorTests.java b/server/src/test/java/org/elasticsearch/cluster/structure/RoutingIteratorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/cluster/structure/RoutingIteratorTests.java rename to server/src/test/java/org/elasticsearch/cluster/structure/RoutingIteratorTests.java diff --git a/core/src/test/java/org/elasticsearch/common/BooleansTests.java b/server/src/test/java/org/elasticsearch/common/BooleansTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/BooleansTests.java rename to server/src/test/java/org/elasticsearch/common/BooleansTests.java diff --git a/core/src/test/java/org/elasticsearch/common/ChannelsTests.java b/server/src/test/java/org/elasticsearch/common/ChannelsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/ChannelsTests.java rename to server/src/test/java/org/elasticsearch/common/ChannelsTests.java diff --git a/core/src/test/java/org/elasticsearch/common/ExponentiallyWeightedMovingAverageTests.java b/server/src/test/java/org/elasticsearch/common/ExponentiallyWeightedMovingAverageTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/ExponentiallyWeightedMovingAverageTests.java rename to server/src/test/java/org/elasticsearch/common/ExponentiallyWeightedMovingAverageTests.java diff --git a/core/src/test/java/org/elasticsearch/common/FieldMemoryStatsTests.java b/server/src/test/java/org/elasticsearch/common/FieldMemoryStatsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/FieldMemoryStatsTests.java rename to server/src/test/java/org/elasticsearch/common/FieldMemoryStatsTests.java diff --git a/core/src/test/java/org/elasticsearch/common/NumbersTests.java b/server/src/test/java/org/elasticsearch/common/NumbersTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/NumbersTests.java rename to server/src/test/java/org/elasticsearch/common/NumbersTests.java diff --git a/core/src/test/java/org/elasticsearch/common/ParseFieldTests.java b/server/src/test/java/org/elasticsearch/common/ParseFieldTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/ParseFieldTests.java rename to server/src/test/java/org/elasticsearch/common/ParseFieldTests.java diff --git a/core/src/test/java/org/elasticsearch/common/PidFileTests.java b/server/src/test/java/org/elasticsearch/common/PidFileTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/PidFileTests.java rename to server/src/test/java/org/elasticsearch/common/PidFileTests.java diff --git a/core/src/test/java/org/elasticsearch/common/PriorityTests.java b/server/src/test/java/org/elasticsearch/common/PriorityTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/PriorityTests.java rename to server/src/test/java/org/elasticsearch/common/PriorityTests.java diff --git a/core/src/test/java/org/elasticsearch/common/ReleasablesTests.java b/server/src/test/java/org/elasticsearch/common/ReleasablesTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/ReleasablesTests.java rename to server/src/test/java/org/elasticsearch/common/ReleasablesTests.java diff --git a/core/src/test/java/org/elasticsearch/common/StringsTests.java b/server/src/test/java/org/elasticsearch/common/StringsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/StringsTests.java rename to server/src/test/java/org/elasticsearch/common/StringsTests.java diff --git a/core/src/test/java/org/elasticsearch/common/TableTests.java b/server/src/test/java/org/elasticsearch/common/TableTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/TableTests.java rename to server/src/test/java/org/elasticsearch/common/TableTests.java diff --git a/core/src/test/java/org/elasticsearch/common/UUIDTests.java b/server/src/test/java/org/elasticsearch/common/UUIDTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/UUIDTests.java rename to server/src/test/java/org/elasticsearch/common/UUIDTests.java diff --git a/core/src/test/java/org/elasticsearch/common/blobstore/BlobPathTests.java b/server/src/test/java/org/elasticsearch/common/blobstore/BlobPathTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/blobstore/BlobPathTests.java rename to server/src/test/java/org/elasticsearch/common/blobstore/BlobPathTests.java diff --git a/core/src/test/java/org/elasticsearch/common/blobstore/FsBlobStoreContainerTests.java b/server/src/test/java/org/elasticsearch/common/blobstore/FsBlobStoreContainerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/blobstore/FsBlobStoreContainerTests.java rename to server/src/test/java/org/elasticsearch/common/blobstore/FsBlobStoreContainerTests.java diff --git a/core/src/test/java/org/elasticsearch/common/blobstore/FsBlobStoreTests.java b/server/src/test/java/org/elasticsearch/common/blobstore/FsBlobStoreTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/blobstore/FsBlobStoreTests.java rename to server/src/test/java/org/elasticsearch/common/blobstore/FsBlobStoreTests.java diff --git a/core/src/test/java/org/elasticsearch/common/breaker/MemoryCircuitBreakerTests.java b/server/src/test/java/org/elasticsearch/common/breaker/MemoryCircuitBreakerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/breaker/MemoryCircuitBreakerTests.java rename to server/src/test/java/org/elasticsearch/common/breaker/MemoryCircuitBreakerTests.java diff --git a/core/src/test/java/org/elasticsearch/common/bytes/ByteBufferReferenceTests.java b/server/src/test/java/org/elasticsearch/common/bytes/ByteBufferReferenceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/bytes/ByteBufferReferenceTests.java rename to server/src/test/java/org/elasticsearch/common/bytes/ByteBufferReferenceTests.java diff --git a/core/src/test/java/org/elasticsearch/common/bytes/BytesArrayTests.java b/server/src/test/java/org/elasticsearch/common/bytes/BytesArrayTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/bytes/BytesArrayTests.java rename to server/src/test/java/org/elasticsearch/common/bytes/BytesArrayTests.java diff --git a/core/src/test/java/org/elasticsearch/common/bytes/CompositeBytesReferenceTests.java b/server/src/test/java/org/elasticsearch/common/bytes/CompositeBytesReferenceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/bytes/CompositeBytesReferenceTests.java rename to server/src/test/java/org/elasticsearch/common/bytes/CompositeBytesReferenceTests.java diff --git a/core/src/test/java/org/elasticsearch/common/bytes/PagedBytesReferenceTests.java b/server/src/test/java/org/elasticsearch/common/bytes/PagedBytesReferenceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/bytes/PagedBytesReferenceTests.java rename to server/src/test/java/org/elasticsearch/common/bytes/PagedBytesReferenceTests.java diff --git a/core/src/test/java/org/elasticsearch/common/cache/CacheBuilderTests.java b/server/src/test/java/org/elasticsearch/common/cache/CacheBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/cache/CacheBuilderTests.java rename to server/src/test/java/org/elasticsearch/common/cache/CacheBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/common/cache/CacheTests.java b/server/src/test/java/org/elasticsearch/common/cache/CacheTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/cache/CacheTests.java rename to server/src/test/java/org/elasticsearch/common/cache/CacheTests.java diff --git a/core/src/test/java/org/elasticsearch/common/collect/CopyOnWriteHashMapTests.java b/server/src/test/java/org/elasticsearch/common/collect/CopyOnWriteHashMapTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/collect/CopyOnWriteHashMapTests.java rename to server/src/test/java/org/elasticsearch/common/collect/CopyOnWriteHashMapTests.java diff --git a/core/src/test/java/org/elasticsearch/common/collect/EvictingQueueTests.java b/server/src/test/java/org/elasticsearch/common/collect/EvictingQueueTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/collect/EvictingQueueTests.java rename to server/src/test/java/org/elasticsearch/common/collect/EvictingQueueTests.java diff --git a/core/src/test/java/org/elasticsearch/common/collect/IteratorsTests.java b/server/src/test/java/org/elasticsearch/common/collect/IteratorsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/collect/IteratorsTests.java rename to server/src/test/java/org/elasticsearch/common/collect/IteratorsTests.java diff --git a/core/src/test/java/org/elasticsearch/common/compress/DeflateCompressTests.java b/server/src/test/java/org/elasticsearch/common/compress/DeflateCompressTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/compress/DeflateCompressTests.java rename to server/src/test/java/org/elasticsearch/common/compress/DeflateCompressTests.java diff --git a/core/src/test/java/org/elasticsearch/common/compress/DeflateCompressedXContentTests.java b/server/src/test/java/org/elasticsearch/common/compress/DeflateCompressedXContentTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/compress/DeflateCompressedXContentTests.java rename to server/src/test/java/org/elasticsearch/common/compress/DeflateCompressedXContentTests.java diff --git a/core/src/test/java/org/elasticsearch/common/geo/BaseGeoParsingTestCase.java b/server/src/test/java/org/elasticsearch/common/geo/BaseGeoParsingTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/geo/BaseGeoParsingTestCase.java rename to server/src/test/java/org/elasticsearch/common/geo/BaseGeoParsingTestCase.java diff --git a/core/src/test/java/org/elasticsearch/common/geo/GeoDistanceTests.java b/server/src/test/java/org/elasticsearch/common/geo/GeoDistanceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/geo/GeoDistanceTests.java rename to server/src/test/java/org/elasticsearch/common/geo/GeoDistanceTests.java diff --git a/core/src/test/java/org/elasticsearch/common/geo/GeoHashTests.java b/server/src/test/java/org/elasticsearch/common/geo/GeoHashTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/geo/GeoHashTests.java rename to server/src/test/java/org/elasticsearch/common/geo/GeoHashTests.java diff --git a/core/src/test/java/org/elasticsearch/common/geo/GeoJsonShapeParserTests.java b/server/src/test/java/org/elasticsearch/common/geo/GeoJsonShapeParserTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/geo/GeoJsonShapeParserTests.java rename to server/src/test/java/org/elasticsearch/common/geo/GeoJsonShapeParserTests.java diff --git a/core/src/test/java/org/elasticsearch/common/geo/GeoWKTShapeParserTests.java b/server/src/test/java/org/elasticsearch/common/geo/GeoWKTShapeParserTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/geo/GeoWKTShapeParserTests.java rename to server/src/test/java/org/elasticsearch/common/geo/GeoWKTShapeParserTests.java diff --git a/core/src/test/java/org/elasticsearch/common/geo/ShapeBuilderTests.java b/server/src/test/java/org/elasticsearch/common/geo/ShapeBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/geo/ShapeBuilderTests.java rename to server/src/test/java/org/elasticsearch/common/geo/ShapeBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/common/geo/ShapeRelationTests.java b/server/src/test/java/org/elasticsearch/common/geo/ShapeRelationTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/geo/ShapeRelationTests.java rename to server/src/test/java/org/elasticsearch/common/geo/ShapeRelationTests.java diff --git a/core/src/test/java/org/elasticsearch/common/geo/SpatialStrategyTests.java b/server/src/test/java/org/elasticsearch/common/geo/SpatialStrategyTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/geo/SpatialStrategyTests.java rename to server/src/test/java/org/elasticsearch/common/geo/SpatialStrategyTests.java diff --git a/core/src/test/java/org/elasticsearch/common/geo/builders/AbstractShapeBuilderTestCase.java b/server/src/test/java/org/elasticsearch/common/geo/builders/AbstractShapeBuilderTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/geo/builders/AbstractShapeBuilderTestCase.java rename to server/src/test/java/org/elasticsearch/common/geo/builders/AbstractShapeBuilderTestCase.java diff --git a/core/src/test/java/org/elasticsearch/common/geo/builders/CircleBuilderTests.java b/server/src/test/java/org/elasticsearch/common/geo/builders/CircleBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/geo/builders/CircleBuilderTests.java rename to server/src/test/java/org/elasticsearch/common/geo/builders/CircleBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/common/geo/builders/EnvelopeBuilderTests.java b/server/src/test/java/org/elasticsearch/common/geo/builders/EnvelopeBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/geo/builders/EnvelopeBuilderTests.java rename to server/src/test/java/org/elasticsearch/common/geo/builders/EnvelopeBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/common/geo/builders/GeometryCollectionBuilderTests.java b/server/src/test/java/org/elasticsearch/common/geo/builders/GeometryCollectionBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/geo/builders/GeometryCollectionBuilderTests.java rename to server/src/test/java/org/elasticsearch/common/geo/builders/GeometryCollectionBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/common/geo/builders/LineStringBuilderTests.java b/server/src/test/java/org/elasticsearch/common/geo/builders/LineStringBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/geo/builders/LineStringBuilderTests.java rename to server/src/test/java/org/elasticsearch/common/geo/builders/LineStringBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/common/geo/builders/MultiLineStringBuilderTests.java b/server/src/test/java/org/elasticsearch/common/geo/builders/MultiLineStringBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/geo/builders/MultiLineStringBuilderTests.java rename to server/src/test/java/org/elasticsearch/common/geo/builders/MultiLineStringBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/common/geo/builders/MultiPointBuilderTests.java b/server/src/test/java/org/elasticsearch/common/geo/builders/MultiPointBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/geo/builders/MultiPointBuilderTests.java rename to server/src/test/java/org/elasticsearch/common/geo/builders/MultiPointBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/common/geo/builders/MultiPolygonBuilderTests.java b/server/src/test/java/org/elasticsearch/common/geo/builders/MultiPolygonBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/geo/builders/MultiPolygonBuilderTests.java rename to server/src/test/java/org/elasticsearch/common/geo/builders/MultiPolygonBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/common/geo/builders/PointBuilderTests.java b/server/src/test/java/org/elasticsearch/common/geo/builders/PointBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/geo/builders/PointBuilderTests.java rename to server/src/test/java/org/elasticsearch/common/geo/builders/PointBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/common/geo/builders/PolygonBuilderTests.java b/server/src/test/java/org/elasticsearch/common/geo/builders/PolygonBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/geo/builders/PolygonBuilderTests.java rename to server/src/test/java/org/elasticsearch/common/geo/builders/PolygonBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/common/hash/MessageDigestsTests.java b/server/src/test/java/org/elasticsearch/common/hash/MessageDigestsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/hash/MessageDigestsTests.java rename to server/src/test/java/org/elasticsearch/common/hash/MessageDigestsTests.java diff --git a/core/src/test/java/org/elasticsearch/common/hashing/MurmurHash3Tests.java b/server/src/test/java/org/elasticsearch/common/hashing/MurmurHash3Tests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/hashing/MurmurHash3Tests.java rename to server/src/test/java/org/elasticsearch/common/hashing/MurmurHash3Tests.java diff --git a/core/src/test/java/org/elasticsearch/common/hppc/HppcMapsTests.java b/server/src/test/java/org/elasticsearch/common/hppc/HppcMapsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/hppc/HppcMapsTests.java rename to server/src/test/java/org/elasticsearch/common/hppc/HppcMapsTests.java diff --git a/core/src/test/java/org/elasticsearch/common/io/FileSystemUtilsTests.java b/server/src/test/java/org/elasticsearch/common/io/FileSystemUtilsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/io/FileSystemUtilsTests.java rename to server/src/test/java/org/elasticsearch/common/io/FileSystemUtilsTests.java diff --git a/core/src/test/java/org/elasticsearch/common/io/StreamsTests.java b/server/src/test/java/org/elasticsearch/common/io/StreamsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/io/StreamsTests.java rename to server/src/test/java/org/elasticsearch/common/io/StreamsTests.java diff --git a/core/src/test/java/org/elasticsearch/common/io/stream/AbstractWriteableEnumTestCase.java b/server/src/test/java/org/elasticsearch/common/io/stream/AbstractWriteableEnumTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/io/stream/AbstractWriteableEnumTestCase.java rename to server/src/test/java/org/elasticsearch/common/io/stream/AbstractWriteableEnumTestCase.java diff --git a/core/src/test/java/org/elasticsearch/common/io/stream/BytesStreamsTests.java b/server/src/test/java/org/elasticsearch/common/io/stream/BytesStreamsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/io/stream/BytesStreamsTests.java rename to server/src/test/java/org/elasticsearch/common/io/stream/BytesStreamsTests.java diff --git a/core/src/test/java/org/elasticsearch/common/io/stream/NamedWriteableRegistryTests.java b/server/src/test/java/org/elasticsearch/common/io/stream/NamedWriteableRegistryTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/io/stream/NamedWriteableRegistryTests.java rename to server/src/test/java/org/elasticsearch/common/io/stream/NamedWriteableRegistryTests.java diff --git a/core/src/test/java/org/elasticsearch/common/io/stream/ReleasableBytesStreamOutputTests.java b/server/src/test/java/org/elasticsearch/common/io/stream/ReleasableBytesStreamOutputTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/io/stream/ReleasableBytesStreamOutputTests.java rename to server/src/test/java/org/elasticsearch/common/io/stream/ReleasableBytesStreamOutputTests.java diff --git a/core/src/test/java/org/elasticsearch/common/io/stream/StreamTests.java b/server/src/test/java/org/elasticsearch/common/io/stream/StreamTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/io/stream/StreamTests.java rename to server/src/test/java/org/elasticsearch/common/io/stream/StreamTests.java diff --git a/core/src/test/java/org/elasticsearch/common/joda/DateMathParserTests.java b/server/src/test/java/org/elasticsearch/common/joda/DateMathParserTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/joda/DateMathParserTests.java rename to server/src/test/java/org/elasticsearch/common/joda/DateMathParserTests.java diff --git a/core/src/test/java/org/elasticsearch/common/joda/JodaTests.java b/server/src/test/java/org/elasticsearch/common/joda/JodaTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/joda/JodaTests.java rename to server/src/test/java/org/elasticsearch/common/joda/JodaTests.java diff --git a/core/src/test/java/org/elasticsearch/common/logging/DeprecationLoggerTests.java b/server/src/test/java/org/elasticsearch/common/logging/DeprecationLoggerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/logging/DeprecationLoggerTests.java rename to server/src/test/java/org/elasticsearch/common/logging/DeprecationLoggerTests.java diff --git a/core/src/test/java/org/elasticsearch/common/lucene/LuceneTests.java b/server/src/test/java/org/elasticsearch/common/lucene/LuceneTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/lucene/LuceneTests.java rename to server/src/test/java/org/elasticsearch/common/lucene/LuceneTests.java diff --git a/core/src/test/java/org/elasticsearch/common/lucene/ShardCoreKeyMapTests.java b/server/src/test/java/org/elasticsearch/common/lucene/ShardCoreKeyMapTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/lucene/ShardCoreKeyMapTests.java rename to server/src/test/java/org/elasticsearch/common/lucene/ShardCoreKeyMapTests.java diff --git a/core/src/test/java/org/elasticsearch/common/lucene/index/ESDirectoryReaderTests.java b/server/src/test/java/org/elasticsearch/common/lucene/index/ESDirectoryReaderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/lucene/index/ESDirectoryReaderTests.java rename to server/src/test/java/org/elasticsearch/common/lucene/index/ESDirectoryReaderTests.java diff --git a/core/src/test/java/org/elasticsearch/common/lucene/index/FreqTermsEnumTests.java b/server/src/test/java/org/elasticsearch/common/lucene/index/FreqTermsEnumTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/lucene/index/FreqTermsEnumTests.java rename to server/src/test/java/org/elasticsearch/common/lucene/index/FreqTermsEnumTests.java diff --git a/core/src/test/java/org/elasticsearch/common/lucene/search/MultiPhrasePrefixQueryTests.java b/server/src/test/java/org/elasticsearch/common/lucene/search/MultiPhrasePrefixQueryTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/lucene/search/MultiPhrasePrefixQueryTests.java rename to server/src/test/java/org/elasticsearch/common/lucene/search/MultiPhrasePrefixQueryTests.java diff --git a/core/src/test/java/org/elasticsearch/common/lucene/search/function/MinScoreScorerTests.java b/server/src/test/java/org/elasticsearch/common/lucene/search/function/MinScoreScorerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/lucene/search/function/MinScoreScorerTests.java rename to server/src/test/java/org/elasticsearch/common/lucene/search/function/MinScoreScorerTests.java diff --git a/core/src/test/java/org/elasticsearch/common/lucene/search/morelikethis/MoreLikeThisQueryTests.java b/server/src/test/java/org/elasticsearch/common/lucene/search/morelikethis/MoreLikeThisQueryTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/lucene/search/morelikethis/MoreLikeThisQueryTests.java rename to server/src/test/java/org/elasticsearch/common/lucene/search/morelikethis/MoreLikeThisQueryTests.java diff --git a/core/src/test/java/org/elasticsearch/common/lucene/search/morelikethis/XMoreLikeThisTests.java b/server/src/test/java/org/elasticsearch/common/lucene/search/morelikethis/XMoreLikeThisTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/lucene/search/morelikethis/XMoreLikeThisTests.java rename to server/src/test/java/org/elasticsearch/common/lucene/search/morelikethis/XMoreLikeThisTests.java diff --git a/core/src/test/java/org/elasticsearch/common/lucene/store/ByteArrayIndexInputTests.java b/server/src/test/java/org/elasticsearch/common/lucene/store/ByteArrayIndexInputTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/lucene/store/ByteArrayIndexInputTests.java rename to server/src/test/java/org/elasticsearch/common/lucene/store/ByteArrayIndexInputTests.java diff --git a/core/src/test/java/org/elasticsearch/common/lucene/store/InputStreamIndexInputTests.java b/server/src/test/java/org/elasticsearch/common/lucene/store/InputStreamIndexInputTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/lucene/store/InputStreamIndexInputTests.java rename to server/src/test/java/org/elasticsearch/common/lucene/store/InputStreamIndexInputTests.java diff --git a/core/src/test/java/org/elasticsearch/common/lucene/uid/VersionLookupTests.java b/server/src/test/java/org/elasticsearch/common/lucene/uid/VersionLookupTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/lucene/uid/VersionLookupTests.java rename to server/src/test/java/org/elasticsearch/common/lucene/uid/VersionLookupTests.java diff --git a/core/src/test/java/org/elasticsearch/common/lucene/uid/VersionsTests.java b/server/src/test/java/org/elasticsearch/common/lucene/uid/VersionsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/lucene/uid/VersionsTests.java rename to server/src/test/java/org/elasticsearch/common/lucene/uid/VersionsTests.java diff --git a/core/src/test/java/org/elasticsearch/common/network/CidrsTests.java b/server/src/test/java/org/elasticsearch/common/network/CidrsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/network/CidrsTests.java rename to server/src/test/java/org/elasticsearch/common/network/CidrsTests.java diff --git a/core/src/test/java/org/elasticsearch/common/network/InetAddressesTests.java b/server/src/test/java/org/elasticsearch/common/network/InetAddressesTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/network/InetAddressesTests.java rename to server/src/test/java/org/elasticsearch/common/network/InetAddressesTests.java diff --git a/core/src/test/java/org/elasticsearch/common/network/NetworkAddressTests.java b/server/src/test/java/org/elasticsearch/common/network/NetworkAddressTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/network/NetworkAddressTests.java rename to server/src/test/java/org/elasticsearch/common/network/NetworkAddressTests.java diff --git a/core/src/test/java/org/elasticsearch/common/network/NetworkModuleTests.java b/server/src/test/java/org/elasticsearch/common/network/NetworkModuleTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/network/NetworkModuleTests.java rename to server/src/test/java/org/elasticsearch/common/network/NetworkModuleTests.java diff --git a/core/src/test/java/org/elasticsearch/common/network/NetworkServiceTests.java b/server/src/test/java/org/elasticsearch/common/network/NetworkServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/network/NetworkServiceTests.java rename to server/src/test/java/org/elasticsearch/common/network/NetworkServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/common/network/NetworkUtilsTests.java b/server/src/test/java/org/elasticsearch/common/network/NetworkUtilsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/network/NetworkUtilsTests.java rename to server/src/test/java/org/elasticsearch/common/network/NetworkUtilsTests.java diff --git a/core/src/test/java/org/elasticsearch/common/path/PathTrieTests.java b/server/src/test/java/org/elasticsearch/common/path/PathTrieTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/path/PathTrieTests.java rename to server/src/test/java/org/elasticsearch/common/path/PathTrieTests.java diff --git a/core/src/test/java/org/elasticsearch/common/recycler/AbstractRecyclerTestCase.java b/server/src/test/java/org/elasticsearch/common/recycler/AbstractRecyclerTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/recycler/AbstractRecyclerTestCase.java rename to server/src/test/java/org/elasticsearch/common/recycler/AbstractRecyclerTestCase.java diff --git a/core/src/test/java/org/elasticsearch/common/recycler/ConcurrentRecyclerTests.java b/server/src/test/java/org/elasticsearch/common/recycler/ConcurrentRecyclerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/recycler/ConcurrentRecyclerTests.java rename to server/src/test/java/org/elasticsearch/common/recycler/ConcurrentRecyclerTests.java diff --git a/core/src/test/java/org/elasticsearch/common/recycler/LockedRecyclerTests.java b/server/src/test/java/org/elasticsearch/common/recycler/LockedRecyclerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/recycler/LockedRecyclerTests.java rename to server/src/test/java/org/elasticsearch/common/recycler/LockedRecyclerTests.java diff --git a/core/src/test/java/org/elasticsearch/common/recycler/NoneRecyclerTests.java b/server/src/test/java/org/elasticsearch/common/recycler/NoneRecyclerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/recycler/NoneRecyclerTests.java rename to server/src/test/java/org/elasticsearch/common/recycler/NoneRecyclerTests.java diff --git a/core/src/test/java/org/elasticsearch/common/recycler/QueueRecyclerTests.java b/server/src/test/java/org/elasticsearch/common/recycler/QueueRecyclerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/recycler/QueueRecyclerTests.java rename to server/src/test/java/org/elasticsearch/common/recycler/QueueRecyclerTests.java diff --git a/core/src/test/java/org/elasticsearch/common/regex/RegexTests.java b/server/src/test/java/org/elasticsearch/common/regex/RegexTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/regex/RegexTests.java rename to server/src/test/java/org/elasticsearch/common/regex/RegexTests.java diff --git a/core/src/test/java/org/elasticsearch/common/rounding/DateTimeUnitTests.java b/server/src/test/java/org/elasticsearch/common/rounding/DateTimeUnitTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/rounding/DateTimeUnitTests.java rename to server/src/test/java/org/elasticsearch/common/rounding/DateTimeUnitTests.java diff --git a/core/src/test/java/org/elasticsearch/common/rounding/TimeZoneRoundingTests.java b/server/src/test/java/org/elasticsearch/common/rounding/TimeZoneRoundingTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/rounding/TimeZoneRoundingTests.java rename to server/src/test/java/org/elasticsearch/common/rounding/TimeZoneRoundingTests.java diff --git a/core/src/test/java/org/elasticsearch/common/settings/AddFileKeyStoreCommandTests.java b/server/src/test/java/org/elasticsearch/common/settings/AddFileKeyStoreCommandTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/settings/AddFileKeyStoreCommandTests.java rename to server/src/test/java/org/elasticsearch/common/settings/AddFileKeyStoreCommandTests.java diff --git a/core/src/test/java/org/elasticsearch/common/settings/AddStringKeyStoreCommandTests.java b/server/src/test/java/org/elasticsearch/common/settings/AddStringKeyStoreCommandTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/settings/AddStringKeyStoreCommandTests.java rename to server/src/test/java/org/elasticsearch/common/settings/AddStringKeyStoreCommandTests.java diff --git a/core/src/test/java/org/elasticsearch/common/settings/CreateKeyStoreCommandTests.java b/server/src/test/java/org/elasticsearch/common/settings/CreateKeyStoreCommandTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/settings/CreateKeyStoreCommandTests.java rename to server/src/test/java/org/elasticsearch/common/settings/CreateKeyStoreCommandTests.java diff --git a/core/src/test/java/org/elasticsearch/common/settings/KeyStoreCommandTestCase.java b/server/src/test/java/org/elasticsearch/common/settings/KeyStoreCommandTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/settings/KeyStoreCommandTestCase.java rename to server/src/test/java/org/elasticsearch/common/settings/KeyStoreCommandTestCase.java diff --git a/core/src/test/java/org/elasticsearch/common/settings/KeyStoreWrapperTests.java b/server/src/test/java/org/elasticsearch/common/settings/KeyStoreWrapperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/settings/KeyStoreWrapperTests.java rename to server/src/test/java/org/elasticsearch/common/settings/KeyStoreWrapperTests.java diff --git a/core/src/test/java/org/elasticsearch/common/settings/ListKeyStoreCommandTests.java b/server/src/test/java/org/elasticsearch/common/settings/ListKeyStoreCommandTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/settings/ListKeyStoreCommandTests.java rename to server/src/test/java/org/elasticsearch/common/settings/ListKeyStoreCommandTests.java diff --git a/core/src/test/java/org/elasticsearch/common/settings/MemorySizeSettingsTests.java b/server/src/test/java/org/elasticsearch/common/settings/MemorySizeSettingsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/settings/MemorySizeSettingsTests.java rename to server/src/test/java/org/elasticsearch/common/settings/MemorySizeSettingsTests.java diff --git a/core/src/test/java/org/elasticsearch/common/settings/PropertyPlaceholderTests.java b/server/src/test/java/org/elasticsearch/common/settings/PropertyPlaceholderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/settings/PropertyPlaceholderTests.java rename to server/src/test/java/org/elasticsearch/common/settings/PropertyPlaceholderTests.java diff --git a/core/src/test/java/org/elasticsearch/common/settings/RemoveSettingKeyStoreCommandTests.java b/server/src/test/java/org/elasticsearch/common/settings/RemoveSettingKeyStoreCommandTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/settings/RemoveSettingKeyStoreCommandTests.java rename to server/src/test/java/org/elasticsearch/common/settings/RemoveSettingKeyStoreCommandTests.java diff --git a/core/src/test/java/org/elasticsearch/common/settings/ScopedSettingsTests.java b/server/src/test/java/org/elasticsearch/common/settings/ScopedSettingsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/settings/ScopedSettingsTests.java rename to server/src/test/java/org/elasticsearch/common/settings/ScopedSettingsTests.java diff --git a/core/src/test/java/org/elasticsearch/common/settings/SecureStringTests.java b/server/src/test/java/org/elasticsearch/common/settings/SecureStringTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/settings/SecureStringTests.java rename to server/src/test/java/org/elasticsearch/common/settings/SecureStringTests.java diff --git a/core/src/test/java/org/elasticsearch/common/settings/SettingTests.java b/server/src/test/java/org/elasticsearch/common/settings/SettingTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/settings/SettingTests.java rename to server/src/test/java/org/elasticsearch/common/settings/SettingTests.java diff --git a/core/src/test/java/org/elasticsearch/common/settings/SettingsFilterTests.java b/server/src/test/java/org/elasticsearch/common/settings/SettingsFilterTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/settings/SettingsFilterTests.java rename to server/src/test/java/org/elasticsearch/common/settings/SettingsFilterTests.java diff --git a/core/src/test/java/org/elasticsearch/common/settings/SettingsModuleTests.java b/server/src/test/java/org/elasticsearch/common/settings/SettingsModuleTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/settings/SettingsModuleTests.java rename to server/src/test/java/org/elasticsearch/common/settings/SettingsModuleTests.java diff --git a/core/src/test/java/org/elasticsearch/common/settings/SettingsTests.java b/server/src/test/java/org/elasticsearch/common/settings/SettingsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/settings/SettingsTests.java rename to server/src/test/java/org/elasticsearch/common/settings/SettingsTests.java diff --git a/core/src/test/java/org/elasticsearch/common/transport/BoundTransportAddressTests.java b/server/src/test/java/org/elasticsearch/common/transport/BoundTransportAddressTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/transport/BoundTransportAddressTests.java rename to server/src/test/java/org/elasticsearch/common/transport/BoundTransportAddressTests.java diff --git a/core/src/test/java/org/elasticsearch/common/unit/ByteSizeUnitTests.java b/server/src/test/java/org/elasticsearch/common/unit/ByteSizeUnitTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/unit/ByteSizeUnitTests.java rename to server/src/test/java/org/elasticsearch/common/unit/ByteSizeUnitTests.java diff --git a/core/src/test/java/org/elasticsearch/common/unit/ByteSizeValueTests.java b/server/src/test/java/org/elasticsearch/common/unit/ByteSizeValueTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/unit/ByteSizeValueTests.java rename to server/src/test/java/org/elasticsearch/common/unit/ByteSizeValueTests.java diff --git a/core/src/test/java/org/elasticsearch/common/unit/DistanceUnitTests.java b/server/src/test/java/org/elasticsearch/common/unit/DistanceUnitTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/unit/DistanceUnitTests.java rename to server/src/test/java/org/elasticsearch/common/unit/DistanceUnitTests.java diff --git a/core/src/test/java/org/elasticsearch/common/unit/FuzzinessTests.java b/server/src/test/java/org/elasticsearch/common/unit/FuzzinessTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/unit/FuzzinessTests.java rename to server/src/test/java/org/elasticsearch/common/unit/FuzzinessTests.java diff --git a/core/src/test/java/org/elasticsearch/common/unit/RatioValueTests.java b/server/src/test/java/org/elasticsearch/common/unit/RatioValueTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/unit/RatioValueTests.java rename to server/src/test/java/org/elasticsearch/common/unit/RatioValueTests.java diff --git a/core/src/test/java/org/elasticsearch/common/unit/SizeValueTests.java b/server/src/test/java/org/elasticsearch/common/unit/SizeValueTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/unit/SizeValueTests.java rename to server/src/test/java/org/elasticsearch/common/unit/SizeValueTests.java diff --git a/core/src/test/java/org/elasticsearch/common/unit/TimeValueTests.java b/server/src/test/java/org/elasticsearch/common/unit/TimeValueTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/unit/TimeValueTests.java rename to server/src/test/java/org/elasticsearch/common/unit/TimeValueTests.java diff --git a/core/src/test/java/org/elasticsearch/common/util/ArrayUtilsTests.java b/server/src/test/java/org/elasticsearch/common/util/ArrayUtilsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/util/ArrayUtilsTests.java rename to server/src/test/java/org/elasticsearch/common/util/ArrayUtilsTests.java diff --git a/core/src/test/java/org/elasticsearch/common/util/BigArraysTests.java b/server/src/test/java/org/elasticsearch/common/util/BigArraysTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/util/BigArraysTests.java rename to server/src/test/java/org/elasticsearch/common/util/BigArraysTests.java diff --git a/core/src/test/java/org/elasticsearch/common/util/ByteUtilsTests.java b/server/src/test/java/org/elasticsearch/common/util/ByteUtilsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/util/ByteUtilsTests.java rename to server/src/test/java/org/elasticsearch/common/util/ByteUtilsTests.java diff --git a/core/src/test/java/org/elasticsearch/common/util/BytesRefHashTests.java b/server/src/test/java/org/elasticsearch/common/util/BytesRefHashTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/util/BytesRefHashTests.java rename to server/src/test/java/org/elasticsearch/common/util/BytesRefHashTests.java diff --git a/core/src/test/java/org/elasticsearch/common/util/CancellableThreadsTests.java b/server/src/test/java/org/elasticsearch/common/util/CancellableThreadsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/util/CancellableThreadsTests.java rename to server/src/test/java/org/elasticsearch/common/util/CancellableThreadsTests.java diff --git a/core/src/test/java/org/elasticsearch/common/util/CollectionUtilsTests.java b/server/src/test/java/org/elasticsearch/common/util/CollectionUtilsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/util/CollectionUtilsTests.java rename to server/src/test/java/org/elasticsearch/common/util/CollectionUtilsTests.java diff --git a/core/src/test/java/org/elasticsearch/common/util/IndexFolderUpgraderTests.java b/server/src/test/java/org/elasticsearch/common/util/IndexFolderUpgraderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/util/IndexFolderUpgraderTests.java rename to server/src/test/java/org/elasticsearch/common/util/IndexFolderUpgraderTests.java diff --git a/core/src/test/java/org/elasticsearch/common/util/LocaleUtilsTests.java b/server/src/test/java/org/elasticsearch/common/util/LocaleUtilsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/util/LocaleUtilsTests.java rename to server/src/test/java/org/elasticsearch/common/util/LocaleUtilsTests.java diff --git a/core/src/test/java/org/elasticsearch/common/util/LongHashTests.java b/server/src/test/java/org/elasticsearch/common/util/LongHashTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/util/LongHashTests.java rename to server/src/test/java/org/elasticsearch/common/util/LongHashTests.java diff --git a/core/src/test/java/org/elasticsearch/common/util/LongObjectHashMapTests.java b/server/src/test/java/org/elasticsearch/common/util/LongObjectHashMapTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/util/LongObjectHashMapTests.java rename to server/src/test/java/org/elasticsearch/common/util/LongObjectHashMapTests.java diff --git a/core/src/test/java/org/elasticsearch/common/util/SingleObjectCacheTests.java b/server/src/test/java/org/elasticsearch/common/util/SingleObjectCacheTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/util/SingleObjectCacheTests.java rename to server/src/test/java/org/elasticsearch/common/util/SingleObjectCacheTests.java diff --git a/core/src/test/java/org/elasticsearch/common/util/URIPatternTests.java b/server/src/test/java/org/elasticsearch/common/util/URIPatternTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/util/URIPatternTests.java rename to server/src/test/java/org/elasticsearch/common/util/URIPatternTests.java diff --git a/core/src/test/java/org/elasticsearch/common/util/concurrent/AbstractLifecycleRunnableTests.java b/server/src/test/java/org/elasticsearch/common/util/concurrent/AbstractLifecycleRunnableTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/util/concurrent/AbstractLifecycleRunnableTests.java rename to server/src/test/java/org/elasticsearch/common/util/concurrent/AbstractLifecycleRunnableTests.java diff --git a/core/src/test/java/org/elasticsearch/common/util/concurrent/AbstractRunnableTests.java b/server/src/test/java/org/elasticsearch/common/util/concurrent/AbstractRunnableTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/util/concurrent/AbstractRunnableTests.java rename to server/src/test/java/org/elasticsearch/common/util/concurrent/AbstractRunnableTests.java diff --git a/core/src/test/java/org/elasticsearch/common/util/concurrent/AsyncIOProcessorTests.java b/server/src/test/java/org/elasticsearch/common/util/concurrent/AsyncIOProcessorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/util/concurrent/AsyncIOProcessorTests.java rename to server/src/test/java/org/elasticsearch/common/util/concurrent/AsyncIOProcessorTests.java diff --git a/core/src/test/java/org/elasticsearch/common/util/concurrent/CountDownTests.java b/server/src/test/java/org/elasticsearch/common/util/concurrent/CountDownTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/util/concurrent/CountDownTests.java rename to server/src/test/java/org/elasticsearch/common/util/concurrent/CountDownTests.java diff --git a/core/src/test/java/org/elasticsearch/common/util/concurrent/EsExecutorsTests.java b/server/src/test/java/org/elasticsearch/common/util/concurrent/EsExecutorsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/util/concurrent/EsExecutorsTests.java rename to server/src/test/java/org/elasticsearch/common/util/concurrent/EsExecutorsTests.java diff --git a/core/src/test/java/org/elasticsearch/common/util/concurrent/EsThreadPoolExecutorTests.java b/server/src/test/java/org/elasticsearch/common/util/concurrent/EsThreadPoolExecutorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/util/concurrent/EsThreadPoolExecutorTests.java rename to server/src/test/java/org/elasticsearch/common/util/concurrent/EsThreadPoolExecutorTests.java diff --git a/core/src/test/java/org/elasticsearch/common/util/concurrent/KeyedLockTests.java b/server/src/test/java/org/elasticsearch/common/util/concurrent/KeyedLockTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/util/concurrent/KeyedLockTests.java rename to server/src/test/java/org/elasticsearch/common/util/concurrent/KeyedLockTests.java diff --git a/core/src/test/java/org/elasticsearch/common/util/concurrent/PrioritizedExecutorsTests.java b/server/src/test/java/org/elasticsearch/common/util/concurrent/PrioritizedExecutorsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/util/concurrent/PrioritizedExecutorsTests.java rename to server/src/test/java/org/elasticsearch/common/util/concurrent/PrioritizedExecutorsTests.java diff --git a/core/src/test/java/org/elasticsearch/common/util/concurrent/PrioritizedRunnableTests.java b/server/src/test/java/org/elasticsearch/common/util/concurrent/PrioritizedRunnableTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/util/concurrent/PrioritizedRunnableTests.java rename to server/src/test/java/org/elasticsearch/common/util/concurrent/PrioritizedRunnableTests.java diff --git a/core/src/test/java/org/elasticsearch/common/util/concurrent/QueueResizingEsThreadPoolExecutorTests.java b/server/src/test/java/org/elasticsearch/common/util/concurrent/QueueResizingEsThreadPoolExecutorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/util/concurrent/QueueResizingEsThreadPoolExecutorTests.java rename to server/src/test/java/org/elasticsearch/common/util/concurrent/QueueResizingEsThreadPoolExecutorTests.java diff --git a/core/src/test/java/org/elasticsearch/common/util/concurrent/RefCountedTests.java b/server/src/test/java/org/elasticsearch/common/util/concurrent/RefCountedTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/util/concurrent/RefCountedTests.java rename to server/src/test/java/org/elasticsearch/common/util/concurrent/RefCountedTests.java diff --git a/core/src/test/java/org/elasticsearch/common/util/concurrent/ResizableBlockingQueueTests.java b/server/src/test/java/org/elasticsearch/common/util/concurrent/ResizableBlockingQueueTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/util/concurrent/ResizableBlockingQueueTests.java rename to server/src/test/java/org/elasticsearch/common/util/concurrent/ResizableBlockingQueueTests.java diff --git a/core/src/test/java/org/elasticsearch/common/util/concurrent/ThreadContextTests.java b/server/src/test/java/org/elasticsearch/common/util/concurrent/ThreadContextTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/util/concurrent/ThreadContextTests.java rename to server/src/test/java/org/elasticsearch/common/util/concurrent/ThreadContextTests.java diff --git a/core/src/test/java/org/elasticsearch/common/util/concurrent/TimedRunnableTests.java b/server/src/test/java/org/elasticsearch/common/util/concurrent/TimedRunnableTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/util/concurrent/TimedRunnableTests.java rename to server/src/test/java/org/elasticsearch/common/util/concurrent/TimedRunnableTests.java diff --git a/core/src/test/java/org/elasticsearch/common/util/iterable/IterablesTests.java b/server/src/test/java/org/elasticsearch/common/util/iterable/IterablesTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/util/iterable/IterablesTests.java rename to server/src/test/java/org/elasticsearch/common/util/iterable/IterablesTests.java diff --git a/core/src/test/java/org/elasticsearch/common/util/set/SetsTests.java b/server/src/test/java/org/elasticsearch/common/util/set/SetsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/util/set/SetsTests.java rename to server/src/test/java/org/elasticsearch/common/util/set/SetsTests.java diff --git a/core/src/test/java/org/elasticsearch/common/xcontent/BaseXContentTestCase.java b/server/src/test/java/org/elasticsearch/common/xcontent/BaseXContentTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/xcontent/BaseXContentTestCase.java rename to server/src/test/java/org/elasticsearch/common/xcontent/BaseXContentTestCase.java diff --git a/core/src/test/java/org/elasticsearch/common/xcontent/ConstructingObjectParserTests.java b/server/src/test/java/org/elasticsearch/common/xcontent/ConstructingObjectParserTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/xcontent/ConstructingObjectParserTests.java rename to server/src/test/java/org/elasticsearch/common/xcontent/ConstructingObjectParserTests.java diff --git a/core/src/test/java/org/elasticsearch/common/xcontent/ObjectParserTests.java b/server/src/test/java/org/elasticsearch/common/xcontent/ObjectParserTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/xcontent/ObjectParserTests.java rename to server/src/test/java/org/elasticsearch/common/xcontent/ObjectParserTests.java diff --git a/core/src/test/java/org/elasticsearch/common/xcontent/UnknownNamedObjectExceptionTests.java b/server/src/test/java/org/elasticsearch/common/xcontent/UnknownNamedObjectExceptionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/xcontent/UnknownNamedObjectExceptionTests.java rename to server/src/test/java/org/elasticsearch/common/xcontent/UnknownNamedObjectExceptionTests.java diff --git a/core/src/test/java/org/elasticsearch/common/xcontent/XContentFactoryTests.java b/server/src/test/java/org/elasticsearch/common/xcontent/XContentFactoryTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/xcontent/XContentFactoryTests.java rename to server/src/test/java/org/elasticsearch/common/xcontent/XContentFactoryTests.java diff --git a/core/src/test/java/org/elasticsearch/common/xcontent/XContentParserTests.java b/server/src/test/java/org/elasticsearch/common/xcontent/XContentParserTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/xcontent/XContentParserTests.java rename to server/src/test/java/org/elasticsearch/common/xcontent/XContentParserTests.java diff --git a/core/src/test/java/org/elasticsearch/common/xcontent/XContentParserUtilsTests.java b/server/src/test/java/org/elasticsearch/common/xcontent/XContentParserUtilsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/xcontent/XContentParserUtilsTests.java rename to server/src/test/java/org/elasticsearch/common/xcontent/XContentParserUtilsTests.java diff --git a/core/src/test/java/org/elasticsearch/common/xcontent/XContentTypeTests.java b/server/src/test/java/org/elasticsearch/common/xcontent/XContentTypeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/xcontent/XContentTypeTests.java rename to server/src/test/java/org/elasticsearch/common/xcontent/XContentTypeTests.java diff --git a/core/src/test/java/org/elasticsearch/common/xcontent/builder/XContentBuilderTests.java b/server/src/test/java/org/elasticsearch/common/xcontent/builder/XContentBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/xcontent/builder/XContentBuilderTests.java rename to server/src/test/java/org/elasticsearch/common/xcontent/builder/XContentBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/common/xcontent/cbor/CborXContentParserTests.java b/server/src/test/java/org/elasticsearch/common/xcontent/cbor/CborXContentParserTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/xcontent/cbor/CborXContentParserTests.java rename to server/src/test/java/org/elasticsearch/common/xcontent/cbor/CborXContentParserTests.java diff --git a/core/src/test/java/org/elasticsearch/common/xcontent/cbor/CborXContentTests.java b/server/src/test/java/org/elasticsearch/common/xcontent/cbor/CborXContentTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/xcontent/cbor/CborXContentTests.java rename to server/src/test/java/org/elasticsearch/common/xcontent/cbor/CborXContentTests.java diff --git a/core/src/test/java/org/elasticsearch/common/xcontent/cbor/JsonVsCborTests.java b/server/src/test/java/org/elasticsearch/common/xcontent/cbor/JsonVsCborTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/xcontent/cbor/JsonVsCborTests.java rename to server/src/test/java/org/elasticsearch/common/xcontent/cbor/JsonVsCborTests.java diff --git a/core/src/test/java/org/elasticsearch/common/xcontent/json/JsonXContentTests.java b/server/src/test/java/org/elasticsearch/common/xcontent/json/JsonXContentTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/xcontent/json/JsonXContentTests.java rename to server/src/test/java/org/elasticsearch/common/xcontent/json/JsonXContentTests.java diff --git a/core/src/test/java/org/elasticsearch/common/xcontent/smile/JsonVsSmileTests.java b/server/src/test/java/org/elasticsearch/common/xcontent/smile/JsonVsSmileTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/xcontent/smile/JsonVsSmileTests.java rename to server/src/test/java/org/elasticsearch/common/xcontent/smile/JsonVsSmileTests.java diff --git a/core/src/test/java/org/elasticsearch/common/xcontent/smile/SmileXContentTests.java b/server/src/test/java/org/elasticsearch/common/xcontent/smile/SmileXContentTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/xcontent/smile/SmileXContentTests.java rename to server/src/test/java/org/elasticsearch/common/xcontent/smile/SmileXContentTests.java diff --git a/core/src/test/java/org/elasticsearch/common/xcontent/support/AbstractFilteringTestCase.java b/server/src/test/java/org/elasticsearch/common/xcontent/support/AbstractFilteringTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/xcontent/support/AbstractFilteringTestCase.java rename to server/src/test/java/org/elasticsearch/common/xcontent/support/AbstractFilteringTestCase.java diff --git a/core/src/test/java/org/elasticsearch/common/xcontent/support/XContentHelperTests.java b/server/src/test/java/org/elasticsearch/common/xcontent/support/XContentHelperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/xcontent/support/XContentHelperTests.java rename to server/src/test/java/org/elasticsearch/common/xcontent/support/XContentHelperTests.java diff --git a/core/src/test/java/org/elasticsearch/common/xcontent/support/XContentMapValuesTests.java b/server/src/test/java/org/elasticsearch/common/xcontent/support/XContentMapValuesTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/xcontent/support/XContentMapValuesTests.java rename to server/src/test/java/org/elasticsearch/common/xcontent/support/XContentMapValuesTests.java diff --git a/core/src/test/java/org/elasticsearch/common/xcontent/support/filtering/AbstractXContentFilteringTestCase.java b/server/src/test/java/org/elasticsearch/common/xcontent/support/filtering/AbstractXContentFilteringTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/xcontent/support/filtering/AbstractXContentFilteringTestCase.java rename to server/src/test/java/org/elasticsearch/common/xcontent/support/filtering/AbstractXContentFilteringTestCase.java diff --git a/core/src/test/java/org/elasticsearch/common/xcontent/support/filtering/CborXContentFilteringTests.java b/server/src/test/java/org/elasticsearch/common/xcontent/support/filtering/CborXContentFilteringTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/xcontent/support/filtering/CborXContentFilteringTests.java rename to server/src/test/java/org/elasticsearch/common/xcontent/support/filtering/CborXContentFilteringTests.java diff --git a/core/src/test/java/org/elasticsearch/common/xcontent/support/filtering/FilterPathGeneratorFilteringTests.java b/server/src/test/java/org/elasticsearch/common/xcontent/support/filtering/FilterPathGeneratorFilteringTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/xcontent/support/filtering/FilterPathGeneratorFilteringTests.java rename to server/src/test/java/org/elasticsearch/common/xcontent/support/filtering/FilterPathGeneratorFilteringTests.java diff --git a/core/src/test/java/org/elasticsearch/common/xcontent/support/filtering/FilterPathTests.java b/server/src/test/java/org/elasticsearch/common/xcontent/support/filtering/FilterPathTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/xcontent/support/filtering/FilterPathTests.java rename to server/src/test/java/org/elasticsearch/common/xcontent/support/filtering/FilterPathTests.java diff --git a/core/src/test/java/org/elasticsearch/common/xcontent/support/filtering/JsonXContentFilteringTests.java b/server/src/test/java/org/elasticsearch/common/xcontent/support/filtering/JsonXContentFilteringTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/xcontent/support/filtering/JsonXContentFilteringTests.java rename to server/src/test/java/org/elasticsearch/common/xcontent/support/filtering/JsonXContentFilteringTests.java diff --git a/core/src/test/java/org/elasticsearch/common/xcontent/support/filtering/SmileFilteringGeneratorTests.java b/server/src/test/java/org/elasticsearch/common/xcontent/support/filtering/SmileFilteringGeneratorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/xcontent/support/filtering/SmileFilteringGeneratorTests.java rename to server/src/test/java/org/elasticsearch/common/xcontent/support/filtering/SmileFilteringGeneratorTests.java diff --git a/core/src/test/java/org/elasticsearch/common/xcontent/support/filtering/YamlFilteringGeneratorTests.java b/server/src/test/java/org/elasticsearch/common/xcontent/support/filtering/YamlFilteringGeneratorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/xcontent/support/filtering/YamlFilteringGeneratorTests.java rename to server/src/test/java/org/elasticsearch/common/xcontent/support/filtering/YamlFilteringGeneratorTests.java diff --git a/core/src/test/java/org/elasticsearch/common/xcontent/yaml/YamlXContentTests.java b/server/src/test/java/org/elasticsearch/common/xcontent/yaml/YamlXContentTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/common/xcontent/yaml/YamlXContentTests.java rename to server/src/test/java/org/elasticsearch/common/xcontent/yaml/YamlXContentTests.java diff --git a/core/src/test/java/org/elasticsearch/deps/jackson/JacksonLocationTests.java b/server/src/test/java/org/elasticsearch/deps/jackson/JacksonLocationTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/deps/jackson/JacksonLocationTests.java rename to server/src/test/java/org/elasticsearch/deps/jackson/JacksonLocationTests.java diff --git a/core/src/test/java/org/elasticsearch/deps/joda/SimpleJodaTests.java b/server/src/test/java/org/elasticsearch/deps/joda/SimpleJodaTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/deps/joda/SimpleJodaTests.java rename to server/src/test/java/org/elasticsearch/deps/joda/SimpleJodaTests.java diff --git a/core/src/test/java/org/elasticsearch/deps/lucene/SimpleLuceneTests.java b/server/src/test/java/org/elasticsearch/deps/lucene/SimpleLuceneTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/deps/lucene/SimpleLuceneTests.java rename to server/src/test/java/org/elasticsearch/deps/lucene/SimpleLuceneTests.java diff --git a/core/src/test/java/org/elasticsearch/deps/lucene/VectorHighlighterTests.java b/server/src/test/java/org/elasticsearch/deps/lucene/VectorHighlighterTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/deps/lucene/VectorHighlighterTests.java rename to server/src/test/java/org/elasticsearch/deps/lucene/VectorHighlighterTests.java diff --git a/core/src/test/java/org/elasticsearch/discovery/AbstractDisruptionTestCase.java b/server/src/test/java/org/elasticsearch/discovery/AbstractDisruptionTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/discovery/AbstractDisruptionTestCase.java rename to server/src/test/java/org/elasticsearch/discovery/AbstractDisruptionTestCase.java diff --git a/core/src/test/java/org/elasticsearch/discovery/BlockingClusterStatePublishResponseHandlerTests.java b/server/src/test/java/org/elasticsearch/discovery/BlockingClusterStatePublishResponseHandlerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/discovery/BlockingClusterStatePublishResponseHandlerTests.java rename to server/src/test/java/org/elasticsearch/discovery/BlockingClusterStatePublishResponseHandlerTests.java diff --git a/core/src/test/java/org/elasticsearch/discovery/ClusterDisruptionIT.java b/server/src/test/java/org/elasticsearch/discovery/ClusterDisruptionIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/discovery/ClusterDisruptionIT.java rename to server/src/test/java/org/elasticsearch/discovery/ClusterDisruptionIT.java diff --git a/core/src/test/java/org/elasticsearch/discovery/DiscoveryDisruptionIT.java b/server/src/test/java/org/elasticsearch/discovery/DiscoveryDisruptionIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/discovery/DiscoveryDisruptionIT.java rename to server/src/test/java/org/elasticsearch/discovery/DiscoveryDisruptionIT.java diff --git a/core/src/test/java/org/elasticsearch/discovery/DiscoveryModuleTests.java b/server/src/test/java/org/elasticsearch/discovery/DiscoveryModuleTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/discovery/DiscoveryModuleTests.java rename to server/src/test/java/org/elasticsearch/discovery/DiscoveryModuleTests.java diff --git a/core/src/test/java/org/elasticsearch/discovery/MasterDisruptionIT.java b/server/src/test/java/org/elasticsearch/discovery/MasterDisruptionIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/discovery/MasterDisruptionIT.java rename to server/src/test/java/org/elasticsearch/discovery/MasterDisruptionIT.java diff --git a/core/src/test/java/org/elasticsearch/discovery/SnapshotDisruptionIT.java b/server/src/test/java/org/elasticsearch/discovery/SnapshotDisruptionIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/discovery/SnapshotDisruptionIT.java rename to server/src/test/java/org/elasticsearch/discovery/SnapshotDisruptionIT.java diff --git a/core/src/test/java/org/elasticsearch/discovery/ZenFaultDetectionTests.java b/server/src/test/java/org/elasticsearch/discovery/ZenFaultDetectionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/discovery/ZenFaultDetectionTests.java rename to server/src/test/java/org/elasticsearch/discovery/ZenFaultDetectionTests.java diff --git a/core/src/test/java/org/elasticsearch/discovery/single/SingleNodeDiscoveryIT.java b/server/src/test/java/org/elasticsearch/discovery/single/SingleNodeDiscoveryIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/discovery/single/SingleNodeDiscoveryIT.java rename to server/src/test/java/org/elasticsearch/discovery/single/SingleNodeDiscoveryIT.java diff --git a/core/src/test/java/org/elasticsearch/discovery/single/SingleNodeDiscoveryTests.java b/server/src/test/java/org/elasticsearch/discovery/single/SingleNodeDiscoveryTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/discovery/single/SingleNodeDiscoveryTests.java rename to server/src/test/java/org/elasticsearch/discovery/single/SingleNodeDiscoveryTests.java diff --git a/core/src/test/java/org/elasticsearch/discovery/zen/ElectMasterServiceTests.java b/server/src/test/java/org/elasticsearch/discovery/zen/ElectMasterServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/discovery/zen/ElectMasterServiceTests.java rename to server/src/test/java/org/elasticsearch/discovery/zen/ElectMasterServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/discovery/zen/MembershipActionTests.java b/server/src/test/java/org/elasticsearch/discovery/zen/MembershipActionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/discovery/zen/MembershipActionTests.java rename to server/src/test/java/org/elasticsearch/discovery/zen/MembershipActionTests.java diff --git a/core/src/test/java/org/elasticsearch/discovery/zen/NodeJoinControllerTests.java b/server/src/test/java/org/elasticsearch/discovery/zen/NodeJoinControllerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/discovery/zen/NodeJoinControllerTests.java rename to server/src/test/java/org/elasticsearch/discovery/zen/NodeJoinControllerTests.java diff --git a/core/src/test/java/org/elasticsearch/discovery/zen/NodeRemovalClusterStateTaskExecutorTests.java b/server/src/test/java/org/elasticsearch/discovery/zen/NodeRemovalClusterStateTaskExecutorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/discovery/zen/NodeRemovalClusterStateTaskExecutorTests.java rename to server/src/test/java/org/elasticsearch/discovery/zen/NodeRemovalClusterStateTaskExecutorTests.java diff --git a/core/src/test/java/org/elasticsearch/discovery/zen/PendingClusterStatesQueueTests.java b/server/src/test/java/org/elasticsearch/discovery/zen/PendingClusterStatesQueueTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/discovery/zen/PendingClusterStatesQueueTests.java rename to server/src/test/java/org/elasticsearch/discovery/zen/PendingClusterStatesQueueTests.java diff --git a/core/src/test/java/org/elasticsearch/discovery/zen/PublishClusterStateActionTests.java b/server/src/test/java/org/elasticsearch/discovery/zen/PublishClusterStateActionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/discovery/zen/PublishClusterStateActionTests.java rename to server/src/test/java/org/elasticsearch/discovery/zen/PublishClusterStateActionTests.java diff --git a/core/src/test/java/org/elasticsearch/discovery/zen/UnicastZenPingTests.java b/server/src/test/java/org/elasticsearch/discovery/zen/UnicastZenPingTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/discovery/zen/UnicastZenPingTests.java rename to server/src/test/java/org/elasticsearch/discovery/zen/UnicastZenPingTests.java diff --git a/core/src/test/java/org/elasticsearch/discovery/zen/ZenDiscoveryIT.java b/server/src/test/java/org/elasticsearch/discovery/zen/ZenDiscoveryIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/discovery/zen/ZenDiscoveryIT.java rename to server/src/test/java/org/elasticsearch/discovery/zen/ZenDiscoveryIT.java diff --git a/core/src/test/java/org/elasticsearch/discovery/zen/ZenDiscoveryUnitTests.java b/server/src/test/java/org/elasticsearch/discovery/zen/ZenDiscoveryUnitTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/discovery/zen/ZenDiscoveryUnitTests.java rename to server/src/test/java/org/elasticsearch/discovery/zen/ZenDiscoveryUnitTests.java diff --git a/core/src/test/java/org/elasticsearch/discovery/zen/ZenPingTests.java b/server/src/test/java/org/elasticsearch/discovery/zen/ZenPingTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/discovery/zen/ZenPingTests.java rename to server/src/test/java/org/elasticsearch/discovery/zen/ZenPingTests.java diff --git a/core/src/test/java/org/elasticsearch/document/AliasedIndexDocumentActionsIT.java b/server/src/test/java/org/elasticsearch/document/AliasedIndexDocumentActionsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/document/AliasedIndexDocumentActionsIT.java rename to server/src/test/java/org/elasticsearch/document/AliasedIndexDocumentActionsIT.java diff --git a/core/src/test/java/org/elasticsearch/document/DocumentActionsIT.java b/server/src/test/java/org/elasticsearch/document/DocumentActionsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/document/DocumentActionsIT.java rename to server/src/test/java/org/elasticsearch/document/DocumentActionsIT.java diff --git a/core/src/test/java/org/elasticsearch/document/ShardInfoIT.java b/server/src/test/java/org/elasticsearch/document/ShardInfoIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/document/ShardInfoIT.java rename to server/src/test/java/org/elasticsearch/document/ShardInfoIT.java diff --git a/core/src/test/java/org/elasticsearch/env/ESFileStoreTests.java b/server/src/test/java/org/elasticsearch/env/ESFileStoreTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/env/ESFileStoreTests.java rename to server/src/test/java/org/elasticsearch/env/ESFileStoreTests.java diff --git a/core/src/test/java/org/elasticsearch/env/EnvironmentTests.java b/server/src/test/java/org/elasticsearch/env/EnvironmentTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/env/EnvironmentTests.java rename to server/src/test/java/org/elasticsearch/env/EnvironmentTests.java diff --git a/core/src/test/java/org/elasticsearch/env/NodeEnvironmentTests.java b/server/src/test/java/org/elasticsearch/env/NodeEnvironmentTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/env/NodeEnvironmentTests.java rename to server/src/test/java/org/elasticsearch/env/NodeEnvironmentTests.java diff --git a/core/src/test/java/org/elasticsearch/explain/ExplainActionIT.java b/server/src/test/java/org/elasticsearch/explain/ExplainActionIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/explain/ExplainActionIT.java rename to server/src/test/java/org/elasticsearch/explain/ExplainActionIT.java diff --git a/core/src/test/java/org/elasticsearch/gateway/AsyncShardFetchTests.java b/server/src/test/java/org/elasticsearch/gateway/AsyncShardFetchTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/gateway/AsyncShardFetchTests.java rename to server/src/test/java/org/elasticsearch/gateway/AsyncShardFetchTests.java diff --git a/core/src/test/java/org/elasticsearch/gateway/DanglingIndicesStateTests.java b/server/src/test/java/org/elasticsearch/gateway/DanglingIndicesStateTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/gateway/DanglingIndicesStateTests.java rename to server/src/test/java/org/elasticsearch/gateway/DanglingIndicesStateTests.java diff --git a/core/src/test/java/org/elasticsearch/gateway/GatewayIndexStateIT.java b/server/src/test/java/org/elasticsearch/gateway/GatewayIndexStateIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/gateway/GatewayIndexStateIT.java rename to server/src/test/java/org/elasticsearch/gateway/GatewayIndexStateIT.java diff --git a/core/src/test/java/org/elasticsearch/gateway/GatewayMetaStateTests.java b/server/src/test/java/org/elasticsearch/gateway/GatewayMetaStateTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/gateway/GatewayMetaStateTests.java rename to server/src/test/java/org/elasticsearch/gateway/GatewayMetaStateTests.java diff --git a/core/src/test/java/org/elasticsearch/gateway/GatewayServiceTests.java b/server/src/test/java/org/elasticsearch/gateway/GatewayServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/gateway/GatewayServiceTests.java rename to server/src/test/java/org/elasticsearch/gateway/GatewayServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/gateway/MetaDataStateFormatTests.java b/server/src/test/java/org/elasticsearch/gateway/MetaDataStateFormatTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/gateway/MetaDataStateFormatTests.java rename to server/src/test/java/org/elasticsearch/gateway/MetaDataStateFormatTests.java diff --git a/core/src/test/java/org/elasticsearch/gateway/MetaDataWriteDataNodesIT.java b/server/src/test/java/org/elasticsearch/gateway/MetaDataWriteDataNodesIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/gateway/MetaDataWriteDataNodesIT.java rename to server/src/test/java/org/elasticsearch/gateway/MetaDataWriteDataNodesIT.java diff --git a/core/src/test/java/org/elasticsearch/gateway/MetaStateServiceTests.java b/server/src/test/java/org/elasticsearch/gateway/MetaStateServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/gateway/MetaStateServiceTests.java rename to server/src/test/java/org/elasticsearch/gateway/MetaStateServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/gateway/PrimaryShardAllocatorTests.java b/server/src/test/java/org/elasticsearch/gateway/PrimaryShardAllocatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/gateway/PrimaryShardAllocatorTests.java rename to server/src/test/java/org/elasticsearch/gateway/PrimaryShardAllocatorTests.java diff --git a/core/src/test/java/org/elasticsearch/gateway/PriorityComparatorTests.java b/server/src/test/java/org/elasticsearch/gateway/PriorityComparatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/gateway/PriorityComparatorTests.java rename to server/src/test/java/org/elasticsearch/gateway/PriorityComparatorTests.java diff --git a/core/src/test/java/org/elasticsearch/gateway/QuorumGatewayIT.java b/server/src/test/java/org/elasticsearch/gateway/QuorumGatewayIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/gateway/QuorumGatewayIT.java rename to server/src/test/java/org/elasticsearch/gateway/QuorumGatewayIT.java diff --git a/core/src/test/java/org/elasticsearch/gateway/RecoverAfterNodesIT.java b/server/src/test/java/org/elasticsearch/gateway/RecoverAfterNodesIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/gateway/RecoverAfterNodesIT.java rename to server/src/test/java/org/elasticsearch/gateway/RecoverAfterNodesIT.java diff --git a/core/src/test/java/org/elasticsearch/gateway/RecoveryFromGatewayIT.java b/server/src/test/java/org/elasticsearch/gateway/RecoveryFromGatewayIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/gateway/RecoveryFromGatewayIT.java rename to server/src/test/java/org/elasticsearch/gateway/RecoveryFromGatewayIT.java diff --git a/core/src/test/java/org/elasticsearch/gateway/ReplicaShardAllocatorTests.java b/server/src/test/java/org/elasticsearch/gateway/ReplicaShardAllocatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/gateway/ReplicaShardAllocatorTests.java rename to server/src/test/java/org/elasticsearch/gateway/ReplicaShardAllocatorTests.java diff --git a/core/src/test/java/org/elasticsearch/gateway/ReusePeerRecoverySharedTest.java b/server/src/test/java/org/elasticsearch/gateway/ReusePeerRecoverySharedTest.java similarity index 100% rename from core/src/test/java/org/elasticsearch/gateway/ReusePeerRecoverySharedTest.java rename to server/src/test/java/org/elasticsearch/gateway/ReusePeerRecoverySharedTest.java diff --git a/core/src/test/java/org/elasticsearch/get/GetActionIT.java b/server/src/test/java/org/elasticsearch/get/GetActionIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/get/GetActionIT.java rename to server/src/test/java/org/elasticsearch/get/GetActionIT.java diff --git a/core/src/test/java/org/elasticsearch/index/IndexModuleTests.java b/server/src/test/java/org/elasticsearch/index/IndexModuleTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/IndexModuleTests.java rename to server/src/test/java/org/elasticsearch/index/IndexModuleTests.java diff --git a/core/src/test/java/org/elasticsearch/index/IndexRequestBuilderIT.java b/server/src/test/java/org/elasticsearch/index/IndexRequestBuilderIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/IndexRequestBuilderIT.java rename to server/src/test/java/org/elasticsearch/index/IndexRequestBuilderIT.java diff --git a/core/src/test/java/org/elasticsearch/index/IndexServiceTests.java b/server/src/test/java/org/elasticsearch/index/IndexServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/IndexServiceTests.java rename to server/src/test/java/org/elasticsearch/index/IndexServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/index/IndexSettingsTests.java b/server/src/test/java/org/elasticsearch/index/IndexSettingsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/IndexSettingsTests.java rename to server/src/test/java/org/elasticsearch/index/IndexSettingsTests.java diff --git a/core/src/test/java/org/elasticsearch/index/IndexSortIT.java b/server/src/test/java/org/elasticsearch/index/IndexSortIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/IndexSortIT.java rename to server/src/test/java/org/elasticsearch/index/IndexSortIT.java diff --git a/core/src/test/java/org/elasticsearch/index/IndexSortSettingsTests.java b/server/src/test/java/org/elasticsearch/index/IndexSortSettingsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/IndexSortSettingsTests.java rename to server/src/test/java/org/elasticsearch/index/IndexSortSettingsTests.java diff --git a/core/src/test/java/org/elasticsearch/index/IndexTests.java b/server/src/test/java/org/elasticsearch/index/IndexTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/IndexTests.java rename to server/src/test/java/org/elasticsearch/index/IndexTests.java diff --git a/core/src/test/java/org/elasticsearch/index/IndexingSlowLogTests.java b/server/src/test/java/org/elasticsearch/index/IndexingSlowLogTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/IndexingSlowLogTests.java rename to server/src/test/java/org/elasticsearch/index/IndexingSlowLogTests.java diff --git a/core/src/test/java/org/elasticsearch/index/MergePolicySettingsTests.java b/server/src/test/java/org/elasticsearch/index/MergePolicySettingsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/MergePolicySettingsTests.java rename to server/src/test/java/org/elasticsearch/index/MergePolicySettingsTests.java diff --git a/core/src/test/java/org/elasticsearch/index/MergeSchedulerSettingsTests.java b/server/src/test/java/org/elasticsearch/index/MergeSchedulerSettingsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/MergeSchedulerSettingsTests.java rename to server/src/test/java/org/elasticsearch/index/MergeSchedulerSettingsTests.java diff --git a/core/src/test/java/org/elasticsearch/index/SearchSlowLogTests.java b/server/src/test/java/org/elasticsearch/index/SearchSlowLogTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/SearchSlowLogTests.java rename to server/src/test/java/org/elasticsearch/index/SearchSlowLogTests.java diff --git a/core/src/test/java/org/elasticsearch/index/SettingsListenerIT.java b/server/src/test/java/org/elasticsearch/index/SettingsListenerIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/SettingsListenerIT.java rename to server/src/test/java/org/elasticsearch/index/SettingsListenerIT.java diff --git a/core/src/test/java/org/elasticsearch/index/VersionTypeTests.java b/server/src/test/java/org/elasticsearch/index/VersionTypeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/VersionTypeTests.java rename to server/src/test/java/org/elasticsearch/index/VersionTypeTests.java diff --git a/core/src/test/java/org/elasticsearch/index/WaitUntilRefreshIT.java b/server/src/test/java/org/elasticsearch/index/WaitUntilRefreshIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/WaitUntilRefreshIT.java rename to server/src/test/java/org/elasticsearch/index/WaitUntilRefreshIT.java diff --git a/core/src/test/java/org/elasticsearch/index/analysis/AnalysisRegistryTests.java b/server/src/test/java/org/elasticsearch/index/analysis/AnalysisRegistryTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/analysis/AnalysisRegistryTests.java rename to server/src/test/java/org/elasticsearch/index/analysis/AnalysisRegistryTests.java diff --git a/core/src/test/java/org/elasticsearch/index/analysis/AnalysisTests.java b/server/src/test/java/org/elasticsearch/index/analysis/AnalysisTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/analysis/AnalysisTests.java rename to server/src/test/java/org/elasticsearch/index/analysis/AnalysisTests.java diff --git a/core/src/test/java/org/elasticsearch/index/analysis/CharMatcherTests.java b/server/src/test/java/org/elasticsearch/index/analysis/CharMatcherTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/analysis/CharMatcherTests.java rename to server/src/test/java/org/elasticsearch/index/analysis/CharMatcherTests.java diff --git a/core/src/test/java/org/elasticsearch/index/analysis/CoreAnalysisFactoryTests.java b/server/src/test/java/org/elasticsearch/index/analysis/CoreAnalysisFactoryTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/analysis/CoreAnalysisFactoryTests.java rename to server/src/test/java/org/elasticsearch/index/analysis/CoreAnalysisFactoryTests.java diff --git a/core/src/test/java/org/elasticsearch/index/analysis/CustomNormalizerTests.java b/server/src/test/java/org/elasticsearch/index/analysis/CustomNormalizerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/analysis/CustomNormalizerTests.java rename to server/src/test/java/org/elasticsearch/index/analysis/CustomNormalizerTests.java diff --git a/core/src/test/java/org/elasticsearch/index/analysis/FingerprintAnalyzerTests.java b/server/src/test/java/org/elasticsearch/index/analysis/FingerprintAnalyzerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/analysis/FingerprintAnalyzerTests.java rename to server/src/test/java/org/elasticsearch/index/analysis/FingerprintAnalyzerTests.java diff --git a/core/src/test/java/org/elasticsearch/index/analysis/HunspellTokenFilterFactoryTests.java b/server/src/test/java/org/elasticsearch/index/analysis/HunspellTokenFilterFactoryTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/analysis/HunspellTokenFilterFactoryTests.java rename to server/src/test/java/org/elasticsearch/index/analysis/HunspellTokenFilterFactoryTests.java diff --git a/core/src/test/java/org/elasticsearch/index/analysis/PathHierarchyTokenizerFactoryTests.java b/server/src/test/java/org/elasticsearch/index/analysis/PathHierarchyTokenizerFactoryTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/analysis/PathHierarchyTokenizerFactoryTests.java rename to server/src/test/java/org/elasticsearch/index/analysis/PathHierarchyTokenizerFactoryTests.java diff --git a/core/src/test/java/org/elasticsearch/index/analysis/PatternAnalyzerTests.java b/server/src/test/java/org/elasticsearch/index/analysis/PatternAnalyzerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/analysis/PatternAnalyzerTests.java rename to server/src/test/java/org/elasticsearch/index/analysis/PatternAnalyzerTests.java diff --git a/core/src/test/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerTests.java b/server/src/test/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerTests.java rename to server/src/test/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerTests.java diff --git a/core/src/test/java/org/elasticsearch/index/analysis/ShingleTokenFilterFactoryTests.java b/server/src/test/java/org/elasticsearch/index/analysis/ShingleTokenFilterFactoryTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/analysis/ShingleTokenFilterFactoryTests.java rename to server/src/test/java/org/elasticsearch/index/analysis/ShingleTokenFilterFactoryTests.java diff --git a/core/src/test/java/org/elasticsearch/index/analysis/SnowballAnalyzerTests.java b/server/src/test/java/org/elasticsearch/index/analysis/SnowballAnalyzerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/analysis/SnowballAnalyzerTests.java rename to server/src/test/java/org/elasticsearch/index/analysis/SnowballAnalyzerTests.java diff --git a/core/src/test/java/org/elasticsearch/index/analysis/StopAnalyzerTests.java b/server/src/test/java/org/elasticsearch/index/analysis/StopAnalyzerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/analysis/StopAnalyzerTests.java rename to server/src/test/java/org/elasticsearch/index/analysis/StopAnalyzerTests.java diff --git a/core/src/test/java/org/elasticsearch/index/analysis/StopTokenFilterTests.java b/server/src/test/java/org/elasticsearch/index/analysis/StopTokenFilterTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/analysis/StopTokenFilterTests.java rename to server/src/test/java/org/elasticsearch/index/analysis/StopTokenFilterTests.java diff --git a/core/src/test/java/org/elasticsearch/index/analysis/WhitespaceTokenizerFactoryTests.java b/server/src/test/java/org/elasticsearch/index/analysis/WhitespaceTokenizerFactoryTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/analysis/WhitespaceTokenizerFactoryTests.java rename to server/src/test/java/org/elasticsearch/index/analysis/WhitespaceTokenizerFactoryTests.java diff --git a/core/src/test/java/org/elasticsearch/index/analysis/synonyms/SynonymsAnalysisTests.java b/server/src/test/java/org/elasticsearch/index/analysis/synonyms/SynonymsAnalysisTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/analysis/synonyms/SynonymsAnalysisTests.java rename to server/src/test/java/org/elasticsearch/index/analysis/synonyms/SynonymsAnalysisTests.java diff --git a/core/src/test/java/org/elasticsearch/index/cache/bitset/BitSetFilterCacheTests.java b/server/src/test/java/org/elasticsearch/index/cache/bitset/BitSetFilterCacheTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/cache/bitset/BitSetFilterCacheTests.java rename to server/src/test/java/org/elasticsearch/index/cache/bitset/BitSetFilterCacheTests.java diff --git a/core/src/test/java/org/elasticsearch/index/codec/CodecTests.java b/server/src/test/java/org/elasticsearch/index/codec/CodecTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/codec/CodecTests.java rename to server/src/test/java/org/elasticsearch/index/codec/CodecTests.java diff --git a/core/src/test/java/org/elasticsearch/index/engine/CombinedDeletionPolicyTests.java b/server/src/test/java/org/elasticsearch/index/engine/CombinedDeletionPolicyTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/engine/CombinedDeletionPolicyTests.java rename to server/src/test/java/org/elasticsearch/index/engine/CombinedDeletionPolicyTests.java diff --git a/core/src/test/java/org/elasticsearch/index/engine/EngineSearcherTotalHitsMatcher.java b/server/src/test/java/org/elasticsearch/index/engine/EngineSearcherTotalHitsMatcher.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/engine/EngineSearcherTotalHitsMatcher.java rename to server/src/test/java/org/elasticsearch/index/engine/EngineSearcherTotalHitsMatcher.java diff --git a/core/src/test/java/org/elasticsearch/index/engine/InternalEngineMergeIT.java b/server/src/test/java/org/elasticsearch/index/engine/InternalEngineMergeIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/engine/InternalEngineMergeIT.java rename to server/src/test/java/org/elasticsearch/index/engine/InternalEngineMergeIT.java diff --git a/core/src/test/java/org/elasticsearch/index/engine/InternalEngineSettingsTests.java b/server/src/test/java/org/elasticsearch/index/engine/InternalEngineSettingsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/engine/InternalEngineSettingsTests.java rename to server/src/test/java/org/elasticsearch/index/engine/InternalEngineSettingsTests.java diff --git a/core/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java b/server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java rename to server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java diff --git a/core/src/test/java/org/elasticsearch/index/engine/LiveVersionMapTests.java b/server/src/test/java/org/elasticsearch/index/engine/LiveVersionMapTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/engine/LiveVersionMapTests.java rename to server/src/test/java/org/elasticsearch/index/engine/LiveVersionMapTests.java diff --git a/core/src/test/java/org/elasticsearch/index/engine/SegmentTests.java b/server/src/test/java/org/elasticsearch/index/engine/SegmentTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/engine/SegmentTests.java rename to server/src/test/java/org/elasticsearch/index/engine/SegmentTests.java diff --git a/core/src/test/java/org/elasticsearch/index/engine/VersionValueTests.java b/server/src/test/java/org/elasticsearch/index/engine/VersionValueTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/engine/VersionValueTests.java rename to server/src/test/java/org/elasticsearch/index/engine/VersionValueTests.java diff --git a/core/src/test/java/org/elasticsearch/index/fielddata/AbstractFieldDataImplTestCase.java b/server/src/test/java/org/elasticsearch/index/fielddata/AbstractFieldDataImplTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/fielddata/AbstractFieldDataImplTestCase.java rename to server/src/test/java/org/elasticsearch/index/fielddata/AbstractFieldDataImplTestCase.java diff --git a/core/src/test/java/org/elasticsearch/index/fielddata/AbstractFieldDataTestCase.java b/server/src/test/java/org/elasticsearch/index/fielddata/AbstractFieldDataTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/fielddata/AbstractFieldDataTestCase.java rename to server/src/test/java/org/elasticsearch/index/fielddata/AbstractFieldDataTestCase.java diff --git a/core/src/test/java/org/elasticsearch/index/fielddata/AbstractGeoFieldDataTestCase.java b/server/src/test/java/org/elasticsearch/index/fielddata/AbstractGeoFieldDataTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/fielddata/AbstractGeoFieldDataTestCase.java rename to server/src/test/java/org/elasticsearch/index/fielddata/AbstractGeoFieldDataTestCase.java diff --git a/core/src/test/java/org/elasticsearch/index/fielddata/AbstractStringFieldDataTestCase.java b/server/src/test/java/org/elasticsearch/index/fielddata/AbstractStringFieldDataTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/fielddata/AbstractStringFieldDataTestCase.java rename to server/src/test/java/org/elasticsearch/index/fielddata/AbstractStringFieldDataTestCase.java diff --git a/core/src/test/java/org/elasticsearch/index/fielddata/BinaryDVFieldDataTests.java b/server/src/test/java/org/elasticsearch/index/fielddata/BinaryDVFieldDataTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/fielddata/BinaryDVFieldDataTests.java rename to server/src/test/java/org/elasticsearch/index/fielddata/BinaryDVFieldDataTests.java diff --git a/core/src/test/java/org/elasticsearch/index/fielddata/FieldDataCacheTests.java b/server/src/test/java/org/elasticsearch/index/fielddata/FieldDataCacheTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/fielddata/FieldDataCacheTests.java rename to server/src/test/java/org/elasticsearch/index/fielddata/FieldDataCacheTests.java diff --git a/core/src/test/java/org/elasticsearch/index/fielddata/FieldDataLoadingIT.java b/server/src/test/java/org/elasticsearch/index/fielddata/FieldDataLoadingIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/fielddata/FieldDataLoadingIT.java rename to server/src/test/java/org/elasticsearch/index/fielddata/FieldDataLoadingIT.java diff --git a/core/src/test/java/org/elasticsearch/index/fielddata/FieldDataStatsTests.java b/server/src/test/java/org/elasticsearch/index/fielddata/FieldDataStatsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/fielddata/FieldDataStatsTests.java rename to server/src/test/java/org/elasticsearch/index/fielddata/FieldDataStatsTests.java diff --git a/core/src/test/java/org/elasticsearch/index/fielddata/FieldDataTests.java b/server/src/test/java/org/elasticsearch/index/fielddata/FieldDataTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/fielddata/FieldDataTests.java rename to server/src/test/java/org/elasticsearch/index/fielddata/FieldDataTests.java diff --git a/core/src/test/java/org/elasticsearch/index/fielddata/FilterFieldDataTests.java b/server/src/test/java/org/elasticsearch/index/fielddata/FilterFieldDataTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/fielddata/FilterFieldDataTests.java rename to server/src/test/java/org/elasticsearch/index/fielddata/FilterFieldDataTests.java diff --git a/core/src/test/java/org/elasticsearch/index/fielddata/GeoFieldDataTests.java b/server/src/test/java/org/elasticsearch/index/fielddata/GeoFieldDataTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/fielddata/GeoFieldDataTests.java rename to server/src/test/java/org/elasticsearch/index/fielddata/GeoFieldDataTests.java diff --git a/core/src/test/java/org/elasticsearch/index/fielddata/IndexFieldDataServiceTests.java b/server/src/test/java/org/elasticsearch/index/fielddata/IndexFieldDataServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/fielddata/IndexFieldDataServiceTests.java rename to server/src/test/java/org/elasticsearch/index/fielddata/IndexFieldDataServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/index/fielddata/NoOrdinalsStringFieldDataTests.java b/server/src/test/java/org/elasticsearch/index/fielddata/NoOrdinalsStringFieldDataTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/fielddata/NoOrdinalsStringFieldDataTests.java rename to server/src/test/java/org/elasticsearch/index/fielddata/NoOrdinalsStringFieldDataTests.java diff --git a/core/src/test/java/org/elasticsearch/index/fielddata/PagedBytesStringFieldDataTests.java b/server/src/test/java/org/elasticsearch/index/fielddata/PagedBytesStringFieldDataTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/fielddata/PagedBytesStringFieldDataTests.java rename to server/src/test/java/org/elasticsearch/index/fielddata/PagedBytesStringFieldDataTests.java diff --git a/core/src/test/java/org/elasticsearch/index/fielddata/ScriptDocValuesDatesTests.java b/server/src/test/java/org/elasticsearch/index/fielddata/ScriptDocValuesDatesTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/fielddata/ScriptDocValuesDatesTests.java rename to server/src/test/java/org/elasticsearch/index/fielddata/ScriptDocValuesDatesTests.java diff --git a/core/src/test/java/org/elasticsearch/index/fielddata/ScriptDocValuesGeoPointsTests.java b/server/src/test/java/org/elasticsearch/index/fielddata/ScriptDocValuesGeoPointsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/fielddata/ScriptDocValuesGeoPointsTests.java rename to server/src/test/java/org/elasticsearch/index/fielddata/ScriptDocValuesGeoPointsTests.java diff --git a/core/src/test/java/org/elasticsearch/index/fielddata/ScriptDocValuesLongsTests.java b/server/src/test/java/org/elasticsearch/index/fielddata/ScriptDocValuesLongsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/fielddata/ScriptDocValuesLongsTests.java rename to server/src/test/java/org/elasticsearch/index/fielddata/ScriptDocValuesLongsTests.java diff --git a/core/src/test/java/org/elasticsearch/index/fielddata/SortedSetDVStringFieldDataTests.java b/server/src/test/java/org/elasticsearch/index/fielddata/SortedSetDVStringFieldDataTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/fielddata/SortedSetDVStringFieldDataTests.java rename to server/src/test/java/org/elasticsearch/index/fielddata/SortedSetDVStringFieldDataTests.java diff --git a/core/src/test/java/org/elasticsearch/index/fielddata/UidFieldDataTests.java b/server/src/test/java/org/elasticsearch/index/fielddata/UidFieldDataTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/fielddata/UidFieldDataTests.java rename to server/src/test/java/org/elasticsearch/index/fielddata/UidFieldDataTests.java diff --git a/core/src/test/java/org/elasticsearch/index/fielddata/fieldcomparator/ReplaceMissingTests.java b/server/src/test/java/org/elasticsearch/index/fielddata/fieldcomparator/ReplaceMissingTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/fielddata/fieldcomparator/ReplaceMissingTests.java rename to server/src/test/java/org/elasticsearch/index/fielddata/fieldcomparator/ReplaceMissingTests.java diff --git a/core/src/test/java/org/elasticsearch/index/fielddata/ordinals/MultiOrdinalsTests.java b/server/src/test/java/org/elasticsearch/index/fielddata/ordinals/MultiOrdinalsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/fielddata/ordinals/MultiOrdinalsTests.java rename to server/src/test/java/org/elasticsearch/index/fielddata/ordinals/MultiOrdinalsTests.java diff --git a/core/src/test/java/org/elasticsearch/index/fielddata/ordinals/SingleOrdinalsTests.java b/server/src/test/java/org/elasticsearch/index/fielddata/ordinals/SingleOrdinalsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/fielddata/ordinals/SingleOrdinalsTests.java rename to server/src/test/java/org/elasticsearch/index/fielddata/ordinals/SingleOrdinalsTests.java diff --git a/core/src/test/java/org/elasticsearch/index/fielddata/plain/HalfFloatFielddataTests.java b/server/src/test/java/org/elasticsearch/index/fielddata/plain/HalfFloatFielddataTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/fielddata/plain/HalfFloatFielddataTests.java rename to server/src/test/java/org/elasticsearch/index/fielddata/plain/HalfFloatFielddataTests.java diff --git a/core/src/test/java/org/elasticsearch/index/fieldstats/FieldStatsProviderRefreshTests.java b/server/src/test/java/org/elasticsearch/index/fieldstats/FieldStatsProviderRefreshTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/fieldstats/FieldStatsProviderRefreshTests.java rename to server/src/test/java/org/elasticsearch/index/fieldstats/FieldStatsProviderRefreshTests.java diff --git a/core/src/test/java/org/elasticsearch/index/get/DocumentFieldTests.java b/server/src/test/java/org/elasticsearch/index/get/DocumentFieldTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/get/DocumentFieldTests.java rename to server/src/test/java/org/elasticsearch/index/get/DocumentFieldTests.java diff --git a/core/src/test/java/org/elasticsearch/index/get/GetResultTests.java b/server/src/test/java/org/elasticsearch/index/get/GetResultTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/get/GetResultTests.java rename to server/src/test/java/org/elasticsearch/index/get/GetResultTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/AllFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/AllFieldMapperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/AllFieldMapperTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/AllFieldMapperTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/BinaryFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/BinaryFieldMapperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/BinaryFieldMapperTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/BinaryFieldMapperTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/BinaryFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/BinaryFieldTypeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/BinaryFieldTypeTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/BinaryFieldTypeTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/BinaryRangeUtilTests.java b/server/src/test/java/org/elasticsearch/index/mapper/BinaryRangeUtilTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/BinaryRangeUtilTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/BinaryRangeUtilTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/BooleanFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/BooleanFieldMapperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/BooleanFieldMapperTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/BooleanFieldMapperTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/BooleanFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/BooleanFieldTypeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/BooleanFieldTypeTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/BooleanFieldTypeTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/CamelCaseFieldNameTests.java b/server/src/test/java/org/elasticsearch/index/mapper/CamelCaseFieldNameTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/CamelCaseFieldNameTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/CamelCaseFieldNameTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/CompletionFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/CompletionFieldMapperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/CompletionFieldMapperTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/CompletionFieldMapperTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/CompletionFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/CompletionFieldTypeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/CompletionFieldTypeTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/CompletionFieldTypeTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/CopyToMapperIntegrationIT.java b/server/src/test/java/org/elasticsearch/index/mapper/CopyToMapperIntegrationIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/CopyToMapperIntegrationIT.java rename to server/src/test/java/org/elasticsearch/index/mapper/CopyToMapperIntegrationIT.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/CopyToMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/CopyToMapperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/CopyToMapperTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/CopyToMapperTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/DateFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/DateFieldMapperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/DateFieldMapperTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/DateFieldMapperTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/DateFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/DateFieldTypeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/DateFieldTypeTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/DateFieldTypeTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/DocumentFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/DocumentFieldMapperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/DocumentFieldMapperTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/DocumentFieldMapperTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/DocumentMapperMergeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/DocumentMapperMergeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/DocumentMapperMergeTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/DocumentMapperMergeTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/DocumentMapperParserTests.java b/server/src/test/java/org/elasticsearch/index/mapper/DocumentMapperParserTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/DocumentMapperParserTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/DocumentMapperParserTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/DocumentParserTests.java b/server/src/test/java/org/elasticsearch/index/mapper/DocumentParserTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/DocumentParserTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/DocumentParserTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/DoubleIndexingDocTests.java b/server/src/test/java/org/elasticsearch/index/mapper/DoubleIndexingDocTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/DoubleIndexingDocTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/DoubleIndexingDocTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/DynamicMappingIT.java b/server/src/test/java/org/elasticsearch/index/mapper/DynamicMappingIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/DynamicMappingIT.java rename to server/src/test/java/org/elasticsearch/index/mapper/DynamicMappingIT.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/DynamicMappingTests.java b/server/src/test/java/org/elasticsearch/index/mapper/DynamicMappingTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/DynamicMappingTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/DynamicMappingTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/DynamicMappingVersionTests.java b/server/src/test/java/org/elasticsearch/index/mapper/DynamicMappingVersionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/DynamicMappingVersionTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/DynamicMappingVersionTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/DynamicTemplateTests.java b/server/src/test/java/org/elasticsearch/index/mapper/DynamicTemplateTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/DynamicTemplateTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/DynamicTemplateTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/DynamicTemplatesTests.java b/server/src/test/java/org/elasticsearch/index/mapper/DynamicTemplatesTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/DynamicTemplatesTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/DynamicTemplatesTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/ExternalFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/ExternalFieldMapperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/ExternalFieldMapperTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/ExternalFieldMapperTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/ExternalMapper.java b/server/src/test/java/org/elasticsearch/index/mapper/ExternalMapper.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/ExternalMapper.java rename to server/src/test/java/org/elasticsearch/index/mapper/ExternalMapper.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/ExternalMapperPlugin.java b/server/src/test/java/org/elasticsearch/index/mapper/ExternalMapperPlugin.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/ExternalMapperPlugin.java rename to server/src/test/java/org/elasticsearch/index/mapper/ExternalMapperPlugin.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/ExternalMetadataMapper.java b/server/src/test/java/org/elasticsearch/index/mapper/ExternalMetadataMapper.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/ExternalMetadataMapper.java rename to server/src/test/java/org/elasticsearch/index/mapper/ExternalMetadataMapper.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/ExternalValuesMapperIntegrationIT.java b/server/src/test/java/org/elasticsearch/index/mapper/ExternalValuesMapperIntegrationIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/ExternalValuesMapperIntegrationIT.java rename to server/src/test/java/org/elasticsearch/index/mapper/ExternalValuesMapperIntegrationIT.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/FakeStringFieldMapper.java b/server/src/test/java/org/elasticsearch/index/mapper/FakeStringFieldMapper.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/FakeStringFieldMapper.java rename to server/src/test/java/org/elasticsearch/index/mapper/FakeStringFieldMapper.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/FieldFilterMapperPluginTests.java b/server/src/test/java/org/elasticsearch/index/mapper/FieldFilterMapperPluginTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/FieldFilterMapperPluginTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/FieldFilterMapperPluginTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/FieldNamesFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/FieldNamesFieldMapperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/FieldNamesFieldMapperTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/FieldNamesFieldMapperTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/FieldNamesFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/FieldNamesFieldTypeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/FieldNamesFieldTypeTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/FieldNamesFieldTypeTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/FieldTypeLookupTests.java b/server/src/test/java/org/elasticsearch/index/mapper/FieldTypeLookupTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/FieldTypeLookupTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/FieldTypeLookupTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/GenericStoreDynamicTemplateTests.java b/server/src/test/java/org/elasticsearch/index/mapper/GenericStoreDynamicTemplateTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/GenericStoreDynamicTemplateTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/GenericStoreDynamicTemplateTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/GeoPointFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/GeoPointFieldMapperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/GeoPointFieldMapperTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/GeoPointFieldMapperTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/GeoPointFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/GeoPointFieldTypeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/GeoPointFieldTypeTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/GeoPointFieldTypeTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/GeoShapeFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/GeoShapeFieldMapperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/GeoShapeFieldMapperTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/GeoShapeFieldMapperTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/GeoShapeFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/GeoShapeFieldTypeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/GeoShapeFieldTypeTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/GeoShapeFieldTypeTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/IdFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/IdFieldMapperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/IdFieldMapperTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/IdFieldMapperTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/IdFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/IdFieldTypeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/IdFieldTypeTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/IdFieldTypeTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/IndexFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/IndexFieldMapperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/IndexFieldMapperTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/IndexFieldMapperTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/IndexFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/IndexFieldTypeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/IndexFieldTypeTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/IndexFieldTypeTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/IpFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/IpFieldMapperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/IpFieldMapperTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/IpFieldMapperTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/IpFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/IpFieldTypeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/IpFieldTypeTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/IpFieldTypeTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/IpRangeFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/IpRangeFieldMapperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/IpRangeFieldMapperTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/IpRangeFieldMapperTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/JavaMultiFieldMergeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/JavaMultiFieldMergeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/JavaMultiFieldMergeTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/JavaMultiFieldMergeTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/KeywordFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/KeywordFieldMapperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/KeywordFieldMapperTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/KeywordFieldMapperTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/KeywordFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/KeywordFieldTypeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/KeywordFieldTypeTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/KeywordFieldTypeTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/MapperServiceTests.java b/server/src/test/java/org/elasticsearch/index/mapper/MapperServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/MapperServiceTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/MapperServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/MapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/MapperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/MapperTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/MapperTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/MultiFieldCopyToMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/MultiFieldCopyToMapperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/MultiFieldCopyToMapperTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/MultiFieldCopyToMapperTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/MultiFieldTests.java b/server/src/test/java/org/elasticsearch/index/mapper/MultiFieldTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/MultiFieldTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/MultiFieldTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/MultiFieldsIntegrationIT.java b/server/src/test/java/org/elasticsearch/index/mapper/MultiFieldsIntegrationIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/MultiFieldsIntegrationIT.java rename to server/src/test/java/org/elasticsearch/index/mapper/MultiFieldsIntegrationIT.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/NestedObjectMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/NestedObjectMapperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/NestedObjectMapperTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/NestedObjectMapperTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/NullValueObjectMappingTests.java b/server/src/test/java/org/elasticsearch/index/mapper/NullValueObjectMappingTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/NullValueObjectMappingTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/NullValueObjectMappingTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/NullValueTests.java b/server/src/test/java/org/elasticsearch/index/mapper/NullValueTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/NullValueTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/NullValueTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/NumberFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/NumberFieldMapperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/NumberFieldMapperTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/NumberFieldMapperTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/NumberFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/NumberFieldTypeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/NumberFieldTypeTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/NumberFieldTypeTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/ObjectMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/ObjectMapperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/ObjectMapperTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/ObjectMapperTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/ParentFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/ParentFieldMapperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/ParentFieldMapperTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/ParentFieldMapperTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/ParentFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/ParentFieldTypeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/ParentFieldTypeTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/ParentFieldTypeTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/PathMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/PathMapperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/PathMapperTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/PathMapperTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/PathMatchDynamicTemplateTests.java b/server/src/test/java/org/elasticsearch/index/mapper/PathMatchDynamicTemplateTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/PathMatchDynamicTemplateTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/PathMatchDynamicTemplateTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/RangeFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/RangeFieldMapperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/RangeFieldMapperTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/RangeFieldMapperTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/RangeFieldQueryStringQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/mapper/RangeFieldQueryStringQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/RangeFieldQueryStringQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/RangeFieldQueryStringQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/RangeFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/RangeFieldTypeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/RangeFieldTypeTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/RangeFieldTypeTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/RootObjectMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/RootObjectMapperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/RootObjectMapperTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/RootObjectMapperTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/RoutingFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/RoutingFieldMapperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/RoutingFieldMapperTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/RoutingFieldMapperTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/RoutingFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/RoutingFieldTypeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/RoutingFieldTypeTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/RoutingFieldTypeTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/SourceFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/SourceFieldMapperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/SourceFieldMapperTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/SourceFieldMapperTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/SourceFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/SourceFieldTypeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/SourceFieldTypeTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/SourceFieldTypeTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/StoredNumericValuesTests.java b/server/src/test/java/org/elasticsearch/index/mapper/StoredNumericValuesTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/StoredNumericValuesTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/StoredNumericValuesTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/TextFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/TextFieldMapperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/TextFieldMapperTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/TextFieldMapperTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/TextFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/TextFieldTypeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/TextFieldTypeTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/TextFieldTypeTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/TypeFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/TypeFieldMapperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/TypeFieldMapperTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/TypeFieldMapperTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/TypeFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/TypeFieldTypeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/TypeFieldTypeTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/TypeFieldTypeTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/UidFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/UidFieldMapperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/UidFieldMapperTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/UidFieldMapperTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/UidFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/UidFieldTypeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/UidFieldTypeTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/UidFieldTypeTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/UidTests.java b/server/src/test/java/org/elasticsearch/index/mapper/UidTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/UidTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/UidTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/UpdateMappingOnClusterIT.java b/server/src/test/java/org/elasticsearch/index/mapper/UpdateMappingOnClusterIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/UpdateMappingOnClusterIT.java rename to server/src/test/java/org/elasticsearch/index/mapper/UpdateMappingOnClusterIT.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/UpdateMappingTests.java b/server/src/test/java/org/elasticsearch/index/mapper/UpdateMappingTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/UpdateMappingTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/UpdateMappingTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/VersionFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/VersionFieldTypeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/VersionFieldTypeTests.java rename to server/src/test/java/org/elasticsearch/index/mapper/VersionFieldTypeTests.java diff --git a/core/src/test/java/org/elasticsearch/index/mapper/package-info.java b/server/src/test/java/org/elasticsearch/index/mapper/package-info.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/package-info.java rename to server/src/test/java/org/elasticsearch/index/mapper/package-info.java diff --git a/core/src/test/java/org/elasticsearch/index/query/AbstractQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/AbstractQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/AbstractQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/AbstractQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/AbstractTermQueryTestCase.java b/server/src/test/java/org/elasticsearch/index/query/AbstractTermQueryTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/AbstractTermQueryTestCase.java rename to server/src/test/java/org/elasticsearch/index/query/AbstractTermQueryTestCase.java diff --git a/core/src/test/java/org/elasticsearch/index/query/BoolQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/BoolQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/BoolQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/BoolQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/BoostingQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/BoostingQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/BoostingQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/BoostingQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/CombineFunctionTests.java b/server/src/test/java/org/elasticsearch/index/query/CombineFunctionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/CombineFunctionTests.java rename to server/src/test/java/org/elasticsearch/index/query/CombineFunctionTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/CommonTermsQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/CommonTermsQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/CommonTermsQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/CommonTermsQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/CommonTermsQueryParserTests.java b/server/src/test/java/org/elasticsearch/index/query/CommonTermsQueryParserTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/CommonTermsQueryParserTests.java rename to server/src/test/java/org/elasticsearch/index/query/CommonTermsQueryParserTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/ConstantScoreQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/ConstantScoreQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/ConstantScoreQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/ConstantScoreQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/DisMaxQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/DisMaxQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/DisMaxQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/DisMaxQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/DisableGraphQueryTests.java b/server/src/test/java/org/elasticsearch/index/query/DisableGraphQueryTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/DisableGraphQueryTests.java rename to server/src/test/java/org/elasticsearch/index/query/DisableGraphQueryTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/ExistsQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/ExistsQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/ExistsQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/ExistsQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/FieldMaskingSpanQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/FieldMaskingSpanQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/FieldMaskingSpanQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/FieldMaskingSpanQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/FuzzyQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/FuzzyQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/FuzzyQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/FuzzyQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/GeoBoundingBoxQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/GeoBoundingBoxQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/GeoBoundingBoxQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/GeoBoundingBoxQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/GeoDistanceQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/GeoDistanceQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/GeoDistanceQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/GeoDistanceQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/GeoPolygonQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/GeoPolygonQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/GeoPolygonQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/GeoPolygonQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/GeoShapeQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/GeoShapeQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/GeoShapeQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/GeoShapeQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/IdsQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/IdsQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/IdsQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/IdsQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/InnerHitBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/InnerHitBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/InnerHitBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/InnerHitBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/MatchAllQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/MatchAllQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/MatchAllQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/MatchAllQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/MatchNoneQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/MatchNoneQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/MatchNoneQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/MatchNoneQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/MatchPhrasePrefixQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/MatchPhrasePrefixQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/MatchPhrasePrefixQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/MatchPhrasePrefixQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/MatchPhraseQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/MatchPhraseQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/MatchPhraseQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/MatchPhraseQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/MatchQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/MatchQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/MatchQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/MatchQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/MockRepeatAnalyzer.java b/server/src/test/java/org/elasticsearch/index/query/MockRepeatAnalyzer.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/MockRepeatAnalyzer.java rename to server/src/test/java/org/elasticsearch/index/query/MockRepeatAnalyzer.java diff --git a/core/src/test/java/org/elasticsearch/index/query/MoreLikeThisQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/MoreLikeThisQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/MoreLikeThisQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/MoreLikeThisQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/MultiMatchQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/MultiMatchQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/MultiMatchQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/MultiMatchQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/NestedQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/NestedQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/NestedQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/NestedQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/OperatorTests.java b/server/src/test/java/org/elasticsearch/index/query/OperatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/OperatorTests.java rename to server/src/test/java/org/elasticsearch/index/query/OperatorTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/PrefixQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/PrefixQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/PrefixQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/PrefixQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/QueryShardContextTests.java b/server/src/test/java/org/elasticsearch/index/query/QueryShardContextTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/QueryShardContextTests.java rename to server/src/test/java/org/elasticsearch/index/query/QueryShardContextTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/QueryStringQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/QueryStringQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/QueryStringQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/QueryStringQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/RandomQueryBuilder.java b/server/src/test/java/org/elasticsearch/index/query/RandomQueryBuilder.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/RandomQueryBuilder.java rename to server/src/test/java/org/elasticsearch/index/query/RandomQueryBuilder.java diff --git a/core/src/test/java/org/elasticsearch/index/query/RangeQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/RangeQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/RangeQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/RangeQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/RangeQueryRewriteTests.java b/server/src/test/java/org/elasticsearch/index/query/RangeQueryRewriteTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/RangeQueryRewriteTests.java rename to server/src/test/java/org/elasticsearch/index/query/RangeQueryRewriteTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/RegexpQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/RegexpQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/RegexpQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/RegexpQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/RewriteableTests.java b/server/src/test/java/org/elasticsearch/index/query/RewriteableTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/RewriteableTests.java rename to server/src/test/java/org/elasticsearch/index/query/RewriteableTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/ScoreModeTests.java b/server/src/test/java/org/elasticsearch/index/query/ScoreModeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/ScoreModeTests.java rename to server/src/test/java/org/elasticsearch/index/query/ScoreModeTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/ScriptQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/ScriptQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/ScriptQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/ScriptQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/SimpleQueryStringBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/SimpleQueryStringBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/SimpleQueryStringBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/SimpleQueryStringBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/SpanContainingQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/SpanContainingQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/SpanContainingQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/SpanContainingQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/SpanFirstQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/SpanFirstQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/SpanFirstQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/SpanFirstQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/SpanMultiTermQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/SpanMultiTermQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/SpanMultiTermQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/SpanMultiTermQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/SpanNearQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/SpanNearQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/SpanNearQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/SpanNearQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/SpanNotQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/SpanNotQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/SpanNotQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/SpanNotQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/SpanOrQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/SpanOrQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/SpanOrQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/SpanOrQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/SpanTermQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/SpanTermQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/SpanTermQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/SpanTermQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/SpanWithinQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/SpanWithinQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/SpanWithinQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/SpanWithinQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/TermQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/TermQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/TermQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/TermQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/TermsQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/TermsQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/TermsQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/TermsQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/TermsSetQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/TermsSetQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/TermsSetQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/TermsSetQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/TypeQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/TypeQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/TypeQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/TypeQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/WildcardQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/WildcardQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/WildcardQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/WildcardQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/WrapperQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/WrapperQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/WrapperQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/WrapperQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/functionscore/FieldValueFactorFunctionModifierTests.java b/server/src/test/java/org/elasticsearch/index/query/functionscore/FieldValueFactorFunctionModifierTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/functionscore/FieldValueFactorFunctionModifierTests.java rename to server/src/test/java/org/elasticsearch/index/query/functionscore/FieldValueFactorFunctionModifierTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreEquivalenceTests.java b/server/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreEquivalenceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreEquivalenceTests.java rename to server/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreEquivalenceTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreQueryBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreQueryBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreQueryBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreTests.java b/server/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreTests.java rename to server/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/functionscore/ScoreFunctionBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/functionscore/ScoreFunctionBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/functionscore/ScoreFunctionBuilderTests.java rename to server/src/test/java/org/elasticsearch/index/query/functionscore/ScoreFunctionBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/index/query/plugin/CustomQueryParserIT.java b/server/src/test/java/org/elasticsearch/index/query/plugin/CustomQueryParserIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/plugin/CustomQueryParserIT.java rename to server/src/test/java/org/elasticsearch/index/query/plugin/CustomQueryParserIT.java diff --git a/core/src/test/java/org/elasticsearch/index/query/plugin/DummyQueryBuilder.java b/server/src/test/java/org/elasticsearch/index/query/plugin/DummyQueryBuilder.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/plugin/DummyQueryBuilder.java rename to server/src/test/java/org/elasticsearch/index/query/plugin/DummyQueryBuilder.java diff --git a/core/src/test/java/org/elasticsearch/index/query/plugin/DummyQueryParserPlugin.java b/server/src/test/java/org/elasticsearch/index/query/plugin/DummyQueryParserPlugin.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/plugin/DummyQueryParserPlugin.java rename to server/src/test/java/org/elasticsearch/index/query/plugin/DummyQueryParserPlugin.java diff --git a/core/src/test/java/org/elasticsearch/index/refresh/RefreshStatsTests.java b/server/src/test/java/org/elasticsearch/index/refresh/RefreshStatsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/refresh/RefreshStatsTests.java rename to server/src/test/java/org/elasticsearch/index/refresh/RefreshStatsTests.java diff --git a/core/src/test/java/org/elasticsearch/index/reindex/AbstractBulkByScrollRequestTestCase.java b/server/src/test/java/org/elasticsearch/index/reindex/AbstractBulkByScrollRequestTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/reindex/AbstractBulkByScrollRequestTestCase.java rename to server/src/test/java/org/elasticsearch/index/reindex/AbstractBulkByScrollRequestTestCase.java diff --git a/core/src/test/java/org/elasticsearch/index/reindex/BulkByScrollResponseTests.java b/server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollResponseTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/reindex/BulkByScrollResponseTests.java rename to server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollResponseTests.java diff --git a/core/src/test/java/org/elasticsearch/index/reindex/BulkByScrollTaskStatusTests.java b/server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollTaskStatusTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/reindex/BulkByScrollTaskStatusTests.java rename to server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollTaskStatusTests.java diff --git a/core/src/test/java/org/elasticsearch/index/reindex/BulkByScrollTaskTests.java b/server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollTaskTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/reindex/BulkByScrollTaskTests.java rename to server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollTaskTests.java diff --git a/core/src/test/java/org/elasticsearch/index/reindex/DeleteByQueryRequestTests.java b/server/src/test/java/org/elasticsearch/index/reindex/DeleteByQueryRequestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/reindex/DeleteByQueryRequestTests.java rename to server/src/test/java/org/elasticsearch/index/reindex/DeleteByQueryRequestTests.java diff --git a/core/src/test/java/org/elasticsearch/index/reindex/LeaderBulkByScrollTaskStateTests.java b/server/src/test/java/org/elasticsearch/index/reindex/LeaderBulkByScrollTaskStateTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/reindex/LeaderBulkByScrollTaskStateTests.java rename to server/src/test/java/org/elasticsearch/index/reindex/LeaderBulkByScrollTaskStateTests.java diff --git a/core/src/test/java/org/elasticsearch/index/reindex/ReindexRequestTests.java b/server/src/test/java/org/elasticsearch/index/reindex/ReindexRequestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/reindex/ReindexRequestTests.java rename to server/src/test/java/org/elasticsearch/index/reindex/ReindexRequestTests.java diff --git a/core/src/test/java/org/elasticsearch/index/reindex/UpdateByQueryRequestTests.java b/server/src/test/java/org/elasticsearch/index/reindex/UpdateByQueryRequestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/reindex/UpdateByQueryRequestTests.java rename to server/src/test/java/org/elasticsearch/index/reindex/UpdateByQueryRequestTests.java diff --git a/core/src/test/java/org/elasticsearch/index/reindex/WorkerBulkByScrollTaskStateTests.java b/server/src/test/java/org/elasticsearch/index/reindex/WorkerBulkByScrollTaskStateTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/reindex/WorkerBulkByScrollTaskStateTests.java rename to server/src/test/java/org/elasticsearch/index/reindex/WorkerBulkByScrollTaskStateTests.java diff --git a/core/src/test/java/org/elasticsearch/index/replication/ESIndexLevelReplicationTestCase.java b/server/src/test/java/org/elasticsearch/index/replication/ESIndexLevelReplicationTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/replication/ESIndexLevelReplicationTestCase.java rename to server/src/test/java/org/elasticsearch/index/replication/ESIndexLevelReplicationTestCase.java diff --git a/core/src/test/java/org/elasticsearch/index/replication/IndexLevelReplicationTests.java b/server/src/test/java/org/elasticsearch/index/replication/IndexLevelReplicationTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/replication/IndexLevelReplicationTests.java rename to server/src/test/java/org/elasticsearch/index/replication/IndexLevelReplicationTests.java diff --git a/core/src/test/java/org/elasticsearch/index/replication/RecoveryDuringReplicationTests.java b/server/src/test/java/org/elasticsearch/index/replication/RecoveryDuringReplicationTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/replication/RecoveryDuringReplicationTests.java rename to server/src/test/java/org/elasticsearch/index/replication/RecoveryDuringReplicationTests.java diff --git a/core/src/test/java/org/elasticsearch/index/search/ESToParentBlockJoinQueryTests.java b/server/src/test/java/org/elasticsearch/index/search/ESToParentBlockJoinQueryTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/search/ESToParentBlockJoinQueryTests.java rename to server/src/test/java/org/elasticsearch/index/search/ESToParentBlockJoinQueryTests.java diff --git a/core/src/test/java/org/elasticsearch/index/search/MatchQueryIT.java b/server/src/test/java/org/elasticsearch/index/search/MatchQueryIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/search/MatchQueryIT.java rename to server/src/test/java/org/elasticsearch/index/search/MatchQueryIT.java diff --git a/core/src/test/java/org/elasticsearch/index/search/MultiMatchQueryTests.java b/server/src/test/java/org/elasticsearch/index/search/MultiMatchQueryTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/search/MultiMatchQueryTests.java rename to server/src/test/java/org/elasticsearch/index/search/MultiMatchQueryTests.java diff --git a/core/src/test/java/org/elasticsearch/index/search/NestedHelperTests.java b/server/src/test/java/org/elasticsearch/index/search/NestedHelperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/search/NestedHelperTests.java rename to server/src/test/java/org/elasticsearch/index/search/NestedHelperTests.java diff --git a/core/src/test/java/org/elasticsearch/index/search/geo/GeoPointParsingTests.java b/server/src/test/java/org/elasticsearch/index/search/geo/GeoPointParsingTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/search/geo/GeoPointParsingTests.java rename to server/src/test/java/org/elasticsearch/index/search/geo/GeoPointParsingTests.java diff --git a/core/src/test/java/org/elasticsearch/index/search/geo/GeoUtilsTests.java b/server/src/test/java/org/elasticsearch/index/search/geo/GeoUtilsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/search/geo/GeoUtilsTests.java rename to server/src/test/java/org/elasticsearch/index/search/geo/GeoUtilsTests.java diff --git a/core/src/test/java/org/elasticsearch/index/search/nested/AbstractNumberNestedSortingTestCase.java b/server/src/test/java/org/elasticsearch/index/search/nested/AbstractNumberNestedSortingTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/search/nested/AbstractNumberNestedSortingTestCase.java rename to server/src/test/java/org/elasticsearch/index/search/nested/AbstractNumberNestedSortingTestCase.java diff --git a/core/src/test/java/org/elasticsearch/index/search/nested/DoubleNestedSortingTests.java b/server/src/test/java/org/elasticsearch/index/search/nested/DoubleNestedSortingTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/search/nested/DoubleNestedSortingTests.java rename to server/src/test/java/org/elasticsearch/index/search/nested/DoubleNestedSortingTests.java diff --git a/core/src/test/java/org/elasticsearch/index/search/nested/FloatNestedSortingTests.java b/server/src/test/java/org/elasticsearch/index/search/nested/FloatNestedSortingTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/search/nested/FloatNestedSortingTests.java rename to server/src/test/java/org/elasticsearch/index/search/nested/FloatNestedSortingTests.java diff --git a/core/src/test/java/org/elasticsearch/index/search/nested/LongNestedSortingTests.java b/server/src/test/java/org/elasticsearch/index/search/nested/LongNestedSortingTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/search/nested/LongNestedSortingTests.java rename to server/src/test/java/org/elasticsearch/index/search/nested/LongNestedSortingTests.java diff --git a/core/src/test/java/org/elasticsearch/index/search/nested/NestedSortingTests.java b/server/src/test/java/org/elasticsearch/index/search/nested/NestedSortingTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/search/nested/NestedSortingTests.java rename to server/src/test/java/org/elasticsearch/index/search/nested/NestedSortingTests.java diff --git a/core/src/test/java/org/elasticsearch/index/seqno/CountedBitSetTests.java b/server/src/test/java/org/elasticsearch/index/seqno/CountedBitSetTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/seqno/CountedBitSetTests.java rename to server/src/test/java/org/elasticsearch/index/seqno/CountedBitSetTests.java diff --git a/core/src/test/java/org/elasticsearch/index/seqno/GlobalCheckpointSyncActionTests.java b/server/src/test/java/org/elasticsearch/index/seqno/GlobalCheckpointSyncActionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/seqno/GlobalCheckpointSyncActionTests.java rename to server/src/test/java/org/elasticsearch/index/seqno/GlobalCheckpointSyncActionTests.java diff --git a/core/src/test/java/org/elasticsearch/index/seqno/GlobalCheckpointSyncIT.java b/server/src/test/java/org/elasticsearch/index/seqno/GlobalCheckpointSyncIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/seqno/GlobalCheckpointSyncIT.java rename to server/src/test/java/org/elasticsearch/index/seqno/GlobalCheckpointSyncIT.java diff --git a/core/src/test/java/org/elasticsearch/index/seqno/GlobalCheckpointTrackerTests.java b/server/src/test/java/org/elasticsearch/index/seqno/GlobalCheckpointTrackerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/seqno/GlobalCheckpointTrackerTests.java rename to server/src/test/java/org/elasticsearch/index/seqno/GlobalCheckpointTrackerTests.java diff --git a/core/src/test/java/org/elasticsearch/index/seqno/LocalCheckpointTrackerTests.java b/server/src/test/java/org/elasticsearch/index/seqno/LocalCheckpointTrackerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/seqno/LocalCheckpointTrackerTests.java rename to server/src/test/java/org/elasticsearch/index/seqno/LocalCheckpointTrackerTests.java diff --git a/core/src/test/java/org/elasticsearch/index/seqno/SequenceNumbersTests.java b/server/src/test/java/org/elasticsearch/index/seqno/SequenceNumbersTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/seqno/SequenceNumbersTests.java rename to server/src/test/java/org/elasticsearch/index/seqno/SequenceNumbersTests.java diff --git a/core/src/test/java/org/elasticsearch/index/shard/DocsStatsTests.java b/server/src/test/java/org/elasticsearch/index/shard/DocsStatsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/shard/DocsStatsTests.java rename to server/src/test/java/org/elasticsearch/index/shard/DocsStatsTests.java diff --git a/core/src/test/java/org/elasticsearch/index/shard/EngineAccess.java b/server/src/test/java/org/elasticsearch/index/shard/EngineAccess.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/shard/EngineAccess.java rename to server/src/test/java/org/elasticsearch/index/shard/EngineAccess.java diff --git a/core/src/test/java/org/elasticsearch/index/shard/IndexSearcherWrapperTests.java b/server/src/test/java/org/elasticsearch/index/shard/IndexSearcherWrapperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/shard/IndexSearcherWrapperTests.java rename to server/src/test/java/org/elasticsearch/index/shard/IndexSearcherWrapperTests.java diff --git a/core/src/test/java/org/elasticsearch/index/shard/IndexShardIT.java b/server/src/test/java/org/elasticsearch/index/shard/IndexShardIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/shard/IndexShardIT.java rename to server/src/test/java/org/elasticsearch/index/shard/IndexShardIT.java diff --git a/core/src/test/java/org/elasticsearch/index/shard/IndexShardOperationPermitsTests.java b/server/src/test/java/org/elasticsearch/index/shard/IndexShardOperationPermitsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/shard/IndexShardOperationPermitsTests.java rename to server/src/test/java/org/elasticsearch/index/shard/IndexShardOperationPermitsTests.java diff --git a/core/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java b/server/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java rename to server/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java diff --git a/core/src/test/java/org/elasticsearch/index/shard/IndexingOperationListenerTests.java b/server/src/test/java/org/elasticsearch/index/shard/IndexingOperationListenerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/shard/IndexingOperationListenerTests.java rename to server/src/test/java/org/elasticsearch/index/shard/IndexingOperationListenerTests.java diff --git a/core/src/test/java/org/elasticsearch/index/shard/NewPathForShardTests.java b/server/src/test/java/org/elasticsearch/index/shard/NewPathForShardTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/shard/NewPathForShardTests.java rename to server/src/test/java/org/elasticsearch/index/shard/NewPathForShardTests.java diff --git a/core/src/test/java/org/elasticsearch/index/shard/PrimaryReplicaSyncerTests.java b/server/src/test/java/org/elasticsearch/index/shard/PrimaryReplicaSyncerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/shard/PrimaryReplicaSyncerTests.java rename to server/src/test/java/org/elasticsearch/index/shard/PrimaryReplicaSyncerTests.java diff --git a/core/src/test/java/org/elasticsearch/index/shard/RefreshListenersTests.java b/server/src/test/java/org/elasticsearch/index/shard/RefreshListenersTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/shard/RefreshListenersTests.java rename to server/src/test/java/org/elasticsearch/index/shard/RefreshListenersTests.java diff --git a/core/src/test/java/org/elasticsearch/index/shard/SearchOperationListenerTests.java b/server/src/test/java/org/elasticsearch/index/shard/SearchOperationListenerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/shard/SearchOperationListenerTests.java rename to server/src/test/java/org/elasticsearch/index/shard/SearchOperationListenerTests.java diff --git a/core/src/test/java/org/elasticsearch/index/shard/ShardIdTests.java b/server/src/test/java/org/elasticsearch/index/shard/ShardIdTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/shard/ShardIdTests.java rename to server/src/test/java/org/elasticsearch/index/shard/ShardIdTests.java diff --git a/core/src/test/java/org/elasticsearch/index/shard/ShardPathTests.java b/server/src/test/java/org/elasticsearch/index/shard/ShardPathTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/shard/ShardPathTests.java rename to server/src/test/java/org/elasticsearch/index/shard/ShardPathTests.java diff --git a/core/src/test/java/org/elasticsearch/index/shard/ShardSplittingQueryTests.java b/server/src/test/java/org/elasticsearch/index/shard/ShardSplittingQueryTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/shard/ShardSplittingQueryTests.java rename to server/src/test/java/org/elasticsearch/index/shard/ShardSplittingQueryTests.java diff --git a/core/src/test/java/org/elasticsearch/index/shard/ShardUtilsTests.java b/server/src/test/java/org/elasticsearch/index/shard/ShardUtilsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/shard/ShardUtilsTests.java rename to server/src/test/java/org/elasticsearch/index/shard/ShardUtilsTests.java diff --git a/core/src/test/java/org/elasticsearch/index/shard/StoreRecoveryTests.java b/server/src/test/java/org/elasticsearch/index/shard/StoreRecoveryTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/shard/StoreRecoveryTests.java rename to server/src/test/java/org/elasticsearch/index/shard/StoreRecoveryTests.java diff --git a/core/src/test/java/org/elasticsearch/index/similarity/ScriptedSimilarityTests.java b/server/src/test/java/org/elasticsearch/index/similarity/ScriptedSimilarityTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/similarity/ScriptedSimilarityTests.java rename to server/src/test/java/org/elasticsearch/index/similarity/ScriptedSimilarityTests.java diff --git a/core/src/test/java/org/elasticsearch/index/similarity/SimilarityServiceTests.java b/server/src/test/java/org/elasticsearch/index/similarity/SimilarityServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/similarity/SimilarityServiceTests.java rename to server/src/test/java/org/elasticsearch/index/similarity/SimilarityServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/index/similarity/SimilarityTests.java b/server/src/test/java/org/elasticsearch/index/similarity/SimilarityTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/similarity/SimilarityTests.java rename to server/src/test/java/org/elasticsearch/index/similarity/SimilarityTests.java diff --git a/core/src/test/java/org/elasticsearch/index/snapshots/blobstore/FileInfoTests.java b/server/src/test/java/org/elasticsearch/index/snapshots/blobstore/FileInfoTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/snapshots/blobstore/FileInfoTests.java rename to server/src/test/java/org/elasticsearch/index/snapshots/blobstore/FileInfoTests.java diff --git a/core/src/test/java/org/elasticsearch/index/snapshots/blobstore/SlicedInputStreamTests.java b/server/src/test/java/org/elasticsearch/index/snapshots/blobstore/SlicedInputStreamTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/snapshots/blobstore/SlicedInputStreamTests.java rename to server/src/test/java/org/elasticsearch/index/snapshots/blobstore/SlicedInputStreamTests.java diff --git a/core/src/test/java/org/elasticsearch/index/store/CorruptedFileIT.java b/server/src/test/java/org/elasticsearch/index/store/CorruptedFileIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/store/CorruptedFileIT.java rename to server/src/test/java/org/elasticsearch/index/store/CorruptedFileIT.java diff --git a/core/src/test/java/org/elasticsearch/index/store/CorruptedTranslogIT.java b/server/src/test/java/org/elasticsearch/index/store/CorruptedTranslogIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/store/CorruptedTranslogIT.java rename to server/src/test/java/org/elasticsearch/index/store/CorruptedTranslogIT.java diff --git a/core/src/test/java/org/elasticsearch/index/store/DirectoryUtilsTests.java b/server/src/test/java/org/elasticsearch/index/store/DirectoryUtilsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/store/DirectoryUtilsTests.java rename to server/src/test/java/org/elasticsearch/index/store/DirectoryUtilsTests.java diff --git a/core/src/test/java/org/elasticsearch/index/store/ExceptionRetryIT.java b/server/src/test/java/org/elasticsearch/index/store/ExceptionRetryIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/store/ExceptionRetryIT.java rename to server/src/test/java/org/elasticsearch/index/store/ExceptionRetryIT.java diff --git a/core/src/test/java/org/elasticsearch/index/store/FsDirectoryServiceTests.java b/server/src/test/java/org/elasticsearch/index/store/FsDirectoryServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/store/FsDirectoryServiceTests.java rename to server/src/test/java/org/elasticsearch/index/store/FsDirectoryServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/index/store/IndexStoreTests.java b/server/src/test/java/org/elasticsearch/index/store/IndexStoreTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/store/IndexStoreTests.java rename to server/src/test/java/org/elasticsearch/index/store/IndexStoreTests.java diff --git a/core/src/test/java/org/elasticsearch/index/store/StoreTests.java b/server/src/test/java/org/elasticsearch/index/store/StoreTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/store/StoreTests.java rename to server/src/test/java/org/elasticsearch/index/store/StoreTests.java diff --git a/core/src/test/java/org/elasticsearch/index/suggest/stats/CompletionsStatsTests.java b/server/src/test/java/org/elasticsearch/index/suggest/stats/CompletionsStatsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/suggest/stats/CompletionsStatsTests.java rename to server/src/test/java/org/elasticsearch/index/suggest/stats/CompletionsStatsTests.java diff --git a/core/src/test/java/org/elasticsearch/index/suggest/stats/SuggestStatsIT.java b/server/src/test/java/org/elasticsearch/index/suggest/stats/SuggestStatsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/suggest/stats/SuggestStatsIT.java rename to server/src/test/java/org/elasticsearch/index/suggest/stats/SuggestStatsIT.java diff --git a/core/src/test/java/org/elasticsearch/index/termvectors/TermVectorsServiceTests.java b/server/src/test/java/org/elasticsearch/index/termvectors/TermVectorsServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/termvectors/TermVectorsServiceTests.java rename to server/src/test/java/org/elasticsearch/index/termvectors/TermVectorsServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/index/translog/MultiSnapshotTests.java b/server/src/test/java/org/elasticsearch/index/translog/MultiSnapshotTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/translog/MultiSnapshotTests.java rename to server/src/test/java/org/elasticsearch/index/translog/MultiSnapshotTests.java diff --git a/core/src/test/java/org/elasticsearch/index/translog/SnapshotMatchers.java b/server/src/test/java/org/elasticsearch/index/translog/SnapshotMatchers.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/translog/SnapshotMatchers.java rename to server/src/test/java/org/elasticsearch/index/translog/SnapshotMatchers.java diff --git a/core/src/test/java/org/elasticsearch/index/translog/TestTranslog.java b/server/src/test/java/org/elasticsearch/index/translog/TestTranslog.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/translog/TestTranslog.java rename to server/src/test/java/org/elasticsearch/index/translog/TestTranslog.java diff --git a/core/src/test/java/org/elasticsearch/index/translog/TranslogDeletionPolicyTests.java b/server/src/test/java/org/elasticsearch/index/translog/TranslogDeletionPolicyTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/translog/TranslogDeletionPolicyTests.java rename to server/src/test/java/org/elasticsearch/index/translog/TranslogDeletionPolicyTests.java diff --git a/core/src/test/java/org/elasticsearch/index/translog/TranslogTests.java b/server/src/test/java/org/elasticsearch/index/translog/TranslogTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/translog/TranslogTests.java rename to server/src/test/java/org/elasticsearch/index/translog/TranslogTests.java diff --git a/core/src/test/java/org/elasticsearch/index/translog/TranslogVersionTests.java b/server/src/test/java/org/elasticsearch/index/translog/TranslogVersionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/translog/TranslogVersionTests.java rename to server/src/test/java/org/elasticsearch/index/translog/TranslogVersionTests.java diff --git a/core/src/test/java/org/elasticsearch/index/translog/TruncateTranslogIT.java b/server/src/test/java/org/elasticsearch/index/translog/TruncateTranslogIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/index/translog/TruncateTranslogIT.java rename to server/src/test/java/org/elasticsearch/index/translog/TruncateTranslogIT.java diff --git a/core/src/test/java/org/elasticsearch/indexing/IndexActionIT.java b/server/src/test/java/org/elasticsearch/indexing/IndexActionIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indexing/IndexActionIT.java rename to server/src/test/java/org/elasticsearch/indexing/IndexActionIT.java diff --git a/core/src/test/java/org/elasticsearch/indexlifecycle/IndexLifecycleActionIT.java b/server/src/test/java/org/elasticsearch/indexlifecycle/IndexLifecycleActionIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indexlifecycle/IndexLifecycleActionIT.java rename to server/src/test/java/org/elasticsearch/indexlifecycle/IndexLifecycleActionIT.java diff --git a/core/src/test/java/org/elasticsearch/indices/DateMathIndexExpressionsIntegrationIT.java b/server/src/test/java/org/elasticsearch/indices/DateMathIndexExpressionsIntegrationIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/DateMathIndexExpressionsIntegrationIT.java rename to server/src/test/java/org/elasticsearch/indices/DateMathIndexExpressionsIntegrationIT.java diff --git a/core/src/test/java/org/elasticsearch/indices/IndexingMemoryControllerTests.java b/server/src/test/java/org/elasticsearch/indices/IndexingMemoryControllerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/IndexingMemoryControllerTests.java rename to server/src/test/java/org/elasticsearch/indices/IndexingMemoryControllerTests.java diff --git a/core/src/test/java/org/elasticsearch/indices/IndicesLifecycleListenerIT.java b/server/src/test/java/org/elasticsearch/indices/IndicesLifecycleListenerIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/IndicesLifecycleListenerIT.java rename to server/src/test/java/org/elasticsearch/indices/IndicesLifecycleListenerIT.java diff --git a/core/src/test/java/org/elasticsearch/indices/IndicesLifecycleListenerSingleNodeTests.java b/server/src/test/java/org/elasticsearch/indices/IndicesLifecycleListenerSingleNodeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/IndicesLifecycleListenerSingleNodeTests.java rename to server/src/test/java/org/elasticsearch/indices/IndicesLifecycleListenerSingleNodeTests.java diff --git a/core/src/test/java/org/elasticsearch/indices/IndicesModuleTests.java b/server/src/test/java/org/elasticsearch/indices/IndicesModuleTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/IndicesModuleTests.java rename to server/src/test/java/org/elasticsearch/indices/IndicesModuleTests.java diff --git a/core/src/test/java/org/elasticsearch/indices/IndicesOptionsIntegrationIT.java b/server/src/test/java/org/elasticsearch/indices/IndicesOptionsIntegrationIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/IndicesOptionsIntegrationIT.java rename to server/src/test/java/org/elasticsearch/indices/IndicesOptionsIntegrationIT.java diff --git a/core/src/test/java/org/elasticsearch/indices/IndicesQueryCacheTests.java b/server/src/test/java/org/elasticsearch/indices/IndicesQueryCacheTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/IndicesQueryCacheTests.java rename to server/src/test/java/org/elasticsearch/indices/IndicesQueryCacheTests.java diff --git a/core/src/test/java/org/elasticsearch/indices/IndicesRequestCacheIT.java b/server/src/test/java/org/elasticsearch/indices/IndicesRequestCacheIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/IndicesRequestCacheIT.java rename to server/src/test/java/org/elasticsearch/indices/IndicesRequestCacheIT.java diff --git a/core/src/test/java/org/elasticsearch/indices/IndicesRequestCacheTests.java b/server/src/test/java/org/elasticsearch/indices/IndicesRequestCacheTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/IndicesRequestCacheTests.java rename to server/src/test/java/org/elasticsearch/indices/IndicesRequestCacheTests.java diff --git a/core/src/test/java/org/elasticsearch/indices/IndicesServiceTests.java b/server/src/test/java/org/elasticsearch/indices/IndicesServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/IndicesServiceTests.java rename to server/src/test/java/org/elasticsearch/indices/IndicesServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/indices/NodeIndicesStatsTests.java b/server/src/test/java/org/elasticsearch/indices/NodeIndicesStatsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/NodeIndicesStatsTests.java rename to server/src/test/java/org/elasticsearch/indices/NodeIndicesStatsTests.java diff --git a/core/src/test/java/org/elasticsearch/indices/TermsLookupTests.java b/server/src/test/java/org/elasticsearch/indices/TermsLookupTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/TermsLookupTests.java rename to server/src/test/java/org/elasticsearch/indices/TermsLookupTests.java diff --git a/core/src/test/java/org/elasticsearch/indices/analysis/AnalysisModuleTests.java b/server/src/test/java/org/elasticsearch/indices/analysis/AnalysisModuleTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/analysis/AnalysisModuleTests.java rename to server/src/test/java/org/elasticsearch/indices/analysis/AnalysisModuleTests.java diff --git a/core/src/test/java/org/elasticsearch/indices/analysis/PreBuiltAnalyzerIntegrationIT.java b/server/src/test/java/org/elasticsearch/indices/analysis/PreBuiltAnalyzerIntegrationIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/analysis/PreBuiltAnalyzerIntegrationIT.java rename to server/src/test/java/org/elasticsearch/indices/analysis/PreBuiltAnalyzerIntegrationIT.java diff --git a/core/src/test/java/org/elasticsearch/indices/analyze/AnalyzeActionIT.java b/server/src/test/java/org/elasticsearch/indices/analyze/AnalyzeActionIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/analyze/AnalyzeActionIT.java rename to server/src/test/java/org/elasticsearch/indices/analyze/AnalyzeActionIT.java diff --git a/core/src/test/java/org/elasticsearch/indices/analyze/HunspellServiceTests.java b/server/src/test/java/org/elasticsearch/indices/analyze/HunspellServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/analyze/HunspellServiceTests.java rename to server/src/test/java/org/elasticsearch/indices/analyze/HunspellServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/indices/cluster/AbstractIndicesClusterStateServiceTestCase.java b/server/src/test/java/org/elasticsearch/indices/cluster/AbstractIndicesClusterStateServiceTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/cluster/AbstractIndicesClusterStateServiceTestCase.java rename to server/src/test/java/org/elasticsearch/indices/cluster/AbstractIndicesClusterStateServiceTestCase.java diff --git a/core/src/test/java/org/elasticsearch/indices/cluster/ClusterStateChanges.java b/server/src/test/java/org/elasticsearch/indices/cluster/ClusterStateChanges.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/cluster/ClusterStateChanges.java rename to server/src/test/java/org/elasticsearch/indices/cluster/ClusterStateChanges.java diff --git a/core/src/test/java/org/elasticsearch/indices/cluster/IndicesClusterStateServiceRandomUpdatesTests.java b/server/src/test/java/org/elasticsearch/indices/cluster/IndicesClusterStateServiceRandomUpdatesTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/cluster/IndicesClusterStateServiceRandomUpdatesTests.java rename to server/src/test/java/org/elasticsearch/indices/cluster/IndicesClusterStateServiceRandomUpdatesTests.java diff --git a/core/src/test/java/org/elasticsearch/indices/exists/indices/IndicesExistsIT.java b/server/src/test/java/org/elasticsearch/indices/exists/indices/IndicesExistsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/exists/indices/IndicesExistsIT.java rename to server/src/test/java/org/elasticsearch/indices/exists/indices/IndicesExistsIT.java diff --git a/core/src/test/java/org/elasticsearch/indices/exists/types/TypesExistsIT.java b/server/src/test/java/org/elasticsearch/indices/exists/types/TypesExistsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/exists/types/TypesExistsIT.java rename to server/src/test/java/org/elasticsearch/indices/exists/types/TypesExistsIT.java diff --git a/core/src/test/java/org/elasticsearch/indices/flush/FlushIT.java b/server/src/test/java/org/elasticsearch/indices/flush/FlushIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/flush/FlushIT.java rename to server/src/test/java/org/elasticsearch/indices/flush/FlushIT.java diff --git a/core/src/test/java/org/elasticsearch/indices/flush/SyncedFlushSingleNodeTests.java b/server/src/test/java/org/elasticsearch/indices/flush/SyncedFlushSingleNodeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/flush/SyncedFlushSingleNodeTests.java rename to server/src/test/java/org/elasticsearch/indices/flush/SyncedFlushSingleNodeTests.java diff --git a/core/src/test/java/org/elasticsearch/indices/flush/SyncedFlushUtil.java b/server/src/test/java/org/elasticsearch/indices/flush/SyncedFlushUtil.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/flush/SyncedFlushUtil.java rename to server/src/test/java/org/elasticsearch/indices/flush/SyncedFlushUtil.java diff --git a/core/src/test/java/org/elasticsearch/indices/mapping/ConcurrentDynamicTemplateIT.java b/server/src/test/java/org/elasticsearch/indices/mapping/ConcurrentDynamicTemplateIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/mapping/ConcurrentDynamicTemplateIT.java rename to server/src/test/java/org/elasticsearch/indices/mapping/ConcurrentDynamicTemplateIT.java diff --git a/core/src/test/java/org/elasticsearch/indices/mapping/DedicatedMasterGetFieldMappingIT.java b/server/src/test/java/org/elasticsearch/indices/mapping/DedicatedMasterGetFieldMappingIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/mapping/DedicatedMasterGetFieldMappingIT.java rename to server/src/test/java/org/elasticsearch/indices/mapping/DedicatedMasterGetFieldMappingIT.java diff --git a/core/src/test/java/org/elasticsearch/indices/mapping/SimpleGetFieldMappingsIT.java b/server/src/test/java/org/elasticsearch/indices/mapping/SimpleGetFieldMappingsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/mapping/SimpleGetFieldMappingsIT.java rename to server/src/test/java/org/elasticsearch/indices/mapping/SimpleGetFieldMappingsIT.java diff --git a/core/src/test/java/org/elasticsearch/indices/mapping/SimpleGetMappingsIT.java b/server/src/test/java/org/elasticsearch/indices/mapping/SimpleGetMappingsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/mapping/SimpleGetMappingsIT.java rename to server/src/test/java/org/elasticsearch/indices/mapping/SimpleGetMappingsIT.java diff --git a/core/src/test/java/org/elasticsearch/indices/mapping/UpdateMappingIntegrationIT.java b/server/src/test/java/org/elasticsearch/indices/mapping/UpdateMappingIntegrationIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/mapping/UpdateMappingIntegrationIT.java rename to server/src/test/java/org/elasticsearch/indices/mapping/UpdateMappingIntegrationIT.java diff --git a/core/src/test/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerNoopIT.java b/server/src/test/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerNoopIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerNoopIT.java rename to server/src/test/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerNoopIT.java diff --git a/core/src/test/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerServiceIT.java b/server/src/test/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerServiceIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerServiceIT.java rename to server/src/test/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerServiceIT.java diff --git a/core/src/test/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerUnitTests.java b/server/src/test/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerUnitTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerUnitTests.java rename to server/src/test/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerUnitTests.java diff --git a/core/src/test/java/org/elasticsearch/indices/memory/breaker/RandomExceptionCircuitBreakerIT.java b/server/src/test/java/org/elasticsearch/indices/memory/breaker/RandomExceptionCircuitBreakerIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/memory/breaker/RandomExceptionCircuitBreakerIT.java rename to server/src/test/java/org/elasticsearch/indices/memory/breaker/RandomExceptionCircuitBreakerIT.java diff --git a/core/src/test/java/org/elasticsearch/indices/recovery/IndexPrimaryRelocationIT.java b/server/src/test/java/org/elasticsearch/indices/recovery/IndexPrimaryRelocationIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/recovery/IndexPrimaryRelocationIT.java rename to server/src/test/java/org/elasticsearch/indices/recovery/IndexPrimaryRelocationIT.java diff --git a/core/src/test/java/org/elasticsearch/indices/recovery/IndexRecoveryIT.java b/server/src/test/java/org/elasticsearch/indices/recovery/IndexRecoveryIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/recovery/IndexRecoveryIT.java rename to server/src/test/java/org/elasticsearch/indices/recovery/IndexRecoveryIT.java diff --git a/core/src/test/java/org/elasticsearch/indices/recovery/PeerRecoverySourceServiceTests.java b/server/src/test/java/org/elasticsearch/indices/recovery/PeerRecoverySourceServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/recovery/PeerRecoverySourceServiceTests.java rename to server/src/test/java/org/elasticsearch/indices/recovery/PeerRecoverySourceServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/indices/recovery/PeerRecoveryTargetServiceTests.java b/server/src/test/java/org/elasticsearch/indices/recovery/PeerRecoveryTargetServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/recovery/PeerRecoveryTargetServiceTests.java rename to server/src/test/java/org/elasticsearch/indices/recovery/PeerRecoveryTargetServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/indices/recovery/RecoverySettingsDynamicUpdateTests.java b/server/src/test/java/org/elasticsearch/indices/recovery/RecoverySettingsDynamicUpdateTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/recovery/RecoverySettingsDynamicUpdateTests.java rename to server/src/test/java/org/elasticsearch/indices/recovery/RecoverySettingsDynamicUpdateTests.java diff --git a/core/src/test/java/org/elasticsearch/indices/recovery/RecoverySourceHandlerTests.java b/server/src/test/java/org/elasticsearch/indices/recovery/RecoverySourceHandlerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/recovery/RecoverySourceHandlerTests.java rename to server/src/test/java/org/elasticsearch/indices/recovery/RecoverySourceHandlerTests.java diff --git a/core/src/test/java/org/elasticsearch/indices/recovery/RecoveryStatusTests.java b/server/src/test/java/org/elasticsearch/indices/recovery/RecoveryStatusTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/recovery/RecoveryStatusTests.java rename to server/src/test/java/org/elasticsearch/indices/recovery/RecoveryStatusTests.java diff --git a/core/src/test/java/org/elasticsearch/indices/recovery/RecoveryTargetTests.java b/server/src/test/java/org/elasticsearch/indices/recovery/RecoveryTargetTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/recovery/RecoveryTargetTests.java rename to server/src/test/java/org/elasticsearch/indices/recovery/RecoveryTargetTests.java diff --git a/core/src/test/java/org/elasticsearch/indices/recovery/RecoveryTests.java b/server/src/test/java/org/elasticsearch/indices/recovery/RecoveryTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/recovery/RecoveryTests.java rename to server/src/test/java/org/elasticsearch/indices/recovery/RecoveryTests.java diff --git a/core/src/test/java/org/elasticsearch/indices/recovery/StartRecoveryRequestTests.java b/server/src/test/java/org/elasticsearch/indices/recovery/StartRecoveryRequestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/recovery/StartRecoveryRequestTests.java rename to server/src/test/java/org/elasticsearch/indices/recovery/StartRecoveryRequestTests.java diff --git a/core/src/test/java/org/elasticsearch/indices/settings/GetSettingsBlocksIT.java b/server/src/test/java/org/elasticsearch/indices/settings/GetSettingsBlocksIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/settings/GetSettingsBlocksIT.java rename to server/src/test/java/org/elasticsearch/indices/settings/GetSettingsBlocksIT.java diff --git a/core/src/test/java/org/elasticsearch/indices/settings/UpdateNumberOfReplicasIT.java b/server/src/test/java/org/elasticsearch/indices/settings/UpdateNumberOfReplicasIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/settings/UpdateNumberOfReplicasIT.java rename to server/src/test/java/org/elasticsearch/indices/settings/UpdateNumberOfReplicasIT.java diff --git a/core/src/test/java/org/elasticsearch/indices/settings/UpdateSettingsIT.java b/server/src/test/java/org/elasticsearch/indices/settings/UpdateSettingsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/settings/UpdateSettingsIT.java rename to server/src/test/java/org/elasticsearch/indices/settings/UpdateSettingsIT.java diff --git a/core/src/test/java/org/elasticsearch/indices/state/CloseIndexDisableCloseAllIT.java b/server/src/test/java/org/elasticsearch/indices/state/CloseIndexDisableCloseAllIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/state/CloseIndexDisableCloseAllIT.java rename to server/src/test/java/org/elasticsearch/indices/state/CloseIndexDisableCloseAllIT.java diff --git a/core/src/test/java/org/elasticsearch/indices/state/OpenCloseIndexIT.java b/server/src/test/java/org/elasticsearch/indices/state/OpenCloseIndexIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/state/OpenCloseIndexIT.java rename to server/src/test/java/org/elasticsearch/indices/state/OpenCloseIndexIT.java diff --git a/core/src/test/java/org/elasticsearch/indices/state/RareClusterStateIT.java b/server/src/test/java/org/elasticsearch/indices/state/RareClusterStateIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/state/RareClusterStateIT.java rename to server/src/test/java/org/elasticsearch/indices/state/RareClusterStateIT.java diff --git a/core/src/test/java/org/elasticsearch/indices/state/SimpleIndexStateIT.java b/server/src/test/java/org/elasticsearch/indices/state/SimpleIndexStateIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/state/SimpleIndexStateIT.java rename to server/src/test/java/org/elasticsearch/indices/state/SimpleIndexStateIT.java diff --git a/core/src/test/java/org/elasticsearch/indices/stats/IndexStatsIT.java b/server/src/test/java/org/elasticsearch/indices/stats/IndexStatsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/stats/IndexStatsIT.java rename to server/src/test/java/org/elasticsearch/indices/stats/IndexStatsIT.java diff --git a/core/src/test/java/org/elasticsearch/indices/store/IndicesStoreIntegrationIT.java b/server/src/test/java/org/elasticsearch/indices/store/IndicesStoreIntegrationIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/store/IndicesStoreIntegrationIT.java rename to server/src/test/java/org/elasticsearch/indices/store/IndicesStoreIntegrationIT.java diff --git a/core/src/test/java/org/elasticsearch/indices/store/IndicesStoreTests.java b/server/src/test/java/org/elasticsearch/indices/store/IndicesStoreTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/store/IndicesStoreTests.java rename to server/src/test/java/org/elasticsearch/indices/store/IndicesStoreTests.java diff --git a/core/src/test/java/org/elasticsearch/indices/template/IndexTemplateBlocksIT.java b/server/src/test/java/org/elasticsearch/indices/template/IndexTemplateBlocksIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/template/IndexTemplateBlocksIT.java rename to server/src/test/java/org/elasticsearch/indices/template/IndexTemplateBlocksIT.java diff --git a/core/src/test/java/org/elasticsearch/indices/template/SimpleIndexTemplateIT.java b/server/src/test/java/org/elasticsearch/indices/template/SimpleIndexTemplateIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/template/SimpleIndexTemplateIT.java rename to server/src/test/java/org/elasticsearch/indices/template/SimpleIndexTemplateIT.java diff --git a/core/src/test/java/org/elasticsearch/ingest/CompoundProcessorTests.java b/server/src/test/java/org/elasticsearch/ingest/CompoundProcessorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/ingest/CompoundProcessorTests.java rename to server/src/test/java/org/elasticsearch/ingest/CompoundProcessorTests.java diff --git a/core/src/test/java/org/elasticsearch/ingest/ConfigurationUtilsTests.java b/server/src/test/java/org/elasticsearch/ingest/ConfigurationUtilsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/ingest/ConfigurationUtilsTests.java rename to server/src/test/java/org/elasticsearch/ingest/ConfigurationUtilsTests.java diff --git a/core/src/test/java/org/elasticsearch/ingest/IngestClientIT.java b/server/src/test/java/org/elasticsearch/ingest/IngestClientIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/ingest/IngestClientIT.java rename to server/src/test/java/org/elasticsearch/ingest/IngestClientIT.java diff --git a/core/src/test/java/org/elasticsearch/ingest/IngestDocumentTests.java b/server/src/test/java/org/elasticsearch/ingest/IngestDocumentTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/ingest/IngestDocumentTests.java rename to server/src/test/java/org/elasticsearch/ingest/IngestDocumentTests.java diff --git a/core/src/test/java/org/elasticsearch/ingest/IngestMetadataTests.java b/server/src/test/java/org/elasticsearch/ingest/IngestMetadataTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/ingest/IngestMetadataTests.java rename to server/src/test/java/org/elasticsearch/ingest/IngestMetadataTests.java diff --git a/core/src/test/java/org/elasticsearch/ingest/IngestProcessorNotInstalledOnAllNodesIT.java b/server/src/test/java/org/elasticsearch/ingest/IngestProcessorNotInstalledOnAllNodesIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/ingest/IngestProcessorNotInstalledOnAllNodesIT.java rename to server/src/test/java/org/elasticsearch/ingest/IngestProcessorNotInstalledOnAllNodesIT.java diff --git a/core/src/test/java/org/elasticsearch/ingest/IngestServiceTests.java b/server/src/test/java/org/elasticsearch/ingest/IngestServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/ingest/IngestServiceTests.java rename to server/src/test/java/org/elasticsearch/ingest/IngestServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/ingest/IngestStatsTests.java b/server/src/test/java/org/elasticsearch/ingest/IngestStatsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/ingest/IngestStatsTests.java rename to server/src/test/java/org/elasticsearch/ingest/IngestStatsTests.java diff --git a/core/src/test/java/org/elasticsearch/ingest/PipelineConfigurationTests.java b/server/src/test/java/org/elasticsearch/ingest/PipelineConfigurationTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/ingest/PipelineConfigurationTests.java rename to server/src/test/java/org/elasticsearch/ingest/PipelineConfigurationTests.java diff --git a/core/src/test/java/org/elasticsearch/ingest/PipelineExecutionServiceTests.java b/server/src/test/java/org/elasticsearch/ingest/PipelineExecutionServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/ingest/PipelineExecutionServiceTests.java rename to server/src/test/java/org/elasticsearch/ingest/PipelineExecutionServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/ingest/PipelineFactoryTests.java b/server/src/test/java/org/elasticsearch/ingest/PipelineFactoryTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/ingest/PipelineFactoryTests.java rename to server/src/test/java/org/elasticsearch/ingest/PipelineFactoryTests.java diff --git a/core/src/test/java/org/elasticsearch/ingest/PipelineStoreTests.java b/server/src/test/java/org/elasticsearch/ingest/PipelineStoreTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/ingest/PipelineStoreTests.java rename to server/src/test/java/org/elasticsearch/ingest/PipelineStoreTests.java diff --git a/core/src/test/java/org/elasticsearch/ingest/ValueSourceTests.java b/server/src/test/java/org/elasticsearch/ingest/ValueSourceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/ingest/ValueSourceTests.java rename to server/src/test/java/org/elasticsearch/ingest/ValueSourceTests.java diff --git a/core/src/test/java/org/elasticsearch/mget/SimpleMgetIT.java b/server/src/test/java/org/elasticsearch/mget/SimpleMgetIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/mget/SimpleMgetIT.java rename to server/src/test/java/org/elasticsearch/mget/SimpleMgetIT.java diff --git a/core/src/test/java/org/elasticsearch/monitor/fs/DeviceStatsTests.java b/server/src/test/java/org/elasticsearch/monitor/fs/DeviceStatsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/monitor/fs/DeviceStatsTests.java rename to server/src/test/java/org/elasticsearch/monitor/fs/DeviceStatsTests.java diff --git a/core/src/test/java/org/elasticsearch/monitor/fs/FsProbeTests.java b/server/src/test/java/org/elasticsearch/monitor/fs/FsProbeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/monitor/fs/FsProbeTests.java rename to server/src/test/java/org/elasticsearch/monitor/fs/FsProbeTests.java diff --git a/core/src/test/java/org/elasticsearch/monitor/jvm/JvmGcMonitorServiceSettingsTests.java b/server/src/test/java/org/elasticsearch/monitor/jvm/JvmGcMonitorServiceSettingsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/monitor/jvm/JvmGcMonitorServiceSettingsTests.java rename to server/src/test/java/org/elasticsearch/monitor/jvm/JvmGcMonitorServiceSettingsTests.java diff --git a/core/src/test/java/org/elasticsearch/monitor/jvm/JvmGcMonitorServiceTests.java b/server/src/test/java/org/elasticsearch/monitor/jvm/JvmGcMonitorServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/monitor/jvm/JvmGcMonitorServiceTests.java rename to server/src/test/java/org/elasticsearch/monitor/jvm/JvmGcMonitorServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/monitor/jvm/JvmInfoTests.java b/server/src/test/java/org/elasticsearch/monitor/jvm/JvmInfoTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/monitor/jvm/JvmInfoTests.java rename to server/src/test/java/org/elasticsearch/monitor/jvm/JvmInfoTests.java diff --git a/core/src/test/java/org/elasticsearch/monitor/jvm/JvmMonitorTests.java b/server/src/test/java/org/elasticsearch/monitor/jvm/JvmMonitorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/monitor/jvm/JvmMonitorTests.java rename to server/src/test/java/org/elasticsearch/monitor/jvm/JvmMonitorTests.java diff --git a/core/src/test/java/org/elasticsearch/monitor/jvm/JvmStatsTests.java b/server/src/test/java/org/elasticsearch/monitor/jvm/JvmStatsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/monitor/jvm/JvmStatsTests.java rename to server/src/test/java/org/elasticsearch/monitor/jvm/JvmStatsTests.java diff --git a/core/src/test/java/org/elasticsearch/monitor/os/OsProbeTests.java b/server/src/test/java/org/elasticsearch/monitor/os/OsProbeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/monitor/os/OsProbeTests.java rename to server/src/test/java/org/elasticsearch/monitor/os/OsProbeTests.java diff --git a/core/src/test/java/org/elasticsearch/monitor/os/OsStatsTests.java b/server/src/test/java/org/elasticsearch/monitor/os/OsStatsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/monitor/os/OsStatsTests.java rename to server/src/test/java/org/elasticsearch/monitor/os/OsStatsTests.java diff --git a/core/src/test/java/org/elasticsearch/monitor/process/ProcessProbeTests.java b/server/src/test/java/org/elasticsearch/monitor/process/ProcessProbeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/monitor/process/ProcessProbeTests.java rename to server/src/test/java/org/elasticsearch/monitor/process/ProcessProbeTests.java diff --git a/core/src/test/java/org/elasticsearch/node/InternalSettingsPreparerTests.java b/server/src/test/java/org/elasticsearch/node/InternalSettingsPreparerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/node/InternalSettingsPreparerTests.java rename to server/src/test/java/org/elasticsearch/node/InternalSettingsPreparerTests.java diff --git a/core/src/test/java/org/elasticsearch/node/NodeTests.java b/server/src/test/java/org/elasticsearch/node/NodeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/node/NodeTests.java rename to server/src/test/java/org/elasticsearch/node/NodeTests.java diff --git a/core/src/test/java/org/elasticsearch/node/ResponseCollectorServiceTests.java b/server/src/test/java/org/elasticsearch/node/ResponseCollectorServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/node/ResponseCollectorServiceTests.java rename to server/src/test/java/org/elasticsearch/node/ResponseCollectorServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/node/service/NodeServiceTests.java b/server/src/test/java/org/elasticsearch/node/service/NodeServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/node/service/NodeServiceTests.java rename to server/src/test/java/org/elasticsearch/node/service/NodeServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/nodesinfo/NodeInfoStreamingTests.java b/server/src/test/java/org/elasticsearch/nodesinfo/NodeInfoStreamingTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/nodesinfo/NodeInfoStreamingTests.java rename to server/src/test/java/org/elasticsearch/nodesinfo/NodeInfoStreamingTests.java diff --git a/core/src/test/java/org/elasticsearch/nodesinfo/SimpleNodesInfoIT.java b/server/src/test/java/org/elasticsearch/nodesinfo/SimpleNodesInfoIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/nodesinfo/SimpleNodesInfoIT.java rename to server/src/test/java/org/elasticsearch/nodesinfo/SimpleNodesInfoIT.java diff --git a/core/src/test/java/org/elasticsearch/operateAllIndices/DestructiveOperationsIT.java b/server/src/test/java/org/elasticsearch/operateAllIndices/DestructiveOperationsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/operateAllIndices/DestructiveOperationsIT.java rename to server/src/test/java/org/elasticsearch/operateAllIndices/DestructiveOperationsIT.java diff --git a/core/src/test/java/org/elasticsearch/plugins/MetaPluginInfoTests.java b/server/src/test/java/org/elasticsearch/plugins/MetaPluginInfoTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/plugins/MetaPluginInfoTests.java rename to server/src/test/java/org/elasticsearch/plugins/MetaPluginInfoTests.java diff --git a/core/src/test/java/org/elasticsearch/plugins/PluginInfoTests.java b/server/src/test/java/org/elasticsearch/plugins/PluginInfoTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/plugins/PluginInfoTests.java rename to server/src/test/java/org/elasticsearch/plugins/PluginInfoTests.java diff --git a/core/src/test/java/org/elasticsearch/plugins/PluginsServiceTests.java b/server/src/test/java/org/elasticsearch/plugins/PluginsServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/plugins/PluginsServiceTests.java rename to server/src/test/java/org/elasticsearch/plugins/PluginsServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/plugins/PluginsTests.java b/server/src/test/java/org/elasticsearch/plugins/PluginsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/plugins/PluginsTests.java rename to server/src/test/java/org/elasticsearch/plugins/PluginsTests.java diff --git a/core/src/test/java/org/elasticsearch/plugins/spi/NamedXContentProviderTests.java b/server/src/test/java/org/elasticsearch/plugins/spi/NamedXContentProviderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/plugins/spi/NamedXContentProviderTests.java rename to server/src/test/java/org/elasticsearch/plugins/spi/NamedXContentProviderTests.java diff --git a/core/src/test/java/org/elasticsearch/recovery/FullRollingRestartIT.java b/server/src/test/java/org/elasticsearch/recovery/FullRollingRestartIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/recovery/FullRollingRestartIT.java rename to server/src/test/java/org/elasticsearch/recovery/FullRollingRestartIT.java diff --git a/core/src/test/java/org/elasticsearch/recovery/RecoveriesCollectionTests.java b/server/src/test/java/org/elasticsearch/recovery/RecoveriesCollectionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/recovery/RecoveriesCollectionTests.java rename to server/src/test/java/org/elasticsearch/recovery/RecoveriesCollectionTests.java diff --git a/core/src/test/java/org/elasticsearch/recovery/RecoveryWhileUnderLoadIT.java b/server/src/test/java/org/elasticsearch/recovery/RecoveryWhileUnderLoadIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/recovery/RecoveryWhileUnderLoadIT.java rename to server/src/test/java/org/elasticsearch/recovery/RecoveryWhileUnderLoadIT.java diff --git a/core/src/test/java/org/elasticsearch/recovery/RelocationIT.java b/server/src/test/java/org/elasticsearch/recovery/RelocationIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/recovery/RelocationIT.java rename to server/src/test/java/org/elasticsearch/recovery/RelocationIT.java diff --git a/core/src/test/java/org/elasticsearch/recovery/SimpleRecoveryIT.java b/server/src/test/java/org/elasticsearch/recovery/SimpleRecoveryIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/recovery/SimpleRecoveryIT.java rename to server/src/test/java/org/elasticsearch/recovery/SimpleRecoveryIT.java diff --git a/core/src/test/java/org/elasticsearch/recovery/TruncatedRecoveryIT.java b/server/src/test/java/org/elasticsearch/recovery/TruncatedRecoveryIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/recovery/TruncatedRecoveryIT.java rename to server/src/test/java/org/elasticsearch/recovery/TruncatedRecoveryIT.java diff --git a/core/src/test/java/org/elasticsearch/repositories/IndexIdTests.java b/server/src/test/java/org/elasticsearch/repositories/IndexIdTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/repositories/IndexIdTests.java rename to server/src/test/java/org/elasticsearch/repositories/IndexIdTests.java diff --git a/core/src/test/java/org/elasticsearch/repositories/RepositoryDataTests.java b/server/src/test/java/org/elasticsearch/repositories/RepositoryDataTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/repositories/RepositoryDataTests.java rename to server/src/test/java/org/elasticsearch/repositories/RepositoryDataTests.java diff --git a/core/src/test/java/org/elasticsearch/repositories/blobstore/BlobStoreRepositoryRestoreTests.java b/server/src/test/java/org/elasticsearch/repositories/blobstore/BlobStoreRepositoryRestoreTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/repositories/blobstore/BlobStoreRepositoryRestoreTests.java rename to server/src/test/java/org/elasticsearch/repositories/blobstore/BlobStoreRepositoryRestoreTests.java diff --git a/core/src/test/java/org/elasticsearch/repositories/blobstore/BlobStoreRepositoryTests.java b/server/src/test/java/org/elasticsearch/repositories/blobstore/BlobStoreRepositoryTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/repositories/blobstore/BlobStoreRepositoryTests.java rename to server/src/test/java/org/elasticsearch/repositories/blobstore/BlobStoreRepositoryTests.java diff --git a/core/src/test/java/org/elasticsearch/rest/BaseRestHandlerTests.java b/server/src/test/java/org/elasticsearch/rest/BaseRestHandlerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/rest/BaseRestHandlerTests.java rename to server/src/test/java/org/elasticsearch/rest/BaseRestHandlerTests.java diff --git a/core/src/test/java/org/elasticsearch/rest/BytesRestResponseTests.java b/server/src/test/java/org/elasticsearch/rest/BytesRestResponseTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/rest/BytesRestResponseTests.java rename to server/src/test/java/org/elasticsearch/rest/BytesRestResponseTests.java diff --git a/core/src/test/java/org/elasticsearch/rest/DeprecationRestHandlerTests.java b/server/src/test/java/org/elasticsearch/rest/DeprecationRestHandlerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/rest/DeprecationRestHandlerTests.java rename to server/src/test/java/org/elasticsearch/rest/DeprecationRestHandlerTests.java diff --git a/core/src/test/java/org/elasticsearch/rest/RestControllerTests.java b/server/src/test/java/org/elasticsearch/rest/RestControllerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/rest/RestControllerTests.java rename to server/src/test/java/org/elasticsearch/rest/RestControllerTests.java diff --git a/core/src/test/java/org/elasticsearch/rest/RestHttpResponseHeadersTests.java b/server/src/test/java/org/elasticsearch/rest/RestHttpResponseHeadersTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/rest/RestHttpResponseHeadersTests.java rename to server/src/test/java/org/elasticsearch/rest/RestHttpResponseHeadersTests.java diff --git a/core/src/test/java/org/elasticsearch/rest/RestRequestTests.java b/server/src/test/java/org/elasticsearch/rest/RestRequestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/rest/RestRequestTests.java rename to server/src/test/java/org/elasticsearch/rest/RestRequestTests.java diff --git a/core/src/test/java/org/elasticsearch/rest/RestUtilsTests.java b/server/src/test/java/org/elasticsearch/rest/RestUtilsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/rest/RestUtilsTests.java rename to server/src/test/java/org/elasticsearch/rest/RestUtilsTests.java diff --git a/core/src/test/java/org/elasticsearch/rest/action/RestActionsTests.java b/server/src/test/java/org/elasticsearch/rest/action/RestActionsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/rest/action/RestActionsTests.java rename to server/src/test/java/org/elasticsearch/rest/action/RestActionsTests.java diff --git a/core/src/test/java/org/elasticsearch/rest/action/RestBuilderListenerTests.java b/server/src/test/java/org/elasticsearch/rest/action/RestBuilderListenerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/rest/action/RestBuilderListenerTests.java rename to server/src/test/java/org/elasticsearch/rest/action/RestBuilderListenerTests.java diff --git a/core/src/test/java/org/elasticsearch/rest/action/RestMainActionTests.java b/server/src/test/java/org/elasticsearch/rest/action/RestMainActionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/rest/action/RestMainActionTests.java rename to server/src/test/java/org/elasticsearch/rest/action/RestMainActionTests.java diff --git a/core/src/test/java/org/elasticsearch/rest/action/admin/cluster/RestNodesStatsActionTests.java b/server/src/test/java/org/elasticsearch/rest/action/admin/cluster/RestNodesStatsActionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/rest/action/admin/cluster/RestNodesStatsActionTests.java rename to server/src/test/java/org/elasticsearch/rest/action/admin/cluster/RestNodesStatsActionTests.java diff --git a/core/src/test/java/org/elasticsearch/rest/action/admin/indices/RestAnalyzeActionTests.java b/server/src/test/java/org/elasticsearch/rest/action/admin/indices/RestAnalyzeActionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/rest/action/admin/indices/RestAnalyzeActionTests.java rename to server/src/test/java/org/elasticsearch/rest/action/admin/indices/RestAnalyzeActionTests.java diff --git a/core/src/test/java/org/elasticsearch/rest/action/admin/indices/RestClearIndicesCacheActionTests.java b/server/src/test/java/org/elasticsearch/rest/action/admin/indices/RestClearIndicesCacheActionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/rest/action/admin/indices/RestClearIndicesCacheActionTests.java rename to server/src/test/java/org/elasticsearch/rest/action/admin/indices/RestClearIndicesCacheActionTests.java diff --git a/core/src/test/java/org/elasticsearch/rest/action/admin/indices/RestIndicesStatsActionTests.java b/server/src/test/java/org/elasticsearch/rest/action/admin/indices/RestIndicesStatsActionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/rest/action/admin/indices/RestIndicesStatsActionTests.java rename to server/src/test/java/org/elasticsearch/rest/action/admin/indices/RestIndicesStatsActionTests.java diff --git a/core/src/test/java/org/elasticsearch/rest/action/cat/RestIndicesActionTests.java b/server/src/test/java/org/elasticsearch/rest/action/cat/RestIndicesActionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/rest/action/cat/RestIndicesActionTests.java rename to server/src/test/java/org/elasticsearch/rest/action/cat/RestIndicesActionTests.java diff --git a/core/src/test/java/org/elasticsearch/rest/action/cat/RestRecoveryActionTests.java b/server/src/test/java/org/elasticsearch/rest/action/cat/RestRecoveryActionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/rest/action/cat/RestRecoveryActionTests.java rename to server/src/test/java/org/elasticsearch/rest/action/cat/RestRecoveryActionTests.java diff --git a/core/src/test/java/org/elasticsearch/rest/action/cat/RestTableTests.java b/server/src/test/java/org/elasticsearch/rest/action/cat/RestTableTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/rest/action/cat/RestTableTests.java rename to server/src/test/java/org/elasticsearch/rest/action/cat/RestTableTests.java diff --git a/core/src/test/java/org/elasticsearch/rest/action/document/RestBulkActionTests.java b/server/src/test/java/org/elasticsearch/rest/action/document/RestBulkActionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/rest/action/document/RestBulkActionTests.java rename to server/src/test/java/org/elasticsearch/rest/action/document/RestBulkActionTests.java diff --git a/core/src/test/java/org/elasticsearch/rest/action/document/RestIndexActionTests.java b/server/src/test/java/org/elasticsearch/rest/action/document/RestIndexActionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/rest/action/document/RestIndexActionTests.java rename to server/src/test/java/org/elasticsearch/rest/action/document/RestIndexActionTests.java diff --git a/core/src/test/java/org/elasticsearch/routing/AliasResolveRoutingIT.java b/server/src/test/java/org/elasticsearch/routing/AliasResolveRoutingIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/routing/AliasResolveRoutingIT.java rename to server/src/test/java/org/elasticsearch/routing/AliasResolveRoutingIT.java diff --git a/core/src/test/java/org/elasticsearch/routing/AliasRoutingIT.java b/server/src/test/java/org/elasticsearch/routing/AliasRoutingIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/routing/AliasRoutingIT.java rename to server/src/test/java/org/elasticsearch/routing/AliasRoutingIT.java diff --git a/core/src/test/java/org/elasticsearch/routing/PartitionedRoutingIT.java b/server/src/test/java/org/elasticsearch/routing/PartitionedRoutingIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/routing/PartitionedRoutingIT.java rename to server/src/test/java/org/elasticsearch/routing/PartitionedRoutingIT.java diff --git a/core/src/test/java/org/elasticsearch/routing/SimpleRoutingIT.java b/server/src/test/java/org/elasticsearch/routing/SimpleRoutingIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/routing/SimpleRoutingIT.java rename to server/src/test/java/org/elasticsearch/routing/SimpleRoutingIT.java diff --git a/core/src/test/java/org/elasticsearch/script/ClassPermissionTests.java b/server/src/test/java/org/elasticsearch/script/ClassPermissionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/script/ClassPermissionTests.java rename to server/src/test/java/org/elasticsearch/script/ClassPermissionTests.java diff --git a/core/src/test/java/org/elasticsearch/script/ScriptContextTests.java b/server/src/test/java/org/elasticsearch/script/ScriptContextTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/script/ScriptContextTests.java rename to server/src/test/java/org/elasticsearch/script/ScriptContextTests.java diff --git a/core/src/test/java/org/elasticsearch/script/ScriptExceptionTests.java b/server/src/test/java/org/elasticsearch/script/ScriptExceptionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/script/ScriptExceptionTests.java rename to server/src/test/java/org/elasticsearch/script/ScriptExceptionTests.java diff --git a/core/src/test/java/org/elasticsearch/script/ScriptMetaDataTests.java b/server/src/test/java/org/elasticsearch/script/ScriptMetaDataTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/script/ScriptMetaDataTests.java rename to server/src/test/java/org/elasticsearch/script/ScriptMetaDataTests.java diff --git a/core/src/test/java/org/elasticsearch/script/ScriptServiceTests.java b/server/src/test/java/org/elasticsearch/script/ScriptServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/script/ScriptServiceTests.java rename to server/src/test/java/org/elasticsearch/script/ScriptServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/script/ScriptTests.java b/server/src/test/java/org/elasticsearch/script/ScriptTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/script/ScriptTests.java rename to server/src/test/java/org/elasticsearch/script/ScriptTests.java diff --git a/core/src/test/java/org/elasticsearch/script/StoredScriptSourceTests.java b/server/src/test/java/org/elasticsearch/script/StoredScriptSourceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/script/StoredScriptSourceTests.java rename to server/src/test/java/org/elasticsearch/script/StoredScriptSourceTests.java diff --git a/core/src/test/java/org/elasticsearch/script/StoredScriptTests.java b/server/src/test/java/org/elasticsearch/script/StoredScriptTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/script/StoredScriptTests.java rename to server/src/test/java/org/elasticsearch/script/StoredScriptTests.java diff --git a/core/src/test/java/org/elasticsearch/script/StoredScriptsIT.java b/server/src/test/java/org/elasticsearch/script/StoredScriptsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/script/StoredScriptsIT.java rename to server/src/test/java/org/elasticsearch/script/StoredScriptsIT.java diff --git a/core/src/test/java/org/elasticsearch/search/AbstractSearchTestCase.java b/server/src/test/java/org/elasticsearch/search/AbstractSearchTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/AbstractSearchTestCase.java rename to server/src/test/java/org/elasticsearch/search/AbstractSearchTestCase.java diff --git a/core/src/test/java/org/elasticsearch/search/ClearScrollResponseTests.java b/server/src/test/java/org/elasticsearch/search/ClearScrollResponseTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/ClearScrollResponseTests.java rename to server/src/test/java/org/elasticsearch/search/ClearScrollResponseTests.java diff --git a/core/src/test/java/org/elasticsearch/search/DefaultSearchContextTests.java b/server/src/test/java/org/elasticsearch/search/DefaultSearchContextTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/DefaultSearchContextTests.java rename to server/src/test/java/org/elasticsearch/search/DefaultSearchContextTests.java diff --git a/core/src/test/java/org/elasticsearch/search/DocValueFormatTests.java b/server/src/test/java/org/elasticsearch/search/DocValueFormatTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/DocValueFormatTests.java rename to server/src/test/java/org/elasticsearch/search/DocValueFormatTests.java diff --git a/core/src/test/java/org/elasticsearch/search/MultiValueModeTests.java b/server/src/test/java/org/elasticsearch/search/MultiValueModeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/MultiValueModeTests.java rename to server/src/test/java/org/elasticsearch/search/MultiValueModeTests.java diff --git a/core/src/test/java/org/elasticsearch/search/NestedIdentityTests.java b/server/src/test/java/org/elasticsearch/search/NestedIdentityTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/NestedIdentityTests.java rename to server/src/test/java/org/elasticsearch/search/NestedIdentityTests.java diff --git a/core/src/test/java/org/elasticsearch/search/SearchCancellationIT.java b/server/src/test/java/org/elasticsearch/search/SearchCancellationIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/SearchCancellationIT.java rename to server/src/test/java/org/elasticsearch/search/SearchCancellationIT.java diff --git a/core/src/test/java/org/elasticsearch/search/SearchCancellationTests.java b/server/src/test/java/org/elasticsearch/search/SearchCancellationTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/SearchCancellationTests.java rename to server/src/test/java/org/elasticsearch/search/SearchCancellationTests.java diff --git a/core/src/test/java/org/elasticsearch/search/SearchHitTests.java b/server/src/test/java/org/elasticsearch/search/SearchHitTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/SearchHitTests.java rename to server/src/test/java/org/elasticsearch/search/SearchHitTests.java diff --git a/core/src/test/java/org/elasticsearch/search/SearchHitsTests.java b/server/src/test/java/org/elasticsearch/search/SearchHitsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/SearchHitsTests.java rename to server/src/test/java/org/elasticsearch/search/SearchHitsTests.java diff --git a/core/src/test/java/org/elasticsearch/search/SearchModuleTests.java b/server/src/test/java/org/elasticsearch/search/SearchModuleTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/SearchModuleTests.java rename to server/src/test/java/org/elasticsearch/search/SearchModuleTests.java diff --git a/core/src/test/java/org/elasticsearch/search/SearchRequestTests.java b/server/src/test/java/org/elasticsearch/search/SearchRequestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/SearchRequestTests.java rename to server/src/test/java/org/elasticsearch/search/SearchRequestTests.java diff --git a/core/src/test/java/org/elasticsearch/search/SearchServiceTests.java b/server/src/test/java/org/elasticsearch/search/SearchServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/SearchServiceTests.java rename to server/src/test/java/org/elasticsearch/search/SearchServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/search/SearchSortValuesTests.java b/server/src/test/java/org/elasticsearch/search/SearchSortValuesTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/SearchSortValuesTests.java rename to server/src/test/java/org/elasticsearch/search/SearchSortValuesTests.java diff --git a/core/src/test/java/org/elasticsearch/search/SearchTimeoutIT.java b/server/src/test/java/org/elasticsearch/search/SearchTimeoutIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/SearchTimeoutIT.java rename to server/src/test/java/org/elasticsearch/search/SearchTimeoutIT.java diff --git a/core/src/test/java/org/elasticsearch/search/SearchWithRejectionsIT.java b/server/src/test/java/org/elasticsearch/search/SearchWithRejectionsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/SearchWithRejectionsIT.java rename to server/src/test/java/org/elasticsearch/search/SearchWithRejectionsIT.java diff --git a/core/src/test/java/org/elasticsearch/search/StressSearchServiceReaperIT.java b/server/src/test/java/org/elasticsearch/search/StressSearchServiceReaperIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/StressSearchServiceReaperIT.java rename to server/src/test/java/org/elasticsearch/search/StressSearchServiceReaperIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/AggregationCollectorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/AggregationCollectorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/AggregationCollectorTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/AggregationCollectorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/AggregationTestScriptsPlugin.java b/server/src/test/java/org/elasticsearch/search/aggregations/AggregationTestScriptsPlugin.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/AggregationTestScriptsPlugin.java rename to server/src/test/java/org/elasticsearch/search/aggregations/AggregationTestScriptsPlugin.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/AggregationsIntegrationIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/AggregationsIntegrationIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/AggregationsIntegrationIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/AggregationsIntegrationIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/AggregationsTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/AggregationsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/AggregationsTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/AggregationsTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/AggregatorFactoriesTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/AggregatorFactoriesTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/AggregatorFactoriesTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/AggregatorFactoriesTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/BasePipelineAggregationTestCase.java b/server/src/test/java/org/elasticsearch/search/aggregations/BasePipelineAggregationTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/BasePipelineAggregationTestCase.java rename to server/src/test/java/org/elasticsearch/search/aggregations/BasePipelineAggregationTestCase.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/CombiIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/CombiIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/CombiIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/CombiIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/EquivalenceIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/EquivalenceIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/EquivalenceIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/EquivalenceIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/FiltersAggsRewriteIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/FiltersAggsRewriteIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/FiltersAggsRewriteIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/FiltersAggsRewriteIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/InternalOrderTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/InternalOrderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/InternalOrderTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/InternalOrderTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/MetaDataIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/MetaDataIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/MetaDataIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/MetaDataIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/MissingValueIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/MissingValueIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/MissingValueIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/MissingValueIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/MultiBucketAggregatorWrapperTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/MultiBucketAggregatorWrapperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/MultiBucketAggregatorWrapperTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/MultiBucketAggregatorWrapperTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/SubAggCollectionModeTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/SubAggCollectionModeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/SubAggCollectionModeTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/SubAggCollectionModeTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/AdjacencyMatrixIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/AdjacencyMatrixIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/AdjacencyMatrixIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/AdjacencyMatrixIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/BestBucketsDeferringCollectorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/BestBucketsDeferringCollectorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/BestBucketsDeferringCollectorTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/BestBucketsDeferringCollectorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/BooleanTermsIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/BooleanTermsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/BooleanTermsIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/BooleanTermsIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/BucketUtilsTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/BucketUtilsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/BucketUtilsTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/BucketUtilsTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/DateHistogramIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/DateHistogramIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/DateHistogramIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/DateHistogramIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/DateHistogramOffsetIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/DateHistogramOffsetIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/DateHistogramOffsetIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/DateHistogramOffsetIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/DateHistogramTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/DateHistogramTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/DateHistogramTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/DateHistogramTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/DateRangeIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/DateRangeIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/DateRangeIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/DateRangeIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/DateRangeTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/DateRangeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/DateRangeTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/DateRangeTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/DateScriptMocksPlugin.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/DateScriptMocksPlugin.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/DateScriptMocksPlugin.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/DateScriptMocksPlugin.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/DiversifiedSamplerIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/DiversifiedSamplerIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/DiversifiedSamplerIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/DiversifiedSamplerIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/DoubleTermsIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/DoubleTermsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/DoubleTermsIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/DoubleTermsIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/FilterIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/FilterIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/FilterIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/FilterIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/FilterTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/FilterTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/FilterTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/FilterTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/FiltersIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/FiltersIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/FiltersIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/FiltersIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/FiltersTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/FiltersTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/FiltersTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/FiltersTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoDistanceIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoDistanceIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoDistanceIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoDistanceIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoDistanceRangeTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoDistanceRangeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoDistanceRangeTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoDistanceRangeTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoHashGridIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoHashGridIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoHashGridIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoHashGridIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoHashGridTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoHashGridTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoHashGridTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoHashGridTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/GlobalAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/GlobalAggregatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/GlobalAggregatorTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/GlobalAggregatorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/GlobalIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/GlobalIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/GlobalIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/GlobalIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/GlobalTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/GlobalTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/GlobalTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/GlobalTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/HistogramIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/HistogramIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/HistogramIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/HistogramIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/HistogramTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/HistogramTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/HistogramTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/HistogramTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/IpRangeIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/IpRangeIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/IpRangeIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/IpRangeIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/IpRangeTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/IpRangeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/IpRangeTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/IpRangeTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/IpTermsIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/IpTermsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/IpTermsIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/IpTermsIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/LongTermsIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/LongTermsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/LongTermsIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/LongTermsIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/MinDocCountIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/MinDocCountIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/MinDocCountIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/MinDocCountIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/MissingIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/MissingIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/MissingIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/MissingIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/MissingTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/MissingTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/MissingTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/MissingTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/NaNSortingIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/NaNSortingIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/NaNSortingIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/NaNSortingIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/NestedIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/NestedIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/NestedIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/NestedIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/ParentIdAggIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/ParentIdAggIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/ParentIdAggIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/ParentIdAggIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/RangeIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/RangeIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/RangeIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/RangeIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/RangeTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/RangeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/RangeTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/RangeTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/ReverseNestedIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/ReverseNestedIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/ReverseNestedIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/ReverseNestedIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/SamplerIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/SamplerIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/SamplerIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/SamplerIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/SamplerTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/SamplerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/SamplerTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/SamplerTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/ShardReduceIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/ShardReduceIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/ShardReduceIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/ShardReduceIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/ShardSizeTermsIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/ShardSizeTermsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/ShardSizeTermsIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/ShardSizeTermsIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/ShardSizeTestCase.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/ShardSizeTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/ShardSizeTestCase.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/ShardSizeTestCase.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsSignificanceScoreIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsSignificanceScoreIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsSignificanceScoreIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsSignificanceScoreIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTextTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTextTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTextTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTextTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/TermsDocCountErrorIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/TermsDocCountErrorIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/TermsDocCountErrorIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/TermsDocCountErrorIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/TermsShardMinDocCountIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/TermsShardMinDocCountIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/TermsShardMinDocCountIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/TermsShardMinDocCountIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/TermsTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/TermsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/TermsTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/TermsTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/adjacency/AdjacencyMatrixAggregationBuilderTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/adjacency/AdjacencyMatrixAggregationBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/adjacency/AdjacencyMatrixAggregationBuilderTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/adjacency/AdjacencyMatrixAggregationBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/adjacency/InternalAdjacencyMatrixTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/adjacency/InternalAdjacencyMatrixTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/adjacency/InternalAdjacencyMatrixTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/adjacency/InternalAdjacencyMatrixTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregationBuilderTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregationBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregationBuilderTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregationBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregatorTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregatorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/InternalCompositeTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/InternalCompositeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/InternalCompositeTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/InternalCompositeTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/filter/FilterAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/filter/FilterAggregatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/filter/FilterAggregatorTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/filter/FilterAggregatorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/filter/FiltersAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/filter/FiltersAggregatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/filter/FiltersAggregatorTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/filter/FiltersAggregatorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/filter/InternalFilterTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/filter/InternalFilterTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/filter/InternalFilterTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/filter/InternalFilterTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/filter/InternalFiltersTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/filter/InternalFiltersTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/filter/InternalFiltersTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/filter/InternalFiltersTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridAggregatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridAggregatorTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridAggregatorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridParserTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridParserTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridParserTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridParserTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/geogrid/InternalGeoHashGridTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/geogrid/InternalGeoHashGridTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/geogrid/InternalGeoHashGridTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/geogrid/InternalGeoHashGridTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/global/InternalGlobalTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/global/InternalGlobalTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/global/InternalGlobalTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/global/InternalGlobalTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramAggregatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramAggregatorTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramAggregatorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/ExtendedBoundsTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/ExtendedBoundsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/ExtendedBoundsTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/ExtendedBoundsTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramAggregatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramAggregatorTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramAggregatorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalDateHistogramTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalDateHistogramTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalDateHistogramTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalDateHistogramTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalHistogramTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalHistogramTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalHistogramTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalHistogramTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/missing/InternalMissingTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/missing/InternalMissingTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/missing/InternalMissingTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/missing/InternalMissingTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/missing/MissingAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/missing/MissingAggregatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/missing/MissingAggregatorTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/missing/MissingAggregatorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/InternalNestedTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/InternalNestedTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/InternalNestedTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/InternalNestedTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/InternalReverseNestedTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/InternalReverseNestedTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/InternalReverseNestedTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/InternalReverseNestedTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregatorTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregatorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/NestedTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/NestedTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/NestedTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/NestedTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedAggregatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedAggregatorTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedAggregatorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/range/BinaryRangeAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/BinaryRangeAggregatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/range/BinaryRangeAggregatorTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/BinaryRangeAggregatorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/range/InternalBinaryRangeTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/InternalBinaryRangeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/range/InternalBinaryRangeTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/InternalBinaryRangeTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/range/InternalDateRangeTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/InternalDateRangeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/range/InternalDateRangeTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/InternalDateRangeTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/range/InternalGeoDistanceTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/InternalGeoDistanceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/range/InternalGeoDistanceTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/InternalGeoDistanceTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/range/InternalRangeTestCase.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/InternalRangeTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/range/InternalRangeTestCase.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/InternalRangeTestCase.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/range/InternalRangeTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/InternalRangeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/range/InternalRangeTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/InternalRangeTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/range/IpRangeAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/IpRangeAggregatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/range/IpRangeAggregatorTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/IpRangeAggregatorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/sampler/BestDocsDeferringCollectorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/sampler/BestDocsDeferringCollectorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/sampler/BestDocsDeferringCollectorTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/sampler/BestDocsDeferringCollectorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedAggregationBuilderTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedAggregationBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedAggregationBuilderTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedAggregationBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedSamplerTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedSamplerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedSamplerTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedSamplerTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/sampler/InternalSamplerTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/sampler/InternalSamplerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/sampler/InternalSamplerTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/sampler/InternalSamplerTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/sampler/SamplerAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/sampler/SamplerAggregatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/sampler/SamplerAggregatorTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/sampler/SamplerAggregatorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/InternalSignificantTermsTestCase.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/InternalSignificantTermsTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/InternalSignificantTermsTestCase.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/InternalSignificantTermsTestCase.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificanceHeuristicTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificanceHeuristicTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificanceHeuristicTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificanceHeuristicTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantLongTermsTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantLongTermsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantLongTermsTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantLongTermsTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantStringTermsTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantStringTermsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantStringTermsTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantStringTermsTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTermsAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTermsAggregatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTermsAggregatorTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTermsAggregatorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTextAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTextAggregatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTextAggregatorTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTextAggregatorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/DoubleTermsTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/DoubleTermsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/DoubleTermsTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/DoubleTermsTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/InternalTermsTestCase.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/InternalTermsTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/InternalTermsTestCase.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/InternalTermsTestCase.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/LongTermsTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/LongTermsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/LongTermsTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/LongTermsTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/StringTermsIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/StringTermsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/StringTermsIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/StringTermsIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/StringTermsTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/StringTermsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/StringTermsTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/StringTermsTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorFactoryTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorFactoryTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorFactoryTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorFactoryTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/AbstractGeoTestCase.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/AbstractGeoTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/AbstractGeoTestCase.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/AbstractGeoTestCase.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/AbstractNumericMetricTestCase.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/AbstractNumericMetricTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/AbstractNumericMetricTestCase.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/AbstractNumericMetricTestCase.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/AdjacencyMatrixTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/AdjacencyMatrixTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/AdjacencyMatrixTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/AdjacencyMatrixTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/AvgIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/AvgIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/AvgIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/AvgIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/AvgTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/AvgTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/AvgTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/AvgTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/CardinalityAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/CardinalityAggregatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/CardinalityAggregatorTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/CardinalityAggregatorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/CardinalityIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/CardinalityIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/CardinalityIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/CardinalityIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/ExtendedStatsAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/ExtendedStatsAggregatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/ExtendedStatsAggregatorTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/ExtendedStatsAggregatorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/ExtendedStatsIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/ExtendedStatsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/ExtendedStatsIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/ExtendedStatsIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/ExtendedStatsTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/ExtendedStatsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/ExtendedStatsTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/ExtendedStatsTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoBoundsIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoBoundsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoBoundsIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoBoundsIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoBoundsTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoBoundsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoBoundsTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoBoundsTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoCentroidIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoCentroidIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoCentroidIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoCentroidIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoCentroidTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoCentroidTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoCentroidTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoCentroidTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/HDRPercentileRanksIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/HDRPercentileRanksIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/HDRPercentileRanksIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/HDRPercentileRanksIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/HDRPercentilesIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/HDRPercentilesIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/HDRPercentilesIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/HDRPercentilesIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalExtendedStatsTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalExtendedStatsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalExtendedStatsTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalExtendedStatsTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalMaxTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalMaxTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalMaxTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalMaxTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalMinTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalMinTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalMinTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalMinTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalStatsBucketTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalStatsBucketTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalStatsBucketTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalStatsBucketTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalStatsTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalStatsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalStatsTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalStatsTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalSumTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalSumTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalSumTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalSumTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/MaxAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/MaxAggregatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/MaxAggregatorTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/MaxAggregatorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/MaxIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/MaxIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/MaxIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/MaxIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/MaxTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/MaxTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/MaxTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/MaxTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/MetricAggScriptPlugin.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/MetricAggScriptPlugin.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/MetricAggScriptPlugin.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/MetricAggScriptPlugin.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/MinAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/MinAggregatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/MinAggregatorTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/MinAggregatorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/MinIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/MinIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/MinIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/MinIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/MinTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/MinTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/MinTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/MinTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/PercentileRanksTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/PercentileRanksTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/PercentileRanksTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/PercentileRanksTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/PercentilesTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/PercentilesTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/PercentilesTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/PercentilesTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/StatsAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/StatsAggregatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/StatsAggregatorTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/StatsAggregatorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/StatsIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/StatsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/StatsIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/StatsIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/StatsTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/StatsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/StatsTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/StatsTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/SumAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/SumAggregatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/SumAggregatorTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/SumAggregatorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/SumIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/SumIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/SumIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/SumIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/SumTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/SumTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/SumTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/SumTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/TDigestPercentileRanksIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/TDigestPercentileRanksIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/TDigestPercentileRanksIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/TDigestPercentileRanksIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/TDigestPercentilesIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/TDigestPercentilesIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/TDigestPercentilesIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/TDigestPercentilesIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/TopHitsIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/TopHitsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/TopHitsIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/TopHitsIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/TopHitsTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/TopHitsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/TopHitsTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/TopHitsTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/ValueCountIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/ValueCountIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/ValueCountIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/ValueCountIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/ValueCountTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/ValueCountTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/ValueCountTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/ValueCountTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/avg/AvgAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/avg/AvgAggregatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/avg/AvgAggregatorTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/avg/AvgAggregatorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/avg/InternalAvgTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/avg/InternalAvgTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/avg/InternalAvgTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/avg/InternalAvgTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/cardinality/CardinalityTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/cardinality/CardinalityTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/cardinality/CardinalityTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/cardinality/CardinalityTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/cardinality/HyperLogLogPlusPlusTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/cardinality/HyperLogLogPlusPlusTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/cardinality/HyperLogLogPlusPlusTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/cardinality/HyperLogLogPlusPlusTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/cardinality/InternalCardinalityTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/cardinality/InternalCardinalityTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/cardinality/InternalCardinalityTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/cardinality/InternalCardinalityTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/geobounds/GeoBoundsAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/geobounds/GeoBoundsAggregatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/geobounds/GeoBoundsAggregatorTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/geobounds/GeoBoundsAggregatorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/geobounds/InternalGeoBoundsTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/geobounds/InternalGeoBoundsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/geobounds/InternalGeoBoundsTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/geobounds/InternalGeoBoundsTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/geocentroid/GeoCentroidAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/geocentroid/GeoCentroidAggregatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/geocentroid/GeoCentroidAggregatorTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/geocentroid/GeoCentroidAggregatorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/geocentroid/InternalGeoCentroidTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/geocentroid/InternalGeoCentroidTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/geocentroid/InternalGeoCentroidTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/geocentroid/InternalGeoCentroidTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/AbstractPercentilesTestCase.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/AbstractPercentilesTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/AbstractPercentilesTestCase.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/AbstractPercentilesTestCase.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/InternalPercentilesRanksTestCase.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/InternalPercentilesRanksTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/InternalPercentilesRanksTestCase.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/InternalPercentilesRanksTestCase.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/InternalPercentilesTestCase.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/InternalPercentilesTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/InternalPercentilesTestCase.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/InternalPercentilesTestCase.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentilesMethodTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentilesMethodTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentilesMethodTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentilesMethodTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/HDRPercentileRanksAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/HDRPercentileRanksAggregatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/HDRPercentileRanksAggregatorTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/HDRPercentileRanksAggregatorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/HDRPercentilesAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/HDRPercentilesAggregatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/HDRPercentilesAggregatorTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/HDRPercentilesAggregatorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/InternalHDRPercentilesRanksTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/InternalHDRPercentilesRanksTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/InternalHDRPercentilesRanksTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/InternalHDRPercentilesRanksTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/InternalHDRPercentilesTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/InternalHDRPercentilesTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/InternalHDRPercentilesTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/InternalHDRPercentilesTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/InternalTDigestPercentilesRanksTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/InternalTDigestPercentilesRanksTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/InternalTDigestPercentilesRanksTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/InternalTDigestPercentilesRanksTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/InternalTDigestPercentilesTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/InternalTDigestPercentilesTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/InternalTDigestPercentilesTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/InternalTDigestPercentilesTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestPercentileRanksAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestPercentileRanksAggregatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestPercentileRanksAggregatorTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestPercentileRanksAggregatorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestPercentilesAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestPercentilesAggregatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestPercentilesAggregatorTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestPercentilesAggregatorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/scripted/InternalScriptedMetricTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/scripted/InternalScriptedMetricTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/scripted/InternalScriptedMetricTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/scripted/InternalScriptedMetricTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricAggregatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricAggregatorTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricAggregatorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/tophits/InternalTopHitsTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/tophits/InternalTopHitsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/tophits/InternalTopHitsTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/tophits/InternalTopHitsTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHitsAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHitsAggregatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHitsAggregatorTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHitsAggregatorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/valuecount/InternalValueCountTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/valuecount/InternalValueCountTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/valuecount/InternalValueCountTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/valuecount/InternalValueCountTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/valuecount/ValueCountAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/valuecount/ValueCountAggregatorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/metrics/valuecount/ValueCountAggregatorTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/metrics/valuecount/ValueCountAggregatorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/AvgBucketIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/AvgBucketIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/AvgBucketIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/AvgBucketIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketScriptIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketScriptIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketScriptIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketScriptIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketScriptTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketScriptTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketScriptTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketScriptTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketSelectorIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketSelectorIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketSelectorIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketSelectorIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketSelectorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketSelectorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketSelectorTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketSelectorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/CumulativeSumIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/CumulativeSumIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/CumulativeSumIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/CumulativeSumIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/CumulativeSumTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/CumulativeSumTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/CumulativeSumTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/CumulativeSumTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/DateDerivativeIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/DateDerivativeIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/DateDerivativeIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/DateDerivativeIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/DerivativeIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/DerivativeIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/DerivativeIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/DerivativeIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/DerivativeTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/DerivativeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/DerivativeTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/DerivativeTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/ExtendedStatsBucketIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/ExtendedStatsBucketIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/ExtendedStatsBucketIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/ExtendedStatsBucketIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/InternalSimpleValueTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/InternalSimpleValueTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/InternalSimpleValueTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/InternalSimpleValueTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/MaxBucketIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/MaxBucketIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/MaxBucketIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/MaxBucketIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/MinBucketIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/MinBucketIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/MinBucketIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/MinBucketIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/PercentilesBucketIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/PercentilesBucketIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/PercentilesBucketIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/PercentilesBucketIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/PipelineAggregationHelperTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/PipelineAggregationHelperTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/PipelineAggregationHelperTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/PipelineAggregationHelperTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/SerialDifferenceTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/SerialDifferenceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/SerialDifferenceTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/SerialDifferenceTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/StatsBucketIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/StatsBucketIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/StatsBucketIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/StatsBucketIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/SumBucketIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/SumBucketIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/SumBucketIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/SumBucketIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/AbstractBucketMetricsTestCase.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/AbstractBucketMetricsTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/AbstractBucketMetricsTestCase.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/AbstractBucketMetricsTestCase.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/AvgBucketTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/AvgBucketTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/AvgBucketTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/AvgBucketTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/ExtendedStatsBucketTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/ExtendedStatsBucketTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/ExtendedStatsBucketTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/ExtendedStatsBucketTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/InternalBucketMetricValueTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/InternalBucketMetricValueTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/InternalBucketMetricValueTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/InternalBucketMetricValueTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/MaxBucketTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/MaxBucketTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/MaxBucketTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/MaxBucketTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/MinBucketTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/MinBucketTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/MinBucketTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/MinBucketTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/PercentilesBucketTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/PercentilesBucketTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/PercentilesBucketTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/PercentilesBucketTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/StatsBucketTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/StatsBucketTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/StatsBucketTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/StatsBucketTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/SumBucketTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/SumBucketTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/SumBucketTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/SumBucketTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/percentile/InternalPercentilesBucketTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/percentile/InternalPercentilesBucketTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/percentile/InternalPercentilesBucketTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/percentile/InternalPercentilesBucketTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/InternalExtendedStatsBucketTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/InternalExtendedStatsBucketTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/InternalExtendedStatsBucketTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/InternalExtendedStatsBucketTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketsort/BucketSortIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketsort/BucketSortIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketsort/BucketSortIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketsort/BucketSortIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketsort/BucketSortTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketsort/BucketSortTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketsort/BucketSortTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketsort/BucketSortTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/derivative/InternalDerivativeTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/derivative/InternalDerivativeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/derivative/InternalDerivativeTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/derivative/InternalDerivativeTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgUnitTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgUnitTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgUnitTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgUnitTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/serialdiff/SerialDiffIT.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/serialdiff/SerialDiffIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/pipeline/serialdiff/SerialDiffIT.java rename to server/src/test/java/org/elasticsearch/search/aggregations/pipeline/serialdiff/SerialDiffIT.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/support/IncludeExcludeTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/support/IncludeExcludeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/support/IncludeExcludeTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/support/IncludeExcludeTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/support/MissingValuesTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/support/MissingValuesTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/support/MissingValuesTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/support/MissingValuesTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/support/PathTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/support/PathTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/support/PathTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/support/PathTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/support/ScriptValuesTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/support/ScriptValuesTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/support/ScriptValuesTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/support/ScriptValuesTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/support/ValueTypeTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/support/ValueTypeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/support/ValueTypeTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/support/ValueTypeTests.java diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/support/ValuesSourceConfigTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/support/ValuesSourceConfigTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/support/ValuesSourceConfigTests.java rename to server/src/test/java/org/elasticsearch/search/aggregations/support/ValuesSourceConfigTests.java diff --git a/core/src/test/java/org/elasticsearch/search/basic/SearchWhileCreatingIndexIT.java b/server/src/test/java/org/elasticsearch/search/basic/SearchWhileCreatingIndexIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/basic/SearchWhileCreatingIndexIT.java rename to server/src/test/java/org/elasticsearch/search/basic/SearchWhileCreatingIndexIT.java diff --git a/core/src/test/java/org/elasticsearch/search/basic/SearchWhileRelocatingIT.java b/server/src/test/java/org/elasticsearch/search/basic/SearchWhileRelocatingIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/basic/SearchWhileRelocatingIT.java rename to server/src/test/java/org/elasticsearch/search/basic/SearchWhileRelocatingIT.java diff --git a/core/src/test/java/org/elasticsearch/search/basic/SearchWithRandomExceptionsIT.java b/server/src/test/java/org/elasticsearch/search/basic/SearchWithRandomExceptionsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/basic/SearchWithRandomExceptionsIT.java rename to server/src/test/java/org/elasticsearch/search/basic/SearchWithRandomExceptionsIT.java diff --git a/core/src/test/java/org/elasticsearch/search/basic/SearchWithRandomIOExceptionsIT.java b/server/src/test/java/org/elasticsearch/search/basic/SearchWithRandomIOExceptionsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/basic/SearchWithRandomIOExceptionsIT.java rename to server/src/test/java/org/elasticsearch/search/basic/SearchWithRandomIOExceptionsIT.java diff --git a/core/src/test/java/org/elasticsearch/search/basic/TransportSearchFailuresIT.java b/server/src/test/java/org/elasticsearch/search/basic/TransportSearchFailuresIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/basic/TransportSearchFailuresIT.java rename to server/src/test/java/org/elasticsearch/search/basic/TransportSearchFailuresIT.java diff --git a/core/src/test/java/org/elasticsearch/search/basic/TransportTwoNodesSearchIT.java b/server/src/test/java/org/elasticsearch/search/basic/TransportTwoNodesSearchIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/basic/TransportTwoNodesSearchIT.java rename to server/src/test/java/org/elasticsearch/search/basic/TransportTwoNodesSearchIT.java diff --git a/core/src/test/java/org/elasticsearch/search/builder/SearchSourceBuilderTests.java b/server/src/test/java/org/elasticsearch/search/builder/SearchSourceBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/builder/SearchSourceBuilderTests.java rename to server/src/test/java/org/elasticsearch/search/builder/SearchSourceBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/search/child/ParentFieldLoadingIT.java b/server/src/test/java/org/elasticsearch/search/child/ParentFieldLoadingIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/child/ParentFieldLoadingIT.java rename to server/src/test/java/org/elasticsearch/search/child/ParentFieldLoadingIT.java diff --git a/core/src/test/java/org/elasticsearch/search/collapse/CollapseBuilderTests.java b/server/src/test/java/org/elasticsearch/search/collapse/CollapseBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/collapse/CollapseBuilderTests.java rename to server/src/test/java/org/elasticsearch/search/collapse/CollapseBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/search/fetch/FetchSubPhasePluginIT.java b/server/src/test/java/org/elasticsearch/search/fetch/FetchSubPhasePluginIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/fetch/FetchSubPhasePluginIT.java rename to server/src/test/java/org/elasticsearch/search/fetch/FetchSubPhasePluginIT.java diff --git a/core/src/test/java/org/elasticsearch/search/fetch/subphase/FetchSourceSubPhaseTests.java b/server/src/test/java/org/elasticsearch/search/fetch/subphase/FetchSourceSubPhaseTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/fetch/subphase/FetchSourceSubPhaseTests.java rename to server/src/test/java/org/elasticsearch/search/fetch/subphase/FetchSourceSubPhaseTests.java diff --git a/core/src/test/java/org/elasticsearch/search/fetch/subphase/InnerHitsIT.java b/server/src/test/java/org/elasticsearch/search/fetch/subphase/InnerHitsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/fetch/subphase/InnerHitsIT.java rename to server/src/test/java/org/elasticsearch/search/fetch/subphase/InnerHitsIT.java diff --git a/core/src/test/java/org/elasticsearch/search/fetch/subphase/MatchedQueriesIT.java b/server/src/test/java/org/elasticsearch/search/fetch/subphase/MatchedQueriesIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/fetch/subphase/MatchedQueriesIT.java rename to server/src/test/java/org/elasticsearch/search/fetch/subphase/MatchedQueriesIT.java diff --git a/core/src/test/java/org/elasticsearch/search/fetch/subphase/ParentFieldSubFetchPhaseTests.java b/server/src/test/java/org/elasticsearch/search/fetch/subphase/ParentFieldSubFetchPhaseTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/fetch/subphase/ParentFieldSubFetchPhaseTests.java rename to server/src/test/java/org/elasticsearch/search/fetch/subphase/ParentFieldSubFetchPhaseTests.java diff --git a/core/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/CustomHighlighter.java b/server/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/CustomHighlighter.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/CustomHighlighter.java rename to server/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/CustomHighlighter.java diff --git a/core/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/CustomHighlighterPlugin.java b/server/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/CustomHighlighterPlugin.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/CustomHighlighterPlugin.java rename to server/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/CustomHighlighterPlugin.java diff --git a/core/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/CustomHighlighterSearchIT.java b/server/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/CustomHighlighterSearchIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/CustomHighlighterSearchIT.java rename to server/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/CustomHighlighterSearchIT.java diff --git a/core/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightBuilderTests.java b/server/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightBuilderTests.java rename to server/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightFieldTests.java b/server/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightFieldTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightFieldTests.java rename to server/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightFieldTests.java diff --git a/core/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/HighlighterSearchIT.java b/server/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/HighlighterSearchIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/HighlighterSearchIT.java rename to server/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/HighlighterSearchIT.java diff --git a/core/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/PlainHighlighterTests.java b/server/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/PlainHighlighterTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/PlainHighlighterTests.java rename to server/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/PlainHighlighterTests.java diff --git a/core/src/test/java/org/elasticsearch/search/fields/SearchFieldsIT.java b/server/src/test/java/org/elasticsearch/search/fields/SearchFieldsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/fields/SearchFieldsIT.java rename to server/src/test/java/org/elasticsearch/search/fields/SearchFieldsIT.java diff --git a/core/src/test/java/org/elasticsearch/search/functionscore/DecayFunctionScoreIT.java b/server/src/test/java/org/elasticsearch/search/functionscore/DecayFunctionScoreIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/functionscore/DecayFunctionScoreIT.java rename to server/src/test/java/org/elasticsearch/search/functionscore/DecayFunctionScoreIT.java diff --git a/core/src/test/java/org/elasticsearch/search/functionscore/ExplainableScriptIT.java b/server/src/test/java/org/elasticsearch/search/functionscore/ExplainableScriptIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/functionscore/ExplainableScriptIT.java rename to server/src/test/java/org/elasticsearch/search/functionscore/ExplainableScriptIT.java diff --git a/core/src/test/java/org/elasticsearch/search/functionscore/FunctionScoreFieldValueIT.java b/server/src/test/java/org/elasticsearch/search/functionscore/FunctionScoreFieldValueIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/functionscore/FunctionScoreFieldValueIT.java rename to server/src/test/java/org/elasticsearch/search/functionscore/FunctionScoreFieldValueIT.java diff --git a/core/src/test/java/org/elasticsearch/search/functionscore/FunctionScoreIT.java b/server/src/test/java/org/elasticsearch/search/functionscore/FunctionScoreIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/functionscore/FunctionScoreIT.java rename to server/src/test/java/org/elasticsearch/search/functionscore/FunctionScoreIT.java diff --git a/core/src/test/java/org/elasticsearch/search/functionscore/FunctionScorePluginIT.java b/server/src/test/java/org/elasticsearch/search/functionscore/FunctionScorePluginIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/functionscore/FunctionScorePluginIT.java rename to server/src/test/java/org/elasticsearch/search/functionscore/FunctionScorePluginIT.java diff --git a/core/src/test/java/org/elasticsearch/search/functionscore/QueryRescorerIT.java b/server/src/test/java/org/elasticsearch/search/functionscore/QueryRescorerIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/functionscore/QueryRescorerIT.java rename to server/src/test/java/org/elasticsearch/search/functionscore/QueryRescorerIT.java diff --git a/core/src/test/java/org/elasticsearch/search/functionscore/RandomScoreFunctionIT.java b/server/src/test/java/org/elasticsearch/search/functionscore/RandomScoreFunctionIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/functionscore/RandomScoreFunctionIT.java rename to server/src/test/java/org/elasticsearch/search/functionscore/RandomScoreFunctionIT.java diff --git a/core/src/test/java/org/elasticsearch/search/geo/GeoBoundingBoxIT.java b/server/src/test/java/org/elasticsearch/search/geo/GeoBoundingBoxIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/geo/GeoBoundingBoxIT.java rename to server/src/test/java/org/elasticsearch/search/geo/GeoBoundingBoxIT.java diff --git a/core/src/test/java/org/elasticsearch/search/geo/GeoDistanceIT.java b/server/src/test/java/org/elasticsearch/search/geo/GeoDistanceIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/geo/GeoDistanceIT.java rename to server/src/test/java/org/elasticsearch/search/geo/GeoDistanceIT.java diff --git a/core/src/test/java/org/elasticsearch/search/geo/GeoFilterIT.java b/server/src/test/java/org/elasticsearch/search/geo/GeoFilterIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/geo/GeoFilterIT.java rename to server/src/test/java/org/elasticsearch/search/geo/GeoFilterIT.java diff --git a/core/src/test/java/org/elasticsearch/search/geo/GeoPolygonIT.java b/server/src/test/java/org/elasticsearch/search/geo/GeoPolygonIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/geo/GeoPolygonIT.java rename to server/src/test/java/org/elasticsearch/search/geo/GeoPolygonIT.java diff --git a/core/src/test/java/org/elasticsearch/search/geo/GeoShapeIntegrationIT.java b/server/src/test/java/org/elasticsearch/search/geo/GeoShapeIntegrationIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/geo/GeoShapeIntegrationIT.java rename to server/src/test/java/org/elasticsearch/search/geo/GeoShapeIntegrationIT.java diff --git a/core/src/test/java/org/elasticsearch/search/geo/GeoShapeQueryTests.java b/server/src/test/java/org/elasticsearch/search/geo/GeoShapeQueryTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/geo/GeoShapeQueryTests.java rename to server/src/test/java/org/elasticsearch/search/geo/GeoShapeQueryTests.java diff --git a/core/src/test/java/org/elasticsearch/search/internal/AliasFilterTests.java b/server/src/test/java/org/elasticsearch/search/internal/AliasFilterTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/internal/AliasFilterTests.java rename to server/src/test/java/org/elasticsearch/search/internal/AliasFilterTests.java diff --git a/core/src/test/java/org/elasticsearch/search/internal/ScrollContextTests.java b/server/src/test/java/org/elasticsearch/search/internal/ScrollContextTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/internal/ScrollContextTests.java rename to server/src/test/java/org/elasticsearch/search/internal/ScrollContextTests.java diff --git a/core/src/test/java/org/elasticsearch/search/internal/ShardSearchTransportRequestTests.java b/server/src/test/java/org/elasticsearch/search/internal/ShardSearchTransportRequestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/internal/ShardSearchTransportRequestTests.java rename to server/src/test/java/org/elasticsearch/search/internal/ShardSearchTransportRequestTests.java diff --git a/core/src/test/java/org/elasticsearch/search/morelikethis/MoreLikeThisIT.java b/server/src/test/java/org/elasticsearch/search/morelikethis/MoreLikeThisIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/morelikethis/MoreLikeThisIT.java rename to server/src/test/java/org/elasticsearch/search/morelikethis/MoreLikeThisIT.java diff --git a/core/src/test/java/org/elasticsearch/search/msearch/MultiSearchIT.java b/server/src/test/java/org/elasticsearch/search/msearch/MultiSearchIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/msearch/MultiSearchIT.java rename to server/src/test/java/org/elasticsearch/search/msearch/MultiSearchIT.java diff --git a/core/src/test/java/org/elasticsearch/search/nested/SimpleNestedIT.java b/server/src/test/java/org/elasticsearch/search/nested/SimpleNestedIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/nested/SimpleNestedIT.java rename to server/src/test/java/org/elasticsearch/search/nested/SimpleNestedIT.java diff --git a/core/src/test/java/org/elasticsearch/search/preference/SearchPreferenceIT.java b/server/src/test/java/org/elasticsearch/search/preference/SearchPreferenceIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/preference/SearchPreferenceIT.java rename to server/src/test/java/org/elasticsearch/search/preference/SearchPreferenceIT.java diff --git a/core/src/test/java/org/elasticsearch/search/profile/ProfileResultTests.java b/server/src/test/java/org/elasticsearch/search/profile/ProfileResultTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/profile/ProfileResultTests.java rename to server/src/test/java/org/elasticsearch/search/profile/ProfileResultTests.java diff --git a/core/src/test/java/org/elasticsearch/search/profile/SearchProfileShardResultsTests.java b/server/src/test/java/org/elasticsearch/search/profile/SearchProfileShardResultsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/profile/SearchProfileShardResultsTests.java rename to server/src/test/java/org/elasticsearch/search/profile/SearchProfileShardResultsTests.java diff --git a/core/src/test/java/org/elasticsearch/search/profile/TimerTests.java b/server/src/test/java/org/elasticsearch/search/profile/TimerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/profile/TimerTests.java rename to server/src/test/java/org/elasticsearch/search/profile/TimerTests.java diff --git a/core/src/test/java/org/elasticsearch/search/profile/aggregation/AggregationProfileShardResultTests.java b/server/src/test/java/org/elasticsearch/search/profile/aggregation/AggregationProfileShardResultTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/profile/aggregation/AggregationProfileShardResultTests.java rename to server/src/test/java/org/elasticsearch/search/profile/aggregation/AggregationProfileShardResultTests.java diff --git a/core/src/test/java/org/elasticsearch/search/profile/aggregation/AggregationProfilerIT.java b/server/src/test/java/org/elasticsearch/search/profile/aggregation/AggregationProfilerIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/profile/aggregation/AggregationProfilerIT.java rename to server/src/test/java/org/elasticsearch/search/profile/aggregation/AggregationProfilerIT.java diff --git a/core/src/test/java/org/elasticsearch/search/profile/query/CollectorResultTests.java b/server/src/test/java/org/elasticsearch/search/profile/query/CollectorResultTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/profile/query/CollectorResultTests.java rename to server/src/test/java/org/elasticsearch/search/profile/query/CollectorResultTests.java diff --git a/core/src/test/java/org/elasticsearch/search/profile/query/QueryProfileShardResultTests.java b/server/src/test/java/org/elasticsearch/search/profile/query/QueryProfileShardResultTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/profile/query/QueryProfileShardResultTests.java rename to server/src/test/java/org/elasticsearch/search/profile/query/QueryProfileShardResultTests.java diff --git a/core/src/test/java/org/elasticsearch/search/profile/query/QueryProfilerIT.java b/server/src/test/java/org/elasticsearch/search/profile/query/QueryProfilerIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/profile/query/QueryProfilerIT.java rename to server/src/test/java/org/elasticsearch/search/profile/query/QueryProfilerIT.java diff --git a/core/src/test/java/org/elasticsearch/search/profile/query/QueryProfilerTests.java b/server/src/test/java/org/elasticsearch/search/profile/query/QueryProfilerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/profile/query/QueryProfilerTests.java rename to server/src/test/java/org/elasticsearch/search/profile/query/QueryProfilerTests.java diff --git a/core/src/test/java/org/elasticsearch/search/profile/query/RandomQueryGenerator.java b/server/src/test/java/org/elasticsearch/search/profile/query/RandomQueryGenerator.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/profile/query/RandomQueryGenerator.java rename to server/src/test/java/org/elasticsearch/search/profile/query/RandomQueryGenerator.java diff --git a/core/src/test/java/org/elasticsearch/search/query/ExistsIT.java b/server/src/test/java/org/elasticsearch/search/query/ExistsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/query/ExistsIT.java rename to server/src/test/java/org/elasticsearch/search/query/ExistsIT.java diff --git a/core/src/test/java/org/elasticsearch/search/query/MultiMatchQueryIT.java b/server/src/test/java/org/elasticsearch/search/query/MultiMatchQueryIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/query/MultiMatchQueryIT.java rename to server/src/test/java/org/elasticsearch/search/query/MultiMatchQueryIT.java diff --git a/core/src/test/java/org/elasticsearch/search/query/QueryPhaseTests.java b/server/src/test/java/org/elasticsearch/search/query/QueryPhaseTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/query/QueryPhaseTests.java rename to server/src/test/java/org/elasticsearch/search/query/QueryPhaseTests.java diff --git a/core/src/test/java/org/elasticsearch/search/query/QueryStringIT.java b/server/src/test/java/org/elasticsearch/search/query/QueryStringIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/query/QueryStringIT.java rename to server/src/test/java/org/elasticsearch/search/query/QueryStringIT.java diff --git a/core/src/test/java/org/elasticsearch/search/query/SearchQueryIT.java b/server/src/test/java/org/elasticsearch/search/query/SearchQueryIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/query/SearchQueryIT.java rename to server/src/test/java/org/elasticsearch/search/query/SearchQueryIT.java diff --git a/core/src/test/java/org/elasticsearch/search/query/SimpleQueryStringIT.java b/server/src/test/java/org/elasticsearch/search/query/SimpleQueryStringIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/query/SimpleQueryStringIT.java rename to server/src/test/java/org/elasticsearch/search/query/SimpleQueryStringIT.java diff --git a/core/src/test/java/org/elasticsearch/search/rescore/QueryRescoreModeTests.java b/server/src/test/java/org/elasticsearch/search/rescore/QueryRescoreModeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/rescore/QueryRescoreModeTests.java rename to server/src/test/java/org/elasticsearch/search/rescore/QueryRescoreModeTests.java diff --git a/core/src/test/java/org/elasticsearch/search/rescore/QueryRescorerBuilderTests.java b/server/src/test/java/org/elasticsearch/search/rescore/QueryRescorerBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/rescore/QueryRescorerBuilderTests.java rename to server/src/test/java/org/elasticsearch/search/rescore/QueryRescorerBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/search/scriptfilter/ScriptQuerySearchIT.java b/server/src/test/java/org/elasticsearch/search/scriptfilter/ScriptQuerySearchIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/scriptfilter/ScriptQuerySearchIT.java rename to server/src/test/java/org/elasticsearch/search/scriptfilter/ScriptQuerySearchIT.java diff --git a/core/src/test/java/org/elasticsearch/search/scroll/DuelScrollIT.java b/server/src/test/java/org/elasticsearch/search/scroll/DuelScrollIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/scroll/DuelScrollIT.java rename to server/src/test/java/org/elasticsearch/search/scroll/DuelScrollIT.java diff --git a/core/src/test/java/org/elasticsearch/search/scroll/RestClearScrollActionTests.java b/server/src/test/java/org/elasticsearch/search/scroll/RestClearScrollActionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/scroll/RestClearScrollActionTests.java rename to server/src/test/java/org/elasticsearch/search/scroll/RestClearScrollActionTests.java diff --git a/core/src/test/java/org/elasticsearch/search/scroll/RestSearchScrollActionTests.java b/server/src/test/java/org/elasticsearch/search/scroll/RestSearchScrollActionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/scroll/RestSearchScrollActionTests.java rename to server/src/test/java/org/elasticsearch/search/scroll/RestSearchScrollActionTests.java diff --git a/core/src/test/java/org/elasticsearch/search/scroll/SearchScrollIT.java b/server/src/test/java/org/elasticsearch/search/scroll/SearchScrollIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/scroll/SearchScrollIT.java rename to server/src/test/java/org/elasticsearch/search/scroll/SearchScrollIT.java diff --git a/core/src/test/java/org/elasticsearch/search/scroll/SearchScrollWithFailingNodesIT.java b/server/src/test/java/org/elasticsearch/search/scroll/SearchScrollWithFailingNodesIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/scroll/SearchScrollWithFailingNodesIT.java rename to server/src/test/java/org/elasticsearch/search/scroll/SearchScrollWithFailingNodesIT.java diff --git a/core/src/test/java/org/elasticsearch/search/searchafter/SearchAfterBuilderTests.java b/server/src/test/java/org/elasticsearch/search/searchafter/SearchAfterBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/searchafter/SearchAfterBuilderTests.java rename to server/src/test/java/org/elasticsearch/search/searchafter/SearchAfterBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/search/searchafter/SearchAfterIT.java b/server/src/test/java/org/elasticsearch/search/searchafter/SearchAfterIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/searchafter/SearchAfterIT.java rename to server/src/test/java/org/elasticsearch/search/searchafter/SearchAfterIT.java diff --git a/core/src/test/java/org/elasticsearch/search/simple/SimpleSearchIT.java b/server/src/test/java/org/elasticsearch/search/simple/SimpleSearchIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/simple/SimpleSearchIT.java rename to server/src/test/java/org/elasticsearch/search/simple/SimpleSearchIT.java diff --git a/core/src/test/java/org/elasticsearch/search/slice/DocValuesSliceQueryTests.java b/server/src/test/java/org/elasticsearch/search/slice/DocValuesSliceQueryTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/slice/DocValuesSliceQueryTests.java rename to server/src/test/java/org/elasticsearch/search/slice/DocValuesSliceQueryTests.java diff --git a/core/src/test/java/org/elasticsearch/search/slice/SearchSliceIT.java b/server/src/test/java/org/elasticsearch/search/slice/SearchSliceIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/slice/SearchSliceIT.java rename to server/src/test/java/org/elasticsearch/search/slice/SearchSliceIT.java diff --git a/core/src/test/java/org/elasticsearch/search/slice/SliceBuilderTests.java b/server/src/test/java/org/elasticsearch/search/slice/SliceBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/slice/SliceBuilderTests.java rename to server/src/test/java/org/elasticsearch/search/slice/SliceBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/search/slice/TermsSliceQueryTests.java b/server/src/test/java/org/elasticsearch/search/slice/TermsSliceQueryTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/slice/TermsSliceQueryTests.java rename to server/src/test/java/org/elasticsearch/search/slice/TermsSliceQueryTests.java diff --git a/core/src/test/java/org/elasticsearch/search/sort/AbstractSortTestCase.java b/server/src/test/java/org/elasticsearch/search/sort/AbstractSortTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/sort/AbstractSortTestCase.java rename to server/src/test/java/org/elasticsearch/search/sort/AbstractSortTestCase.java diff --git a/core/src/test/java/org/elasticsearch/search/sort/FieldSortBuilderTests.java b/server/src/test/java/org/elasticsearch/search/sort/FieldSortBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/sort/FieldSortBuilderTests.java rename to server/src/test/java/org/elasticsearch/search/sort/FieldSortBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/search/sort/FieldSortIT.java b/server/src/test/java/org/elasticsearch/search/sort/FieldSortIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/sort/FieldSortIT.java rename to server/src/test/java/org/elasticsearch/search/sort/FieldSortIT.java diff --git a/core/src/test/java/org/elasticsearch/search/sort/GeoDistanceIT.java b/server/src/test/java/org/elasticsearch/search/sort/GeoDistanceIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/sort/GeoDistanceIT.java rename to server/src/test/java/org/elasticsearch/search/sort/GeoDistanceIT.java diff --git a/core/src/test/java/org/elasticsearch/search/sort/GeoDistanceSortBuilderIT.java b/server/src/test/java/org/elasticsearch/search/sort/GeoDistanceSortBuilderIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/sort/GeoDistanceSortBuilderIT.java rename to server/src/test/java/org/elasticsearch/search/sort/GeoDistanceSortBuilderIT.java diff --git a/core/src/test/java/org/elasticsearch/search/sort/GeoDistanceSortBuilderTests.java b/server/src/test/java/org/elasticsearch/search/sort/GeoDistanceSortBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/sort/GeoDistanceSortBuilderTests.java rename to server/src/test/java/org/elasticsearch/search/sort/GeoDistanceSortBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/search/sort/NestedSortBuilderTests.java b/server/src/test/java/org/elasticsearch/search/sort/NestedSortBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/sort/NestedSortBuilderTests.java rename to server/src/test/java/org/elasticsearch/search/sort/NestedSortBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/search/sort/ScoreSortBuilderTests.java b/server/src/test/java/org/elasticsearch/search/sort/ScoreSortBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/sort/ScoreSortBuilderTests.java rename to server/src/test/java/org/elasticsearch/search/sort/ScoreSortBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/search/sort/ScriptSortBuilderTests.java b/server/src/test/java/org/elasticsearch/search/sort/ScriptSortBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/sort/ScriptSortBuilderTests.java rename to server/src/test/java/org/elasticsearch/search/sort/ScriptSortBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/search/sort/SimpleSortIT.java b/server/src/test/java/org/elasticsearch/search/sort/SimpleSortIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/sort/SimpleSortIT.java rename to server/src/test/java/org/elasticsearch/search/sort/SimpleSortIT.java diff --git a/core/src/test/java/org/elasticsearch/search/sort/SortBuilderTests.java b/server/src/test/java/org/elasticsearch/search/sort/SortBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/sort/SortBuilderTests.java rename to server/src/test/java/org/elasticsearch/search/sort/SortBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/search/sort/SortModeTests.java b/server/src/test/java/org/elasticsearch/search/sort/SortModeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/sort/SortModeTests.java rename to server/src/test/java/org/elasticsearch/search/sort/SortModeTests.java diff --git a/core/src/test/java/org/elasticsearch/search/sort/SortOrderTests.java b/server/src/test/java/org/elasticsearch/search/sort/SortOrderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/sort/SortOrderTests.java rename to server/src/test/java/org/elasticsearch/search/sort/SortOrderTests.java diff --git a/core/src/test/java/org/elasticsearch/search/source/MetadataFetchingIT.java b/server/src/test/java/org/elasticsearch/search/source/MetadataFetchingIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/source/MetadataFetchingIT.java rename to server/src/test/java/org/elasticsearch/search/source/MetadataFetchingIT.java diff --git a/core/src/test/java/org/elasticsearch/search/source/SourceFetchingIT.java b/server/src/test/java/org/elasticsearch/search/source/SourceFetchingIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/source/SourceFetchingIT.java rename to server/src/test/java/org/elasticsearch/search/source/SourceFetchingIT.java diff --git a/core/src/test/java/org/elasticsearch/search/stats/SearchStatsIT.java b/server/src/test/java/org/elasticsearch/search/stats/SearchStatsIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/stats/SearchStatsIT.java rename to server/src/test/java/org/elasticsearch/search/stats/SearchStatsIT.java diff --git a/core/src/test/java/org/elasticsearch/search/stats/SearchStatsUnitTests.java b/server/src/test/java/org/elasticsearch/search/stats/SearchStatsUnitTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/stats/SearchStatsUnitTests.java rename to server/src/test/java/org/elasticsearch/search/stats/SearchStatsUnitTests.java diff --git a/core/src/test/java/org/elasticsearch/search/suggest/AbstractSuggestionBuilderTestCase.java b/server/src/test/java/org/elasticsearch/search/suggest/AbstractSuggestionBuilderTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/suggest/AbstractSuggestionBuilderTestCase.java rename to server/src/test/java/org/elasticsearch/search/suggest/AbstractSuggestionBuilderTestCase.java diff --git a/core/src/test/java/org/elasticsearch/search/suggest/CompletionSuggestSearchIT.java b/server/src/test/java/org/elasticsearch/search/suggest/CompletionSuggestSearchIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/suggest/CompletionSuggestSearchIT.java rename to server/src/test/java/org/elasticsearch/search/suggest/CompletionSuggestSearchIT.java diff --git a/core/src/test/java/org/elasticsearch/search/suggest/CompletionSuggestionOptionTests.java b/server/src/test/java/org/elasticsearch/search/suggest/CompletionSuggestionOptionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/suggest/CompletionSuggestionOptionTests.java rename to server/src/test/java/org/elasticsearch/search/suggest/CompletionSuggestionOptionTests.java diff --git a/core/src/test/java/org/elasticsearch/search/suggest/ContextCompletionSuggestSearchIT.java b/server/src/test/java/org/elasticsearch/search/suggest/ContextCompletionSuggestSearchIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/suggest/ContextCompletionSuggestSearchIT.java rename to server/src/test/java/org/elasticsearch/search/suggest/ContextCompletionSuggestSearchIT.java diff --git a/core/src/test/java/org/elasticsearch/search/suggest/CustomSuggester.java b/server/src/test/java/org/elasticsearch/search/suggest/CustomSuggester.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/suggest/CustomSuggester.java rename to server/src/test/java/org/elasticsearch/search/suggest/CustomSuggester.java diff --git a/core/src/test/java/org/elasticsearch/search/suggest/CustomSuggesterSearchIT.java b/server/src/test/java/org/elasticsearch/search/suggest/CustomSuggesterSearchIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/suggest/CustomSuggesterSearchIT.java rename to server/src/test/java/org/elasticsearch/search/suggest/CustomSuggesterSearchIT.java diff --git a/core/src/test/java/org/elasticsearch/search/suggest/SuggestBuilderTests.java b/server/src/test/java/org/elasticsearch/search/suggest/SuggestBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/suggest/SuggestBuilderTests.java rename to server/src/test/java/org/elasticsearch/search/suggest/SuggestBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/search/suggest/SuggestSearchIT.java b/server/src/test/java/org/elasticsearch/search/suggest/SuggestSearchIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/suggest/SuggestSearchIT.java rename to server/src/test/java/org/elasticsearch/search/suggest/SuggestSearchIT.java diff --git a/core/src/test/java/org/elasticsearch/search/suggest/SuggestTests.java b/server/src/test/java/org/elasticsearch/search/suggest/SuggestTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/suggest/SuggestTests.java rename to server/src/test/java/org/elasticsearch/search/suggest/SuggestTests.java diff --git a/core/src/test/java/org/elasticsearch/search/suggest/SuggestionEntryTests.java b/server/src/test/java/org/elasticsearch/search/suggest/SuggestionEntryTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/suggest/SuggestionEntryTests.java rename to server/src/test/java/org/elasticsearch/search/suggest/SuggestionEntryTests.java diff --git a/core/src/test/java/org/elasticsearch/search/suggest/SuggestionOptionTests.java b/server/src/test/java/org/elasticsearch/search/suggest/SuggestionOptionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/suggest/SuggestionOptionTests.java rename to server/src/test/java/org/elasticsearch/search/suggest/SuggestionOptionTests.java diff --git a/core/src/test/java/org/elasticsearch/search/suggest/SuggestionTests.java b/server/src/test/java/org/elasticsearch/search/suggest/SuggestionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/suggest/SuggestionTests.java rename to server/src/test/java/org/elasticsearch/search/suggest/SuggestionTests.java diff --git a/core/src/test/java/org/elasticsearch/search/suggest/TermSuggestionOptionTests.java b/server/src/test/java/org/elasticsearch/search/suggest/TermSuggestionOptionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/suggest/TermSuggestionOptionTests.java rename to server/src/test/java/org/elasticsearch/search/suggest/TermSuggestionOptionTests.java diff --git a/core/src/test/java/org/elasticsearch/search/suggest/completion/CategoryContextMappingTests.java b/server/src/test/java/org/elasticsearch/search/suggest/completion/CategoryContextMappingTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/suggest/completion/CategoryContextMappingTests.java rename to server/src/test/java/org/elasticsearch/search/suggest/completion/CategoryContextMappingTests.java diff --git a/core/src/test/java/org/elasticsearch/search/suggest/completion/CategoryQueryContextTests.java b/server/src/test/java/org/elasticsearch/search/suggest/completion/CategoryQueryContextTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/suggest/completion/CategoryQueryContextTests.java rename to server/src/test/java/org/elasticsearch/search/suggest/completion/CategoryQueryContextTests.java diff --git a/core/src/test/java/org/elasticsearch/search/suggest/completion/CompletionSuggesterBuilderTests.java b/server/src/test/java/org/elasticsearch/search/suggest/completion/CompletionSuggesterBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/suggest/completion/CompletionSuggesterBuilderTests.java rename to server/src/test/java/org/elasticsearch/search/suggest/completion/CompletionSuggesterBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/search/suggest/completion/CompletionSuggestionTests.java b/server/src/test/java/org/elasticsearch/search/suggest/completion/CompletionSuggestionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/suggest/completion/CompletionSuggestionTests.java rename to server/src/test/java/org/elasticsearch/search/suggest/completion/CompletionSuggestionTests.java diff --git a/core/src/test/java/org/elasticsearch/search/suggest/completion/FuzzyOptionsTests.java b/server/src/test/java/org/elasticsearch/search/suggest/completion/FuzzyOptionsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/suggest/completion/FuzzyOptionsTests.java rename to server/src/test/java/org/elasticsearch/search/suggest/completion/FuzzyOptionsTests.java diff --git a/core/src/test/java/org/elasticsearch/search/suggest/completion/GeoContextMappingTests.java b/server/src/test/java/org/elasticsearch/search/suggest/completion/GeoContextMappingTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/suggest/completion/GeoContextMappingTests.java rename to server/src/test/java/org/elasticsearch/search/suggest/completion/GeoContextMappingTests.java diff --git a/core/src/test/java/org/elasticsearch/search/suggest/completion/GeoQueryContextTests.java b/server/src/test/java/org/elasticsearch/search/suggest/completion/GeoQueryContextTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/suggest/completion/GeoQueryContextTests.java rename to server/src/test/java/org/elasticsearch/search/suggest/completion/GeoQueryContextTests.java diff --git a/core/src/test/java/org/elasticsearch/search/suggest/completion/QueryContextTestCase.java b/server/src/test/java/org/elasticsearch/search/suggest/completion/QueryContextTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/suggest/completion/QueryContextTestCase.java rename to server/src/test/java/org/elasticsearch/search/suggest/completion/QueryContextTestCase.java diff --git a/core/src/test/java/org/elasticsearch/search/suggest/completion/RegexOptionsTests.java b/server/src/test/java/org/elasticsearch/search/suggest/completion/RegexOptionsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/suggest/completion/RegexOptionsTests.java rename to server/src/test/java/org/elasticsearch/search/suggest/completion/RegexOptionsTests.java diff --git a/core/src/test/java/org/elasticsearch/search/suggest/phrase/DirectCandidateGeneratorTests.java b/server/src/test/java/org/elasticsearch/search/suggest/phrase/DirectCandidateGeneratorTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/suggest/phrase/DirectCandidateGeneratorTests.java rename to server/src/test/java/org/elasticsearch/search/suggest/phrase/DirectCandidateGeneratorTests.java diff --git a/core/src/test/java/org/elasticsearch/search/suggest/phrase/LaplaceModelTests.java b/server/src/test/java/org/elasticsearch/search/suggest/phrase/LaplaceModelTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/suggest/phrase/LaplaceModelTests.java rename to server/src/test/java/org/elasticsearch/search/suggest/phrase/LaplaceModelTests.java diff --git a/core/src/test/java/org/elasticsearch/search/suggest/phrase/LinearInterpolationModelTests.java b/server/src/test/java/org/elasticsearch/search/suggest/phrase/LinearInterpolationModelTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/suggest/phrase/LinearInterpolationModelTests.java rename to server/src/test/java/org/elasticsearch/search/suggest/phrase/LinearInterpolationModelTests.java diff --git a/core/src/test/java/org/elasticsearch/search/suggest/phrase/NoisyChannelSpellCheckerTests.java b/server/src/test/java/org/elasticsearch/search/suggest/phrase/NoisyChannelSpellCheckerTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/suggest/phrase/NoisyChannelSpellCheckerTests.java rename to server/src/test/java/org/elasticsearch/search/suggest/phrase/NoisyChannelSpellCheckerTests.java diff --git a/core/src/test/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilderTests.java b/server/src/test/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilderTests.java rename to server/src/test/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/search/suggest/phrase/SmoothingModelTestCase.java b/server/src/test/java/org/elasticsearch/search/suggest/phrase/SmoothingModelTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/suggest/phrase/SmoothingModelTestCase.java rename to server/src/test/java/org/elasticsearch/search/suggest/phrase/SmoothingModelTestCase.java diff --git a/core/src/test/java/org/elasticsearch/search/suggest/phrase/StupidBackoffModelTests.java b/server/src/test/java/org/elasticsearch/search/suggest/phrase/StupidBackoffModelTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/suggest/phrase/StupidBackoffModelTests.java rename to server/src/test/java/org/elasticsearch/search/suggest/phrase/StupidBackoffModelTests.java diff --git a/core/src/test/java/org/elasticsearch/search/suggest/term/SortByTests.java b/server/src/test/java/org/elasticsearch/search/suggest/term/SortByTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/suggest/term/SortByTests.java rename to server/src/test/java/org/elasticsearch/search/suggest/term/SortByTests.java diff --git a/core/src/test/java/org/elasticsearch/search/suggest/term/StringDistanceImplTests.java b/server/src/test/java/org/elasticsearch/search/suggest/term/StringDistanceImplTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/suggest/term/StringDistanceImplTests.java rename to server/src/test/java/org/elasticsearch/search/suggest/term/StringDistanceImplTests.java diff --git a/core/src/test/java/org/elasticsearch/search/suggest/term/SuggestModeTests.java b/server/src/test/java/org/elasticsearch/search/suggest/term/SuggestModeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/suggest/term/SuggestModeTests.java rename to server/src/test/java/org/elasticsearch/search/suggest/term/SuggestModeTests.java diff --git a/core/src/test/java/org/elasticsearch/search/suggest/term/TermSuggestionBuilderTests.java b/server/src/test/java/org/elasticsearch/search/suggest/term/TermSuggestionBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/search/suggest/term/TermSuggestionBuilderTests.java rename to server/src/test/java/org/elasticsearch/search/suggest/term/TermSuggestionBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/similarity/SimilarityIT.java b/server/src/test/java/org/elasticsearch/similarity/SimilarityIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/similarity/SimilarityIT.java rename to server/src/test/java/org/elasticsearch/similarity/SimilarityIT.java diff --git a/core/src/test/java/org/elasticsearch/snapshots/AbstractSnapshotIntegTestCase.java b/server/src/test/java/org/elasticsearch/snapshots/AbstractSnapshotIntegTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/snapshots/AbstractSnapshotIntegTestCase.java rename to server/src/test/java/org/elasticsearch/snapshots/AbstractSnapshotIntegTestCase.java diff --git a/core/src/test/java/org/elasticsearch/snapshots/BlobStoreFormatIT.java b/server/src/test/java/org/elasticsearch/snapshots/BlobStoreFormatIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/snapshots/BlobStoreFormatIT.java rename to server/src/test/java/org/elasticsearch/snapshots/BlobStoreFormatIT.java diff --git a/core/src/test/java/org/elasticsearch/snapshots/DedicatedClusterSnapshotRestoreIT.java b/server/src/test/java/org/elasticsearch/snapshots/DedicatedClusterSnapshotRestoreIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/snapshots/DedicatedClusterSnapshotRestoreIT.java rename to server/src/test/java/org/elasticsearch/snapshots/DedicatedClusterSnapshotRestoreIT.java diff --git a/core/src/test/java/org/elasticsearch/snapshots/FsBlobStoreRepositoryIT.java b/server/src/test/java/org/elasticsearch/snapshots/FsBlobStoreRepositoryIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/snapshots/FsBlobStoreRepositoryIT.java rename to server/src/test/java/org/elasticsearch/snapshots/FsBlobStoreRepositoryIT.java diff --git a/core/src/test/java/org/elasticsearch/snapshots/MinThreadsSnapshotRestoreIT.java b/server/src/test/java/org/elasticsearch/snapshots/MinThreadsSnapshotRestoreIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/snapshots/MinThreadsSnapshotRestoreIT.java rename to server/src/test/java/org/elasticsearch/snapshots/MinThreadsSnapshotRestoreIT.java diff --git a/core/src/test/java/org/elasticsearch/snapshots/RepositoriesIT.java b/server/src/test/java/org/elasticsearch/snapshots/RepositoriesIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/snapshots/RepositoriesIT.java rename to server/src/test/java/org/elasticsearch/snapshots/RepositoriesIT.java diff --git a/core/src/test/java/org/elasticsearch/snapshots/RepositoriesMetaDataSerializationTests.java b/server/src/test/java/org/elasticsearch/snapshots/RepositoriesMetaDataSerializationTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/snapshots/RepositoriesMetaDataSerializationTests.java rename to server/src/test/java/org/elasticsearch/snapshots/RepositoriesMetaDataSerializationTests.java diff --git a/core/src/test/java/org/elasticsearch/snapshots/SharedClusterSnapshotRestoreIT.java b/server/src/test/java/org/elasticsearch/snapshots/SharedClusterSnapshotRestoreIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/snapshots/SharedClusterSnapshotRestoreIT.java rename to server/src/test/java/org/elasticsearch/snapshots/SharedClusterSnapshotRestoreIT.java diff --git a/core/src/test/java/org/elasticsearch/snapshots/SnapshotRequestsTests.java b/server/src/test/java/org/elasticsearch/snapshots/SnapshotRequestsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/snapshots/SnapshotRequestsTests.java rename to server/src/test/java/org/elasticsearch/snapshots/SnapshotRequestsTests.java diff --git a/core/src/test/java/org/elasticsearch/snapshots/SnapshotShardsServiceIT.java b/server/src/test/java/org/elasticsearch/snapshots/SnapshotShardsServiceIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/snapshots/SnapshotShardsServiceIT.java rename to server/src/test/java/org/elasticsearch/snapshots/SnapshotShardsServiceIT.java diff --git a/core/src/test/java/org/elasticsearch/snapshots/SnapshotTests.java b/server/src/test/java/org/elasticsearch/snapshots/SnapshotTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/snapshots/SnapshotTests.java rename to server/src/test/java/org/elasticsearch/snapshots/SnapshotTests.java diff --git a/core/src/test/java/org/elasticsearch/snapshots/SnapshotUtilsTests.java b/server/src/test/java/org/elasticsearch/snapshots/SnapshotUtilsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/snapshots/SnapshotUtilsTests.java rename to server/src/test/java/org/elasticsearch/snapshots/SnapshotUtilsTests.java diff --git a/core/src/test/java/org/elasticsearch/snapshots/SnapshotsInProgressSerializationTests.java b/server/src/test/java/org/elasticsearch/snapshots/SnapshotsInProgressSerializationTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/snapshots/SnapshotsInProgressSerializationTests.java rename to server/src/test/java/org/elasticsearch/snapshots/SnapshotsInProgressSerializationTests.java diff --git a/core/src/test/java/org/elasticsearch/snapshots/mockstore/BlobContainerWrapper.java b/server/src/test/java/org/elasticsearch/snapshots/mockstore/BlobContainerWrapper.java similarity index 100% rename from core/src/test/java/org/elasticsearch/snapshots/mockstore/BlobContainerWrapper.java rename to server/src/test/java/org/elasticsearch/snapshots/mockstore/BlobContainerWrapper.java diff --git a/core/src/test/java/org/elasticsearch/snapshots/mockstore/BlobStoreWrapper.java b/server/src/test/java/org/elasticsearch/snapshots/mockstore/BlobStoreWrapper.java similarity index 100% rename from core/src/test/java/org/elasticsearch/snapshots/mockstore/BlobStoreWrapper.java rename to server/src/test/java/org/elasticsearch/snapshots/mockstore/BlobStoreWrapper.java diff --git a/core/src/test/java/org/elasticsearch/snapshots/mockstore/MockRepository.java b/server/src/test/java/org/elasticsearch/snapshots/mockstore/MockRepository.java similarity index 100% rename from core/src/test/java/org/elasticsearch/snapshots/mockstore/MockRepository.java rename to server/src/test/java/org/elasticsearch/snapshots/mockstore/MockRepository.java diff --git a/core/src/test/java/org/elasticsearch/tasks/ListTasksResponseTests.java b/server/src/test/java/org/elasticsearch/tasks/ListTasksResponseTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/tasks/ListTasksResponseTests.java rename to server/src/test/java/org/elasticsearch/tasks/ListTasksResponseTests.java diff --git a/core/src/test/java/org/elasticsearch/tasks/TaskIdTests.java b/server/src/test/java/org/elasticsearch/tasks/TaskIdTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/tasks/TaskIdTests.java rename to server/src/test/java/org/elasticsearch/tasks/TaskIdTests.java diff --git a/core/src/test/java/org/elasticsearch/tasks/TaskResultTests.java b/server/src/test/java/org/elasticsearch/tasks/TaskResultTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/tasks/TaskResultTests.java rename to server/src/test/java/org/elasticsearch/tasks/TaskResultTests.java diff --git a/core/src/test/java/org/elasticsearch/test/NoopDiscovery.java b/server/src/test/java/org/elasticsearch/test/NoopDiscovery.java similarity index 100% rename from core/src/test/java/org/elasticsearch/test/NoopDiscovery.java rename to server/src/test/java/org/elasticsearch/test/NoopDiscovery.java diff --git a/core/src/test/java/org/elasticsearch/test/geo/RandomGeoGenerator.java b/server/src/test/java/org/elasticsearch/test/geo/RandomGeoGenerator.java similarity index 100% rename from core/src/test/java/org/elasticsearch/test/geo/RandomGeoGenerator.java rename to server/src/test/java/org/elasticsearch/test/geo/RandomGeoGenerator.java diff --git a/core/src/test/java/org/elasticsearch/test/geo/RandomShapeGenerator.java b/server/src/test/java/org/elasticsearch/test/geo/RandomShapeGenerator.java similarity index 100% rename from core/src/test/java/org/elasticsearch/test/geo/RandomShapeGenerator.java rename to server/src/test/java/org/elasticsearch/test/geo/RandomShapeGenerator.java diff --git a/core/src/test/java/org/elasticsearch/test/hamcrest/DoubleMatcher.java b/server/src/test/java/org/elasticsearch/test/hamcrest/DoubleMatcher.java similarity index 100% rename from core/src/test/java/org/elasticsearch/test/hamcrest/DoubleMatcher.java rename to server/src/test/java/org/elasticsearch/test/hamcrest/DoubleMatcher.java diff --git a/core/src/test/java/org/elasticsearch/test/hamcrest/ElasticsearchGeoAssertions.java b/server/src/test/java/org/elasticsearch/test/hamcrest/ElasticsearchGeoAssertions.java similarity index 100% rename from core/src/test/java/org/elasticsearch/test/hamcrest/ElasticsearchGeoAssertions.java rename to server/src/test/java/org/elasticsearch/test/hamcrest/ElasticsearchGeoAssertions.java diff --git a/core/src/test/java/org/elasticsearch/test/search/aggregations/bucket/SharedSignificantTermsTestMethods.java b/server/src/test/java/org/elasticsearch/test/search/aggregations/bucket/SharedSignificantTermsTestMethods.java similarity index 100% rename from core/src/test/java/org/elasticsearch/test/search/aggregations/bucket/SharedSignificantTermsTestMethods.java rename to server/src/test/java/org/elasticsearch/test/search/aggregations/bucket/SharedSignificantTermsTestMethods.java diff --git a/core/src/test/java/org/elasticsearch/threadpool/AutoQueueAdjustingExecutorBuilderTests.java b/server/src/test/java/org/elasticsearch/threadpool/AutoQueueAdjustingExecutorBuilderTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/threadpool/AutoQueueAdjustingExecutorBuilderTests.java rename to server/src/test/java/org/elasticsearch/threadpool/AutoQueueAdjustingExecutorBuilderTests.java diff --git a/core/src/test/java/org/elasticsearch/threadpool/ESThreadPoolTestCase.java b/server/src/test/java/org/elasticsearch/threadpool/ESThreadPoolTestCase.java similarity index 100% rename from core/src/test/java/org/elasticsearch/threadpool/ESThreadPoolTestCase.java rename to server/src/test/java/org/elasticsearch/threadpool/ESThreadPoolTestCase.java diff --git a/core/src/test/java/org/elasticsearch/threadpool/FixedThreadPoolTests.java b/server/src/test/java/org/elasticsearch/threadpool/FixedThreadPoolTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/threadpool/FixedThreadPoolTests.java rename to server/src/test/java/org/elasticsearch/threadpool/FixedThreadPoolTests.java diff --git a/core/src/test/java/org/elasticsearch/threadpool/ScalingThreadPoolTests.java b/server/src/test/java/org/elasticsearch/threadpool/ScalingThreadPoolTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/threadpool/ScalingThreadPoolTests.java rename to server/src/test/java/org/elasticsearch/threadpool/ScalingThreadPoolTests.java diff --git a/core/src/test/java/org/elasticsearch/threadpool/ScheduleWithFixedDelayTests.java b/server/src/test/java/org/elasticsearch/threadpool/ScheduleWithFixedDelayTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/threadpool/ScheduleWithFixedDelayTests.java rename to server/src/test/java/org/elasticsearch/threadpool/ScheduleWithFixedDelayTests.java diff --git a/core/src/test/java/org/elasticsearch/threadpool/SimpleThreadPoolIT.java b/server/src/test/java/org/elasticsearch/threadpool/SimpleThreadPoolIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/threadpool/SimpleThreadPoolIT.java rename to server/src/test/java/org/elasticsearch/threadpool/SimpleThreadPoolIT.java diff --git a/core/src/test/java/org/elasticsearch/threadpool/ThreadPoolSerializationTests.java b/server/src/test/java/org/elasticsearch/threadpool/ThreadPoolSerializationTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/threadpool/ThreadPoolSerializationTests.java rename to server/src/test/java/org/elasticsearch/threadpool/ThreadPoolSerializationTests.java diff --git a/core/src/test/java/org/elasticsearch/threadpool/ThreadPoolStatsTests.java b/server/src/test/java/org/elasticsearch/threadpool/ThreadPoolStatsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/threadpool/ThreadPoolStatsTests.java rename to server/src/test/java/org/elasticsearch/threadpool/ThreadPoolStatsTests.java diff --git a/core/src/test/java/org/elasticsearch/threadpool/ThreadPoolTests.java b/server/src/test/java/org/elasticsearch/threadpool/ThreadPoolTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/threadpool/ThreadPoolTests.java rename to server/src/test/java/org/elasticsearch/threadpool/ThreadPoolTests.java diff --git a/core/src/test/java/org/elasticsearch/threadpool/UpdateThreadPoolSettingsTests.java b/server/src/test/java/org/elasticsearch/threadpool/UpdateThreadPoolSettingsTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/threadpool/UpdateThreadPoolSettingsTests.java rename to server/src/test/java/org/elasticsearch/threadpool/UpdateThreadPoolSettingsTests.java diff --git a/core/src/test/java/org/elasticsearch/transport/ActionNamesIT.java b/server/src/test/java/org/elasticsearch/transport/ActionNamesIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/transport/ActionNamesIT.java rename to server/src/test/java/org/elasticsearch/transport/ActionNamesIT.java diff --git a/core/src/test/java/org/elasticsearch/transport/CompressibleBytesOutputStreamTests.java b/server/src/test/java/org/elasticsearch/transport/CompressibleBytesOutputStreamTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/transport/CompressibleBytesOutputStreamTests.java rename to server/src/test/java/org/elasticsearch/transport/CompressibleBytesOutputStreamTests.java diff --git a/core/src/test/java/org/elasticsearch/transport/ConnectionProfileTests.java b/server/src/test/java/org/elasticsearch/transport/ConnectionProfileTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/transport/ConnectionProfileTests.java rename to server/src/test/java/org/elasticsearch/transport/ConnectionProfileTests.java diff --git a/core/src/test/java/org/elasticsearch/transport/PublishPortTests.java b/server/src/test/java/org/elasticsearch/transport/PublishPortTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/transport/PublishPortTests.java rename to server/src/test/java/org/elasticsearch/transport/PublishPortTests.java diff --git a/core/src/test/java/org/elasticsearch/transport/RemoteClusterConnectionTests.java b/server/src/test/java/org/elasticsearch/transport/RemoteClusterConnectionTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/transport/RemoteClusterConnectionTests.java rename to server/src/test/java/org/elasticsearch/transport/RemoteClusterConnectionTests.java diff --git a/core/src/test/java/org/elasticsearch/transport/RemoteClusterServiceTests.java b/server/src/test/java/org/elasticsearch/transport/RemoteClusterServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/transport/RemoteClusterServiceTests.java rename to server/src/test/java/org/elasticsearch/transport/RemoteClusterServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/transport/TcpTransportTests.java b/server/src/test/java/org/elasticsearch/transport/TcpTransportTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/transport/TcpTransportTests.java rename to server/src/test/java/org/elasticsearch/transport/TcpTransportTests.java diff --git a/core/src/test/java/org/elasticsearch/transport/TransportActionProxyTests.java b/server/src/test/java/org/elasticsearch/transport/TransportActionProxyTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/transport/TransportActionProxyTests.java rename to server/src/test/java/org/elasticsearch/transport/TransportActionProxyTests.java diff --git a/core/src/test/java/org/elasticsearch/transport/TransportServiceHandshakeTests.java b/server/src/test/java/org/elasticsearch/transport/TransportServiceHandshakeTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/transport/TransportServiceHandshakeTests.java rename to server/src/test/java/org/elasticsearch/transport/TransportServiceHandshakeTests.java diff --git a/core/src/test/java/org/elasticsearch/update/UpdateIT.java b/server/src/test/java/org/elasticsearch/update/UpdateIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/update/UpdateIT.java rename to server/src/test/java/org/elasticsearch/update/UpdateIT.java diff --git a/core/src/test/java/org/elasticsearch/update/UpdateNoopIT.java b/server/src/test/java/org/elasticsearch/update/UpdateNoopIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/update/UpdateNoopIT.java rename to server/src/test/java/org/elasticsearch/update/UpdateNoopIT.java diff --git a/core/src/test/java/org/elasticsearch/usage/UsageServiceTests.java b/server/src/test/java/org/elasticsearch/usage/UsageServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/usage/UsageServiceTests.java rename to server/src/test/java/org/elasticsearch/usage/UsageServiceTests.java diff --git a/core/src/test/java/org/elasticsearch/validate/SimpleValidateQueryIT.java b/server/src/test/java/org/elasticsearch/validate/SimpleValidateQueryIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/validate/SimpleValidateQueryIT.java rename to server/src/test/java/org/elasticsearch/validate/SimpleValidateQueryIT.java diff --git a/core/src/test/java/org/elasticsearch/versioning/ConcurrentDocumentOperationIT.java b/server/src/test/java/org/elasticsearch/versioning/ConcurrentDocumentOperationIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/versioning/ConcurrentDocumentOperationIT.java rename to server/src/test/java/org/elasticsearch/versioning/ConcurrentDocumentOperationIT.java diff --git a/core/src/test/java/org/elasticsearch/versioning/SimpleVersioningIT.java b/server/src/test/java/org/elasticsearch/versioning/SimpleVersioningIT.java similarity index 100% rename from core/src/test/java/org/elasticsearch/versioning/SimpleVersioningIT.java rename to server/src/test/java/org/elasticsearch/versioning/SimpleVersioningIT.java diff --git a/core/src/test/java/org/elasticsearch/watcher/FileWatcherTests.java b/server/src/test/java/org/elasticsearch/watcher/FileWatcherTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/watcher/FileWatcherTests.java rename to server/src/test/java/org/elasticsearch/watcher/FileWatcherTests.java diff --git a/core/src/test/java/org/elasticsearch/watcher/ResourceWatcherServiceTests.java b/server/src/test/java/org/elasticsearch/watcher/ResourceWatcherServiceTests.java similarity index 100% rename from core/src/test/java/org/elasticsearch/watcher/ResourceWatcherServiceTests.java rename to server/src/test/java/org/elasticsearch/watcher/ResourceWatcherServiceTests.java diff --git a/core/src/test/resources/META-INF/services/org.elasticsearch.plugins.spi.NamedXContentProvider b/server/src/test/resources/META-INF/services/org.elasticsearch.plugins.spi.NamedXContentProvider similarity index 100% rename from core/src/test/resources/META-INF/services/org.elasticsearch.plugins.spi.NamedXContentProvider rename to server/src/test/resources/META-INF/services/org.elasticsearch.plugins.spi.NamedXContentProvider diff --git a/core/src/test/resources/config/elasticsearch.json b/server/src/test/resources/config/elasticsearch.json similarity index 100% rename from core/src/test/resources/config/elasticsearch.json rename to server/src/test/resources/config/elasticsearch.json diff --git a/core/src/test/resources/config/elasticsearch.yml b/server/src/test/resources/config/elasticsearch.yml similarity index 100% rename from core/src/test/resources/config/elasticsearch.yml rename to server/src/test/resources/config/elasticsearch.yml diff --git a/core/src/test/resources/config/garbage/garbage.yml b/server/src/test/resources/config/garbage/garbage.yml similarity index 100% rename from core/src/test/resources/config/garbage/garbage.yml rename to server/src/test/resources/config/garbage/garbage.yml diff --git a/core/src/test/resources/indices/analyze/conf_dir/hunspell/en_US/en_US.aff b/server/src/test/resources/indices/analyze/conf_dir/hunspell/en_US/en_US.aff similarity index 100% rename from core/src/test/resources/indices/analyze/conf_dir/hunspell/en_US/en_US.aff rename to server/src/test/resources/indices/analyze/conf_dir/hunspell/en_US/en_US.aff diff --git a/core/src/test/resources/indices/analyze/conf_dir/hunspell/en_US/en_US.dic b/server/src/test/resources/indices/analyze/conf_dir/hunspell/en_US/en_US.dic similarity index 100% rename from core/src/test/resources/indices/analyze/conf_dir/hunspell/en_US/en_US.dic rename to server/src/test/resources/indices/analyze/conf_dir/hunspell/en_US/en_US.dic diff --git a/core/src/test/resources/indices/analyze/conf_dir/hunspell/en_US_custom/en_US.aff b/server/src/test/resources/indices/analyze/conf_dir/hunspell/en_US_custom/en_US.aff similarity index 100% rename from core/src/test/resources/indices/analyze/conf_dir/hunspell/en_US_custom/en_US.aff rename to server/src/test/resources/indices/analyze/conf_dir/hunspell/en_US_custom/en_US.aff diff --git a/core/src/test/resources/indices/analyze/conf_dir/hunspell/en_US_custom/en_US.dic b/server/src/test/resources/indices/analyze/conf_dir/hunspell/en_US_custom/en_US.dic similarity index 100% rename from core/src/test/resources/indices/analyze/conf_dir/hunspell/en_US_custom/en_US.dic rename to server/src/test/resources/indices/analyze/conf_dir/hunspell/en_US_custom/en_US.dic diff --git a/core/src/test/resources/indices/analyze/conf_dir/hunspell/en_US_custom/settings.yml b/server/src/test/resources/indices/analyze/conf_dir/hunspell/en_US_custom/settings.yml similarity index 100% rename from core/src/test/resources/indices/analyze/conf_dir/hunspell/en_US_custom/settings.yml rename to server/src/test/resources/indices/analyze/conf_dir/hunspell/en_US_custom/settings.yml diff --git a/core/src/test/resources/indices/analyze/no_aff_conf_dir/hunspell/en_US/en_US.dic b/server/src/test/resources/indices/analyze/no_aff_conf_dir/hunspell/en_US/en_US.dic similarity index 100% rename from core/src/test/resources/indices/analyze/no_aff_conf_dir/hunspell/en_US/en_US.dic rename to server/src/test/resources/indices/analyze/no_aff_conf_dir/hunspell/en_US/en_US.dic diff --git a/core/src/test/resources/indices/analyze/two_aff_conf_dir/hunspell/en_US/en_AU.aff b/server/src/test/resources/indices/analyze/two_aff_conf_dir/hunspell/en_US/en_AU.aff similarity index 100% rename from core/src/test/resources/indices/analyze/two_aff_conf_dir/hunspell/en_US/en_AU.aff rename to server/src/test/resources/indices/analyze/two_aff_conf_dir/hunspell/en_US/en_AU.aff diff --git a/core/src/test/resources/indices/analyze/two_aff_conf_dir/hunspell/en_US/en_US.aff b/server/src/test/resources/indices/analyze/two_aff_conf_dir/hunspell/en_US/en_US.aff similarity index 100% rename from core/src/test/resources/indices/analyze/two_aff_conf_dir/hunspell/en_US/en_US.aff rename to server/src/test/resources/indices/analyze/two_aff_conf_dir/hunspell/en_US/en_US.aff diff --git a/core/src/test/resources/indices/analyze/two_aff_conf_dir/hunspell/en_US/en_US.dic b/server/src/test/resources/indices/analyze/two_aff_conf_dir/hunspell/en_US/en_US.dic similarity index 100% rename from core/src/test/resources/indices/analyze/two_aff_conf_dir/hunspell/en_US/en_US.dic rename to server/src/test/resources/indices/analyze/two_aff_conf_dir/hunspell/en_US/en_US.dic diff --git a/core/src/test/resources/indices/bwc/compressed-repo-1.7.4.zip b/server/src/test/resources/indices/bwc/compressed-repo-1.7.4.zip similarity index 100% rename from core/src/test/resources/indices/bwc/compressed-repo-1.7.4.zip rename to server/src/test/resources/indices/bwc/compressed-repo-1.7.4.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-0.20.6.zip b/server/src/test/resources/indices/bwc/unsupported-0.20.6.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-0.20.6.zip rename to server/src/test/resources/indices/bwc/unsupported-0.20.6.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-0.90.0.Beta1.zip b/server/src/test/resources/indices/bwc/unsupported-0.90.0.Beta1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-0.90.0.Beta1.zip rename to server/src/test/resources/indices/bwc/unsupported-0.90.0.Beta1.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-0.90.0.RC1.zip b/server/src/test/resources/indices/bwc/unsupported-0.90.0.RC1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-0.90.0.RC1.zip rename to server/src/test/resources/indices/bwc/unsupported-0.90.0.RC1.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-0.90.0.RC2.zip b/server/src/test/resources/indices/bwc/unsupported-0.90.0.RC2.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-0.90.0.RC2.zip rename to server/src/test/resources/indices/bwc/unsupported-0.90.0.RC2.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-0.90.0.zip b/server/src/test/resources/indices/bwc/unsupported-0.90.0.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-0.90.0.zip rename to server/src/test/resources/indices/bwc/unsupported-0.90.0.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-0.90.1.zip b/server/src/test/resources/indices/bwc/unsupported-0.90.1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-0.90.1.zip rename to server/src/test/resources/indices/bwc/unsupported-0.90.1.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-0.90.10.zip b/server/src/test/resources/indices/bwc/unsupported-0.90.10.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-0.90.10.zip rename to server/src/test/resources/indices/bwc/unsupported-0.90.10.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-0.90.11.zip b/server/src/test/resources/indices/bwc/unsupported-0.90.11.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-0.90.11.zip rename to server/src/test/resources/indices/bwc/unsupported-0.90.11.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-0.90.12.zip b/server/src/test/resources/indices/bwc/unsupported-0.90.12.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-0.90.12.zip rename to server/src/test/resources/indices/bwc/unsupported-0.90.12.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-0.90.13.zip b/server/src/test/resources/indices/bwc/unsupported-0.90.13.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-0.90.13.zip rename to server/src/test/resources/indices/bwc/unsupported-0.90.13.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-0.90.2.zip b/server/src/test/resources/indices/bwc/unsupported-0.90.2.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-0.90.2.zip rename to server/src/test/resources/indices/bwc/unsupported-0.90.2.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-0.90.3.zip b/server/src/test/resources/indices/bwc/unsupported-0.90.3.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-0.90.3.zip rename to server/src/test/resources/indices/bwc/unsupported-0.90.3.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-0.90.4.zip b/server/src/test/resources/indices/bwc/unsupported-0.90.4.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-0.90.4.zip rename to server/src/test/resources/indices/bwc/unsupported-0.90.4.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-0.90.5.zip b/server/src/test/resources/indices/bwc/unsupported-0.90.5.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-0.90.5.zip rename to server/src/test/resources/indices/bwc/unsupported-0.90.5.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-0.90.6.zip b/server/src/test/resources/indices/bwc/unsupported-0.90.6.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-0.90.6.zip rename to server/src/test/resources/indices/bwc/unsupported-0.90.6.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-0.90.7.zip b/server/src/test/resources/indices/bwc/unsupported-0.90.7.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-0.90.7.zip rename to server/src/test/resources/indices/bwc/unsupported-0.90.7.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-0.90.8.zip b/server/src/test/resources/indices/bwc/unsupported-0.90.8.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-0.90.8.zip rename to server/src/test/resources/indices/bwc/unsupported-0.90.8.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-0.90.9.zip b/server/src/test/resources/indices/bwc/unsupported-0.90.9.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-0.90.9.zip rename to server/src/test/resources/indices/bwc/unsupported-0.90.9.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.0.0.Beta1.zip b/server/src/test/resources/indices/bwc/unsupported-1.0.0.Beta1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.0.0.Beta1.zip rename to server/src/test/resources/indices/bwc/unsupported-1.0.0.Beta1.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.0.0.Beta2.zip b/server/src/test/resources/indices/bwc/unsupported-1.0.0.Beta2.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.0.0.Beta2.zip rename to server/src/test/resources/indices/bwc/unsupported-1.0.0.Beta2.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.0.0.RC1.zip b/server/src/test/resources/indices/bwc/unsupported-1.0.0.RC1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.0.0.RC1.zip rename to server/src/test/resources/indices/bwc/unsupported-1.0.0.RC1.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.0.0.RC2.zip b/server/src/test/resources/indices/bwc/unsupported-1.0.0.RC2.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.0.0.RC2.zip rename to server/src/test/resources/indices/bwc/unsupported-1.0.0.RC2.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.0.0.zip b/server/src/test/resources/indices/bwc/unsupported-1.0.0.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.0.0.zip rename to server/src/test/resources/indices/bwc/unsupported-1.0.0.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.0.1.zip b/server/src/test/resources/indices/bwc/unsupported-1.0.1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.0.1.zip rename to server/src/test/resources/indices/bwc/unsupported-1.0.1.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.0.2.zip b/server/src/test/resources/indices/bwc/unsupported-1.0.2.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.0.2.zip rename to server/src/test/resources/indices/bwc/unsupported-1.0.2.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.0.3.zip b/server/src/test/resources/indices/bwc/unsupported-1.0.3.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.0.3.zip rename to server/src/test/resources/indices/bwc/unsupported-1.0.3.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.1.0.zip b/server/src/test/resources/indices/bwc/unsupported-1.1.0.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.1.0.zip rename to server/src/test/resources/indices/bwc/unsupported-1.1.0.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.1.1.zip b/server/src/test/resources/indices/bwc/unsupported-1.1.1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.1.1.zip rename to server/src/test/resources/indices/bwc/unsupported-1.1.1.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.1.2.zip b/server/src/test/resources/indices/bwc/unsupported-1.1.2.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.1.2.zip rename to server/src/test/resources/indices/bwc/unsupported-1.1.2.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.2.0.zip b/server/src/test/resources/indices/bwc/unsupported-1.2.0.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.2.0.zip rename to server/src/test/resources/indices/bwc/unsupported-1.2.0.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.2.1.zip b/server/src/test/resources/indices/bwc/unsupported-1.2.1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.2.1.zip rename to server/src/test/resources/indices/bwc/unsupported-1.2.1.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.2.2.zip b/server/src/test/resources/indices/bwc/unsupported-1.2.2.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.2.2.zip rename to server/src/test/resources/indices/bwc/unsupported-1.2.2.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.2.3.zip b/server/src/test/resources/indices/bwc/unsupported-1.2.3.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.2.3.zip rename to server/src/test/resources/indices/bwc/unsupported-1.2.3.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.2.4.zip b/server/src/test/resources/indices/bwc/unsupported-1.2.4.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.2.4.zip rename to server/src/test/resources/indices/bwc/unsupported-1.2.4.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.3.0.zip b/server/src/test/resources/indices/bwc/unsupported-1.3.0.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.3.0.zip rename to server/src/test/resources/indices/bwc/unsupported-1.3.0.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.3.1.zip b/server/src/test/resources/indices/bwc/unsupported-1.3.1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.3.1.zip rename to server/src/test/resources/indices/bwc/unsupported-1.3.1.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.3.2.zip b/server/src/test/resources/indices/bwc/unsupported-1.3.2.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.3.2.zip rename to server/src/test/resources/indices/bwc/unsupported-1.3.2.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.3.3.zip b/server/src/test/resources/indices/bwc/unsupported-1.3.3.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.3.3.zip rename to server/src/test/resources/indices/bwc/unsupported-1.3.3.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.3.4.zip b/server/src/test/resources/indices/bwc/unsupported-1.3.4.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.3.4.zip rename to server/src/test/resources/indices/bwc/unsupported-1.3.4.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.3.5.zip b/server/src/test/resources/indices/bwc/unsupported-1.3.5.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.3.5.zip rename to server/src/test/resources/indices/bwc/unsupported-1.3.5.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.3.6.zip b/server/src/test/resources/indices/bwc/unsupported-1.3.6.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.3.6.zip rename to server/src/test/resources/indices/bwc/unsupported-1.3.6.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.3.7.zip b/server/src/test/resources/indices/bwc/unsupported-1.3.7.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.3.7.zip rename to server/src/test/resources/indices/bwc/unsupported-1.3.7.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.3.8.zip b/server/src/test/resources/indices/bwc/unsupported-1.3.8.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.3.8.zip rename to server/src/test/resources/indices/bwc/unsupported-1.3.8.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.3.9.zip b/server/src/test/resources/indices/bwc/unsupported-1.3.9.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.3.9.zip rename to server/src/test/resources/indices/bwc/unsupported-1.3.9.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.4.0.Beta1.zip b/server/src/test/resources/indices/bwc/unsupported-1.4.0.Beta1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.4.0.Beta1.zip rename to server/src/test/resources/indices/bwc/unsupported-1.4.0.Beta1.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.4.0.zip b/server/src/test/resources/indices/bwc/unsupported-1.4.0.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.4.0.zip rename to server/src/test/resources/indices/bwc/unsupported-1.4.0.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.4.1.zip b/server/src/test/resources/indices/bwc/unsupported-1.4.1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.4.1.zip rename to server/src/test/resources/indices/bwc/unsupported-1.4.1.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.4.2.zip b/server/src/test/resources/indices/bwc/unsupported-1.4.2.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.4.2.zip rename to server/src/test/resources/indices/bwc/unsupported-1.4.2.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.4.3.zip b/server/src/test/resources/indices/bwc/unsupported-1.4.3.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.4.3.zip rename to server/src/test/resources/indices/bwc/unsupported-1.4.3.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.4.4.zip b/server/src/test/resources/indices/bwc/unsupported-1.4.4.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.4.4.zip rename to server/src/test/resources/indices/bwc/unsupported-1.4.4.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.4.5.zip b/server/src/test/resources/indices/bwc/unsupported-1.4.5.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.4.5.zip rename to server/src/test/resources/indices/bwc/unsupported-1.4.5.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.5.0.zip b/server/src/test/resources/indices/bwc/unsupported-1.5.0.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.5.0.zip rename to server/src/test/resources/indices/bwc/unsupported-1.5.0.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.5.1.zip b/server/src/test/resources/indices/bwc/unsupported-1.5.1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.5.1.zip rename to server/src/test/resources/indices/bwc/unsupported-1.5.1.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.5.2.zip b/server/src/test/resources/indices/bwc/unsupported-1.5.2.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.5.2.zip rename to server/src/test/resources/indices/bwc/unsupported-1.5.2.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.6.0.zip b/server/src/test/resources/indices/bwc/unsupported-1.6.0.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.6.0.zip rename to server/src/test/resources/indices/bwc/unsupported-1.6.0.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.6.1.zip b/server/src/test/resources/indices/bwc/unsupported-1.6.1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.6.1.zip rename to server/src/test/resources/indices/bwc/unsupported-1.6.1.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.6.2.zip b/server/src/test/resources/indices/bwc/unsupported-1.6.2.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.6.2.zip rename to server/src/test/resources/indices/bwc/unsupported-1.6.2.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.7.0.zip b/server/src/test/resources/indices/bwc/unsupported-1.7.0.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.7.0.zip rename to server/src/test/resources/indices/bwc/unsupported-1.7.0.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.7.1.zip b/server/src/test/resources/indices/bwc/unsupported-1.7.1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.7.1.zip rename to server/src/test/resources/indices/bwc/unsupported-1.7.1.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.7.2.zip b/server/src/test/resources/indices/bwc/unsupported-1.7.2.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.7.2.zip rename to server/src/test/resources/indices/bwc/unsupported-1.7.2.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.7.3.zip b/server/src/test/resources/indices/bwc/unsupported-1.7.3.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.7.3.zip rename to server/src/test/resources/indices/bwc/unsupported-1.7.3.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.7.4.zip b/server/src/test/resources/indices/bwc/unsupported-1.7.4.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.7.4.zip rename to server/src/test/resources/indices/bwc/unsupported-1.7.4.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-1.7.5.zip b/server/src/test/resources/indices/bwc/unsupported-1.7.5.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-1.7.5.zip rename to server/src/test/resources/indices/bwc/unsupported-1.7.5.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-2.0.0-beta1.zip b/server/src/test/resources/indices/bwc/unsupported-2.0.0-beta1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-2.0.0-beta1.zip rename to server/src/test/resources/indices/bwc/unsupported-2.0.0-beta1.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-2.0.0-beta2.zip b/server/src/test/resources/indices/bwc/unsupported-2.0.0-beta2.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-2.0.0-beta2.zip rename to server/src/test/resources/indices/bwc/unsupported-2.0.0-beta2.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-2.0.0-rc1.zip b/server/src/test/resources/indices/bwc/unsupported-2.0.0-rc1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-2.0.0-rc1.zip rename to server/src/test/resources/indices/bwc/unsupported-2.0.0-rc1.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-2.0.0.zip b/server/src/test/resources/indices/bwc/unsupported-2.0.0.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-2.0.0.zip rename to server/src/test/resources/indices/bwc/unsupported-2.0.0.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-2.0.1.zip b/server/src/test/resources/indices/bwc/unsupported-2.0.1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-2.0.1.zip rename to server/src/test/resources/indices/bwc/unsupported-2.0.1.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-2.0.2.zip b/server/src/test/resources/indices/bwc/unsupported-2.0.2.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-2.0.2.zip rename to server/src/test/resources/indices/bwc/unsupported-2.0.2.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-2.1.0.zip b/server/src/test/resources/indices/bwc/unsupported-2.1.0.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-2.1.0.zip rename to server/src/test/resources/indices/bwc/unsupported-2.1.0.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-2.1.1.zip b/server/src/test/resources/indices/bwc/unsupported-2.1.1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-2.1.1.zip rename to server/src/test/resources/indices/bwc/unsupported-2.1.1.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-2.1.2.zip b/server/src/test/resources/indices/bwc/unsupported-2.1.2.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-2.1.2.zip rename to server/src/test/resources/indices/bwc/unsupported-2.1.2.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-2.2.0.zip b/server/src/test/resources/indices/bwc/unsupported-2.2.0.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-2.2.0.zip rename to server/src/test/resources/indices/bwc/unsupported-2.2.0.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-2.2.1.zip b/server/src/test/resources/indices/bwc/unsupported-2.2.1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-2.2.1.zip rename to server/src/test/resources/indices/bwc/unsupported-2.2.1.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-2.2.2.zip b/server/src/test/resources/indices/bwc/unsupported-2.2.2.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-2.2.2.zip rename to server/src/test/resources/indices/bwc/unsupported-2.2.2.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-2.3.0.zip b/server/src/test/resources/indices/bwc/unsupported-2.3.0.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-2.3.0.zip rename to server/src/test/resources/indices/bwc/unsupported-2.3.0.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-2.3.1.zip b/server/src/test/resources/indices/bwc/unsupported-2.3.1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-2.3.1.zip rename to server/src/test/resources/indices/bwc/unsupported-2.3.1.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-2.3.2.zip b/server/src/test/resources/indices/bwc/unsupported-2.3.2.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-2.3.2.zip rename to server/src/test/resources/indices/bwc/unsupported-2.3.2.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-2.3.3.zip b/server/src/test/resources/indices/bwc/unsupported-2.3.3.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-2.3.3.zip rename to server/src/test/resources/indices/bwc/unsupported-2.3.3.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-2.3.4.zip b/server/src/test/resources/indices/bwc/unsupported-2.3.4.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-2.3.4.zip rename to server/src/test/resources/indices/bwc/unsupported-2.3.4.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-2.3.5.zip b/server/src/test/resources/indices/bwc/unsupported-2.3.5.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-2.3.5.zip rename to server/src/test/resources/indices/bwc/unsupported-2.3.5.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-2.4.0.zip b/server/src/test/resources/indices/bwc/unsupported-2.4.0.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-2.4.0.zip rename to server/src/test/resources/indices/bwc/unsupported-2.4.0.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-2.4.1.zip b/server/src/test/resources/indices/bwc/unsupported-2.4.1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-2.4.1.zip rename to server/src/test/resources/indices/bwc/unsupported-2.4.1.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-2.4.2.zip b/server/src/test/resources/indices/bwc/unsupported-2.4.2.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-2.4.2.zip rename to server/src/test/resources/indices/bwc/unsupported-2.4.2.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-2.4.3.zip b/server/src/test/resources/indices/bwc/unsupported-2.4.3.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-2.4.3.zip rename to server/src/test/resources/indices/bwc/unsupported-2.4.3.zip diff --git a/core/src/test/resources/indices/bwc/unsupported-2.4.5.zip b/server/src/test/resources/indices/bwc/unsupported-2.4.5.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupported-2.4.5.zip rename to server/src/test/resources/indices/bwc/unsupported-2.4.5.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-0.20.6.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-0.20.6.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-0.20.6.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-0.20.6.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.0.0.Beta2.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.0.0.Beta2.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.0.0.Beta2.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.0.0.Beta2.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.0.0.RC1.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.0.0.RC1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.0.0.RC1.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.0.0.RC1.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.0.0.RC2.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.0.0.RC2.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.0.0.RC2.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.0.0.RC2.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.0.0.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.0.0.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.0.0.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.0.0.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.0.1.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.0.1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.0.1.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.0.1.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.0.2.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.0.2.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.0.2.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.0.2.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.0.3.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.0.3.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.0.3.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.0.3.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.1.0.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.1.0.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.1.0.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.1.0.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.1.1.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.1.1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.1.1.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.1.1.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.1.2.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.1.2.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.1.2.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.1.2.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.2.0.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.2.0.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.2.0.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.2.0.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.2.1.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.2.1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.2.1.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.2.1.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.2.2.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.2.2.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.2.2.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.2.2.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.2.3.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.2.3.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.2.3.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.2.3.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.2.4.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.2.4.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.2.4.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.2.4.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.3.0.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.3.0.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.3.0.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.3.0.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.3.1.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.3.1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.3.1.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.3.1.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.3.2.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.3.2.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.3.2.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.3.2.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.3.3.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.3.3.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.3.3.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.3.3.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.3.4.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.3.4.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.3.4.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.3.4.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.3.5.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.3.5.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.3.5.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.3.5.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.3.6.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.3.6.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.3.6.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.3.6.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.3.7.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.3.7.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.3.7.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.3.7.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.3.8.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.3.8.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.3.8.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.3.8.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.3.9.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.3.9.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.3.9.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.3.9.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.4.0.Beta1.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.4.0.Beta1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.4.0.Beta1.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.4.0.Beta1.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.4.0.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.4.0.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.4.0.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.4.0.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.4.1.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.4.1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.4.1.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.4.1.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.4.2.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.4.2.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.4.2.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.4.2.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.4.3.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.4.3.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.4.3.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.4.3.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.4.4.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.4.4.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.4.4.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.4.4.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.4.5.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.4.5.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.4.5.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.4.5.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.5.0.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.5.0.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.5.0.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.5.0.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.5.1.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.5.1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.5.1.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.5.1.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.5.2.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.5.2.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.5.2.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.5.2.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.6.0.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.6.0.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.6.0.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.6.0.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.6.1.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.6.1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.6.1.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.6.1.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.6.2.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.6.2.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.6.2.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.6.2.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.7.0.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.7.0.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.7.0.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.7.0.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.7.1.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.7.1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.7.1.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.7.1.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.7.2.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.7.2.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.7.2.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.7.2.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.7.3.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.7.3.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.7.3.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.7.3.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.7.4.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.7.4.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.7.4.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.7.4.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-1.7.5.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-1.7.5.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-1.7.5.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-1.7.5.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-2.0.0-beta1.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-2.0.0-beta1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-2.0.0-beta1.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-2.0.0-beta1.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-2.0.0-beta2.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-2.0.0-beta2.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-2.0.0-beta2.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-2.0.0-beta2.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-2.0.0-rc1.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-2.0.0-rc1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-2.0.0-rc1.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-2.0.0-rc1.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-2.0.0.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-2.0.0.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-2.0.0.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-2.0.0.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-2.0.1.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-2.0.1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-2.0.1.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-2.0.1.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-2.0.2.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-2.0.2.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-2.0.2.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-2.0.2.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-2.1.0.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-2.1.0.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-2.1.0.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-2.1.0.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-2.1.1.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-2.1.1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-2.1.1.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-2.1.1.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-2.1.2.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-2.1.2.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-2.1.2.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-2.1.2.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-2.2.0.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-2.2.0.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-2.2.0.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-2.2.0.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-2.2.1.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-2.2.1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-2.2.1.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-2.2.1.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-2.2.2.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-2.2.2.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-2.2.2.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-2.2.2.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-2.3.0.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-2.3.0.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-2.3.0.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-2.3.0.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-2.3.1.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-2.3.1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-2.3.1.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-2.3.1.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-2.3.2.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-2.3.2.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-2.3.2.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-2.3.2.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-2.3.3.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-2.3.3.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-2.3.3.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-2.3.3.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-2.3.4.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-2.3.4.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-2.3.4.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-2.3.4.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-2.3.5.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-2.3.5.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-2.3.5.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-2.3.5.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-2.4.0.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-2.4.0.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-2.4.0.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-2.4.0.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-2.4.1.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-2.4.1.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-2.4.1.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-2.4.1.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-2.4.2.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-2.4.2.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-2.4.2.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-2.4.2.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-2.4.3.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-2.4.3.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-2.4.3.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-2.4.3.zip diff --git a/core/src/test/resources/indices/bwc/unsupportedrepo-2.4.5.zip b/server/src/test/resources/indices/bwc/unsupportedrepo-2.4.5.zip similarity index 100% rename from core/src/test/resources/indices/bwc/unsupportedrepo-2.4.5.zip rename to server/src/test/resources/indices/bwc/unsupportedrepo-2.4.5.zip diff --git a/core/src/test/resources/org/elasticsearch/action/bulk/bulk-log.json b/server/src/test/resources/org/elasticsearch/action/bulk/bulk-log.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/action/bulk/bulk-log.json rename to server/src/test/resources/org/elasticsearch/action/bulk/bulk-log.json diff --git a/core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk.json b/server/src/test/resources/org/elasticsearch/action/bulk/simple-bulk.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk.json rename to server/src/test/resources/org/elasticsearch/action/bulk/simple-bulk.json diff --git a/core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk10.json b/server/src/test/resources/org/elasticsearch/action/bulk/simple-bulk10.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk10.json rename to server/src/test/resources/org/elasticsearch/action/bulk/simple-bulk10.json diff --git a/core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk11.json b/server/src/test/resources/org/elasticsearch/action/bulk/simple-bulk11.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk11.json rename to server/src/test/resources/org/elasticsearch/action/bulk/simple-bulk11.json diff --git a/core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk2.json b/server/src/test/resources/org/elasticsearch/action/bulk/simple-bulk2.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk2.json rename to server/src/test/resources/org/elasticsearch/action/bulk/simple-bulk2.json diff --git a/core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk3.json b/server/src/test/resources/org/elasticsearch/action/bulk/simple-bulk3.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk3.json rename to server/src/test/resources/org/elasticsearch/action/bulk/simple-bulk3.json diff --git a/core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk4.json b/server/src/test/resources/org/elasticsearch/action/bulk/simple-bulk4.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk4.json rename to server/src/test/resources/org/elasticsearch/action/bulk/simple-bulk4.json diff --git a/core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk5.json b/server/src/test/resources/org/elasticsearch/action/bulk/simple-bulk5.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk5.json rename to server/src/test/resources/org/elasticsearch/action/bulk/simple-bulk5.json diff --git a/core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk6.json b/server/src/test/resources/org/elasticsearch/action/bulk/simple-bulk6.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk6.json rename to server/src/test/resources/org/elasticsearch/action/bulk/simple-bulk6.json diff --git a/core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk7.json b/server/src/test/resources/org/elasticsearch/action/bulk/simple-bulk7.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk7.json rename to server/src/test/resources/org/elasticsearch/action/bulk/simple-bulk7.json diff --git a/core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk8.json b/server/src/test/resources/org/elasticsearch/action/bulk/simple-bulk8.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk8.json rename to server/src/test/resources/org/elasticsearch/action/bulk/simple-bulk8.json diff --git a/core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk9.json b/server/src/test/resources/org/elasticsearch/action/bulk/simple-bulk9.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk9.json rename to server/src/test/resources/org/elasticsearch/action/bulk/simple-bulk9.json diff --git a/core/src/test/resources/org/elasticsearch/action/fieldstats/fieldstats-index-constraints-request.json b/server/src/test/resources/org/elasticsearch/action/fieldstats/fieldstats-index-constraints-request.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/action/fieldstats/fieldstats-index-constraints-request.json rename to server/src/test/resources/org/elasticsearch/action/fieldstats/fieldstats-index-constraints-request.json diff --git a/core/src/test/resources/org/elasticsearch/action/search/simple-msearch1.json b/server/src/test/resources/org/elasticsearch/action/search/simple-msearch1.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/action/search/simple-msearch1.json rename to server/src/test/resources/org/elasticsearch/action/search/simple-msearch1.json diff --git a/core/src/test/resources/org/elasticsearch/action/search/simple-msearch2.json b/server/src/test/resources/org/elasticsearch/action/search/simple-msearch2.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/action/search/simple-msearch2.json rename to server/src/test/resources/org/elasticsearch/action/search/simple-msearch2.json diff --git a/core/src/test/resources/org/elasticsearch/action/search/simple-msearch3.json b/server/src/test/resources/org/elasticsearch/action/search/simple-msearch3.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/action/search/simple-msearch3.json rename to server/src/test/resources/org/elasticsearch/action/search/simple-msearch3.json diff --git a/core/src/test/resources/org/elasticsearch/action/search/simple-msearch4.json b/server/src/test/resources/org/elasticsearch/action/search/simple-msearch4.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/action/search/simple-msearch4.json rename to server/src/test/resources/org/elasticsearch/action/search/simple-msearch4.json diff --git a/core/src/test/resources/org/elasticsearch/action/search/simple-msearch5.json b/server/src/test/resources/org/elasticsearch/action/search/simple-msearch5.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/action/search/simple-msearch5.json rename to server/src/test/resources/org/elasticsearch/action/search/simple-msearch5.json diff --git a/core/src/test/resources/org/elasticsearch/action/termvectors/multiRequest1.json b/server/src/test/resources/org/elasticsearch/action/termvectors/multiRequest1.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/action/termvectors/multiRequest1.json rename to server/src/test/resources/org/elasticsearch/action/termvectors/multiRequest1.json diff --git a/core/src/test/resources/org/elasticsearch/action/termvectors/multiRequest2.json b/server/src/test/resources/org/elasticsearch/action/termvectors/multiRequest2.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/action/termvectors/multiRequest2.json rename to server/src/test/resources/org/elasticsearch/action/termvectors/multiRequest2.json diff --git a/core/src/test/resources/org/elasticsearch/action/termvectors/multiRequest3.json b/server/src/test/resources/org/elasticsearch/action/termvectors/multiRequest3.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/action/termvectors/multiRequest3.json rename to server/src/test/resources/org/elasticsearch/action/termvectors/multiRequest3.json diff --git a/core/src/test/resources/org/elasticsearch/bootstrap/duplicate-classes.jar b/server/src/test/resources/org/elasticsearch/bootstrap/duplicate-classes.jar similarity index 100% rename from core/src/test/resources/org/elasticsearch/bootstrap/duplicate-classes.jar rename to server/src/test/resources/org/elasticsearch/bootstrap/duplicate-classes.jar diff --git a/core/src/test/resources/org/elasticsearch/bootstrap/duplicate-xmlbeans-classes.jar b/server/src/test/resources/org/elasticsearch/bootstrap/duplicate-xmlbeans-classes.jar similarity index 100% rename from core/src/test/resources/org/elasticsearch/bootstrap/duplicate-xmlbeans-classes.jar rename to server/src/test/resources/org/elasticsearch/bootstrap/duplicate-xmlbeans-classes.jar diff --git a/core/src/test/resources/org/elasticsearch/cluster/routing/issue_9023.zip b/server/src/test/resources/org/elasticsearch/cluster/routing/issue_9023.zip similarity index 100% rename from core/src/test/resources/org/elasticsearch/cluster/routing/issue_9023.zip rename to server/src/test/resources/org/elasticsearch/cluster/routing/issue_9023.zip diff --git a/core/src/test/resources/org/elasticsearch/common/settings/loader/indentation-settings.yml b/server/src/test/resources/org/elasticsearch/common/settings/loader/indentation-settings.yml similarity index 100% rename from core/src/test/resources/org/elasticsearch/common/settings/loader/indentation-settings.yml rename to server/src/test/resources/org/elasticsearch/common/settings/loader/indentation-settings.yml diff --git a/core/src/test/resources/org/elasticsearch/common/settings/loader/indentation-with-explicit-document-start-settings.yml b/server/src/test/resources/org/elasticsearch/common/settings/loader/indentation-with-explicit-document-start-settings.yml similarity index 100% rename from core/src/test/resources/org/elasticsearch/common/settings/loader/indentation-with-explicit-document-start-settings.yml rename to server/src/test/resources/org/elasticsearch/common/settings/loader/indentation-with-explicit-document-start-settings.yml diff --git a/core/src/test/resources/org/elasticsearch/common/settings/loader/test-settings.json b/server/src/test/resources/org/elasticsearch/common/settings/loader/test-settings.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/common/settings/loader/test-settings.json rename to server/src/test/resources/org/elasticsearch/common/settings/loader/test-settings.json diff --git a/core/src/test/resources/org/elasticsearch/common/settings/loader/test-settings.yml b/server/src/test/resources/org/elasticsearch/common/settings/loader/test-settings.yml similarity index 100% rename from core/src/test/resources/org/elasticsearch/common/settings/loader/test-settings.yml rename to server/src/test/resources/org/elasticsearch/common/settings/loader/test-settings.yml diff --git a/core/src/test/resources/org/elasticsearch/gateway/global-3.st b/server/src/test/resources/org/elasticsearch/gateway/global-3.st similarity index 100% rename from core/src/test/resources/org/elasticsearch/gateway/global-3.st rename to server/src/test/resources/org/elasticsearch/gateway/global-3.st diff --git a/core/src/test/resources/org/elasticsearch/index/analysis/shingle_analysis.json b/server/src/test/resources/org/elasticsearch/index/analysis/shingle_analysis.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/analysis/shingle_analysis.json rename to server/src/test/resources/org/elasticsearch/index/analysis/shingle_analysis.json diff --git a/core/src/test/resources/org/elasticsearch/index/analysis/shingle_analysis2.json b/server/src/test/resources/org/elasticsearch/index/analysis/shingle_analysis2.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/analysis/shingle_analysis2.json rename to server/src/test/resources/org/elasticsearch/index/analysis/shingle_analysis2.json diff --git a/core/src/test/resources/org/elasticsearch/index/analysis/stop.json b/server/src/test/resources/org/elasticsearch/index/analysis/stop.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/analysis/stop.json rename to server/src/test/resources/org/elasticsearch/index/analysis/stop.json diff --git a/core/src/test/resources/org/elasticsearch/index/analysis/synonyms/synonyms.json b/server/src/test/resources/org/elasticsearch/index/analysis/synonyms/synonyms.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/analysis/synonyms/synonyms.json rename to server/src/test/resources/org/elasticsearch/index/analysis/synonyms/synonyms.json diff --git a/core/src/test/resources/org/elasticsearch/index/analysis/synonyms/synonyms.txt b/server/src/test/resources/org/elasticsearch/index/analysis/synonyms/synonyms.txt similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/analysis/synonyms/synonyms.txt rename to server/src/test/resources/org/elasticsearch/index/analysis/synonyms/synonyms.txt diff --git a/core/src/test/resources/org/elasticsearch/index/analysis/synonyms/synonyms_wordnet.txt b/server/src/test/resources/org/elasticsearch/index/analysis/synonyms/synonyms_wordnet.txt similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/analysis/synonyms/synonyms_wordnet.txt rename to server/src/test/resources/org/elasticsearch/index/analysis/synonyms/synonyms_wordnet.txt diff --git a/core/src/test/resources/org/elasticsearch/index/analysis/test1.json b/server/src/test/resources/org/elasticsearch/index/analysis/test1.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/analysis/test1.json rename to server/src/test/resources/org/elasticsearch/index/analysis/test1.json diff --git a/core/src/test/resources/org/elasticsearch/index/analysis/test1.yml b/server/src/test/resources/org/elasticsearch/index/analysis/test1.yml similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/analysis/test1.yml rename to server/src/test/resources/org/elasticsearch/index/analysis/test1.yml diff --git a/core/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/genericstore/test-data.json b/server/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/genericstore/test-data.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/genericstore/test-data.json rename to server/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/genericstore/test-data.json diff --git a/core/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/genericstore/test-mapping.json b/server/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/genericstore/test-mapping.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/genericstore/test-mapping.json rename to server/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/genericstore/test-mapping.json diff --git a/core/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/test-data.json b/server/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/test-data.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/test-data.json rename to server/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/test-data.json diff --git a/core/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/test-mapping.json b/server/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/test-mapping.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/test-mapping.json rename to server/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/test-mapping.json diff --git a/core/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/simple/test-data.json b/server/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/simple/test-data.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/simple/test-data.json rename to server/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/simple/test-data.json diff --git a/core/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/simple/test-mapping.json b/server/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/simple/test-mapping.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/simple/test-mapping.json rename to server/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/simple/test-mapping.json diff --git a/core/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/test-data.json b/server/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/test-data.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/test-data.json rename to server/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/test-data.json diff --git a/core/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/test-mapping1.json b/server/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/test-mapping1.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/test-mapping1.json rename to server/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/test-mapping1.json diff --git a/core/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/test-mapping2.json b/server/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/test-mapping2.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/test-mapping2.json rename to server/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/test-mapping2.json diff --git a/core/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/test-mapping3.json b/server/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/test-mapping3.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/test-mapping3.json rename to server/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/test-mapping3.json diff --git a/core/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/test-mapping4.json b/server/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/test-mapping4.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/test-mapping4.json rename to server/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/test-mapping4.json diff --git a/core/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/upgrade1.json b/server/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/upgrade1.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/upgrade1.json rename to server/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/upgrade1.json diff --git a/core/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/upgrade2.json b/server/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/upgrade2.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/upgrade2.json rename to server/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/upgrade2.json diff --git a/core/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/upgrade3.json b/server/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/upgrade3.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/upgrade3.json rename to server/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/upgrade3.json diff --git a/core/src/test/resources/org/elasticsearch/index/mapper/multifield/test-data.json b/server/src/test/resources/org/elasticsearch/index/mapper/multifield/test-data.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/mapper/multifield/test-data.json rename to server/src/test/resources/org/elasticsearch/index/mapper/multifield/test-data.json diff --git a/core/src/test/resources/org/elasticsearch/index/mapper/multifield/test-multi-fields.json b/server/src/test/resources/org/elasticsearch/index/mapper/multifield/test-multi-fields.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/mapper/multifield/test-multi-fields.json rename to server/src/test/resources/org/elasticsearch/index/mapper/multifield/test-multi-fields.json diff --git a/core/src/test/resources/org/elasticsearch/index/mapper/path/test-mapping.json b/server/src/test/resources/org/elasticsearch/index/mapper/path/test-mapping.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/mapper/path/test-mapping.json rename to server/src/test/resources/org/elasticsearch/index/mapper/path/test-mapping.json diff --git a/core/src/test/resources/org/elasticsearch/index/mapper/simple/test-mapping.json b/server/src/test/resources/org/elasticsearch/index/mapper/simple/test-mapping.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/mapper/simple/test-mapping.json rename to server/src/test/resources/org/elasticsearch/index/mapper/simple/test-mapping.json diff --git a/core/src/test/resources/org/elasticsearch/index/mapper/simple/test1-notype-noid.json b/server/src/test/resources/org/elasticsearch/index/mapper/simple/test1-notype-noid.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/mapper/simple/test1-notype-noid.json rename to server/src/test/resources/org/elasticsearch/index/mapper/simple/test1-notype-noid.json diff --git a/core/src/test/resources/org/elasticsearch/index/mapper/simple/test1.json b/server/src/test/resources/org/elasticsearch/index/mapper/simple/test1.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/mapper/simple/test1.json rename to server/src/test/resources/org/elasticsearch/index/mapper/simple/test1.json diff --git a/core/src/test/resources/org/elasticsearch/index/query/commonTerms-query1.json b/server/src/test/resources/org/elasticsearch/index/query/commonTerms-query1.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/query/commonTerms-query1.json rename to server/src/test/resources/org/elasticsearch/index/query/commonTerms-query1.json diff --git a/core/src/test/resources/org/elasticsearch/index/query/commonTerms-query2.json b/server/src/test/resources/org/elasticsearch/index/query/commonTerms-query2.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/query/commonTerms-query2.json rename to server/src/test/resources/org/elasticsearch/index/query/commonTerms-query2.json diff --git a/core/src/test/resources/org/elasticsearch/index/query/commonTerms-query3.json b/server/src/test/resources/org/elasticsearch/index/query/commonTerms-query3.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/query/commonTerms-query3.json rename to server/src/test/resources/org/elasticsearch/index/query/commonTerms-query3.json diff --git a/core/src/test/resources/org/elasticsearch/index/query/geo_polygon_exception_1.json b/server/src/test/resources/org/elasticsearch/index/query/geo_polygon_exception_1.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/query/geo_polygon_exception_1.json rename to server/src/test/resources/org/elasticsearch/index/query/geo_polygon_exception_1.json diff --git a/core/src/test/resources/org/elasticsearch/index/query/geo_polygon_exception_2.json b/server/src/test/resources/org/elasticsearch/index/query/geo_polygon_exception_2.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/query/geo_polygon_exception_2.json rename to server/src/test/resources/org/elasticsearch/index/query/geo_polygon_exception_2.json diff --git a/core/src/test/resources/org/elasticsearch/index/query/geo_polygon_exception_3.json b/server/src/test/resources/org/elasticsearch/index/query/geo_polygon_exception_3.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/query/geo_polygon_exception_3.json rename to server/src/test/resources/org/elasticsearch/index/query/geo_polygon_exception_3.json diff --git a/core/src/test/resources/org/elasticsearch/index/query/geo_polygon_exception_4.json b/server/src/test/resources/org/elasticsearch/index/query/geo_polygon_exception_4.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/query/geo_polygon_exception_4.json rename to server/src/test/resources/org/elasticsearch/index/query/geo_polygon_exception_4.json diff --git a/core/src/test/resources/org/elasticsearch/index/query/geo_polygon_exception_5.json b/server/src/test/resources/org/elasticsearch/index/query/geo_polygon_exception_5.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/query/geo_polygon_exception_5.json rename to server/src/test/resources/org/elasticsearch/index/query/geo_polygon_exception_5.json diff --git a/core/src/test/resources/org/elasticsearch/index/translog/translog-invalid-first-byte.binary b/server/src/test/resources/org/elasticsearch/index/translog/translog-invalid-first-byte.binary similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/translog/translog-invalid-first-byte.binary rename to server/src/test/resources/org/elasticsearch/index/translog/translog-invalid-first-byte.binary diff --git a/core/src/test/resources/org/elasticsearch/index/translog/translog-v0.binary b/server/src/test/resources/org/elasticsearch/index/translog/translog-v0.binary similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/translog/translog-v0.binary rename to server/src/test/resources/org/elasticsearch/index/translog/translog-v0.binary diff --git a/core/src/test/resources/org/elasticsearch/index/translog/translog-v1-corrupted-body.binary b/server/src/test/resources/org/elasticsearch/index/translog/translog-v1-corrupted-body.binary similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/translog/translog-v1-corrupted-body.binary rename to server/src/test/resources/org/elasticsearch/index/translog/translog-v1-corrupted-body.binary diff --git a/core/src/test/resources/org/elasticsearch/index/translog/translog-v1-corrupted-magic.binary b/server/src/test/resources/org/elasticsearch/index/translog/translog-v1-corrupted-magic.binary similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/translog/translog-v1-corrupted-magic.binary rename to server/src/test/resources/org/elasticsearch/index/translog/translog-v1-corrupted-magic.binary diff --git a/core/src/test/resources/org/elasticsearch/index/translog/translog-v1-truncated.binary b/server/src/test/resources/org/elasticsearch/index/translog/translog-v1-truncated.binary similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/translog/translog-v1-truncated.binary rename to server/src/test/resources/org/elasticsearch/index/translog/translog-v1-truncated.binary diff --git a/core/src/test/resources/org/elasticsearch/index/translog/translog-v1.binary b/server/src/test/resources/org/elasticsearch/index/translog/translog-v1.binary similarity index 100% rename from core/src/test/resources/org/elasticsearch/index/translog/translog-v1.binary rename to server/src/test/resources/org/elasticsearch/index/translog/translog-v1.binary diff --git a/core/src/test/resources/org/elasticsearch/plugins/dummy-plugin.jar b/server/src/test/resources/org/elasticsearch/plugins/dummy-plugin.jar similarity index 100% rename from core/src/test/resources/org/elasticsearch/plugins/dummy-plugin.jar rename to server/src/test/resources/org/elasticsearch/plugins/dummy-plugin.jar diff --git a/core/src/test/resources/org/elasticsearch/plugins/non-extensible-plugin.jar b/server/src/test/resources/org/elasticsearch/plugins/non-extensible-plugin.jar similarity index 100% rename from core/src/test/resources/org/elasticsearch/plugins/non-extensible-plugin.jar rename to server/src/test/resources/org/elasticsearch/plugins/non-extensible-plugin.jar diff --git a/core/src/test/resources/org/elasticsearch/search/geo/gzippedmap.gz b/server/src/test/resources/org/elasticsearch/search/geo/gzippedmap.gz similarity index 100% rename from core/src/test/resources/org/elasticsearch/search/geo/gzippedmap.gz rename to server/src/test/resources/org/elasticsearch/search/geo/gzippedmap.gz diff --git a/core/src/test/resources/org/elasticsearch/search/query/all-example-document.json b/server/src/test/resources/org/elasticsearch/search/query/all-example-document.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/search/query/all-example-document.json rename to server/src/test/resources/org/elasticsearch/search/query/all-example-document.json diff --git a/core/src/test/resources/org/elasticsearch/search/query/all-query-index.json b/server/src/test/resources/org/elasticsearch/search/query/all-query-index.json similarity index 100% rename from core/src/test/resources/org/elasticsearch/search/query/all-query-index.json rename to server/src/test/resources/org/elasticsearch/search/query/all-query-index.json diff --git a/settings.gradle b/settings.gradle index d4b280c346b3b..40034a8542448 100644 --- a/settings.gradle +++ b/settings.gradle @@ -4,8 +4,6 @@ rootProject.name = dirName List projects = [ 'build-tools', 'rest-api-spec', - 'core', - 'core:cli', 'docs', 'client:rest', 'client:rest-high-level', @@ -22,6 +20,8 @@ List projects = [ 'distribution:rpm', 'distribution:tools:launchers', 'distribution:tools:plugin-cli', + 'server', + 'server:cli', 'test:framework', 'test:fixtures:example-fixture', 'test:fixtures:hdfs-fixture', @@ -107,8 +107,8 @@ for (final String branch : branches) { boolean isEclipse = System.getProperty("eclipse.launcher") != null || gradle.startParameter.taskNames.contains('eclipse') || gradle.startParameter.taskNames.contains('cleanEclipse') if (isEclipse) { // eclipse cannot handle an intermediate dependency between main and test, so we must create separate projects - // for core-src and core-tests - projects << 'core-tests' + // for server-src and server-tests + projects << 'server-tests' projects << 'libs:elasticsearch-nio-tests' } @@ -123,10 +123,10 @@ for (final String branch : branches) { } if (isEclipse) { - project(":core").projectDir = new File(rootProject.projectDir, 'core/src/main') - project(":core").buildFileName = 'eclipse-build.gradle' - project(":core-tests").projectDir = new File(rootProject.projectDir, 'core/src/test') - project(":core-tests").buildFileName = 'eclipse-build.gradle' + project(":server").projectDir = new File(rootProject.projectDir, 'server/src/main') + project(":server").buildFileName = 'eclipse-build.gradle' + project(":server-tests").projectDir = new File(rootProject.projectDir, 'server/src/test') + project(":server-tests").buildFileName = 'eclipse-build.gradle' project(":libs:elasticsearch-nio").projectDir = new File(rootProject.projectDir, 'libs/elasticsearch-nio/src/main') project(":libs:elasticsearch-nio").buildFileName = 'eclipse-build.gradle' project(":libs:elasticsearch-nio-tests").projectDir = new File(rootProject.projectDir, 'libs/elasticsearch-nio/src/test') From 55a14230a7b0d563d81184b1158dd21f0104c45c Mon Sep 17 00:00:00 2001 From: Nhat Nguyen Date: Thu, 11 Jan 2018 18:34:17 -0500 Subject: [PATCH 58/74] Do not keep 5.x commits once having 6.x commits (#28188) Currently we keep a 5.x index commit as a safe commit until we have a 6.x safe commit. During that time, if peer-recovery happens, a primary will send a 5.x commit in file-based sync and the recovery will even fail as the snapshotted commit does not have sequence number tags. This commit updates the combined deletion policy to delete legacy commits if there are 6.x commits. Relates #27606 Relates #28038 --- .../elasticsearch/index/engine/CombinedDeletionPolicy.java | 4 ++-- .../index/engine/CombinedDeletionPolicyTests.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/server/src/main/java/org/elasticsearch/index/engine/CombinedDeletionPolicy.java b/server/src/main/java/org/elasticsearch/index/engine/CombinedDeletionPolicy.java index 6a61843c263e4..e5d8cacf73657 100644 --- a/server/src/main/java/org/elasticsearch/index/engine/CombinedDeletionPolicy.java +++ b/server/src/main/java/org/elasticsearch/index/engine/CombinedDeletionPolicy.java @@ -160,9 +160,9 @@ private static int indexOfKeptCommits(List commits, long if (expectedTranslogUUID.equals(commitUserData.get(Translog.TRANSLOG_UUID_KEY)) == false) { return i + 1; } - // 5.x commits do not contain MAX_SEQ_NO. + // 5.x commits do not contain MAX_SEQ_NO, we should not keep it and the older commits. if (commitUserData.containsKey(SequenceNumbers.MAX_SEQ_NO) == false) { - return i; + return Math.min(commits.size() - 1, i + 1); } final long maxSeqNoFromCommit = Long.parseLong(commitUserData.get(SequenceNumbers.MAX_SEQ_NO)); if (maxSeqNoFromCommit <= globalCheckpoint) { diff --git a/server/src/test/java/org/elasticsearch/index/engine/CombinedDeletionPolicyTests.java b/server/src/test/java/org/elasticsearch/index/engine/CombinedDeletionPolicyTests.java index ca75c70137b5a..e74cde52aa418 100644 --- a/server/src/test/java/org/elasticsearch/index/engine/CombinedDeletionPolicyTests.java +++ b/server/src/test/java/org/elasticsearch/index/engine/CombinedDeletionPolicyTests.java @@ -171,15 +171,15 @@ public void testLegacyIndex() throws Exception { globalCheckpoint.set(randomLongBetween(0, maxSeqNo - 1)); indexPolicy.onCommit(Arrays.asList(legacyCommit, freshCommit)); - verify(legacyCommit, times(0)).delete(); + verify(legacyCommit, times(1)).delete(); // Do not keep the legacy commit once we have a new commit. verify(freshCommit, times(0)).delete(); - assertThat(translogPolicy.getMinTranslogGenerationForRecovery(), equalTo(legacyTranslogGen)); + assertThat(translogPolicy.getMinTranslogGenerationForRecovery(), equalTo(safeTranslogGen)); assertThat(translogPolicy.getTranslogGenerationOfLastCommit(), equalTo(safeTranslogGen)); // Make the fresh commit safe. globalCheckpoint.set(randomLongBetween(maxSeqNo, Long.MAX_VALUE)); indexPolicy.onCommit(Arrays.asList(legacyCommit, freshCommit)); - verify(legacyCommit, times(1)).delete(); + verify(legacyCommit, times(2)).delete(); verify(freshCommit, times(0)).delete(); assertThat(translogPolicy.getMinTranslogGenerationForRecovery(), equalTo(safeTranslogGen)); assertThat(translogPolicy.getTranslogGenerationOfLastCommit(), equalTo(safeTranslogGen)); From f15c2044c47ad8ce8e375cec92723f0b3a3fac5d Mon Sep 17 00:00:00 2001 From: Clinton Gormley Date: Fri, 12 Jan 2018 11:19:57 +0100 Subject: [PATCH 59/74] Fixed the cat.health REST test to accept 4ms, not just 4.0ms (#28186) --- .../main/resources/rest-api-spec/test/cat.health/10_basic.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cat.health/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/cat.health/10_basic.yml index 380caec931899..504b7c8f9b1b6 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/cat.health/10_basic.yml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/cat.health/10_basic.yml @@ -45,7 +45,7 @@ \d+ \s+ # init \d+ \s+ # unassign \d+ \s+ # pending_tasks - (-|\d+[.]\d+ms|s) \s+ # max task waiting time + (-|\d+(?:[.]\d+)?m?s) \s+ # max task waiting time \d+\.\d+% # active shards percent \n )+ @@ -72,7 +72,7 @@ \d+ \s+ # init \d+ \s+ # unassign \d+ \s+ # pending_tasks - (-|\d+[.]\d+ms|s) \s+ # max task waiting time + (-|\d+(?:[.]\d+)?m?s) \s+ # max task waiting time \d+\.\d+% # active shards percent \n )+ From c417427ecda8cf93614501c9a3c0672d0cf4f690 Mon Sep 17 00:00:00 2001 From: Andrew Banchich Date: Fri, 12 Jan 2018 05:47:39 -0500 Subject: [PATCH 60/74] [Docs] Spelling fix in painless-getting-started.asciidoc (#28187) --- docs/painless/painless-getting-started.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/painless/painless-getting-started.asciidoc b/docs/painless/painless-getting-started.asciidoc index 98209fc7da9e5..155b5f272b426 100644 --- a/docs/painless/painless-getting-started.asciidoc +++ b/docs/painless/painless-getting-started.asciidoc @@ -234,7 +234,7 @@ POST hockey/player/_update_by_query ---------------------------------------------------------------- // CONSOLE -Using the match operator (`==~`) you can update all the hockey players who's +Using the match operator (`==~`) you can update all the hockey players whose names start with a consonant and end with a vowel: [source,js] From 3a96518b582f014ee17dd2a79bb1ebded10c644f Mon Sep 17 00:00:00 2001 From: Boudewijn <31416818+boudewijnk@users.noreply.github.com> Date: Wed, 10 Jan 2018 18:00:12 +0100 Subject: [PATCH 61/74] Update getting-started.asciidoc (#28145) Replaced single quotation marks with double quotation marks surrounding localhost address --- docs/reference/getting-started.asciidoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/reference/getting-started.asciidoc b/docs/reference/getting-started.asciidoc index 2ebe8c038655b..0a6dbd0eb8359 100755 --- a/docs/reference/getting-started.asciidoc +++ b/docs/reference/getting-started.asciidoc @@ -669,8 +669,8 @@ You can download the sample dataset (accounts.json) from https://github.com/elas [source,sh] -------------------------------------------------- -curl -H "Content-Type: application/json" -XPOST 'localhost:9200/bank/account/_bulk?pretty&refresh' --data-binary "@accounts.json" -curl 'localhost:9200/_cat/indices?v' +curl -H "Content-Type: application/json" -XPOST "localhost:9200/bank/account/_bulk?pretty&refresh" --data-binary "@accounts.json" +curl "localhost:9200/_cat/indices?v" -------------------------------------------------- // NOTCONSOLE From a10c406292b1c856ee3cd05c495526b82be320ca Mon Sep 17 00:00:00 2001 From: Andrew Banchich Date: Wed, 10 Jan 2018 11:59:01 -0500 Subject: [PATCH 62/74] text fixes (#28136) --- .../aggregations/pipeline/bucket-selector-aggregation.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/reference/aggregations/pipeline/bucket-selector-aggregation.asciidoc b/docs/reference/aggregations/pipeline/bucket-selector-aggregation.asciidoc index cd0218e7c4353..5dc1b80d4adda 100644 --- a/docs/reference/aggregations/pipeline/bucket-selector-aggregation.asciidoc +++ b/docs/reference/aggregations/pipeline/bucket-selector-aggregation.asciidoc @@ -6,7 +6,7 @@ in the parent multi-bucket aggregation. The specified metric must be numeric and If the script language is `expression` then a numeric return value is permitted. In this case 0.0 will be evaluated as `false` and all other values will evaluate to true. -NOTE: The bucket_selector aggregation, like all pipeline aggregations, executions after all other sibling aggregations. This means that +NOTE: The bucket_selector aggregation, like all pipeline aggregations, executes after all other sibling aggregations. This means that using the bucket_selector aggregation to filter the returned buckets in the response does not save on execution time running the aggregations. ==== Syntax From 6a5807ad8feffa0e22e6fe4b136c90d73892040d Mon Sep 17 00:00:00 2001 From: akadko Date: Fri, 12 Jan 2018 18:36:48 +0300 Subject: [PATCH 63/74] [DOCS] Removed differencies between text and code (#27993) --- .../aggregations/metrics/cardinality-aggregation.asciidoc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/reference/aggregations/metrics/cardinality-aggregation.asciidoc b/docs/reference/aggregations/metrics/cardinality-aggregation.asciidoc index 938d42a70abd5..d458d377a6077 100644 --- a/docs/reference/aggregations/metrics/cardinality-aggregation.asciidoc +++ b/docs/reference/aggregations/metrics/cardinality-aggregation.asciidoc @@ -5,8 +5,7 @@ A `single-value` metrics aggregation that calculates an approximate count of distinct values. Values can be extracted either from specific fields in the document or generated by a script. -Assume you are indexing books and would like to count the unique authors that -match a query: +Assume you are indexing store sales and would like to count the unique number of sold products that match a query: [source,js] -------------------------------------------------- From c75ac319a655f9a2b37c853913ef989e7159f65e Mon Sep 17 00:00:00 2001 From: Igor Motov Date: Fri, 12 Jan 2018 15:34:17 -0500 Subject: [PATCH 64/74] Add ability to associate an ID with tasks (#27764) Adds support for capturing the X-Opaque-Id header from a REST request and storing it's value in the tasks that this request started. It works for all user-initiated tasks (not only search). Closes #23250 Usage: ``` $ curl -H "X-Opaque-Id: imotov" -H "foo:bar" "localhost:9200/_tasks?pretty&group_by=parents" { "tasks" : { "7qrTVbiDQKiZfubUP7DPkg:6998" : { "node" : "7qrTVbiDQKiZfubUP7DPkg", "id" : 6998, "type" : "transport", "action" : "cluster:monitor/tasks/lists", "start_time_in_millis" : 1513029940042, "running_time_in_nanos" : 266794, "cancellable" : false, "headers" : { "X-Opaque-Id" : "imotov" }, "children" : [ { "node" : "V-PuCjPhRp2ryuEsNw6V1g", "id" : 6088, "type" : "netty", "action" : "cluster:monitor/tasks/lists[n]", "start_time_in_millis" : 1513029940043, "running_time_in_nanos" : 67785, "cancellable" : false, "parent_task_id" : "7qrTVbiDQKiZfubUP7DPkg:6998", "headers" : { "X-Opaque-Id" : "imotov" } }, { "node" : "7qrTVbiDQKiZfubUP7DPkg", "id" : 6999, "type" : "direct", "action" : "cluster:monitor/tasks/lists[n]", "start_time_in_millis" : 1513029940043, "running_time_in_nanos" : 98754, "cancellable" : false, "parent_task_id" : "7qrTVbiDQKiZfubUP7DPkg:6998", "headers" : { "X-Opaque-Id" : "imotov" } } ] } } } ``` --- docs/reference/cluster/tasks.asciidoc | 68 +++++++++++++++++++ .../reindex/AsyncBulkByScrollActionTests.java | 8 ++- .../TransportRethrottleActionTests.java | 9 ++- .../netty4/SimpleNetty4TransportTests.java | 2 +- .../nio/SimpleNioTransportTests.java | 2 +- .../test/old_cluster/10_basic.yml | 41 +++++++++++ .../test/upgraded_cluster/10_basic.yml | 39 +++++++++++ .../rest-api-spec/api/tasks.list.json | 2 +- .../test/tasks.list/10_basic.yml | 16 +++++ .../elasticsearch/action/ActionModule.java | 7 +- .../cancel/TransportCancelTasksAction.java | 2 +- .../node/tasks/list/ListTasksResponse.java | 15 ++++ .../action/index/IndexRequest.java | 2 +- .../action/search/SearchRequest.java | 5 +- .../action/search/SearchScrollRequest.java | 5 +- .../action/search/SearchTask.java | 6 +- .../replication/ReplicationRequest.java | 5 +- .../support/replication/ReplicationTask.java | 5 +- .../TransportReplicationAction.java | 5 +- .../client/transport/TransportClient.java | 2 +- .../reindex/AbstractBulkByScrollRequest.java | 5 +- .../index/reindex/BulkByScrollTask.java | 6 +- .../index/shard/PrimaryReplicaSyncer.java | 9 +-- .../java/org/elasticsearch/node/Node.java | 11 ++- .../elasticsearch/plugins/ActionPlugin.java | 7 ++ .../admin/cluster/RestListTasksAction.java | 13 +++- .../search/fetch/ShardFetchRequest.java | 5 +- .../internal/InternalScrollSearchRequest.java | 5 +- .../internal/ShardSearchTransportRequest.java | 5 +- .../search/query/QuerySearchRequest.java | 5 +- .../elasticsearch/tasks/CancellableTask.java | 5 +- .../java/org/elasticsearch/tasks/Task.java | 21 ++++-- .../elasticsearch/tasks/TaskAwareRequest.java | 6 +- .../org/elasticsearch/tasks/TaskInfo.java | 43 ++++++++++-- .../org/elasticsearch/tasks/TaskManager.java | 34 +++++++++- .../tasks/TaskResultsService.java | 19 +++++- .../transport/TransportService.java | 10 +-- .../tasks/task-index-mapping.json | 7 ++ .../node/tasks/CancellableTasksTests.java | 9 +-- .../node/tasks/TaskManagerTestCase.java | 15 ++-- .../admin/cluster/node/tasks/TaskTests.java | 5 +- .../admin/cluster/node/tasks/TasksIT.java | 61 ++++++++++++----- .../cluster/node/tasks/TestTaskPlugin.java | 19 ++++-- .../node/tasks/TransportTasksActionTests.java | 8 +-- .../action/bulk/TransportBulkActionTests.java | 2 +- .../bulk/TransportBulkActionTookTests.java | 3 +- .../action/main/MainActionTests.java | 3 +- .../action/search/MockSearchPhaseContext.java | 2 +- .../search/MultiSearchActionTookTests.java | 3 +- .../TransportMultiSearchActionTests.java | 29 ++++++-- .../TransportActionFilterChainTests.java | 18 ++++- .../TransportBroadcastByNodeActionTests.java | 3 +- .../TransportMasterNodeActionTests.java | 2 +- .../nodes/TransportNodesActionTests.java | 2 +- .../BroadcastReplicationTests.java | 2 +- .../TransportReplicationActionTests.java | 6 +- .../TransportWriteActionTests.java | 6 +- ...ortInstanceSingleOperationActionTests.java | 4 +- .../client/node/NodeClientHeadersTests.java | 2 +- .../TransportClientNodesServiceTests.java | 2 +- .../cluster/NodeConnectionsServiceTests.java | 3 +- .../action/shard/ShardStateActionTests.java | 3 +- .../health/ClusterStateHealthTests.java | 3 +- .../discovery/ZenFaultDetectionTests.java | 2 +- .../discovery/zen/UnicastZenPingTests.java | 18 +++-- .../LeaderBulkByScrollTaskStateTests.java | 3 +- .../WorkerBulkByScrollTaskStateTests.java | 3 +- .../ESIndexLevelReplicationTestCase.java | 3 +- .../GlobalCheckpointSyncActionTests.java | 2 +- .../shard/PrimaryReplicaSyncerTests.java | 11 +-- .../indices/cluster/ClusterStateChanges.java | 3 +- ...ClusterStateServiceRandomUpdatesTests.java | 3 +- .../search/SearchServiceTests.java | 4 +- .../search/query/QueryPhaseTests.java | 17 ++--- .../tasks/ListTasksResponseTests.java | 7 +- .../elasticsearch/tasks/TaskResultTests.java | 4 +- .../TransportServiceHandshakeTests.java | 2 +- ...stractAsyncBulkByScrollActionTestCase.java | 4 +- .../java/org/elasticsearch/node/MockNode.java | 7 +- .../test/tasks/MockTaskManager.java | 6 +- .../test/transport/MockTransportService.java | 19 +++--- .../AbstractSimpleTransportTestCase.java | 8 ++- .../transport/MockTcpTransportTests.java | 2 +- .../nio/SimpleMockNioTransportTests.java | 2 +- 84 files changed, 627 insertions(+), 180 deletions(-) diff --git a/docs/reference/cluster/tasks.asciidoc b/docs/reference/cluster/tasks.asciidoc index ed73290883d23..b3457953f46e5 100644 --- a/docs/reference/cluster/tasks.asciidoc +++ b/docs/reference/cluster/tasks.asciidoc @@ -195,3 +195,71 @@ The following command will change the grouping to parent tasks: GET _tasks?group_by=parents -------------------------------------------------- // CONSOLE + +The grouping can be disabled by specifying `none` as a `group_by` parameter: + +[source,js] +-------------------------------------------------- +GET _tasks?group_by=none +-------------------------------------------------- +// CONSOLE + +[float] +=== Identifying running tasks + +The `X-Opaque-Id` header, when provided on the HTTP request header, is going to be returned as a header in the response as well as +in the `headers` field for in the task information. This allows to track certain calls, or associate certain tasks with +a the client that started them: + +[source,sh] +-------------------------------------------------- +curl -i -H "X-Opaque-Id: 123456" "http://localhost:9200/_tasks?group_by=parents" +-------------------------------------------------- +// NOTCONSOLE + +The result will look similar to the following: + +[source,js] +-------------------------------------------------- +HTTP/1.1 200 OK +X-Opaque-Id: 123456 <1> +content-type: application/json; charset=UTF-8 +content-length: 831 + +{ + "tasks" : { + "u5lcZHqcQhu-rUoFaqDphA:45" : { + "node" : "u5lcZHqcQhu-rUoFaqDphA", + "id" : 45, + "type" : "transport", + "action" : "cluster:monitor/tasks/lists", + "start_time_in_millis" : 1513823752749, + "running_time_in_nanos" : 293139, + "cancellable" : false, + "headers" : { + "X-Opaque-Id" : "123456" <2> + }, + "children" : [ + { + "node" : "u5lcZHqcQhu-rUoFaqDphA", + "id" : 46, + "type" : "direct", + "action" : "cluster:monitor/tasks/lists[n]", + "start_time_in_millis" : 1513823752750, + "running_time_in_nanos" : 92133, + "cancellable" : false, + "parent_task_id" : "u5lcZHqcQhu-rUoFaqDphA:45", + "headers" : { + "X-Opaque-Id" : "123456" <3> + } + } + ] + } + } +} +-------------------------------------------------- +// NOTCONSOLE + +<1> id as a part of the response header +<2> id for the tasks that was initiated by the REST request +<3> the child task of the task initiated by the REST request diff --git a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/AsyncBulkByScrollActionTests.java b/modules/reindex/src/test/java/org/elasticsearch/index/reindex/AsyncBulkByScrollActionTests.java index a13bdea0ef2f4..db259de411165 100644 --- a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/AsyncBulkByScrollActionTests.java +++ b/modules/reindex/src/test/java/org/elasticsearch/index/reindex/AsyncBulkByScrollActionTests.java @@ -81,6 +81,7 @@ import org.junit.Before; import java.util.ArrayList; +import java.util.Collections; import java.util.HashMap; import java.util.IdentityHashMap; import java.util.Iterator; @@ -123,6 +124,7 @@ public class AsyncBulkByScrollActionTests extends ESTestCase { private SearchRequest firstSearchRequest; private PlainActionFuture listener; private String scrollId; + private ThreadPool threadPool; private TaskManager taskManager; private BulkByScrollTask testTask; private WorkerBulkByScrollTaskState worker; @@ -141,7 +143,8 @@ public void setupForTest() { testRequest = new DummyAbstractBulkByScrollRequest(firstSearchRequest); listener = new PlainActionFuture<>(); scrollId = null; - taskManager = new TaskManager(Settings.EMPTY); + threadPool = new TestThreadPool(getClass().getName()); + taskManager = new TaskManager(Settings.EMPTY, threadPool, Collections.emptySet()); testTask = (BulkByScrollTask) taskManager.register("don'tcare", "hereeither", testRequest); testTask.setWorker(testRequest.getRequestsPerSecond(), null); worker = testTask.getWorkerState(); @@ -159,8 +162,9 @@ private void setupClient(ThreadPool threadPool) { } @After - public void tearDownAndVerifyCommonStuff() { + public void tearDownAndVerifyCommonStuff() throws Exception { client.close(); + terminate(threadPool); } /** diff --git a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/TransportRethrottleActionTests.java b/modules/reindex/src/test/java/org/elasticsearch/index/reindex/TransportRethrottleActionTests.java index 62a2c34ea582c..3c2f5194fceda 100644 --- a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/TransportRethrottleActionTests.java +++ b/modules/reindex/src/test/java/org/elasticsearch/index/reindex/TransportRethrottleActionTests.java @@ -32,6 +32,7 @@ import org.mockito.ArgumentCaptor; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.function.Consumer; @@ -53,7 +54,7 @@ public class TransportRethrottleActionTests extends ESTestCase { @Before public void createTask() { slices = between(2, 50); - task = new BulkByScrollTask(1, "test_type", "test_action", "test", TaskId.EMPTY_TASK_ID); + task = new BulkByScrollTask(1, "test_type", "test_action", "test", TaskId.EMPTY_TASK_ID, Collections.emptyMap()); task.setWorkerCount(slices); } @@ -101,7 +102,8 @@ public void testRethrottleSuccessfulResponse() { List sliceStatuses = new ArrayList<>(slices); for (int i = 0; i < slices; i++) { BulkByScrollTask.Status status = believeableInProgressStatus(i); - tasks.add(new TaskInfo(new TaskId("test", 123), "test", "test", "test", status, 0, 0, true, new TaskId("test", task.getId()))); + tasks.add(new TaskInfo(new TaskId("test", 123), "test", "test", "test", status, 0, 0, true, new TaskId("test", task.getId()), + Collections.emptyMap())); sliceStatuses.add(new BulkByScrollTask.StatusOrException(status)); } rethrottleTestCase(slices, @@ -121,7 +123,8 @@ public void testRethrottleWithSomeSucceeded() { List tasks = new ArrayList<>(); for (int i = succeeded; i < slices; i++) { BulkByScrollTask.Status status = believeableInProgressStatus(i); - tasks.add(new TaskInfo(new TaskId("test", 123), "test", "test", "test", status, 0, 0, true, new TaskId("test", task.getId()))); + tasks.add(new TaskInfo(new TaskId("test", 123), "test", "test", "test", status, 0, 0, true, new TaskId("test", task.getId()), + Collections.emptyMap())); sliceStatuses.add(new BulkByScrollTask.StatusOrException(status)); } rethrottleTestCase(slices - succeeded, diff --git a/modules/transport-netty4/src/test/java/org/elasticsearch/transport/netty4/SimpleNetty4TransportTests.java b/modules/transport-netty4/src/test/java/org/elasticsearch/transport/netty4/SimpleNetty4TransportTests.java index b2126b1b61185..efa296b6278af 100644 --- a/modules/transport-netty4/src/test/java/org/elasticsearch/transport/netty4/SimpleNetty4TransportTests.java +++ b/modules/transport-netty4/src/test/java/org/elasticsearch/transport/netty4/SimpleNetty4TransportTests.java @@ -73,7 +73,7 @@ protected Version getCurrentVersion() { } }; MockTransportService mockTransportService = - MockTransportService.createNewService(Settings.EMPTY, transport, version, threadPool, clusterSettings); + MockTransportService.createNewService(Settings.EMPTY, transport, version, threadPool, clusterSettings, Collections.emptySet()); mockTransportService.start(); return mockTransportService; } diff --git a/plugins/transport-nio/src/test/java/org/elasticsearch/transport/nio/SimpleNioTransportTests.java b/plugins/transport-nio/src/test/java/org/elasticsearch/transport/nio/SimpleNioTransportTests.java index ee65eb5ccbd0d..c78ae25e44a06 100644 --- a/plugins/transport-nio/src/test/java/org/elasticsearch/transport/nio/SimpleNioTransportTests.java +++ b/plugins/transport-nio/src/test/java/org/elasticsearch/transport/nio/SimpleNioTransportTests.java @@ -77,7 +77,7 @@ protected Version getCurrentVersion() { } }; MockTransportService mockTransportService = - MockTransportService.createNewService(Settings.EMPTY, transport, version, threadPool, clusterSettings); + MockTransportService.createNewService(Settings.EMPTY, transport, version, threadPool, clusterSettings, Collections.emptySet()); mockTransportService.start(); return mockTransportService; } diff --git a/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/10_basic.yml b/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/10_basic.yml index 29790e2146190..067eba6e4b860 100644 --- a/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/10_basic.yml +++ b/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/10_basic.yml @@ -212,3 +212,44 @@ field3: value - match: { hits.total: 1 } - match: { hits.hits.0._id: q3 } + +--- +"Create a task result record in the old cluster": + - do: + indices.create: + index: reindexed_index + body: + settings: + index: + number_of_replicas: 0 + - do: + bulk: + refresh: true + body: + - '{"index": {"_index": "reindexed_index", "_type": "doc"}}' + - '{"f1": "1"}' + - '{"index": {"_index": "reindexed_index", "_type": "doc"}}' + - '{"f1": "2"}' + - '{"index": {"_index": "reindexed_index", "_type": "doc"}}' + - '{"f1": "3"}' + - '{"index": {"_index": "reindexed_index", "_type": "doc"}}' + - '{"f1": "4"}' + - '{"index": {"_index": "reindexed_index", "_type": "doc"}}' + - '{"f1": "5"}' + + - do: + reindex: + wait_for_completion: false + body: + source: + index: reindexed_index + size: 1 + dest: + index: reindexed_index_copy + - match: {task: '/.+:\d+/'} + - set: {task: task} + + - do: + tasks.get: + wait_for_completion: true + task_id: $task diff --git a/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/10_basic.yml b/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/10_basic.yml index af58a2f362c78..338b8728b6a82 100644 --- a/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/10_basic.yml +++ b/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/10_basic.yml @@ -126,3 +126,42 @@ field3: value - match: { hits.total: 1 } - match: { hits.hits.0._id: q3 } + +--- +"Find a task result record from the old cluster": + - do: + search: + index: .tasks + body: + query: + match_all: {} + - match: { hits.total: 1 } + - match: { hits.hits.0._id: '/.+:\d+/' } + - set: {hits.hits.0._id: task_id} + + - do: + tasks.get: + wait_for_completion: true + task_id: $task_id + + - is_false: node_failures + - is_true: task + + - do: + headers: { "X-Opaque-Id": "Reindexing Again" } + reindex: + wait_for_completion: false + body: + source: + index: reindexed_index_copy + size: 1 + dest: + index: reindexed_index_another_copy + - match: { task: '/.+:\d+/' } + - set: { task: task_id } + + - do: + tasks.get: + wait_for_completion: true + task_id: $task_id + - match: { task.headers.X-Opaque-Id: "Reindexing Again" } diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/tasks.list.json b/rest-api-spec/src/main/resources/rest-api-spec/api/tasks.list.json index fbe355ee164b0..1110c3c111b99 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/api/tasks.list.json +++ b/rest-api-spec/src/main/resources/rest-api-spec/api/tasks.list.json @@ -34,7 +34,7 @@ "group_by": { "type" : "enum", "description": "Group tasks by nodes or parent/child relationships", - "options" : ["nodes", "parents"], + "options" : ["nodes", "parents", "none"], "default" : "nodes" } diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/tasks.list/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/tasks.list/10_basic.yml index dd1c415876fa7..57bf5b629b76a 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/tasks.list/10_basic.yml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/tasks.list/10_basic.yml @@ -17,3 +17,19 @@ group_by: parents - is_true: tasks + +--- +"tasks_list headers": + - skip: + version: " - 6.99.99" + reason: task headers has been added in 7.0.0 + + - do: + headers: { "X-Opaque-Id": "That is me" } + tasks.list: + actions: "cluster:monitor/tasks/lists" + group_by: none + + - is_true: tasks + - match: { tasks.0.headers.X-Opaque-Id: "That is me" } + diff --git a/server/src/main/java/org/elasticsearch/action/ActionModule.java b/server/src/main/java/org/elasticsearch/action/ActionModule.java index 28fd3458b902a..872c217f98091 100644 --- a/server/src/main/java/org/elasticsearch/action/ActionModule.java +++ b/server/src/main/java/org/elasticsearch/action/ActionModule.java @@ -312,6 +312,7 @@ import org.elasticsearch.rest.action.search.RestMultiSearchAction; import org.elasticsearch.rest.action.search.RestSearchAction; import org.elasticsearch.rest.action.search.RestSearchScrollAction; +import org.elasticsearch.tasks.TaskManager; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.usage.UsageService; @@ -324,6 +325,7 @@ import java.util.function.Supplier; import java.util.function.UnaryOperator; import java.util.stream.Collectors; +import java.util.stream.Stream; import static java.util.Collections.unmodifiableMap; @@ -362,7 +364,10 @@ public ActionModule(boolean transportClient, Settings settings, IndexNameExpress actionFilters = setupActionFilters(actionPlugins); autoCreateIndex = transportClient ? null : new AutoCreateIndex(settings, clusterSettings, indexNameExpressionResolver); destructiveOperations = new DestructiveOperations(settings, clusterSettings); - Set headers = actionPlugins.stream().flatMap(p -> p.getRestHeaders().stream()).collect(Collectors.toSet()); + Set headers = Stream.concat( + actionPlugins.stream().flatMap(p -> p.getRestHeaders().stream()), + Stream.of("X-Opaque-Id") + ).collect(Collectors.toSet()); UnaryOperator restWrapper = null; for (ActionPlugin plugin : actionPlugins) { UnaryOperator newRestWrapper = plugin.getRestHandlerWrapper(threadPool.getThreadContext()); diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/cancel/TransportCancelTasksAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/cancel/TransportCancelTasksAction.java index aca1be7adff4c..0bd1ff2945bd7 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/cancel/TransportCancelTasksAction.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/cancel/TransportCancelTasksAction.java @@ -56,7 +56,7 @@ * Transport action that can be used to cancel currently running cancellable tasks. *

    * For a task to be cancellable it has to return an instance of - * {@link CancellableTask} from {@link TransportRequest#createTask(long, String, String, TaskId)} + * {@link CancellableTask} from {@link TransportRequest#createTask} */ public class TransportCancelTasksAction extends TransportTasksAction { diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/ListTasksResponse.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/ListTasksResponse.java index de5fcf9345d23..88d8ff4679917 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/ListTasksResponse.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/ListTasksResponse.java @@ -186,6 +186,21 @@ public XContentBuilder toXContentGroupedByParents(XContentBuilder builder, Param return builder; } + /** + * Presents a flat list of tasks + */ + public XContentBuilder toXContentGroupedByNone(XContentBuilder builder, Params params) throws IOException { + toXContentCommon(builder, params); + builder.startArray("tasks"); + for (TaskInfo taskInfo : getTasks()) { + builder.startObject(); + taskInfo.toXContent(builder, params); + builder.endObject(); + } + builder.endArray(); + return builder; + } + @Override public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException { builder.startObject(); diff --git a/server/src/main/java/org/elasticsearch/action/index/IndexRequest.java b/server/src/main/java/org/elasticsearch/action/index/IndexRequest.java index 59a0b5e198087..46d51ee0b40e4 100644 --- a/server/src/main/java/org/elasticsearch/action/index/IndexRequest.java +++ b/server/src/main/java/org/elasticsearch/action/index/IndexRequest.java @@ -77,7 +77,7 @@ public class IndexRequest extends ReplicatedWriteRequest implement /** * Max length of the source document to include into toString() * - * @see ReplicationRequest#createTask(long, java.lang.String, java.lang.String, org.elasticsearch.tasks.TaskId) + * @see ReplicationRequest#createTask */ static final int MAX_SOURCE_LENGTH_IN_TOSTRING = 2048; diff --git a/server/src/main/java/org/elasticsearch/action/search/SearchRequest.java b/server/src/main/java/org/elasticsearch/action/search/SearchRequest.java index 07d2229a5366d..2c699bf6d9b3a 100644 --- a/server/src/main/java/org/elasticsearch/action/search/SearchRequest.java +++ b/server/src/main/java/org/elasticsearch/action/search/SearchRequest.java @@ -38,6 +38,7 @@ import java.io.IOException; import java.util.Arrays; import java.util.Collections; +import java.util.Map; import java.util.Objects; import static org.elasticsearch.action.ValidateActions.addValidationError; @@ -428,9 +429,9 @@ public boolean isSuggestOnly() { } @Override - public Task createTask(long id, String type, String action, TaskId parentTaskId) { + public Task createTask(long id, String type, String action, TaskId parentTaskId, Map headers) { // generating description in a lazy way since source can be quite big - return new SearchTask(id, type, action, null, parentTaskId) { + return new SearchTask(id, type, action, null, parentTaskId, headers) { @Override public String getDescription() { StringBuilder sb = new StringBuilder(); diff --git a/server/src/main/java/org/elasticsearch/action/search/SearchScrollRequest.java b/server/src/main/java/org/elasticsearch/action/search/SearchScrollRequest.java index be83ef6d5839e..68f6a6afce091 100644 --- a/server/src/main/java/org/elasticsearch/action/search/SearchScrollRequest.java +++ b/server/src/main/java/org/elasticsearch/action/search/SearchScrollRequest.java @@ -32,6 +32,7 @@ import org.elasticsearch.tasks.TaskId; import java.io.IOException; +import java.util.Map; import java.util.Objects; import static org.elasticsearch.action.ValidateActions.addValidationError; @@ -117,8 +118,8 @@ public void readFrom(StreamInput in) throws IOException { } @Override - public Task createTask(long id, String type, String action, TaskId parentTaskId) { - return new SearchTask(id, type, action, getDescription(), parentTaskId); + public Task createTask(long id, String type, String action, TaskId parentTaskId, Map headers) { + return new SearchTask(id, type, action, getDescription(), parentTaskId, headers); } @Override diff --git a/server/src/main/java/org/elasticsearch/action/search/SearchTask.java b/server/src/main/java/org/elasticsearch/action/search/SearchTask.java index d0a1cdd456f47..699448909a2b5 100644 --- a/server/src/main/java/org/elasticsearch/action/search/SearchTask.java +++ b/server/src/main/java/org/elasticsearch/action/search/SearchTask.java @@ -22,13 +22,15 @@ import org.elasticsearch.tasks.CancellableTask; import org.elasticsearch.tasks.TaskId; +import java.util.Map; + /** * Task storing information about a currently running search request. */ public class SearchTask extends CancellableTask { - public SearchTask(long id, String type, String action, String description, TaskId parentTaskId) { - super(id, type, action, description, parentTaskId); + public SearchTask(long id, String type, String action, String description, TaskId parentTaskId, Map headers) { + super(id, type, action, description, parentTaskId, headers); } @Override diff --git a/server/src/main/java/org/elasticsearch/action/support/replication/ReplicationRequest.java b/server/src/main/java/org/elasticsearch/action/support/replication/ReplicationRequest.java index 07822bebaa9ac..81584a7bb6467 100644 --- a/server/src/main/java/org/elasticsearch/action/support/replication/ReplicationRequest.java +++ b/server/src/main/java/org/elasticsearch/action/support/replication/ReplicationRequest.java @@ -35,6 +35,7 @@ import org.elasticsearch.tasks.TaskId; import java.io.IOException; +import java.util.Map; import java.util.concurrent.TimeUnit; import static org.elasticsearch.action.ValidateActions.addValidationError; @@ -207,8 +208,8 @@ public void writeTo(StreamOutput out) throws IOException { } @Override - public Task createTask(long id, String type, String action, TaskId parentTaskId) { - return new ReplicationTask(id, type, action, getDescription(), parentTaskId); + public Task createTask(long id, String type, String action, TaskId parentTaskId, Map headers) { + return new ReplicationTask(id, type, action, getDescription(), parentTaskId, headers); } /** diff --git a/server/src/main/java/org/elasticsearch/action/support/replication/ReplicationTask.java b/server/src/main/java/org/elasticsearch/action/support/replication/ReplicationTask.java index 2e0baa057b223..1cf8b8bf0ff68 100644 --- a/server/src/main/java/org/elasticsearch/action/support/replication/ReplicationTask.java +++ b/server/src/main/java/org/elasticsearch/action/support/replication/ReplicationTask.java @@ -27,6 +27,7 @@ import org.elasticsearch.tasks.TaskId; import java.io.IOException; +import java.util.Map; import static java.util.Objects.requireNonNull; @@ -36,8 +37,8 @@ public class ReplicationTask extends Task { private volatile String phase = "starting"; - public ReplicationTask(long id, String type, String action, String description, TaskId parentTaskId) { - super(id, type, action, description, parentTaskId); + public ReplicationTask(long id, String type, String action, String description, TaskId parentTaskId, Map headers) { + super(id, type, action, description, parentTaskId, headers); } /** diff --git a/server/src/main/java/org/elasticsearch/action/support/replication/TransportReplicationAction.java b/server/src/main/java/org/elasticsearch/action/support/replication/TransportReplicationAction.java index a63d14d7f9d12..1a57b6a5d9500 100644 --- a/server/src/main/java/org/elasticsearch/action/support/replication/TransportReplicationAction.java +++ b/server/src/main/java/org/elasticsearch/action/support/replication/TransportReplicationAction.java @@ -81,6 +81,7 @@ import org.elasticsearch.transport.TransportService; import java.io.IOException; +import java.util.Map; import java.util.Objects; import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Consumer; @@ -1228,8 +1229,8 @@ public TaskId getParentTask() { return request.getParentTask(); } @Override - public Task createTask(long id, String type, String action, TaskId parentTaskId) { - return request.createTask(id, type, action, parentTaskId); + public Task createTask(long id, String type, String action, TaskId parentTaskId, Map headers) { + return request.createTask(id, type, action, parentTaskId, headers); } @Override diff --git a/server/src/main/java/org/elasticsearch/client/transport/TransportClient.java b/server/src/main/java/org/elasticsearch/client/transport/TransportClient.java index 0d4a87f3bfa24..dc0f7b015632e 100644 --- a/server/src/main/java/org/elasticsearch/client/transport/TransportClient.java +++ b/server/src/main/java/org/elasticsearch/client/transport/TransportClient.java @@ -180,7 +180,7 @@ private static ClientTemplate buildTemplate(Settings providedSettings, Settings final TransportService transportService = new TransportService(settings, transport, threadPool, networkModule.getTransportInterceptor(), boundTransportAddress -> DiscoveryNode.createLocal(settings, new TransportAddress(TransportAddress.META_ADDRESS, 0), - UUIDs.randomBase64UUID()), null); + UUIDs.randomBase64UUID()), null, Collections.emptySet()); modules.add((b -> { b.bind(BigArrays.class).toInstance(bigArrays); b.bind(PluginsService.class).toInstance(pluginsService); diff --git a/server/src/main/java/org/elasticsearch/index/reindex/AbstractBulkByScrollRequest.java b/server/src/main/java/org/elasticsearch/index/reindex/AbstractBulkByScrollRequest.java index 9d2c221fcb24d..fc4163ddd19b2 100644 --- a/server/src/main/java/org/elasticsearch/index/reindex/AbstractBulkByScrollRequest.java +++ b/server/src/main/java/org/elasticsearch/index/reindex/AbstractBulkByScrollRequest.java @@ -35,6 +35,7 @@ import java.io.IOException; import java.util.Arrays; +import java.util.Map; import static org.elasticsearch.action.ValidateActions.addValidationError; import static org.elasticsearch.common.unit.TimeValue.timeValueMillis; @@ -408,8 +409,8 @@ protected Self doForSlice(Self request, TaskId slicingTask, int totalSlices) { } @Override - public Task createTask(long id, String type, String action, TaskId parentTaskId) { - return new BulkByScrollTask(id, type, action, getDescription(), parentTaskId); + public Task createTask(long id, String type, String action, TaskId parentTaskId, Map headers) { + return new BulkByScrollTask(id, type, action, getDescription(), parentTaskId, headers); } @Override diff --git a/server/src/main/java/org/elasticsearch/index/reindex/BulkByScrollTask.java b/server/src/main/java/org/elasticsearch/index/reindex/BulkByScrollTask.java index d5e656489558c..276484b055253 100644 --- a/server/src/main/java/org/elasticsearch/index/reindex/BulkByScrollTask.java +++ b/server/src/main/java/org/elasticsearch/index/reindex/BulkByScrollTask.java @@ -26,7 +26,6 @@ import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.common.unit.TimeValue; -import org.elasticsearch.common.xcontent.ToXContent.Params; import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.tasks.CancellableTask; @@ -38,6 +37,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; +import java.util.Map; import java.util.Objects; import static java.lang.Math.min; @@ -62,8 +62,8 @@ public class BulkByScrollTask extends CancellableTask { private volatile LeaderBulkByScrollTaskState leaderState; private volatile WorkerBulkByScrollTaskState workerState; - public BulkByScrollTask(long id, String type, String action, String description, TaskId parentTaskId) { - super(id, type, action, description, parentTaskId); + public BulkByScrollTask(long id, String type, String action, String description, TaskId parentTaskId, Map headers) { + super(id, type, action, description, parentTaskId, headers); } @Override diff --git a/server/src/main/java/org/elasticsearch/index/shard/PrimaryReplicaSyncer.java b/server/src/main/java/org/elasticsearch/index/shard/PrimaryReplicaSyncer.java index b1bd1c5b3138e..1e31eae7d417f 100644 --- a/server/src/main/java/org/elasticsearch/index/shard/PrimaryReplicaSyncer.java +++ b/server/src/main/java/org/elasticsearch/index/shard/PrimaryReplicaSyncer.java @@ -45,6 +45,7 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; +import java.util.Map; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; @@ -271,8 +272,8 @@ public ResyncRequest(ShardId shardId, String allocationId) { } @Override - public Task createTask(long id, String type, String action, TaskId parentTaskId) { - return new ResyncTask(id, type, action, getDescription(), parentTaskId); + public Task createTask(long id, String type, String action, TaskId parentTaskId, Map headers) { + return new ResyncTask(id, type, action, getDescription(), parentTaskId, headers); } @Override @@ -297,8 +298,8 @@ public static class ResyncTask extends Task { private volatile int resyncedOperations; private volatile int skippedOperations; - public ResyncTask(long id, String type, String action, String description, TaskId parentTaskId) { - super(id, type, action, description, parentTaskId); + public ResyncTask(long id, String type, String action, String description, TaskId parentTaskId, Map headers) { + super(id, type, action, description, parentTaskId, headers); } /** diff --git a/server/src/main/java/org/elasticsearch/node/Node.java b/server/src/main/java/org/elasticsearch/node/Node.java index 21ce12c59f8fb..62fc271f99084 100644 --- a/server/src/main/java/org/elasticsearch/node/Node.java +++ b/server/src/main/java/org/elasticsearch/node/Node.java @@ -156,6 +156,7 @@ import java.util.Collections; import java.util.List; import java.util.Map; +import java.util.Set; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.function.Consumer; @@ -424,8 +425,12 @@ protected Node(final Environment environment, Collection metaDataIndexUpgradeService, metaDataUpgrader); new TemplateUpgradeService(settings, client, clusterService, threadPool, indexTemplateMetaDataUpgraders); final Transport transport = networkModule.getTransportSupplier().get(); + Set taskHeaders = Stream.concat( + pluginsService.filterPlugins(ActionPlugin.class).stream().flatMap(p -> p.getTaskHeaders().stream()), + Stream.of("X-Opaque-Id") + ).collect(Collectors.toSet()); final TransportService transportService = newTransportService(settings, transport, threadPool, - networkModule.getTransportInterceptor(), localNodeFactory, settingsModule.getClusterSettings()); + networkModule.getTransportInterceptor(), localNodeFactory, settingsModule.getClusterSettings(), taskHeaders); final ResponseCollectorService responseCollectorService = new ResponseCollectorService(this.settings, clusterService); final SearchTransportService searchTransportService = new SearchTransportService(settings, transportService, SearchExecutionStatsCollector.makeWrapper(responseCollectorService)); @@ -543,8 +548,8 @@ static void warnIfPreRelease(final Version version, final boolean isSnapshot, fi protected TransportService newTransportService(Settings settings, Transport transport, ThreadPool threadPool, TransportInterceptor interceptor, Function localNodeFactory, - ClusterSettings clusterSettings) { - return new TransportService(settings, transport, threadPool, interceptor, localNodeFactory, clusterSettings); + ClusterSettings clusterSettings, Set taskHeaders) { + return new TransportService(settings, transport, threadPool, interceptor, localNodeFactory, clusterSettings, taskHeaders); } protected void processRecoverySettings(ClusterSettings clusterSettings, RecoverySettings recoverySettings) { diff --git a/server/src/main/java/org/elasticsearch/plugins/ActionPlugin.java b/server/src/main/java/org/elasticsearch/plugins/ActionPlugin.java index 377da56f6018b..41f0ed86116ad 100644 --- a/server/src/main/java/org/elasticsearch/plugins/ActionPlugin.java +++ b/server/src/main/java/org/elasticsearch/plugins/ActionPlugin.java @@ -84,6 +84,13 @@ default Collection getRestHeaders() { return Collections.emptyList(); } + /** + * Returns headers which should be copied from internal requests into tasks. + */ + default Collection getTaskHeaders() { + return Collections.emptyList(); + } + /** * Returns a function used to wrap each rest request before handling the request. * diff --git a/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestListTasksAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestListTasksAction.java index 6ef5d5a2de2bf..8e6447e0e4980 100644 --- a/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestListTasksAction.java +++ b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestListTasksAction.java @@ -103,10 +103,21 @@ public RestResponse buildResponse(T response, XContentBuilder builder) throws Ex return new BytesRestResponse(RestStatus.OK, builder); } }; + } else if ("none".equals(groupBy)) { + return new RestBuilderListener(channel) { + @Override + public RestResponse buildResponse(T response, XContentBuilder builder) throws Exception { + builder.startObject(); + response.toXContentGroupedByNone(builder, channel.request()); + builder.endObject(); + return new BytesRestResponse(RestStatus.OK, builder); + } + }; + } else if ("parents".equals(groupBy)) { return new RestToXContentListener<>(channel); } else { - throw new IllegalArgumentException("[group_by] must be one of [nodes] or [parents] but was [" + groupBy + "]"); + throw new IllegalArgumentException("[group_by] must be one of [nodes], [parents] or [none] but was [" + groupBy + "]"); } } diff --git a/server/src/main/java/org/elasticsearch/search/fetch/ShardFetchRequest.java b/server/src/main/java/org/elasticsearch/search/fetch/ShardFetchRequest.java index ac71b84d54f34..6957eea4758d9 100644 --- a/server/src/main/java/org/elasticsearch/search/fetch/ShardFetchRequest.java +++ b/server/src/main/java/org/elasticsearch/search/fetch/ShardFetchRequest.java @@ -31,6 +31,7 @@ import org.elasticsearch.transport.TransportRequest; import java.io.IOException; +import java.util.Map; /** * Shard level fetch base request. Holds all the info needed to execute a fetch. @@ -115,8 +116,8 @@ public void readFrom(StreamInput in) throws IOException { } @Override - public Task createTask(long id, String type, String action, TaskId parentTaskId) { - return new SearchTask(id, type, action, getDescription(), parentTaskId); + public Task createTask(long id, String type, String action, TaskId parentTaskId, Map headers) { + return new SearchTask(id, type, action, getDescription(), parentTaskId, headers); } @Override diff --git a/server/src/main/java/org/elasticsearch/search/internal/InternalScrollSearchRequest.java b/server/src/main/java/org/elasticsearch/search/internal/InternalScrollSearchRequest.java index d1fba0f761526..c551205f6b5db 100644 --- a/server/src/main/java/org/elasticsearch/search/internal/InternalScrollSearchRequest.java +++ b/server/src/main/java/org/elasticsearch/search/internal/InternalScrollSearchRequest.java @@ -29,6 +29,7 @@ import org.elasticsearch.transport.TransportRequest; import java.io.IOException; +import java.util.Map; public class InternalScrollSearchRequest extends TransportRequest { @@ -76,8 +77,8 @@ public void readFrom(StreamInput in) throws IOException { } @Override - public Task createTask(long id, String type, String action, TaskId parentTaskId) { - return new SearchTask(id, type, action, getDescription(), parentTaskId); + public Task createTask(long id, String type, String action, TaskId parentTaskId, Map headers) { + return new SearchTask(id, type, action, getDescription(), parentTaskId, headers); } @Override diff --git a/server/src/main/java/org/elasticsearch/search/internal/ShardSearchTransportRequest.java b/server/src/main/java/org/elasticsearch/search/internal/ShardSearchTransportRequest.java index 76a13b7b02f24..a0fecc9bf8b3d 100644 --- a/server/src/main/java/org/elasticsearch/search/internal/ShardSearchTransportRequest.java +++ b/server/src/main/java/org/elasticsearch/search/internal/ShardSearchTransportRequest.java @@ -40,6 +40,7 @@ import org.elasticsearch.transport.TransportRequest; import java.io.IOException; +import java.util.Map; /** * Shard level search request that represents an actual search sent from the coordinating node to the nodes holding @@ -177,8 +178,8 @@ public boolean isProfile() { } @Override - public Task createTask(long id, String type, String action, TaskId parentTaskId) { - return new SearchTask(id, type, action, getDescription(), parentTaskId); + public Task createTask(long id, String type, String action, TaskId parentTaskId, Map headers) { + return new SearchTask(id, type, action, getDescription(), parentTaskId, headers); } @Override diff --git a/server/src/main/java/org/elasticsearch/search/query/QuerySearchRequest.java b/server/src/main/java/org/elasticsearch/search/query/QuerySearchRequest.java index c893ed93046f0..dbb14fda71783 100644 --- a/server/src/main/java/org/elasticsearch/search/query/QuerySearchRequest.java +++ b/server/src/main/java/org/elasticsearch/search/query/QuerySearchRequest.java @@ -32,6 +32,7 @@ import org.elasticsearch.transport.TransportRequest; import java.io.IOException; +import java.util.Map; import static org.elasticsearch.search.dfs.AggregatedDfs.readAggregatedDfs; @@ -91,8 +92,8 @@ public void readFrom(StreamInput in) throws IOException { } @Override - public Task createTask(long id, String type, String action, TaskId parentTaskId) { - return new SearchTask(id, type, action, getDescription(), parentTaskId); + public Task createTask(long id, String type, String action, TaskId parentTaskId, Map headers) { + return new SearchTask(id, type, action, getDescription(), parentTaskId, headers); } public String getDescription() { diff --git a/server/src/main/java/org/elasticsearch/tasks/CancellableTask.java b/server/src/main/java/org/elasticsearch/tasks/CancellableTask.java index 685e9bcf35251..1d43076305ccd 100644 --- a/server/src/main/java/org/elasticsearch/tasks/CancellableTask.java +++ b/server/src/main/java/org/elasticsearch/tasks/CancellableTask.java @@ -21,6 +21,7 @@ import org.elasticsearch.common.Nullable; +import java.util.Map; import java.util.concurrent.atomic.AtomicReference; /** @@ -30,8 +31,8 @@ public abstract class CancellableTask extends Task { private final AtomicReference reason = new AtomicReference<>(); - public CancellableTask(long id, String type, String action, String description, TaskId parentTaskId) { - super(id, type, action, description, parentTaskId); + public CancellableTask(long id, String type, String action, String description, TaskId parentTaskId, Map headers) { + super(id, type, action, description, parentTaskId, headers); } /** diff --git a/server/src/main/java/org/elasticsearch/tasks/Task.java b/server/src/main/java/org/elasticsearch/tasks/Task.java index e59970b84ee47..9fd9019cd213c 100644 --- a/server/src/main/java/org/elasticsearch/tasks/Task.java +++ b/server/src/main/java/org/elasticsearch/tasks/Task.java @@ -27,6 +27,7 @@ import org.elasticsearch.common.xcontent.ToXContentObject; import java.io.IOException; +import java.util.Map; /** * Current task information @@ -43,6 +44,8 @@ public class Task { private final TaskId parentTask; + private final Map headers; + /** * The task's start time as a wall clock time since epoch ({@link System#currentTimeMillis()} style). */ @@ -53,11 +56,12 @@ public class Task { */ private final long startTimeNanos; - public Task(long id, String type, String action, String description, TaskId parentTask) { - this(id, type, action, description, parentTask, System.currentTimeMillis(), System.nanoTime()); + public Task(long id, String type, String action, String description, TaskId parentTask, Map headers) { + this(id, type, action, description, parentTask, System.currentTimeMillis(), System.nanoTime(), headers); } - public Task(long id, String type, String action, String description, TaskId parentTask, long startTime, long startTimeNanos) { + public Task(long id, String type, String action, String description, TaskId parentTask, long startTime, long startTimeNanos, + Map headers) { this.id = id; this.type = type; this.action = action; @@ -65,6 +69,7 @@ public Task(long id, String type, String action, String description, TaskId pare this.parentTask = parentTask; this.startTime = startTime; this.startTimeNanos = startTimeNanos; + this.headers = headers; } /** @@ -92,7 +97,7 @@ public final TaskInfo taskInfo(String localNodeId, boolean detailed) { */ protected final TaskInfo taskInfo(String localNodeId, String description, Status status) { return new TaskInfo(new TaskId(localNodeId, getId()), getType(), getAction(), description, status, startTime, - System.nanoTime() - startTimeNanos, this instanceof CancellableTask, parentTask); + System.nanoTime() - startTimeNanos, this instanceof CancellableTask, parentTask, headers); } /** @@ -149,6 +154,14 @@ public Status getStatus() { public interface Status extends ToXContentObject, NamedWriteable {} + + /** + * Returns stored task header associated with the task + */ + public String getHeader(String header) { + return headers.get(header); + } + public TaskResult result(DiscoveryNode node, Exception error) throws IOException { return new TaskResult(taskInfo(node.getId(), true), error); } diff --git a/server/src/main/java/org/elasticsearch/tasks/TaskAwareRequest.java b/server/src/main/java/org/elasticsearch/tasks/TaskAwareRequest.java index a2364ac8e4047..86ba59ebcc804 100644 --- a/server/src/main/java/org/elasticsearch/tasks/TaskAwareRequest.java +++ b/server/src/main/java/org/elasticsearch/tasks/TaskAwareRequest.java @@ -19,6 +19,8 @@ package org.elasticsearch.tasks; +import java.util.Map; + /** * An interface for a request that can be used to register a task manager task */ @@ -47,8 +49,8 @@ default void setParentTask(String parentTaskNode, long parentTaskId) { * A request can override this method and return null to avoid being tracked by the task * manager. */ - default Task createTask(long id, String type, String action, TaskId parentTaskId) { - return new Task(id, type, action, getDescription(), parentTaskId); + default Task createTask(long id, String type, String action, TaskId parentTaskId, Map headers) { + return new Task(id, type, action, getDescription(), parentTaskId, headers); } /** diff --git a/server/src/main/java/org/elasticsearch/tasks/TaskInfo.java b/server/src/main/java/org/elasticsearch/tasks/TaskInfo.java index d0fd66703e09e..2bd16a9addf6a 100644 --- a/server/src/main/java/org/elasticsearch/tasks/TaskInfo.java +++ b/server/src/main/java/org/elasticsearch/tasks/TaskInfo.java @@ -19,6 +19,7 @@ package org.elasticsearch.tasks; +import org.elasticsearch.Version; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.Strings; import org.elasticsearch.common.bytes.BytesReference; @@ -31,6 +32,8 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import java.io.IOException; +import java.util.Collections; +import java.util.Map; import java.util.Objects; import java.util.concurrent.TimeUnit; @@ -65,8 +68,10 @@ public final class TaskInfo implements Writeable, ToXContentFragment { private final TaskId parentTaskId; + private final Map headers; + public TaskInfo(TaskId taskId, String type, String action, String description, Task.Status status, long startTime, - long runningTimeNanos, boolean cancellable, TaskId parentTaskId) { + long runningTimeNanos, boolean cancellable, TaskId parentTaskId, Map headers) { this.taskId = taskId; this.type = type; this.action = action; @@ -76,6 +81,7 @@ public TaskInfo(TaskId taskId, String type, String action, String description, T this.runningTimeNanos = runningTimeNanos; this.cancellable = cancellable; this.parentTaskId = parentTaskId; + this.headers = headers; } /** @@ -91,6 +97,11 @@ public TaskInfo(StreamInput in) throws IOException { runningTimeNanos = in.readLong(); cancellable = in.readBoolean(); parentTaskId = TaskId.readFromStream(in); + if (in.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { + headers = in.readMap(StreamInput::readString, StreamInput::readString); + } else { + headers = Collections.emptyMap(); + } } @Override @@ -104,6 +115,9 @@ public void writeTo(StreamOutput out) throws IOException { out.writeLong(runningTimeNanos); out.writeBoolean(cancellable); parentTaskId.writeTo(out); + if (out.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { + out.writeMap(headers, StreamOutput::writeString, StreamOutput::writeString); + } } public TaskId getTaskId() { @@ -162,6 +176,13 @@ public TaskId getParentTaskId() { return parentTaskId; } + /** + * Returns the task headers + */ + public Map getHeaders() { + return headers; + } + @Override public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException { builder.field("node", taskId.getNodeId()); @@ -180,6 +201,11 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws if (parentTaskId.isSet()) { builder.field("parent_task_id", parentTaskId.toString()); } + builder.startObject("headers"); + for(Map.Entry attribute : headers.entrySet()) { + builder.field(attribute.getKey(), attribute.getValue()); + } + builder.endObject(); return builder; } @@ -195,10 +221,15 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws long runningTimeNanos = (Long) a[i++]; boolean cancellable = (Boolean) a[i++]; String parentTaskIdString = (String) a[i++]; - + @SuppressWarnings("unchecked") Map headers = (Map) a[i++]; + if (headers == null) { + // This might happen if we are reading an old version of task info + headers = Collections.emptyMap(); + } RawTaskStatus status = statusBytes == null ? null : new RawTaskStatus(statusBytes); TaskId parentTaskId = parentTaskIdString == null ? TaskId.EMPTY_TASK_ID : new TaskId(parentTaskIdString); - return new TaskInfo(id, type, action, description, status, startTime, runningTimeNanos, cancellable, parentTaskId); + return new TaskInfo(id, type, action, description, status, startTime, runningTimeNanos, cancellable, parentTaskId, + headers); }); static { // Note for the future: this has to be backwards and forwards compatible with all changes to the task storage format @@ -212,6 +243,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws PARSER.declareLong(constructorArg(), new ParseField("running_time_in_nanos")); PARSER.declareBoolean(constructorArg(), new ParseField("cancellable")); PARSER.declareString(optionalConstructorArg(), new ParseField("parent_task_id")); + PARSER.declareObject(optionalConstructorArg(), (p, c) -> p.mapStrings(), new ParseField("headers")); } @Override @@ -234,11 +266,12 @@ public boolean equals(Object obj) { && Objects.equals(runningTimeNanos, other.runningTimeNanos) && Objects.equals(parentTaskId, other.parentTaskId) && Objects.equals(cancellable, other.cancellable) - && Objects.equals(status, other.status); + && Objects.equals(status, other.status) + && Objects.equals(headers, other.headers); } @Override public int hashCode() { - return Objects.hash(taskId, type, action, description, startTime, runningTimeNanos, parentTaskId, cancellable, status); + return Objects.hash(taskId, type, action, description, startTime, runningTimeNanos, parentTaskId, cancellable, status, headers); } } diff --git a/server/src/main/java/org/elasticsearch/tasks/TaskManager.java b/server/src/main/java/org/elasticsearch/tasks/TaskManager.java index afeeeeedd1168..16212e066bbff 100644 --- a/server/src/main/java/org/elasticsearch/tasks/TaskManager.java +++ b/server/src/main/java/org/elasticsearch/tasks/TaskManager.java @@ -32,19 +32,26 @@ import org.elasticsearch.cluster.node.DiscoveryNodes; import org.elasticsearch.common.component.AbstractComponent; import org.elasticsearch.common.settings.Settings; +import org.elasticsearch.common.unit.ByteSizeValue; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.util.concurrent.ConcurrentCollections; import org.elasticsearch.common.util.concurrent.ConcurrentMapLong; +import org.elasticsearch.common.util.concurrent.ThreadContext; +import org.elasticsearch.threadpool.ThreadPool; import java.io.IOException; +import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; import java.util.Iterator; +import java.util.List; import java.util.Map; +import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicLong; import static org.elasticsearch.common.unit.TimeValue.timeValueMillis; +import static org.elasticsearch.http.HttpTransportSettings.SETTING_HTTP_MAX_HEADER_SIZE; /** * Task Manager service for keeping track of currently running tasks on the nodes @@ -52,6 +59,10 @@ public class TaskManager extends AbstractComponent implements ClusterStateApplier { private static final TimeValue WAIT_FOR_COMPLETION_POLL = timeValueMillis(100); + /** Rest headers that are copied to the task */ + private final List taskHeaders; + private final ThreadPool threadPool; + private final ConcurrentMapLong tasks = ConcurrentCollections.newConcurrentMapLongWithAggressiveConcurrency(); private final ConcurrentMapLong cancellableTasks = ConcurrentCollections @@ -65,8 +76,13 @@ public class TaskManager extends AbstractComponent implements ClusterStateApplie private DiscoveryNodes lastDiscoveryNodes = DiscoveryNodes.EMPTY_NODES; - public TaskManager(Settings settings) { + private final ByteSizeValue maxHeaderSize; + + public TaskManager(Settings settings, ThreadPool threadPool, Set taskHeaders) { super(settings); + this.threadPool = threadPool; + this.taskHeaders = new ArrayList<>(taskHeaders); + this.maxHeaderSize = SETTING_HTTP_MAX_HEADER_SIZE.get(settings); } public void setTaskResultsService(TaskResultsService taskResultsService) { @@ -80,7 +96,21 @@ public void setTaskResultsService(TaskResultsService taskResultsService) { * Returns the task manager tracked task or null if the task doesn't support the task manager */ public Task register(String type, String action, TaskAwareRequest request) { - Task task = request.createTask(taskIdGenerator.incrementAndGet(), type, action, request.getParentTask()); + Map headers = new HashMap<>(); + long headerSize = 0; + long maxSize = maxHeaderSize.getBytes(); + ThreadContext threadContext = threadPool.getThreadContext(); + for (String key : taskHeaders) { + String httpHeader = threadContext.getHeader(key); + if (httpHeader != null) { + headerSize += key.length() * 2 + httpHeader.length() * 2; + if (headerSize > maxSize) { + throw new IllegalArgumentException("Request exceeded the maximum size of task headers " + maxHeaderSize); + } + headers.put(key, httpHeader); + } + } + Task task = request.createTask(taskIdGenerator.incrementAndGet(), type, action, request.getParentTask(), headers); if (task == null) { return null; } diff --git a/server/src/main/java/org/elasticsearch/tasks/TaskResultsService.java b/server/src/main/java/org/elasticsearch/tasks/TaskResultsService.java index 69549c611f1e6..f661095d6bd47 100644 --- a/server/src/main/java/org/elasticsearch/tasks/TaskResultsService.java +++ b/server/src/main/java/org/elasticsearch/tasks/TaskResultsService.java @@ -34,6 +34,7 @@ import org.elasticsearch.client.Requests; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.metadata.IndexMetaData; +import org.elasticsearch.cluster.metadata.MappingMetaData; import org.elasticsearch.cluster.service.ClusterService; import org.elasticsearch.common.component.AbstractComponent; import org.elasticsearch.common.inject.Inject; @@ -48,6 +49,7 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; +import java.util.Map; /** * Service that can store task results. @@ -60,6 +62,10 @@ public class TaskResultsService extends AbstractComponent { public static final String TASK_RESULT_INDEX_MAPPING_FILE = "task-index-mapping.json"; + public static final String TASK_RESULT_MAPPING_VERSION_META_FIELD = "version"; + + public static final int TASK_RESULT_MAPPING_VERSION = 2; + private final Client client; private final ClusterService clusterService; @@ -109,7 +115,7 @@ public void onFailure(Exception e) { }); } else { IndexMetaData metaData = state.getMetaData().index(TASK_INDEX); - if (metaData.getMappings().containsKey(TASK_TYPE) == false) { + if (getTaskResultMappingVersion(metaData) < TASK_RESULT_MAPPING_VERSION) { // The index already exists but doesn't have our mapping client.admin().indices().preparePutMapping(TASK_INDEX).setType(TASK_TYPE) .setSource(taskResultIndexMapping(), XContentType.JSON) @@ -131,6 +137,17 @@ public void onFailure(Exception e) { } } + private int getTaskResultMappingVersion(IndexMetaData metaData) { + MappingMetaData mappingMetaData = metaData.getMappings().get(TASK_TYPE); + if (mappingMetaData == null) { + return 0; + } + @SuppressWarnings("unchecked") Map meta = (Map) mappingMetaData.sourceAsMap().get("_meta"); + if (meta == null || meta.containsKey(TASK_RESULT_MAPPING_VERSION_META_FIELD) == false) { + return 1; // The mapping was created before meta field was introduced + } + return (int) meta.get(TASK_RESULT_MAPPING_VERSION_META_FIELD); + } private void doStoreResult(TaskResult taskResult, ActionListener listener) { IndexRequestBuilder index = client.prepareIndex(TASK_INDEX, TASK_TYPE, taskResult.getTask().getTaskId().toString()); diff --git a/server/src/main/java/org/elasticsearch/transport/TransportService.java b/server/src/main/java/org/elasticsearch/transport/TransportService.java index a59ffcaa872d2..7687844231ccd 100644 --- a/server/src/main/java/org/elasticsearch/transport/TransportService.java +++ b/server/src/main/java/org/elasticsearch/transport/TransportService.java @@ -61,6 +61,7 @@ import java.util.List; import java.util.Map; import java.util.Objects; +import java.util.Set; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; @@ -149,7 +150,8 @@ public void close() throws IOException { * updates for {@link #TRACE_LOG_EXCLUDE_SETTING} and {@link #TRACE_LOG_INCLUDE_SETTING}. */ public TransportService(Settings settings, Transport transport, ThreadPool threadPool, TransportInterceptor transportInterceptor, - Function localNodeFactory, @Nullable ClusterSettings clusterSettings) { + Function localNodeFactory, @Nullable ClusterSettings clusterSettings, + Set taskHeaders) { super(settings); this.transport = transport; this.threadPool = threadPool; @@ -158,7 +160,7 @@ public TransportService(Settings settings, Transport transport, ThreadPool threa setTracerLogInclude(TRACE_LOG_INCLUDE_SETTING.get(settings)); setTracerLogExclude(TRACE_LOG_EXCLUDE_SETTING.get(settings)); tracerLog = Loggers.getLogger(logger, ".tracer"); - taskManager = createTaskManager(); + taskManager = createTaskManager(settings, threadPool, taskHeaders); this.interceptor = transportInterceptor; this.asyncSender = interceptor.interceptSender(this::sendRequestInternal); this.connectToRemoteCluster = RemoteClusterService.ENABLE_REMOTE_CLUSTERS.get(settings); @@ -184,8 +186,8 @@ public TaskManager getTaskManager() { return taskManager; } - protected TaskManager createTaskManager() { - return new TaskManager(settings); + protected TaskManager createTaskManager(Settings settings, ThreadPool threadPool, Set taskHeaders) { + return new TaskManager(settings, threadPool, taskHeaders); } /** diff --git a/server/src/main/resources/org/elasticsearch/tasks/task-index-mapping.json b/server/src/main/resources/org/elasticsearch/tasks/task-index-mapping.json index 0f1a32e1bef81..435e6c5759cbb 100644 --- a/server/src/main/resources/org/elasticsearch/tasks/task-index-mapping.json +++ b/server/src/main/resources/org/elasticsearch/tasks/task-index-mapping.json @@ -1,5 +1,8 @@ { "task" : { + "_meta": { + "version": 2 + }, "dynamic" : "strict", "properties" : { "completed": { @@ -37,6 +40,10 @@ }, "description": { "type": "text" + }, + "headers": { + "type" : "object", + "enabled" : false } } }, diff --git a/server/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/CancellableTasksTests.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/CancellableTasksTests.java index c28fddf68ad72..6b2e2040bca80 100644 --- a/server/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/CancellableTasksTests.java +++ b/server/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/CancellableTasksTests.java @@ -45,6 +45,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.List; +import java.util.Map; import java.util.Random; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutionException; @@ -91,8 +92,8 @@ public String getDescription() { } @Override - public Task createTask(long id, String type, String action, TaskId parentTaskId) { - return new CancellableTask(id, type, action, getDescription(), parentTaskId) { + public Task createTask(long id, String type, String action, TaskId parentTaskId, Map headers) { + return new CancellableTask(id, type, action, getDescription(), parentTaskId, headers) { @Override public boolean shouldCancelChildrenOnCancellation() { return false; @@ -131,8 +132,8 @@ public String getDescription() { } @Override - public Task createTask(long id, String type, String action, TaskId parentTaskId) { - return new CancellableTask(id, type, action, getDescription(), parentTaskId) { + public Task createTask(long id, String type, String action, TaskId parentTaskId, Map headers) { + return new CancellableTask(id, type, action, getDescription(), parentTaskId, headers) { @Override public boolean shouldCancelChildrenOnCancellation() { return true; diff --git a/server/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TaskManagerTestCase.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TaskManagerTestCase.java index 8927fed567ed9..62313d01b95c3 100644 --- a/server/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TaskManagerTestCase.java +++ b/server/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TaskManagerTestCase.java @@ -56,9 +56,11 @@ import org.junit.BeforeClass; import java.io.IOException; +import java.util.Collection; import java.util.Collections; import java.util.HashSet; import java.util.List; +import java.util.Set; import java.util.concurrent.TimeUnit; import java.util.function.Function; import java.util.function.Supplier; @@ -175,15 +177,16 @@ public TestNode(String name, ThreadPool threadPool, Settings settings) { }; transportService = new TransportService(settings, new MockTcpTransport(settings, threadPool, BigArrays.NON_RECYCLING_INSTANCE, new NoneCircuitBreakerService(), - new NamedWriteableRegistry(ClusterModule.getNamedWriteables()), - new NetworkService(Collections.emptyList())), - threadPool, TransportService.NOOP_TRANSPORT_INTERCEPTOR, boundTransportAddressDiscoveryNodeFunction, null) { + new NamedWriteableRegistry(ClusterModule.getNamedWriteables()), + new NetworkService(Collections.emptyList())), + threadPool, TransportService.NOOP_TRANSPORT_INTERCEPTOR, boundTransportAddressDiscoveryNodeFunction, null, + Collections.emptySet()) { @Override - protected TaskManager createTaskManager() { + protected TaskManager createTaskManager(Settings settings, ThreadPool threadPool, Set taskHeaders) { if (MockTaskManager.USE_MOCK_TASK_MANAGER_SETTING.get(settings)) { - return new MockTaskManager(settings); + return new MockTaskManager(settings, threadPool, taskHeaders); } else { - return super.createTaskManager(); + return super.createTaskManager(settings, threadPool, taskHeaders); } } }; diff --git a/server/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TaskTests.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TaskTests.java index c5d8b39c3da39..8628a8ee2c391 100644 --- a/server/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TaskTests.java +++ b/server/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TaskTests.java @@ -25,6 +25,7 @@ import org.elasticsearch.test.ESTestCase; import java.nio.charset.StandardCharsets; +import java.util.Collections; import java.util.Map; public class TaskTests extends ESTestCase { @@ -36,7 +37,8 @@ public void testTaskInfoToString() { long runningTime = randomNonNegativeLong(); boolean cancellable = randomBoolean(); TaskInfo taskInfo = new TaskInfo(new TaskId(nodeId, taskId), "test_type", - "test_action", "test_description", null, startTime, runningTime, cancellable, TaskId.EMPTY_TASK_ID); + "test_action", "test_description", null, startTime, runningTime, cancellable, TaskId.EMPTY_TASK_ID, + Collections.singletonMap("foo", "bar")); String taskInfoString = taskInfo.toString(); Map map = XContentHelper.convertToMap(new BytesArray(taskInfoString.getBytes(StandardCharsets.UTF_8)), true).v2(); assertEquals(((Number)map.get("id")).longValue(), taskId); @@ -46,6 +48,7 @@ public void testTaskInfoToString() { assertEquals(((Number)map.get("start_time_in_millis")).longValue(), startTime); assertEquals(((Number)map.get("running_time_in_nanos")).longValue(), runningTime); assertEquals(map.get("cancellable"), cancellable); + assertEquals(map.get("headers"), Collections.singletonMap("foo", "bar")); } } diff --git a/server/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TasksIT.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TasksIT.java index 778930e7d05ac..b04205ed01813 100644 --- a/server/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TasksIT.java +++ b/server/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TasksIT.java @@ -84,6 +84,7 @@ import static java.util.Collections.singleton; import static org.elasticsearch.common.unit.TimeValue.timeValueMillis; import static org.elasticsearch.common.unit.TimeValue.timeValueSeconds; +import static org.elasticsearch.http.HttpTransportSettings.SETTING_HTTP_MAX_HEADER_SIZE; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSearchResponse; @@ -355,19 +356,26 @@ public void testSearchTaskDescriptions() { client().prepareIndex("test", "doc", "test_id").setSource("{\"foo\": \"bar\"}", XContentType.JSON) .setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE).get(); - assertSearchResponse(client().prepareSearch("test").setTypes("doc").setQuery(QueryBuilders.matchAllQuery()).get()); + Map headers = new HashMap<>(); + headers.put("X-Opaque-Id", "my_id"); + headers.put("Foo-Header", "bar"); + headers.put("Custom-Task-Header", "my_value"); + assertSearchResponse( + client().filterWithHeader(headers).prepareSearch("test").setTypes("doc").setQuery(QueryBuilders.matchAllQuery()).get()); // the search operation should produce one main task List mainTask = findEvents(SearchAction.NAME, Tuple::v1); assertEquals(1, mainTask.size()); assertThat(mainTask.get(0).getDescription(), startsWith("indices[test], types[doc], search_type[")); assertThat(mainTask.get(0).getDescription(), containsString("\"query\":{\"match_all\"")); + assertTaskHeaders(mainTask.get(0)); // check that if we have any shard-level requests they all have non-zero length description List shardTasks = findEvents(SearchAction.NAME + "[*]", Tuple::v1); for (TaskInfo taskInfo : shardTasks) { assertThat(taskInfo.getParentTaskId(), notNullValue()); assertEquals(mainTask.get(0).getTaskId(), taskInfo.getParentTaskId()); + assertTaskHeaders(taskInfo); switch (taskInfo.getAction()) { case SearchTransportService.QUERY_ACTION_NAME: case SearchTransportService.DFS_ACTION_NAME: @@ -392,6 +400,25 @@ public void testSearchTaskDescriptions() { } + public void testSearchTaskHeaderLimit() { + int maxSize = Math.toIntExact(SETTING_HTTP_MAX_HEADER_SIZE.getDefault(Settings.EMPTY).getBytes() / 2 + 1); + + Map headers = new HashMap<>(); + headers.put("X-Opaque-Id", "my_id"); + headers.put("Custom-Task-Header", randomAlphaOfLengthBetween(maxSize, maxSize + 100)); + IllegalArgumentException ex = expectThrows( + IllegalArgumentException.class, + () -> client().filterWithHeader(headers).admin().cluster().prepareListTasks().get() + ); + assertThat(ex.getMessage(), startsWith("Request exceeded the maximum size of task headers ")); + } + + private void assertTaskHeaders(TaskInfo taskInfo) { + assertThat(taskInfo.getHeaders().keySet(), hasSize(2)); + assertEquals("my_id", taskInfo.getHeaders().get("X-Opaque-Id")); + assertEquals("my_value", taskInfo.getHeaders().get("Custom-Task-Header")); + } + /** * Very basic "is it plugged in" style test that indexes a document and makes sure that you can fetch the status of the process. The * goal here is to verify that the large moving parts that make fetching task status work fit together rather than to verify any @@ -802,24 +829,24 @@ public void testNodeNotFoundButTaskFound() throws Exception { // Save a fake task that looks like it is from a node that isn't part of the cluster CyclicBarrier b = new CyclicBarrier(2); TaskResultsService resultsService = internalCluster().getInstance(TaskResultsService.class); - resultsService.storeResult( - new TaskResult(new TaskInfo(new TaskId("fake", 1), "test", "test", "", null, 0, 0, false, TaskId.EMPTY_TASK_ID), - new RuntimeException("test")), - new ActionListener() { - @Override - public void onResponse(Void response) { - try { - b.await(); - } catch (InterruptedException | BrokenBarrierException e) { - onFailure(e); - } + resultsService.storeResult(new TaskResult( + new TaskInfo(new TaskId("fake", 1), "test", "test", "", null, 0, 0, false, TaskId.EMPTY_TASK_ID, Collections.emptyMap()), + new RuntimeException("test")), + new ActionListener() { + @Override + public void onResponse(Void response) { + try { + b.await(); + } catch (InterruptedException | BrokenBarrierException e) { + onFailure(e); } + } - @Override - public void onFailure(Exception e) { - throw new RuntimeException(e); - } - }); + @Override + public void onFailure(Exception e) { + throw new RuntimeException(e); + } + }); b.await(); // Now we can find it! diff --git a/server/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TestTaskPlugin.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TestTaskPlugin.java index 88674bfec74d8..5bf000a17bac7 100644 --- a/server/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TestTaskPlugin.java +++ b/server/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TestTaskPlugin.java @@ -59,9 +59,11 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collection; import java.util.Collections; import java.util.HashSet; import java.util.List; +import java.util.Map; import static org.elasticsearch.test.ESTestCase.awaitBusy; @@ -76,12 +78,17 @@ public class TestTaskPlugin extends Plugin implements ActionPlugin { new ActionHandler<>(UnblockTestTasksAction.INSTANCE, TransportUnblockTestTasksAction.class)); } + @Override + public Collection getTaskHeaders() { + return Collections.singleton("Custom-Task-Header"); + } + static class TestTask extends CancellableTask { private volatile boolean blocked = true; - TestTask(long id, String type, String action, String description, TaskId parentTaskId) { - super(id, type, action, description, parentTaskId); + TestTask(long id, String type, String action, String description, TaskId parentTaskId, Map headers) { + super(id, type, action, description, parentTaskId, headers); } @Override @@ -178,8 +185,8 @@ public String getDescription() { } @Override - public Task createTask(long id, String type, String action, TaskId parentTaskId) { - return new TestTask(id, type, action, this.getDescription(), parentTaskId); + public Task createTask(long id, String type, String action, TaskId parentTaskId, Map headers) { + return new TestTask(id, type, action, this.getDescription(), parentTaskId, headers); } } @@ -247,8 +254,8 @@ public String getDescription() { } @Override - public Task createTask(long id, String type, String action, TaskId parentTaskId) { - return new CancellableTask(id, type, action, getDescription(), parentTaskId) { + public Task createTask(long id, String type, String action, TaskId parentTaskId, Map headers) { + return new CancellableTask(id, type, action, getDescription(), parentTaskId, headers) { @Override public boolean shouldCancelChildrenOnCancellation() { return true; diff --git a/server/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TransportTasksActionTests.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TransportTasksActionTests.java index d0d5be5b4178d..2fb23b26709bd 100644 --- a/server/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TransportTasksActionTests.java +++ b/server/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TransportTasksActionTests.java @@ -109,9 +109,9 @@ public String getDescription() { } @Override - public Task createTask(long id, String type, String action, TaskId parentTaskId) { + public Task createTask(long id, String type, String action, TaskId parentTaskId, Map headers) { if (enableTaskManager) { - return super.createTask(id, type, action, parentTaskId); + return super.createTask(id, type, action, parentTaskId, headers); } else { return null; } @@ -156,9 +156,9 @@ public String getDescription() { } @Override - public Task createTask(long id, String type, String action, TaskId parentTaskId) { + public Task createTask(long id, String type, String action, TaskId parentTaskId, Map headers) { if (enableTaskManager) { - return super.createTask(id, type, action, parentTaskId); + return super.createTask(id, type, action, parentTaskId, headers); } else { return null; } diff --git a/server/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionTests.java b/server/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionTests.java index 5141b9cd47187..3bd66af1bab05 100644 --- a/server/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionTests.java +++ b/server/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionTests.java @@ -82,7 +82,7 @@ public void setUp() throws Exception { CapturingTransport capturingTransport = new CapturingTransport(); transportService = new TransportService(clusterService.getSettings(), capturingTransport, threadPool, TransportService.NOOP_TRANSPORT_INTERCEPTOR, - boundAddress -> clusterService.localNode(), null); + boundAddress -> clusterService.localNode(), null, Collections.emptySet()); transportService.start(); transportService.acceptIncomingRequests(); bulkAction = new TestTransportBulkAction(); diff --git a/server/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionTookTests.java b/server/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionTookTests.java index e35f98e220e03..af8289f0c45b1 100644 --- a/server/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionTookTests.java +++ b/server/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionTookTests.java @@ -49,6 +49,7 @@ import org.junit.BeforeClass; import java.nio.charset.StandardCharsets; +import java.util.Collections; import java.util.HashSet; import java.util.Map; import java.util.concurrent.TimeUnit; @@ -92,7 +93,7 @@ private TransportBulkAction createAction(boolean controlled, AtomicLong expected CapturingTransport capturingTransport = new CapturingTransport(); TransportService transportService = new TransportService(clusterService.getSettings(), capturingTransport, threadPool, TransportService.NOOP_TRANSPORT_INTERCEPTOR, - boundAddress -> clusterService.localNode(), null); + boundAddress -> clusterService.localNode(), null, Collections.emptySet()); transportService.start(); transportService.acceptIncomingRequests(); IndexNameExpressionResolver resolver = new Resolver(Settings.EMPTY); diff --git a/server/src/test/java/org/elasticsearch/action/main/MainActionTests.java b/server/src/test/java/org/elasticsearch/action/main/MainActionTests.java index 6cc0afa3fadf2..34f9bc15ecfa6 100644 --- a/server/src/test/java/org/elasticsearch/action/main/MainActionTests.java +++ b/server/src/test/java/org/elasticsearch/action/main/MainActionTests.java @@ -34,6 +34,7 @@ import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; +import java.util.Collections; import java.util.concurrent.atomic.AtomicReference; import static org.mockito.Mockito.mock; @@ -68,7 +69,7 @@ public void testMainActionClusterAvailable() { when(clusterService.state()).thenReturn(state); TransportService transportService = new TransportService(Settings.EMPTY, null, null, TransportService.NOOP_TRANSPORT_INTERCEPTOR, - x -> null, null); + x -> null, null, Collections.emptySet()); TransportMainAction action = new TransportMainAction(settings, mock(ThreadPool.class), transportService, mock(ActionFilters.class), mock(IndexNameExpressionResolver.class), clusterService); AtomicReference responseRef = new AtomicReference<>(); diff --git a/server/src/test/java/org/elasticsearch/action/search/MockSearchPhaseContext.java b/server/src/test/java/org/elasticsearch/action/search/MockSearchPhaseContext.java index 80fbd4cc43ddf..b0ac2ed5fa0d3 100644 --- a/server/src/test/java/org/elasticsearch/action/search/MockSearchPhaseContext.java +++ b/server/src/test/java/org/elasticsearch/action/search/MockSearchPhaseContext.java @@ -73,7 +73,7 @@ public Logger getLogger() { @Override public SearchTask getTask() { - return new SearchTask(0, "n/a", "n/a", "test", null); + return new SearchTask(0, "n/a", "n/a", "test", null, Collections.emptyMap()); } @Override diff --git a/server/src/test/java/org/elasticsearch/action/search/MultiSearchActionTookTests.java b/server/src/test/java/org/elasticsearch/action/search/MultiSearchActionTookTests.java index 73743230d1a14..86ad2f75fedf2 100644 --- a/server/src/test/java/org/elasticsearch/action/search/MultiSearchActionTookTests.java +++ b/server/src/test/java/org/elasticsearch/action/search/MultiSearchActionTookTests.java @@ -130,7 +130,8 @@ private TransportMultiSearchAction createTransportMultiSearchAction(boolean cont Settings settings = Settings.builder().put("node.name", TransportMultiSearchActionTests.class.getSimpleName()).build(); TaskManager taskManager = mock(TaskManager.class); TransportService transportService = new TransportService(Settings.EMPTY, null, null, TransportService.NOOP_TRANSPORT_INTERCEPTOR, - boundAddress -> DiscoveryNode.createLocal(settings, boundAddress.publishAddress(), UUIDs.randomBase64UUID()), null) { + boundAddress -> DiscoveryNode.createLocal(settings, boundAddress.publishAddress(), UUIDs.randomBase64UUID()), null, + Collections.emptySet()) { @Override public TaskManager getTaskManager() { return taskManager; diff --git a/server/src/test/java/org/elasticsearch/action/search/TransportMultiSearchActionTests.java b/server/src/test/java/org/elasticsearch/action/search/TransportMultiSearchActionTests.java index 4410507eef92e..3c2a87e8fef00 100644 --- a/server/src/test/java/org/elasticsearch/action/search/TransportMultiSearchActionTests.java +++ b/server/src/test/java/org/elasticsearch/action/search/TransportMultiSearchActionTests.java @@ -35,8 +35,11 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.tasks.TaskManager; import org.elasticsearch.test.ESTestCase; +import org.elasticsearch.threadpool.TestThreadPool; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; +import org.junit.After; +import org.junit.Before; import java.util.Arrays; import java.util.Collections; @@ -54,6 +57,22 @@ public class TransportMultiSearchActionTests extends ESTestCase { + protected ThreadPool threadPool; + + @Before + @Override + public void setUp() throws Exception { + super.setUp(); + threadPool = new TestThreadPool(getTestName()); + } + + @After + @Override + public void tearDown() throws Exception { + threadPool.shutdown(); + super.tearDown(); + } + public void testBatchExecute() throws Exception { // Initialize dependencies of TransportMultiSearchAction Settings settings = Settings.builder() @@ -63,8 +82,10 @@ public void testBatchExecute() throws Exception { when(actionFilters.filters()).thenReturn(new ActionFilter[0]); ThreadPool threadPool = new ThreadPool(settings); TaskManager taskManager = mock(TaskManager.class); - TransportService transportService = new TransportService(Settings.EMPTY, null, null, TransportService.NOOP_TRANSPORT_INTERCEPTOR, - boundAddress -> DiscoveryNode.createLocal(settings, boundAddress.publishAddress(), UUIDs.randomBase64UUID()), null) { + TransportService transportService = new TransportService(Settings.EMPTY, null, threadPool, + TransportService.NOOP_TRANSPORT_INTERCEPTOR, + boundAddress -> DiscoveryNode.createLocal(settings, boundAddress.publishAddress(), UUIDs.randomBase64UUID()), null, + Collections.emptySet()) { @Override public TaskManager getTaskManager() { return taskManager; @@ -102,8 +123,8 @@ protected void doExecute(SearchRequest request, ActionListener l }); } }; - - TransportMultiSearchAction action = + + TransportMultiSearchAction action = new TransportMultiSearchAction(threadPool, actionFilters, transportService, clusterService, searchAction, resolver, 10, System::nanoTime); diff --git a/server/src/test/java/org/elasticsearch/action/support/TransportActionFilterChainTests.java b/server/src/test/java/org/elasticsearch/action/support/TransportActionFilterChainTests.java index 3eb1616348d84..d576d440c0263 100644 --- a/server/src/test/java/org/elasticsearch/action/support/TransportActionFilterChainTests.java +++ b/server/src/test/java/org/elasticsearch/action/support/TransportActionFilterChainTests.java @@ -25,12 +25,16 @@ import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.common.settings.Settings; +import org.elasticsearch.node.Node; import org.elasticsearch.tasks.Task; import org.elasticsearch.tasks.TaskManager; import org.elasticsearch.test.ESTestCase; +import org.elasticsearch.threadpool.ThreadPool; +import org.junit.After; import org.junit.Before; import java.util.ArrayList; +import java.util.Collections; import java.util.Comparator; import java.util.HashSet; import java.util.List; @@ -48,10 +52,17 @@ public class TransportActionFilterChainTests extends ESTestCase { private AtomicInteger counter; + private ThreadPool threadPool; @Before public void init() throws Exception { counter = new AtomicInteger(); + threadPool = new ThreadPool(Settings.builder().put(Node.NODE_NAME_SETTING.getKey(), "TransportActionFilterChainTests").build()); + } + + @After + public void shutdown() throws Exception { + terminate(threadPool); } public void testActionFiltersRequest() throws ExecutionException, InterruptedException { @@ -68,7 +79,9 @@ public void testActionFiltersRequest() throws ExecutionException, InterruptedExc String actionName = randomAlphaOfLength(randomInt(30)); ActionFilters actionFilters = new ActionFilters(filters); - TransportAction transportAction = new TransportAction(Settings.EMPTY, actionName, null, actionFilters, null, new TaskManager(Settings.EMPTY)) { + TransportAction transportAction = + new TransportAction(Settings.EMPTY, actionName, null, actionFilters, null, + new TaskManager(Settings.EMPTY, threadPool, Collections.emptySet())) { @Override protected void doExecute(TestRequest request, ActionListener listener) { listener.onResponse(new TestResponse()); @@ -144,7 +157,8 @@ public void exe String actionName = randomAlphaOfLength(randomInt(30)); ActionFilters actionFilters = new ActionFilters(filters); - TransportAction transportAction = new TransportAction(Settings.EMPTY, actionName, null, actionFilters, null, new TaskManager(Settings.EMPTY)) { + TransportAction transportAction = new TransportAction(Settings.EMPTY, + actionName, null, actionFilters, null, new TaskManager(Settings.EMPTY, threadPool, Collections.emptySet())) { @Override protected void doExecute(TestRequest request, ActionListener listener) { listener.onResponse(new TestResponse()); diff --git a/server/src/test/java/org/elasticsearch/action/support/broadcast/node/TransportBroadcastByNodeActionTests.java b/server/src/test/java/org/elasticsearch/action/support/broadcast/node/TransportBroadcastByNodeActionTests.java index 54253e9620745..470da323043ae 100644 --- a/server/src/test/java/org/elasticsearch/action/support/broadcast/node/TransportBroadcastByNodeActionTests.java +++ b/server/src/test/java/org/elasticsearch/action/support/broadcast/node/TransportBroadcastByNodeActionTests.java @@ -67,6 +67,7 @@ import java.io.IOException; import java.util.ArrayList; +import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -191,7 +192,7 @@ public void setUp() throws Exception { transport = new CapturingTransport(); clusterService = createClusterService(THREAD_POOL); final TransportService transportService = new TransportService(clusterService.getSettings(), transport, THREAD_POOL, - TransportService.NOOP_TRANSPORT_INTERCEPTOR, x -> clusterService.localNode(), null); + TransportService.NOOP_TRANSPORT_INTERCEPTOR, x -> clusterService.localNode(), null, Collections.emptySet()); transportService.start(); transportService.acceptIncomingRequests(); setClusterState(clusterService, TEST_INDEX); diff --git a/server/src/test/java/org/elasticsearch/action/support/master/TransportMasterNodeActionTests.java b/server/src/test/java/org/elasticsearch/action/support/master/TransportMasterNodeActionTests.java index b14b030a5dc88..de65d2a3f9240 100644 --- a/server/src/test/java/org/elasticsearch/action/support/master/TransportMasterNodeActionTests.java +++ b/server/src/test/java/org/elasticsearch/action/support/master/TransportMasterNodeActionTests.java @@ -88,7 +88,7 @@ public void setUp() throws Exception { transport = new CapturingTransport(); clusterService = createClusterService(threadPool); transportService = new TransportService(clusterService.getSettings(), transport, threadPool, - TransportService.NOOP_TRANSPORT_INTERCEPTOR, x -> clusterService.localNode(), null); + TransportService.NOOP_TRANSPORT_INTERCEPTOR, x -> clusterService.localNode(), null, Collections.emptySet()); transportService.start(); transportService.acceptIncomingRequests(); localNode = new DiscoveryNode("local_node", buildNewFakeTransportAddress(), Collections.emptyMap(), diff --git a/server/src/test/java/org/elasticsearch/action/support/nodes/TransportNodesActionTests.java b/server/src/test/java/org/elasticsearch/action/support/nodes/TransportNodesActionTests.java index 7d471f77f83d0..60a46876a7126 100644 --- a/server/src/test/java/org/elasticsearch/action/support/nodes/TransportNodesActionTests.java +++ b/server/src/test/java/org/elasticsearch/action/support/nodes/TransportNodesActionTests.java @@ -181,7 +181,7 @@ public void setUp() throws Exception { transport = new CapturingTransport(); clusterService = createClusterService(THREAD_POOL); transportService = new TransportService(clusterService.getSettings(), transport, THREAD_POOL, - TransportService.NOOP_TRANSPORT_INTERCEPTOR, x -> clusterService.localNode(), null); + TransportService.NOOP_TRANSPORT_INTERCEPTOR, x -> clusterService.localNode(), null, Collections.emptySet()); transportService.start(); transportService.acceptIncomingRequests(); int numNodes = randomIntBetween(3, 10); diff --git a/server/src/test/java/org/elasticsearch/action/support/replication/BroadcastReplicationTests.java b/server/src/test/java/org/elasticsearch/action/support/replication/BroadcastReplicationTests.java index 9f1591f6a540b..3aeab0fa5fb5b 100644 --- a/server/src/test/java/org/elasticsearch/action/support/replication/BroadcastReplicationTests.java +++ b/server/src/test/java/org/elasticsearch/action/support/replication/BroadcastReplicationTests.java @@ -96,7 +96,7 @@ threadPool, BigArrays.NON_RECYCLING_INSTANCE, circuitBreakerService, new NamedWr new NetworkService(Collections.emptyList())); clusterService = createClusterService(threadPool); transportService = new TransportService(clusterService.getSettings(), transport, threadPool, - TransportService.NOOP_TRANSPORT_INTERCEPTOR, x -> clusterService.localNode(), null); + TransportService.NOOP_TRANSPORT_INTERCEPTOR, x -> clusterService.localNode(), null, Collections.emptySet()); transportService.start(); transportService.acceptIncomingRequests(); broadcastReplicationAction = new TestBroadcastReplicationAction(Settings.EMPTY, threadPool, clusterService, transportService, diff --git a/server/src/test/java/org/elasticsearch/action/support/replication/TransportReplicationActionTests.java b/server/src/test/java/org/elasticsearch/action/support/replication/TransportReplicationActionTests.java index d2472da34f56c..9356fd12a3a5b 100644 --- a/server/src/test/java/org/elasticsearch/action/support/replication/TransportReplicationActionTests.java +++ b/server/src/test/java/org/elasticsearch/action/support/replication/TransportReplicationActionTests.java @@ -163,7 +163,7 @@ public void setUp() throws Exception { transport = new CapturingTransport(); clusterService = createClusterService(threadPool); transportService = new TransportService(clusterService.getSettings(), transport, threadPool, - TransportService.NOOP_TRANSPORT_INTERCEPTOR, x -> clusterService.localNode(), null); + TransportService.NOOP_TRANSPORT_INTERCEPTOR, x -> clusterService.localNode(), null, Collections.emptySet()); transportService.start(); transportService.acceptIncomingRequests(); shardStateAction = new ShardStateAction(Settings.EMPTY, clusterService, transportService, null, null, threadPool); @@ -977,7 +977,7 @@ public void testRetryOnReplicaWithRealTransport() throws Exception { new NoneCircuitBreakerService(), namedWriteableRegistry, new NetworkService(Collections.emptyList()), Version.CURRENT); transportService = new MockTransportService(Settings.EMPTY, transport, threadPool, TransportService.NOOP_TRANSPORT_INTERCEPTOR, - x -> clusterService.localNode(),null); + x -> clusterService.localNode(), null, Collections.emptySet()); transportService.start(); transportService.acceptIncomingRequests(); @@ -1040,7 +1040,7 @@ private void assertIndexShardCounter(int expected) { * half the time. */ private ReplicationTask maybeTask() { - return random().nextBoolean() ? new ReplicationTask(0, null, null, null, null) : null; + return random().nextBoolean() ? new ReplicationTask(0, null, null, null, null, null) : null; } /** diff --git a/server/src/test/java/org/elasticsearch/action/support/replication/TransportWriteActionTests.java b/server/src/test/java/org/elasticsearch/action/support/replication/TransportWriteActionTests.java index b3db10f920973..47ce090d895fa 100644 --- a/server/src/test/java/org/elasticsearch/action/support/replication/TransportWriteActionTests.java +++ b/server/src/test/java/org/elasticsearch/action/support/replication/TransportWriteActionTests.java @@ -62,6 +62,7 @@ import org.junit.BeforeClass; import org.mockito.ArgumentCaptor; +import java.util.Collections; import java.util.HashSet; import java.util.Locale; import java.util.concurrent.ExecutionException; @@ -254,7 +255,7 @@ public void testDocumentFailureInShardOperationOnReplica() throws Exception { public void testReplicaProxy() throws InterruptedException, ExecutionException { CapturingTransport transport = new CapturingTransport(); TransportService transportService = new TransportService(clusterService.getSettings(), transport, threadPool, - TransportService.NOOP_TRANSPORT_INTERCEPTOR, x -> clusterService.localNode(), null); + TransportService.NOOP_TRANSPORT_INTERCEPTOR, x -> clusterService.localNode(), null, Collections.emptySet()); transportService.start(); transportService.acceptIncomingRequests(); ShardStateAction shardStateAction = new ShardStateAction(Settings.EMPTY, clusterService, transportService, null, null, threadPool); @@ -355,7 +356,8 @@ protected TestAction() { protected TestAction(boolean withDocumentFailureOnPrimary, boolean withDocumentFailureOnReplica) { super(Settings.EMPTY, "test", - new TransportService(Settings.EMPTY, null, null, TransportService.NOOP_TRANSPORT_INTERCEPTOR, x -> null, null), null, + new TransportService(Settings.EMPTY, null, null, TransportService.NOOP_TRANSPORT_INTERCEPTOR, x -> null, null, + Collections.emptySet()), null, null, null, null, new ActionFilters(new HashSet<>()), new IndexNameExpressionResolver(Settings.EMPTY), TestRequest::new, TestRequest::new, ThreadPool.Names.SAME); this.withDocumentFailureOnPrimary = withDocumentFailureOnPrimary; diff --git a/server/src/test/java/org/elasticsearch/action/support/single/instance/TransportInstanceSingleOperationActionTests.java b/server/src/test/java/org/elasticsearch/action/support/single/instance/TransportInstanceSingleOperationActionTests.java index 29235329d6669..8db45cc5508ef 100644 --- a/server/src/test/java/org/elasticsearch/action/support/single/instance/TransportInstanceSingleOperationActionTests.java +++ b/server/src/test/java/org/elasticsearch/action/support/single/instance/TransportInstanceSingleOperationActionTests.java @@ -53,6 +53,7 @@ import org.junit.Before; import org.junit.BeforeClass; +import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.Map; @@ -144,7 +145,8 @@ public void setUp() throws Exception { transport = new CapturingTransport(); clusterService = createClusterService(THREAD_POOL); transportService = new TransportService(clusterService.getSettings(), transport, THREAD_POOL, - TransportService.NOOP_TRANSPORT_INTERCEPTOR, x -> clusterService.localNode(), null); + TransportService.NOOP_TRANSPORT_INTERCEPTOR, x -> clusterService.localNode(), null, Collections.emptySet() + ); transportService.start(); transportService.acceptIncomingRequests(); action = new TestTransportInstanceSingleOperationAction( diff --git a/server/src/test/java/org/elasticsearch/client/node/NodeClientHeadersTests.java b/server/src/test/java/org/elasticsearch/client/node/NodeClientHeadersTests.java index 160c14c243cb2..bca04738d8b89 100644 --- a/server/src/test/java/org/elasticsearch/client/node/NodeClientHeadersTests.java +++ b/server/src/test/java/org/elasticsearch/client/node/NodeClientHeadersTests.java @@ -59,7 +59,7 @@ private Actions(Settings settings, ThreadPool threadPool, GenericAction[] action private static class InternalTransportAction extends TransportAction { private InternalTransportAction(Settings settings, String actionName, ThreadPool threadPool) { - super(settings, actionName, threadPool, EMPTY_FILTERS, null, new TaskManager(settings)); + super(settings, actionName, threadPool, EMPTY_FILTERS, null, new TaskManager(settings, threadPool, Collections.emptySet())); } @Override diff --git a/server/src/test/java/org/elasticsearch/client/transport/TransportClientNodesServiceTests.java b/server/src/test/java/org/elasticsearch/client/transport/TransportClientNodesServiceTests.java index ad894906cfb2d..c8030e1cf4aee 100644 --- a/server/src/test/java/org/elasticsearch/client/transport/TransportClientNodesServiceTests.java +++ b/server/src/test/java/org/elasticsearch/client/transport/TransportClientNodesServiceTests.java @@ -163,7 +163,7 @@ public void sendRequest(Transport.Connection conne }, (addr) -> { assert addr == null : "boundAddress: " + addr; return DiscoveryNode.createLocal(settings, buildNewFakeTransportAddress(), UUIDs.randomBase64UUID()); - }, null); + }, null, Collections.emptySet()); transportService.start(); transportService.acceptIncomingRequests(); transportClientNodesService = diff --git a/server/src/test/java/org/elasticsearch/cluster/NodeConnectionsServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/NodeConnectionsServiceTests.java index 51908a45380f0..828b385f85fa5 100644 --- a/server/src/test/java/org/elasticsearch/cluster/NodeConnectionsServiceTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/NodeConnectionsServiceTests.java @@ -155,7 +155,8 @@ public void setUp() throws Exception { this.threadPool = new TestThreadPool(getClass().getName()); this.transport = new MockTransport(); transportService = new TransportService(Settings.EMPTY, transport, threadPool, TransportService.NOOP_TRANSPORT_INTERCEPTOR, - boundAddress -> DiscoveryNode.createLocal(Settings.EMPTY, buildNewFakeTransportAddress(), UUIDs.randomBase64UUID()), null); + boundAddress -> DiscoveryNode.createLocal(Settings.EMPTY, buildNewFakeTransportAddress(), UUIDs.randomBase64UUID()), null, + Collections.emptySet()); transportService.start(); transportService.acceptIncomingRequests(); } diff --git a/server/src/test/java/org/elasticsearch/cluster/action/shard/ShardStateActionTests.java b/server/src/test/java/org/elasticsearch/cluster/action/shard/ShardStateActionTests.java index 58c9651a82af1..b1ff626fa39b8 100644 --- a/server/src/test/java/org/elasticsearch/cluster/action/shard/ShardStateActionTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/action/shard/ShardStateActionTests.java @@ -48,6 +48,7 @@ import org.junit.Before; import org.junit.BeforeClass; +import java.util.Collections; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; @@ -108,7 +109,7 @@ public void setUp() throws Exception { this.transport = new CapturingTransport(); clusterService = createClusterService(THREAD_POOL); transportService = new TransportService(clusterService.getSettings(), transport, THREAD_POOL, - TransportService.NOOP_TRANSPORT_INTERCEPTOR, x -> clusterService.localNode(), null); + TransportService.NOOP_TRANSPORT_INTERCEPTOR, x -> clusterService.localNode(), null, Collections.emptySet()); transportService.start(); transportService.acceptIncomingRequests(); shardStateAction = new TestShardStateAction(Settings.EMPTY, clusterService, transportService, null, null); diff --git a/server/src/test/java/org/elasticsearch/cluster/health/ClusterStateHealthTests.java b/server/src/test/java/org/elasticsearch/cluster/health/ClusterStateHealthTests.java index f2537e746ad0c..0f5f4870ae1bb 100644 --- a/server/src/test/java/org/elasticsearch/cluster/health/ClusterStateHealthTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/health/ClusterStateHealthTests.java @@ -60,6 +60,7 @@ import java.io.IOException; import java.util.ArrayList; +import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Set; @@ -94,7 +95,7 @@ public void setUp() throws Exception { super.setUp(); clusterService = createClusterService(threadPool); transportService = new TransportService(clusterService.getSettings(), new CapturingTransport(), threadPool, - TransportService.NOOP_TRANSPORT_INTERCEPTOR, x -> clusterService.localNode(), null); + TransportService.NOOP_TRANSPORT_INTERCEPTOR, x -> clusterService.localNode(), null, Collections.emptySet()); transportService.start(); transportService.acceptIncomingRequests(); } diff --git a/server/src/test/java/org/elasticsearch/discovery/ZenFaultDetectionTests.java b/server/src/test/java/org/elasticsearch/discovery/ZenFaultDetectionTests.java index 1a837b825d867..f32e93bb82dbd 100644 --- a/server/src/test/java/org/elasticsearch/discovery/ZenFaultDetectionTests.java +++ b/server/src/test/java/org/elasticsearch/discovery/ZenFaultDetectionTests.java @@ -145,7 +145,7 @@ namedWriteableRegistry, new NetworkService(Collections.emptyList()), version), (boundAddress) -> new DiscoveryNode(Node.NODE_NAME_SETTING.get(settings), boundAddress.publishAddress(), Node.NODE_ATTRIBUTES.getAsMap(settings), DiscoveryNode.getRolesFromSettings(settings), version), - null); + null, Collections.emptySet()); transportService.start(); transportService.acceptIncomingRequests(); return transportService; diff --git a/server/src/test/java/org/elasticsearch/discovery/zen/UnicastZenPingTests.java b/server/src/test/java/org/elasticsearch/discovery/zen/UnicastZenPingTests.java index e0593a694d0b4..44914b1958777 100644 --- a/server/src/test/java/org/elasticsearch/discovery/zen/UnicastZenPingTests.java +++ b/server/src/test/java/org/elasticsearch/discovery/zen/UnicastZenPingTests.java @@ -402,7 +402,8 @@ public BoundTransportAddress boundAddress() { }; closeables.push(transport); final TransportService transportService = - new TransportService(Settings.EMPTY, transport, threadPool, TransportService.NOOP_TRANSPORT_INTERCEPTOR, x -> null, null); + new TransportService(Settings.EMPTY, transport, threadPool, TransportService.NOOP_TRANSPORT_INTERCEPTOR, x -> null, null, + Collections.emptySet()); closeables.push(transportService); final int limitPortCounts = randomIntBetween(1, 10); final List discoveryNodes = TestUnicastZenPing.resolveHostsLists( @@ -447,7 +448,8 @@ public BoundTransportAddress boundAddress() { }; closeables.push(transport); final TransportService transportService = - new TransportService(Settings.EMPTY, transport, threadPool, TransportService.NOOP_TRANSPORT_INTERCEPTOR, x -> null, null); + new TransportService(Settings.EMPTY, transport, threadPool, TransportService.NOOP_TRANSPORT_INTERCEPTOR, x -> null, null, + Collections.emptySet()); closeables.push(transportService); final List discoveryNodes = TestUnicastZenPing.resolveHostsLists( executorService, @@ -497,7 +499,8 @@ public TransportAddress[] addressesFromString(String address, int perAddressLimi closeables.push(transport); final TransportService transportService = - new TransportService(Settings.EMPTY, transport, threadPool, TransportService.NOOP_TRANSPORT_INTERCEPTOR, x -> null, null); + new TransportService(Settings.EMPTY, transport, threadPool, TransportService.NOOP_TRANSPORT_INTERCEPTOR, x -> null, null, + Collections.emptySet()); closeables.push(transportService); final List discoveryNodes = TestUnicastZenPing.resolveHostsLists( @@ -555,7 +558,8 @@ public TransportAddress[] addressesFromString(String address, int perAddressLimi closeables.push(transport); final TransportService transportService = - new TransportService(Settings.EMPTY, transport, threadPool, TransportService.NOOP_TRANSPORT_INTERCEPTOR, x -> null, null); + new TransportService(Settings.EMPTY, transport, threadPool, TransportService.NOOP_TRANSPORT_INTERCEPTOR, x -> null, null, + Collections.emptySet()); closeables.push(transportService); final TimeValue resolveTimeout = TimeValue.timeValueSeconds(randomIntBetween(1, 3)); try { @@ -723,7 +727,8 @@ public BoundTransportAddress boundAddress() { closeables.push(transport); final TransportService transportService = - new TransportService(Settings.EMPTY, transport, threadPool, TransportService.NOOP_TRANSPORT_INTERCEPTOR, x -> null, null); + new TransportService(Settings.EMPTY, transport, threadPool, TransportService.NOOP_TRANSPORT_INTERCEPTOR, x -> null, null, + Collections.emptySet()); closeables.push(transportService); final List discoveryNodes = TestUnicastZenPing.resolveHostsLists( executorService, @@ -772,7 +777,8 @@ private NetworkHandle startServices( final Transport transport = supplier.apply(nodeSettings, version); final MockTransportService transportService = new MockTransportService(nodeSettings, transport, threadPool, TransportService.NOOP_TRANSPORT_INTERCEPTOR, boundAddress -> - new DiscoveryNode(nodeId, nodeId, boundAddress.publishAddress(), emptyMap(), nodeRoles, version), null); + new DiscoveryNode(nodeId, nodeId, boundAddress.publishAddress(), emptyMap(), nodeRoles, version), null, + Collections.emptySet()); transportService.start(); transportService.acceptIncomingRequests(); final ConcurrentMap counters = ConcurrentCollections.newConcurrentMap(); diff --git a/server/src/test/java/org/elasticsearch/index/reindex/LeaderBulkByScrollTaskStateTests.java b/server/src/test/java/org/elasticsearch/index/reindex/LeaderBulkByScrollTaskStateTests.java index 2b15181ca3930..16d9df8c820ee 100644 --- a/server/src/test/java/org/elasticsearch/index/reindex/LeaderBulkByScrollTaskStateTests.java +++ b/server/src/test/java/org/elasticsearch/index/reindex/LeaderBulkByScrollTaskStateTests.java @@ -26,6 +26,7 @@ import org.mockito.ArgumentCaptor; import java.util.Arrays; +import java.util.Collections; import java.util.List; import static java.util.Collections.emptyList; @@ -42,7 +43,7 @@ public class LeaderBulkByScrollTaskStateTests extends ESTestCase { @Before public void createTask() { slices = between(2, 50); - task = new BulkByScrollTask(1, "test_type", "test_action", "test", TaskId.EMPTY_TASK_ID); + task = new BulkByScrollTask(1, "test_type", "test_action", "test", TaskId.EMPTY_TASK_ID, Collections.emptyMap()); task.setWorkerCount(slices); taskState = task.getLeaderState(); } diff --git a/server/src/test/java/org/elasticsearch/index/reindex/WorkerBulkByScrollTaskStateTests.java b/server/src/test/java/org/elasticsearch/index/reindex/WorkerBulkByScrollTaskStateTests.java index 64bf52c319e68..db624798bb71c 100644 --- a/server/src/test/java/org/elasticsearch/index/reindex/WorkerBulkByScrollTaskStateTests.java +++ b/server/src/test/java/org/elasticsearch/index/reindex/WorkerBulkByScrollTaskStateTests.java @@ -28,6 +28,7 @@ import org.junit.Before; import java.io.IOException; +import java.util.Collections; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CyclicBarrier; @@ -52,7 +53,7 @@ public class WorkerBulkByScrollTaskStateTests extends ESTestCase { @Before public void createTask() { - task = new BulkByScrollTask(1, "test_type", "test_action", "test", TaskId.EMPTY_TASK_ID); + task = new BulkByScrollTask(1, "test_type", "test_action", "test", TaskId.EMPTY_TASK_ID, Collections.emptyMap()); task.setWorker(Float.POSITIVE_INFINITY, null); workerState = task.getWorkerState(); } diff --git a/server/src/test/java/org/elasticsearch/index/replication/ESIndexLevelReplicationTestCase.java b/server/src/test/java/org/elasticsearch/index/replication/ESIndexLevelReplicationTestCase.java index 7e8949cd15fbf..e80c2df4ea060 100644 --- a/server/src/test/java/org/elasticsearch/index/replication/ESIndexLevelReplicationTestCase.java +++ b/server/src/test/java/org/elasticsearch/index/replication/ESIndexLevelReplicationTestCase.java @@ -130,7 +130,8 @@ protected class ReplicationGroup implements AutoCloseable, Iterable private final AtomicInteger replicaId = new AtomicInteger(); private final AtomicInteger docId = new AtomicInteger(); boolean closed = false; - private final PrimaryReplicaSyncer primaryReplicaSyncer = new PrimaryReplicaSyncer(Settings.EMPTY, new TaskManager(Settings.EMPTY), + private final PrimaryReplicaSyncer primaryReplicaSyncer = new PrimaryReplicaSyncer(Settings.EMPTY, + new TaskManager(Settings.EMPTY, threadPool, Collections.emptySet()), (request, parentTask, primaryAllocationId, primaryTerm, listener) -> { try { new ResyncAction(request, listener, ReplicationGroup.this).execute(); diff --git a/server/src/test/java/org/elasticsearch/index/seqno/GlobalCheckpointSyncActionTests.java b/server/src/test/java/org/elasticsearch/index/seqno/GlobalCheckpointSyncActionTests.java index 71faecfcea59a..618714fc9d959 100644 --- a/server/src/test/java/org/elasticsearch/index/seqno/GlobalCheckpointSyncActionTests.java +++ b/server/src/test/java/org/elasticsearch/index/seqno/GlobalCheckpointSyncActionTests.java @@ -58,7 +58,7 @@ public void setUp() throws Exception { transport = new CapturingTransport(); clusterService = createClusterService(threadPool); transportService = new TransportService(clusterService.getSettings(), transport, threadPool, - TransportService.NOOP_TRANSPORT_INTERCEPTOR, boundAddress -> clusterService.localNode(), null); + TransportService.NOOP_TRANSPORT_INTERCEPTOR, boundAddress -> clusterService.localNode(), null, Collections.emptySet()); transportService.start(); transportService.acceptIncomingRequests(); shardStateAction = new ShardStateAction(Settings.EMPTY, clusterService, transportService, null, null, threadPool); diff --git a/server/src/test/java/org/elasticsearch/index/shard/PrimaryReplicaSyncerTests.java b/server/src/test/java/org/elasticsearch/index/shard/PrimaryReplicaSyncerTests.java index 1b9a0ff629066..433f662062735 100644 --- a/server/src/test/java/org/elasticsearch/index/shard/PrimaryReplicaSyncerTests.java +++ b/server/src/test/java/org/elasticsearch/index/shard/PrimaryReplicaSyncerTests.java @@ -50,7 +50,7 @@ public class PrimaryReplicaSyncerTests extends IndexShardTestCase { public void testSyncerSendsOffCorrectDocuments() throws Exception { IndexShard shard = newStartedShard(true); - TaskManager taskManager = new TaskManager(Settings.EMPTY); + TaskManager taskManager = new TaskManager(Settings.EMPTY, threadPool, Collections.emptySet()); AtomicBoolean syncActionCalled = new AtomicBoolean(); PrimaryReplicaSyncer.SyncAction syncAction = (request, parentTask, allocationId, primaryTerm, listener) -> { @@ -112,7 +112,8 @@ public void testSyncerOnClosingShard() throws Exception { syncCalledLatch.countDown(); threadPool.generic().execute(() -> listener.onResponse(new ResyncReplicationResponse())); }; - PrimaryReplicaSyncer syncer = new PrimaryReplicaSyncer(Settings.EMPTY, new TaskManager(Settings.EMPTY), syncAction); + PrimaryReplicaSyncer syncer = new PrimaryReplicaSyncer(Settings.EMPTY, + new TaskManager(Settings.EMPTY, threadPool, Collections.emptySet()), syncAction); syncer.setChunkSize(new ByteSizeValue(1)); // every document is sent off separately int numDocs = 10; @@ -158,7 +159,8 @@ public void testStatusSerialization() throws IOException { } public void testStatusEquals() throws IOException { - PrimaryReplicaSyncer.ResyncTask task = new PrimaryReplicaSyncer.ResyncTask(0, "type", "action", "desc", null); + PrimaryReplicaSyncer.ResyncTask task = + new PrimaryReplicaSyncer.ResyncTask(0, "type", "action", "desc", null, Collections.emptyMap()); task.setPhase(randomAlphaOfLength(10)); task.setResyncedOperations(randomIntBetween(0, 1000)); task.setTotalOperations(randomIntBetween(0, 1000)); @@ -181,7 +183,8 @@ public void testStatusEquals() throws IOException { } public void testStatusReportsCorrectNumbers() throws IOException { - PrimaryReplicaSyncer.ResyncTask task = new PrimaryReplicaSyncer.ResyncTask(0, "type", "action", "desc", null); + PrimaryReplicaSyncer.ResyncTask task = + new PrimaryReplicaSyncer.ResyncTask(0, "type", "action", "desc", null, Collections.emptyMap()); task.setPhase(randomAlphaOfLength(10)); task.setResyncedOperations(randomIntBetween(0, 1000)); task.setTotalOperations(randomIntBetween(0, 1000)); diff --git a/server/src/test/java/org/elasticsearch/indices/cluster/ClusterStateChanges.java b/server/src/test/java/org/elasticsearch/indices/cluster/ClusterStateChanges.java index 6e6eaf726a599..dd10dd2747df6 100644 --- a/server/src/test/java/org/elasticsearch/indices/cluster/ClusterStateChanges.java +++ b/server/src/test/java/org/elasticsearch/indices/cluster/ClusterStateChanges.java @@ -159,7 +159,8 @@ public ClusterStateChanges(NamedXContentRegistry xContentRegistry, ThreadPool th // services TransportService transportService = new TransportService(settings, transport, threadPool, TransportService.NOOP_TRANSPORT_INTERCEPTOR, - boundAddress -> DiscoveryNode.createLocal(settings, boundAddress.publishAddress(), UUIDs.randomBase64UUID()), clusterSettings); + boundAddress -> DiscoveryNode.createLocal(settings, boundAddress.publishAddress(), UUIDs.randomBase64UUID()), clusterSettings, + Collections.emptySet()); MetaDataIndexUpgradeService metaDataIndexUpgradeService = new MetaDataIndexUpgradeService(settings, xContentRegistry, null, null, null) { // metaData upgrader should do nothing diff --git a/server/src/test/java/org/elasticsearch/indices/cluster/IndicesClusterStateServiceRandomUpdatesTests.java b/server/src/test/java/org/elasticsearch/indices/cluster/IndicesClusterStateServiceRandomUpdatesTests.java index bc5a5b95b958a..d76429c53f3a5 100644 --- a/server/src/test/java/org/elasticsearch/indices/cluster/IndicesClusterStateServiceRandomUpdatesTests.java +++ b/server/src/test/java/org/elasticsearch/indices/cluster/IndicesClusterStateServiceRandomUpdatesTests.java @@ -401,7 +401,8 @@ private IndicesClusterStateService createIndicesClusterStateService(DiscoveryNod final Settings settings = Settings.builder().put("node.name", discoveryNode.getName()).build(); final TransportService transportService = new TransportService(settings, null, threadPool, TransportService.NOOP_TRANSPORT_INTERCEPTOR, - boundAddress -> DiscoveryNode.createLocal(settings, boundAddress.publishAddress(), UUIDs.randomBase64UUID()), null); + boundAddress -> DiscoveryNode.createLocal(settings, boundAddress.publishAddress(), UUIDs.randomBase64UUID()), null, + Collections.emptySet()); final ClusterService clusterService = mock(ClusterService.class); final RepositoriesService repositoriesService = new RepositoriesService(settings, clusterService, transportService, null); diff --git a/server/src/test/java/org/elasticsearch/search/SearchServiceTests.java b/server/src/test/java/org/elasticsearch/search/SearchServiceTests.java index 92f018f282a43..5ed708ecb7581 100644 --- a/server/src/test/java/org/elasticsearch/search/SearchServiceTests.java +++ b/server/src/test/java/org/elasticsearch/search/SearchServiceTests.java @@ -213,11 +213,11 @@ public void onFailure(Exception e) { SearchPhaseResult searchPhaseResult = service.executeQueryPhase( new ShardSearchLocalRequest(indexShard.shardId(), 1, SearchType.DEFAULT, new SearchSourceBuilder(), new String[0], false, new AliasFilter(null, Strings.EMPTY_ARRAY), 1.0f), - new SearchTask(123L, "", "", "", null)); + new SearchTask(123L, "", "", "", null, Collections.emptyMap())); IntArrayList intCursors = new IntArrayList(1); intCursors.add(0); ShardFetchRequest req = new ShardFetchRequest(searchPhaseResult.getRequestId(), intCursors, null /* not a scroll */); - service.executeFetchPhase(req, new SearchTask(123L, "", "", "", null)); + service.executeFetchPhase(req, new SearchTask(123L, "", "", "", null, Collections.emptyMap())); } catch (AlreadyClosedException ex) { throw ex; } catch (IllegalStateException ex) { diff --git a/server/src/test/java/org/elasticsearch/search/query/QueryPhaseTests.java b/server/src/test/java/org/elasticsearch/search/query/QueryPhaseTests.java index d651c92cd611e..06d738cfb6016 100644 --- a/server/src/test/java/org/elasticsearch/search/query/QueryPhaseTests.java +++ b/server/src/test/java/org/elasticsearch/search/query/QueryPhaseTests.java @@ -62,6 +62,7 @@ import java.io.IOException; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import static org.hamcrest.Matchers.anyOf; @@ -94,7 +95,7 @@ private void countTestCase(Query query, IndexReader reader, boolean shouldCollec TestSearchContext context = new TestSearchContext(null, indexShard); context.parsedQuery(new ParsedQuery(query)); context.setSize(0); - context.setTask(new SearchTask(123L, "", "", "", null)); + context.setTask(new SearchTask(123L, "", "", "", null, Collections.emptyMap())); final IndexSearcher searcher = shouldCollect ? new IndexSearcher(reader) : getAssertingEarlyTerminationSearcher(reader, 0); @@ -166,7 +167,7 @@ public void testPostFilterDisablesCountOptimization() throws Exception { IndexReader reader = DirectoryReader.open(dir); IndexSearcher contextSearcher = getAssertingEarlyTerminationSearcher(reader, 0); TestSearchContext context = new TestSearchContext(null, indexShard); - context.setTask(new SearchTask(123L, "", "", "", null)); + context.setTask(new SearchTask(123L, "", "", "", null, Collections.emptyMap())); context.parsedQuery(new ParsedQuery(new MatchAllDocsQuery())); QueryPhase.execute(context, contextSearcher, checkCancelled -> {}); @@ -195,7 +196,7 @@ public void testMinScoreDisablesCountOptimization() throws Exception { TestSearchContext context = new TestSearchContext(null, indexShard); context.parsedQuery(new ParsedQuery(new MatchAllDocsQuery())); context.setSize(0); - context.setTask(new SearchTask(123L, "", "", "", null)); + context.setTask(new SearchTask(123L, "", "", "", null, Collections.emptyMap())); QueryPhase.execute(context, contextSearcher, checkCancelled -> {}); assertEquals(1, context.queryResult().topDocs().totalHits); @@ -209,7 +210,7 @@ public void testMinScoreDisablesCountOptimization() throws Exception { public void testQueryCapturesThreadPoolStats() throws Exception { TestSearchContext context = new TestSearchContext(null, indexShard); - context.setTask(new SearchTask(123L, "", "", "", null)); + context.setTask(new SearchTask(123L, "", "", "", null, Collections.emptyMap())); context.parsedQuery(new ParsedQuery(new MatchAllDocsQuery())); Directory dir = newDirectory(); @@ -251,7 +252,7 @@ public void testInOrderScrollOptimization() throws Exception { scrollContext.maxScore = Float.NaN; scrollContext.totalHits = -1; context.scrollContext(scrollContext); - context.setTask(new SearchTask(123L, "", "", "", null)); + context.setTask(new SearchTask(123L, "", "", "", null, Collections.emptyMap())); int size = randomIntBetween(2, 5); context.setSize(size); @@ -290,7 +291,7 @@ public void testTerminateAfterEarlyTermination() throws Exception { } w.close(); TestSearchContext context = new TestSearchContext(null, indexShard); - context.setTask(new SearchTask(123L, "", "", "", null)); + context.setTask(new SearchTask(123L, "", "", "", null, Collections.emptyMap())); context.parsedQuery(new ParsedQuery(new MatchAllDocsQuery())); context.terminateAfter(1); @@ -384,7 +385,7 @@ public void testIndexSortingEarlyTermination() throws Exception { TestSearchContext context = new TestSearchContext(null, indexShard); context.parsedQuery(new ParsedQuery(new MatchAllDocsQuery())); context.setSize(1); - context.setTask(new SearchTask(123L, "", "", "", null)); + context.setTask(new SearchTask(123L, "", "", "", null, Collections.emptyMap())); context.sort(new SortAndFormats(sort, new DocValueFormat[] {DocValueFormat.RAW})); final IndexReader reader = DirectoryReader.open(dir); @@ -471,7 +472,7 @@ public void testIndexSortScrollOptimization() throws Exception { scrollContext.maxScore = Float.NaN; scrollContext.totalHits = -1; context.scrollContext(scrollContext); - context.setTask(new SearchTask(123L, "", "", "", null)); + context.setTask(new SearchTask(123L, "", "", "", null, Collections.emptyMap())); context.setSize(10); context.sort(searchSortAndFormat); diff --git a/server/src/test/java/org/elasticsearch/tasks/ListTasksResponseTests.java b/server/src/test/java/org/elasticsearch/tasks/ListTasksResponseTests.java index 6643a71b0962f..be0624d6bba83 100644 --- a/server/src/test/java/org/elasticsearch/tasks/ListTasksResponseTests.java +++ b/server/src/test/java/org/elasticsearch/tasks/ListTasksResponseTests.java @@ -22,6 +22,8 @@ import org.elasticsearch.action.admin.cluster.node.tasks.list.ListTasksResponse; import org.elasticsearch.test.ESTestCase; +import java.util.Collections; + import static java.util.Collections.emptyList; import static java.util.Collections.singletonList; @@ -33,10 +35,11 @@ public void testEmptyToString() { public void testNonEmptyToString() { TaskInfo info = new TaskInfo( - new TaskId("node1", 1), "dummy-type", "dummy-action", "dummy-description", null, 0, 1, true, new TaskId("node1", 0)); + new TaskId("node1", 1), "dummy-type", "dummy-action", "dummy-description", null, 0, 1, true, new TaskId("node1", 0), + Collections.singletonMap("foo", "bar")); ListTasksResponse tasksResponse = new ListTasksResponse(singletonList(info), emptyList(), emptyList()); assertEquals("{\"tasks\":{\"node1:1\":{\"node\":\"node1\",\"id\":1,\"type\":\"dummy-type\",\"action\":\"dummy-action\"," + "\"description\":\"dummy-description\",\"start_time_in_millis\":0,\"running_time_in_nanos\":1,\"cancellable\":true," - + "\"parent_task_id\":\"node1:0\"}}}", tasksResponse.toString()); + + "\"parent_task_id\":\"node1:0\",\"headers\":{\"foo\":\"bar\"}}}}", tasksResponse.toString()); } } diff --git a/server/src/test/java/org/elasticsearch/tasks/TaskResultTests.java b/server/src/test/java/org/elasticsearch/tasks/TaskResultTests.java index e70c2b7119421..d4da4f8f1c5cb 100644 --- a/server/src/test/java/org/elasticsearch/tasks/TaskResultTests.java +++ b/server/src/test/java/org/elasticsearch/tasks/TaskResultTests.java @@ -134,7 +134,9 @@ private static TaskInfo randomTaskInfo() throws IOException { long runningTimeNanos = randomLong(); boolean cancellable = randomBoolean(); TaskId parentTaskId = randomBoolean() ? TaskId.EMPTY_TASK_ID : randomTaskId(); - return new TaskInfo(taskId, type, action, description, status, startTime, runningTimeNanos, cancellable, parentTaskId); + Map headers = + randomBoolean() ? Collections.emptyMap() : Collections.singletonMap(randomAlphaOfLength(5), randomAlphaOfLength(5)); + return new TaskInfo(taskId, type, action, description, status, startTime, runningTimeNanos, cancellable, parentTaskId, headers); } private static TaskId randomTaskId() { diff --git a/server/src/test/java/org/elasticsearch/transport/TransportServiceHandshakeTests.java b/server/src/test/java/org/elasticsearch/transport/TransportServiceHandshakeTests.java index c4fe88d2fce46..08d88ad2e0486 100644 --- a/server/src/test/java/org/elasticsearch/transport/TransportServiceHandshakeTests.java +++ b/server/src/test/java/org/elasticsearch/transport/TransportServiceHandshakeTests.java @@ -73,7 +73,7 @@ private NetworkHandle startServices(String nodeNameAndId, Settings settings, Ver boundAddress.publishAddress(), emptyMap(), emptySet(), - version), null); + version), null, Collections.emptySet()); transportService.start(); transportService.acceptIncomingRequests(); transportServices.add(transportService); diff --git a/test/framework/src/main/java/org/elasticsearch/index/reindex/AbstractAsyncBulkByScrollActionTestCase.java b/test/framework/src/main/java/org/elasticsearch/index/reindex/AbstractAsyncBulkByScrollActionTestCase.java index a0752b0048564..73cff7717b44d 100644 --- a/test/framework/src/main/java/org/elasticsearch/index/reindex/AbstractAsyncBulkByScrollActionTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/index/reindex/AbstractAsyncBulkByScrollActionTestCase.java @@ -27,6 +27,8 @@ import org.junit.After; import org.junit.Before; +import java.util.Collections; + public abstract class AbstractAsyncBulkByScrollActionTestCase< Request extends AbstractBulkByScrollRequest, Response extends BulkByScrollResponse> @@ -37,7 +39,7 @@ public abstract class AbstractAsyncBulkByScrollActionTestCase< @Before public void setupForTest() { threadPool = new TestThreadPool(getTestName()); - task = new BulkByScrollTask(1, "test", "test", "test", TaskId.EMPTY_TASK_ID); + task = new BulkByScrollTask(1, "test", "test", "test", TaskId.EMPTY_TASK_ID, Collections.emptyMap()); task.setWorker(Float.POSITIVE_INFINITY, null); } diff --git a/test/framework/src/main/java/org/elasticsearch/node/MockNode.java b/test/framework/src/main/java/org/elasticsearch/node/MockNode.java index 5a6075b1f8571..8d2f6e895504c 100644 --- a/test/framework/src/main/java/org/elasticsearch/node/MockNode.java +++ b/test/framework/src/main/java/org/elasticsearch/node/MockNode.java @@ -50,6 +50,7 @@ import java.nio.file.Path; import java.util.Collection; import java.util.Collections; +import java.util.Set; import java.util.function.Consumer; import java.util.function.Function; @@ -115,15 +116,15 @@ protected SearchService newSearchService(ClusterService clusterService, IndicesS protected TransportService newTransportService(Settings settings, Transport transport, ThreadPool threadPool, TransportInterceptor interceptor, Function localNodeFactory, - ClusterSettings clusterSettings) { + ClusterSettings clusterSettings, Set taskHeaders) { // we use the MockTransportService.TestPlugin class as a marker to create a network // module with this MockNetworkService. NetworkService is such an integral part of the systme // we don't allow to plug it in from plugins or anything. this is a test-only override and // can't be done in a production env. if (getPluginsService().filterPlugins(MockTransportService.TestPlugin.class).isEmpty()) { - return super.newTransportService(settings, transport, threadPool, interceptor, localNodeFactory, clusterSettings); + return super.newTransportService(settings, transport, threadPool, interceptor, localNodeFactory, clusterSettings, taskHeaders); } else { - return new MockTransportService(settings, transport, threadPool, interceptor, localNodeFactory, clusterSettings); + return new MockTransportService(settings, transport, threadPool, interceptor, localNodeFactory, clusterSettings, taskHeaders); } } diff --git a/test/framework/src/main/java/org/elasticsearch/test/tasks/MockTaskManager.java b/test/framework/src/main/java/org/elasticsearch/test/tasks/MockTaskManager.java index bccbd537a53b4..dec204537b917 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/tasks/MockTaskManager.java +++ b/test/framework/src/main/java/org/elasticsearch/test/tasks/MockTaskManager.java @@ -27,8 +27,10 @@ import org.elasticsearch.tasks.Task; import org.elasticsearch.tasks.TaskAwareRequest; import org.elasticsearch.tasks.TaskManager; +import org.elasticsearch.threadpool.ThreadPool; import java.util.Collection; +import java.util.Set; import java.util.concurrent.CopyOnWriteArrayList; /** @@ -41,8 +43,8 @@ public class MockTaskManager extends TaskManager { private final Collection listeners = new CopyOnWriteArrayList<>(); - public MockTaskManager(Settings settings) { - super(settings); + public MockTaskManager(Settings settings, ThreadPool threadPool, Set taskHeaders) { + super(settings, threadPool, taskHeaders); } @Override diff --git a/test/framework/src/main/java/org/elasticsearch/test/transport/MockTransportService.java b/test/framework/src/main/java/org/elasticsearch/test/transport/MockTransportService.java index f5efa9a8c56fa..1c31533c9337d 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/transport/MockTransportService.java +++ b/test/framework/src/main/java/org/elasticsearch/test/transport/MockTransportService.java @@ -111,16 +111,16 @@ public static MockTransportService createNewService(Settings settings, Version v NamedWriteableRegistry namedWriteableRegistry = new NamedWriteableRegistry(ClusterModule.getNamedWriteables()); final Transport transport = new MockTcpTransport(settings, threadPool, BigArrays.NON_RECYCLING_INSTANCE, new NoneCircuitBreakerService(), namedWriteableRegistry, new NetworkService(Collections.emptyList()), version); - return createNewService(settings, transport, version, threadPool, clusterSettings); + return createNewService(settings, transport, version, threadPool, clusterSettings, Collections.emptySet()); } public static MockTransportService createNewService(Settings settings, Transport transport, Version version, ThreadPool threadPool, - @Nullable ClusterSettings clusterSettings) { + @Nullable ClusterSettings clusterSettings, Set taskHeaders) { return new MockTransportService(settings, transport, threadPool, TransportService.NOOP_TRANSPORT_INTERCEPTOR, boundAddress -> new DiscoveryNode(Node.NODE_NAME_SETTING.get(settings), UUIDs.randomBase64UUID(), boundAddress.publishAddress(), Node.NODE_ATTRIBUTES.getAsMap(settings), DiscoveryNode.getRolesFromSettings(settings), version), - clusterSettings); + clusterSettings, taskHeaders); } private final Transport original; @@ -135,7 +135,7 @@ public MockTransportService(Settings settings, Transport transport, ThreadPool t @Nullable ClusterSettings clusterSettings) { this(settings, transport, threadPool, interceptor, (boundAddress) -> DiscoveryNode.createLocal(settings, boundAddress.publishAddress(), settings.get(Node.NODE_NAME_SETTING.getKey(), - UUIDs.randomBase64UUID())), clusterSettings); + UUIDs.randomBase64UUID())), clusterSettings, Collections.emptySet()); } /** @@ -146,8 +146,9 @@ public MockTransportService(Settings settings, Transport transport, ThreadPool t */ public MockTransportService(Settings settings, Transport transport, ThreadPool threadPool, TransportInterceptor interceptor, Function localNodeFactory, - @Nullable ClusterSettings clusterSettings) { - super(settings, new LookupTestTransport(transport), threadPool, interceptor, localNodeFactory, clusterSettings); + @Nullable ClusterSettings clusterSettings, Set taskHeaders) { + super(settings, new LookupTestTransport(transport), threadPool, interceptor, localNodeFactory, clusterSettings, + taskHeaders); this.original = transport; } @@ -160,11 +161,11 @@ public static TransportAddress[] extractTransportAddresses(TransportService tran } @Override - protected TaskManager createTaskManager() { + protected TaskManager createTaskManager(Settings settings, ThreadPool threadPool, Set taskHeaders) { if (MockTaskManager.USE_MOCK_TASK_MANAGER_SETTING.get(settings)) { - return new MockTaskManager(settings); + return new MockTaskManager(settings, threadPool, taskHeaders); } else { - return super.createTaskManager(); + return super.createTaskManager(settings, threadPool, taskHeaders); } } diff --git a/test/framework/src/main/java/org/elasticsearch/transport/AbstractSimpleTransportTestCase.java b/test/framework/src/main/java/org/elasticsearch/transport/AbstractSimpleTransportTestCase.java index 17423207d56c6..20971b3865ea1 100644 --- a/test/framework/src/main/java/org/elasticsearch/transport/AbstractSimpleTransportTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/transport/AbstractSimpleTransportTestCase.java @@ -1931,7 +1931,8 @@ public void testHandshakeWithIncompatVersion() { Version version = Version.fromString("2.0.0"); try (MockTcpTransport transport = new MockTcpTransport(Settings.EMPTY, threadPool, BigArrays.NON_RECYCLING_INSTANCE, new NoneCircuitBreakerService(), namedWriteableRegistry, new NetworkService(Collections.emptyList()), version); - MockTransportService service = MockTransportService.createNewService(Settings.EMPTY, transport, version, threadPool, null)) { + MockTransportService service = MockTransportService.createNewService(Settings.EMPTY, transport, version, threadPool, null, + Collections.emptySet())) { service.start(); service.acceptIncomingRequests(); DiscoveryNode node = @@ -1953,7 +1954,8 @@ public void testHandshakeUpdatesVersion() throws IOException { Version version = VersionUtils.randomVersionBetween(random(), Version.CURRENT.minimumCompatibilityVersion(), Version.CURRENT); try (MockTcpTransport transport = new MockTcpTransport(Settings.EMPTY, threadPool, BigArrays.NON_RECYCLING_INSTANCE, new NoneCircuitBreakerService(), namedWriteableRegistry, new NetworkService(Collections.emptyList()), version); - MockTransportService service = MockTransportService.createNewService(Settings.EMPTY, transport, version, threadPool, null)) { + MockTransportService service = MockTransportService.createNewService(Settings.EMPTY, transport, version, threadPool, null, + Collections.emptySet())) { service.start(); service.acceptIncomingRequests(); DiscoveryNode node = @@ -1989,7 +1991,7 @@ protected String handleRequest(TcpChannel mockChannel, String profileName, Strea }; try (MockTransportService service = MockTransportService.createNewService(Settings.EMPTY, transport, Version.CURRENT, threadPool, - null)) { + null, Collections.emptySet())) { service.start(); service.acceptIncomingRequests(); // this acts like a node that doesn't have support for handshakes diff --git a/test/framework/src/test/java/org/elasticsearch/transport/MockTcpTransportTests.java b/test/framework/src/test/java/org/elasticsearch/transport/MockTcpTransportTests.java index 916e97ffd1211..e9f5f86462f54 100644 --- a/test/framework/src/test/java/org/elasticsearch/transport/MockTcpTransportTests.java +++ b/test/framework/src/test/java/org/elasticsearch/transport/MockTcpTransportTests.java @@ -50,7 +50,7 @@ protected Version executeHandshake(DiscoveryNode node, TcpChannel mockChannel, T } }; MockTransportService mockTransportService = - MockTransportService.createNewService(Settings.EMPTY, transport, version, threadPool, clusterSettings); + MockTransportService.createNewService(Settings.EMPTY, transport, version, threadPool, clusterSettings, Collections.emptySet()); mockTransportService.start(); return mockTransportService; } diff --git a/test/framework/src/test/java/org/elasticsearch/transport/nio/SimpleMockNioTransportTests.java b/test/framework/src/test/java/org/elasticsearch/transport/nio/SimpleMockNioTransportTests.java index bb36ed9f6db1d..bd7fddf82b858 100644 --- a/test/framework/src/test/java/org/elasticsearch/transport/nio/SimpleMockNioTransportTests.java +++ b/test/framework/src/test/java/org/elasticsearch/transport/nio/SimpleMockNioTransportTests.java @@ -78,7 +78,7 @@ protected Version getCurrentVersion() { }; MockTransportService mockTransportService = - MockTransportService.createNewService(Settings.EMPTY, transport, version, threadPool, clusterSettings); + MockTransportService.createNewService(Settings.EMPTY, transport, version, threadPool, clusterSettings, Collections.emptySet()); mockTransportService.start(); return mockTransportService; } From a15ba75d934823d8867b5c69438c627563db7a86 Mon Sep 17 00:00:00 2001 From: Jason Tedor Date: Fri, 12 Jan 2018 16:17:30 -0500 Subject: [PATCH 65/74] Fix lock accounting in releasable lock Releasble locks hold accounting on who holds the lock when assertions are enabled. However, the underlying lock can be re-entrant yet we mark the lock as not held by the current thread as soon as the releasable is closed. For a re-entrant lock this is not right because the thread could have entered the lock multiple times. Instead, we have to count how many times the thread has entered the lock and only mark the lock as not held by the current thread when the counter reaches zero. Relates #28202 --- .../util/concurrent/ReleasableLock.java | 20 ++-- .../util/concurrent/ReleasableLockTests.java | 97 +++++++++++++++++++ 2 files changed, 111 insertions(+), 6 deletions(-) create mode 100644 server/src/test/java/org/elasticsearch/common/util/concurrent/ReleasableLockTests.java diff --git a/server/src/main/java/org/elasticsearch/common/util/concurrent/ReleasableLock.java b/server/src/main/java/org/elasticsearch/common/util/concurrent/ReleasableLock.java index 46d6abff17632..9c90b3bbde313 100644 --- a/server/src/main/java/org/elasticsearch/common/util/concurrent/ReleasableLock.java +++ b/server/src/main/java/org/elasticsearch/common/util/concurrent/ReleasableLock.java @@ -31,8 +31,9 @@ public class ReleasableLock implements Releasable { private final Lock lock; - /* a per thread boolean indicating the lock is held by it. only works when assertions are enabled */ - private final ThreadLocal holdingThreads; + + // a per-thread count indicating how many times the thread has entered the lock; only works if assertions are enabled + private final ThreadLocal holdingThreads; public ReleasableLock(Lock lock) { this.lock = lock; @@ -57,12 +58,19 @@ public ReleasableLock acquire() throws EngineException { } private boolean addCurrentThread() { - holdingThreads.set(true); + final Integer current = holdingThreads.get(); + holdingThreads.set(current == null ? 1 : current + 1); return true; } private boolean removeCurrentThread() { - holdingThreads.remove(); + final Integer count = holdingThreads.get(); + assert count != null && count > 0; + if (count == 1) { + holdingThreads.remove(); + } else { + holdingThreads.set(count - 1); + } return true; } @@ -70,7 +78,7 @@ public Boolean isHeldByCurrentThread() { if (holdingThreads == null) { throw new UnsupportedOperationException("asserts must be enabled"); } - Boolean b = holdingThreads.get(); - return b != null && b.booleanValue(); + final Integer count = holdingThreads.get(); + return count != null && count > 0; } } diff --git a/server/src/test/java/org/elasticsearch/common/util/concurrent/ReleasableLockTests.java b/server/src/test/java/org/elasticsearch/common/util/concurrent/ReleasableLockTests.java new file mode 100644 index 0000000000000..6a303449ce1c1 --- /dev/null +++ b/server/src/test/java/org/elasticsearch/common/util/concurrent/ReleasableLockTests.java @@ -0,0 +1,97 @@ +/* + * Licensed to Elasticsearch under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch licenses this file to you 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. + */ + +package org.elasticsearch.common.util.concurrent; + +import org.elasticsearch.common.lease.Releasable; +import org.elasticsearch.test.ESTestCase; + +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.BrokenBarrierException; +import java.util.concurrent.CyclicBarrier; +import java.util.concurrent.locks.ReentrantReadWriteLock; + +public class ReleasableLockTests extends ESTestCase { + + /** + * Test that accounting on whether or not a thread holds a releasable lock is correct. Previously we had a bug where on a re-entrant + * lock that if a thread entered the lock twice we would declare that it does not hold the lock after it exits its first entrance but + * not its second entrance. + * + * @throws BrokenBarrierException if awaiting on the synchronization barrier breaks + * @throws InterruptedException if awaiting on the synchronization barrier is interrupted + */ + public void testIsHeldByCurrentThread() throws BrokenBarrierException, InterruptedException { + final ReentrantReadWriteLock readWriteLock = new ReentrantReadWriteLock(); + final ReleasableLock readLock = new ReleasableLock(readWriteLock.readLock()); + final ReleasableLock writeLock = new ReleasableLock(readWriteLock.writeLock()); + + final int numberOfThreads = scaledRandomIntBetween(1, 32); + final int iterations = scaledRandomIntBetween(1, 32); + final CyclicBarrier barrier = new CyclicBarrier(1 + numberOfThreads); + final List threads = new ArrayList<>(); + for (int i = 0; i < numberOfThreads; i++) { + final Thread thread = new Thread(() -> { + try { + barrier.await(); + } catch (final BrokenBarrierException | InterruptedException e) { + throw new RuntimeException(e); + } + for (int j = 0; j < iterations; j++) { + if (randomBoolean()) { + acquire(readLock, writeLock); + } else { + acquire(writeLock, readLock); + } + } + try { + barrier.await(); + } catch (final BrokenBarrierException | InterruptedException e) { + throw new RuntimeException(e); + } + }); + threads.add(thread); + thread.start(); + } + + barrier.await(); + barrier.await(); + for (final Thread thread : threads) { + thread.join(); + } + } + + private void acquire(final ReleasableLock lockToAcquire, final ReleasableLock otherLock) { + try (@SuppressWarnings("unused") Releasable outer = lockToAcquire.acquire()) { + assertTrue(lockToAcquire.isHeldByCurrentThread()); + assertFalse(otherLock.isHeldByCurrentThread()); + try (@SuppressWarnings("unused") Releasable inner = lockToAcquire.acquire()) { + assertTrue(lockToAcquire.isHeldByCurrentThread()); + assertFalse(otherLock.isHeldByCurrentThread()); + } + // previously there was a bug here and this would return false + assertTrue(lockToAcquire.isHeldByCurrentThread()); + assertFalse(otherLock.isHeldByCurrentThread()); + } + assertFalse(lockToAcquire.isHeldByCurrentThread()); + assertFalse(otherLock.isHeldByCurrentThread()); + } + +} From f2db2a02e20f208afd3c90f9c11e2cc33b1f982e Mon Sep 17 00:00:00 2001 From: Nhat Nguyen Date: Fri, 12 Jan 2018 19:06:04 -0500 Subject: [PATCH 66/74] Truncate tlog cli should assign global checkpoint (#28192) We are targeting to always have a safe index once the recovery is done. This invariant does not hold if the translog is manually truncated by users because the truncate translog cli resets the global checkpoint to unassigned. This commit assigns the global checkpoint to the max_seqno of the last commit when truncating translog. We can only safely do it because the truncate translog command will generate a new history uuid for that shard. With a new history UUID, sequence-based recovery between that shard and other old shards will be disabled. Relates #28181 --- .../translog/TruncateTranslogCommand.java | 18 ++++++++++++++---- .../index/translog/TruncateTranslogIT.java | 17 +++++++++++++++++ 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/server/src/main/java/org/elasticsearch/index/translog/TruncateTranslogCommand.java b/server/src/main/java/org/elasticsearch/index/translog/TruncateTranslogCommand.java index d9b77f841ed09..222e3e13d65e1 100644 --- a/server/src/main/java/org/elasticsearch/index/translog/TruncateTranslogCommand.java +++ b/server/src/main/java/org/elasticsearch/index/translog/TruncateTranslogCommand.java @@ -132,9 +132,19 @@ protected void execute(Terminal terminal, OptionSet options, Environment env) th } // Retrieve the generation and UUID from the existing data - commitData = commits.get(commits.size() - 1).getUserData(); + commitData = new HashMap<>(commits.get(commits.size() - 1).getUserData()); String translogGeneration = commitData.get(Translog.TRANSLOG_GENERATION_KEY); String translogUUID = commitData.get(Translog.TRANSLOG_UUID_KEY); + final long globalCheckpoint; + // In order to have a safe commit invariant, we have to assign the global checkpoint to the max_seqno of the last commit. + // We can only safely do it because we will generate a new history uuid this shard. + if (commitData.containsKey(SequenceNumbers.MAX_SEQ_NO)) { + globalCheckpoint = Long.parseLong(commitData.get(SequenceNumbers.MAX_SEQ_NO)); + // Also advances the local checkpoint of the last commit to its max_seqno. + commitData.put(SequenceNumbers.LOCAL_CHECKPOINT_KEY, Long.toString(globalCheckpoint)); + } else { + globalCheckpoint = SequenceNumbers.UNASSIGNED_SEQ_NO; + } if (translogGeneration == null || translogUUID == null) { throw new ElasticsearchException("shard must have a valid translog generation and UUID but got: [{}] and: [{}]", translogGeneration, translogUUID); @@ -153,7 +163,7 @@ protected void execute(Terminal terminal, OptionSet options, Environment env) th // Write empty checkpoint and translog to empty files long gen = Long.parseLong(translogGeneration); int translogLen = writeEmptyTranslog(tempEmptyTranslog, translogUUID); - writeEmptyCheckpoint(tempEmptyCheckpoint, translogLen, gen); + writeEmptyCheckpoint(tempEmptyCheckpoint, translogLen, gen, globalCheckpoint); terminal.println("Removing existing translog files"); IOUtils.rm(translogFiles.toArray(new Path[]{})); @@ -190,9 +200,9 @@ protected void execute(Terminal terminal, OptionSet options, Environment env) th } /** Write a checkpoint file to the given location with the given generation */ - public static void writeEmptyCheckpoint(Path filename, int translogLength, long translogGeneration) throws IOException { + static void writeEmptyCheckpoint(Path filename, int translogLength, long translogGeneration, long globalCheckpoint) throws IOException { Checkpoint emptyCheckpoint = Checkpoint.emptyTranslogCheckpoint(translogLength, translogGeneration, - SequenceNumbers.UNASSIGNED_SEQ_NO, translogGeneration); + globalCheckpoint, translogGeneration); Checkpoint.write(FileChannel::open, filename, emptyCheckpoint, StandardOpenOption.WRITE, StandardOpenOption.READ, StandardOpenOption.CREATE_NEW); // fsync with metadata here to make sure. diff --git a/server/src/test/java/org/elasticsearch/index/translog/TruncateTranslogIT.java b/server/src/test/java/org/elasticsearch/index/translog/TruncateTranslogIT.java index d98359cdd06a0..029ed50fb2851 100644 --- a/server/src/test/java/org/elasticsearch/index/translog/TruncateTranslogIT.java +++ b/server/src/test/java/org/elasticsearch/index/translog/TruncateTranslogIT.java @@ -31,6 +31,7 @@ import org.elasticsearch.action.admin.cluster.node.stats.NodesStatsResponse; import org.elasticsearch.action.admin.indices.flush.FlushRequest; import org.elasticsearch.action.admin.indices.recovery.RecoveryResponse; +import org.elasticsearch.action.admin.indices.stats.ShardStats; import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.search.SearchPhaseExecutionException; import org.elasticsearch.action.search.SearchRequestBuilder; @@ -48,6 +49,7 @@ import org.elasticsearch.index.Index; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.MockEngineFactoryPlugin; +import org.elasticsearch.index.seqno.SeqNoStats; import org.elasticsearch.index.shard.IndexShard; import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.indices.IndicesService; @@ -74,6 +76,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThan; @ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.SUITE, numDataNodes = 0) @@ -214,6 +217,10 @@ public void testCorruptTranslogTruncation() throws Exception { final RecoveryState replicaRecoveryState = recoveryResponse.shardRecoveryStates().get("test").stream() .filter(recoveryState -> recoveryState.getPrimary() == false).findFirst().get(); assertThat(replicaRecoveryState.getIndex().toString(), replicaRecoveryState.getIndex().recoveredFileCount(), greaterThan(0)); + // Ensure that the global checkpoint and local checkpoint are restored from the max seqno of the last commit. + final SeqNoStats seqNoStats = getSeqNoStats("test", 0); + assertThat(seqNoStats.getGlobalCheckpoint(), equalTo(seqNoStats.getMaxSeqNo())); + assertThat(seqNoStats.getLocalCheckpoint(), equalTo(seqNoStats.getMaxSeqNo())); } public void testCorruptTranslogTruncationOfReplica() throws Exception { @@ -316,6 +323,10 @@ public void testCorruptTranslogTruncationOfReplica() throws Exception { .filter(recoveryState -> recoveryState.getPrimary() == false).findFirst().get(); // the replica translog was disabled so it doesn't know what hte global checkpoint is and thus can't do ops based recovery assertThat(replicaRecoveryState.getIndex().toString(), replicaRecoveryState.getIndex().recoveredFileCount(), greaterThan(0)); + // Ensure that the global checkpoint and local checkpoint are restored from the max seqno of the last commit. + final SeqNoStats seqNoStats = getSeqNoStats("test", 0); + assertThat(seqNoStats.getGlobalCheckpoint(), equalTo(seqNoStats.getMaxSeqNo())); + assertThat(seqNoStats.getLocalCheckpoint(), equalTo(seqNoStats.getMaxSeqNo())); } private Set getTranslogDirs(String indexName) throws IOException { @@ -360,4 +371,10 @@ private static void disableTranslogFlush(String index) { client().admin().indices().prepareUpdateSettings(index).setSettings(settings).get(); } + private SeqNoStats getSeqNoStats(String index, int shardId) { + final ShardStats[] shardStats = client().admin().indices() + .prepareStats(index).get() + .getIndices().get(index).getShards(); + return shardStats[shardId].getSeqNoStats(); + } } From 095f31b80ef22ea4b29a0673774158d452c454cc Mon Sep 17 00:00:00 2001 From: Nhat Nguyen Date: Fri, 12 Jan 2018 19:09:31 -0500 Subject: [PATCH 67/74] Replica start peer recovery with safe commit (#28181) Today a replica starts a peer-recovery with the last commit. If the last commit is not a safe commit, a replica will immediately fallback to the file based sync which is more expensive than the sequence based recovery. This commit modifies the peer-recovery in replica to start with a safe commit. Moreover we can keep the existing translog on the target if the recovery is sequence based recovery. Relates #10708 --- .../elasticsearch/index/engine/Engine.java | 5 + .../index/engine/InternalEngine.java | 9 ++ .../elasticsearch/index/shard/IndexShard.java | 16 ++- .../index/shard/StoreRecovery.java | 2 +- .../recovery/PeerRecoveryTargetService.java | 14 +- ...ryPrepareForTranslogOperationsRequest.java | 47 ++++--- .../recovery/RecoverySourceHandler.java | 11 +- .../indices/recovery/RecoveryTarget.java | 10 +- .../recovery/RecoveryTargetHandler.java | 6 +- .../recovery/RemoteRecoveryTargetHandler.java | 4 +- .../RecoveryDuringReplicationTests.java | 29 +++- .../index/shard/IndexShardTests.java | 11 +- .../PeerRecoveryTargetServiceTests.java | 128 ++++++------------ .../recovery/RecoverySourceHandlerTests.java | 2 +- .../indices/recovery/RecoveryTests.java | 35 +++++ 15 files changed, 196 insertions(+), 133 deletions(-) diff --git a/server/src/main/java/org/elasticsearch/index/engine/Engine.java b/server/src/main/java/org/elasticsearch/index/engine/Engine.java index 5de7062ab18ee..b0e2654e7f2fb 100644 --- a/server/src/main/java/org/elasticsearch/index/engine/Engine.java +++ b/server/src/main/java/org/elasticsearch/index/engine/Engine.java @@ -1512,6 +1512,11 @@ public interface Warmer { */ public abstract Engine recoverFromTranslog() throws IOException; + /** + * Do not replay translog operations, but make the engine be ready. + */ + public abstract void skipTranslogRecovery(); + /** * Returns true iff this engine is currently recovering from translog. */ diff --git a/server/src/main/java/org/elasticsearch/index/engine/InternalEngine.java b/server/src/main/java/org/elasticsearch/index/engine/InternalEngine.java index 77b8275277079..1b7b891efd6ff 100644 --- a/server/src/main/java/org/elasticsearch/index/engine/InternalEngine.java +++ b/server/src/main/java/org/elasticsearch/index/engine/InternalEngine.java @@ -401,6 +401,15 @@ public InternalEngine recoverFromTranslog() throws IOException { return this; } + @Override + public void skipTranslogRecovery() { + if (openMode != EngineConfig.OpenMode.OPEN_INDEX_AND_TRANSLOG) { + throw new IllegalStateException("Can't skip translog recovery with open mode: " + openMode); + } + assert pendingTranslogRecovery.get() : "translogRecovery is not pending but should be"; + pendingTranslogRecovery.set(false); // we are good - now we can commit + } + private IndexCommit getStartingCommitPoint() throws IOException { if (openMode == EngineConfig.OpenMode.OPEN_INDEX_AND_TRANSLOG) { final long lastSyncedGlobalCheckpoint = translog.getLastSyncedGlobalCheckpoint(); diff --git a/server/src/main/java/org/elasticsearch/index/shard/IndexShard.java b/server/src/main/java/org/elasticsearch/index/shard/IndexShard.java index 4c6c6a17c234d..3832cd0ae2055 100644 --- a/server/src/main/java/org/elasticsearch/index/shard/IndexShard.java +++ b/server/src/main/java/org/elasticsearch/index/shard/IndexShard.java @@ -1304,9 +1304,20 @@ public void openIndexAndCreateTranslog(boolean forceNewHistoryUUID, long globalC * opens the engine on top of the existing lucene engine and translog. * Operations from the translog will be replayed to bring lucene up to date. **/ - public void openIndexAndTranslog() throws IOException { + public void openIndexAndRecoveryFromTranslog() throws IOException { assert recoveryState.getRecoverySource().getType() == RecoverySource.Type.EXISTING_STORE; innerOpenEngineAndTranslog(EngineConfig.OpenMode.OPEN_INDEX_AND_TRANSLOG, false); + getEngine().recoverFromTranslog(); + } + + /** + * Opens the engine on top of the existing lucene engine and translog. + * The translog is kept but its operations won't be replayed. + */ + public void openIndexAndSkipTranslogRecovery() throws IOException { + assert recoveryState.getRecoverySource().getType() == RecoverySource.Type.PEER; + innerOpenEngineAndTranslog(EngineConfig.OpenMode.OPEN_INDEX_AND_TRANSLOG, false); + getEngine().skipTranslogRecovery(); } private void innerOpenEngineAndTranslog(final EngineConfig.OpenMode openMode, final boolean forceNewHistoryUUID) throws IOException { @@ -1339,13 +1350,12 @@ private void innerOpenEngineAndTranslog(final EngineConfig.OpenMode openMode, fi globalCheckpointTracker.updateGlobalCheckpointOnReplica(Translog.readGlobalCheckpoint(translogConfig.getTranslogPath()), "read from translog checkpoint"); } - Engine newEngine = createNewEngine(config); + createNewEngine(config); verifyNotClosed(); if (openMode == EngineConfig.OpenMode.OPEN_INDEX_AND_TRANSLOG) { // We set active because we are now writing operations to the engine; this way, if we go idle after some time and become inactive, // we still give sync'd flush a chance to run: active.set(true); - newEngine.recoverFromTranslog(); } assertSequenceNumbersInCommit(); assert recoveryState.getStage() == RecoveryState.Stage.TRANSLOG : "TRANSLOG stage expected but was: " + recoveryState.getStage(); diff --git a/server/src/main/java/org/elasticsearch/index/shard/StoreRecovery.java b/server/src/main/java/org/elasticsearch/index/shard/StoreRecovery.java index 6bc1ce2882c92..81ffbea642c58 100644 --- a/server/src/main/java/org/elasticsearch/index/shard/StoreRecovery.java +++ b/server/src/main/java/org/elasticsearch/index/shard/StoreRecovery.java @@ -401,7 +401,7 @@ private void internalRecoverFromStore(IndexShard indexShard) throws IndexShardRe logger.debug("failed to list file details", e); } if (indexShouldExists) { - indexShard.openIndexAndTranslog(); + indexShard.openIndexAndRecoveryFromTranslog(); indexShard.getEngine().fillSeqNoGaps(indexShard.getPrimaryTerm()); } else { indexShard.createIndexAndTranslog(); diff --git a/server/src/main/java/org/elasticsearch/indices/recovery/PeerRecoveryTargetService.java b/server/src/main/java/org/elasticsearch/indices/recovery/PeerRecoveryTargetService.java index ba5dc5c60f29f..88b0f23d72a99 100644 --- a/server/src/main/java/org/elasticsearch/indices/recovery/PeerRecoveryTargetService.java +++ b/server/src/main/java/org/elasticsearch/indices/recovery/PeerRecoveryTargetService.java @@ -21,6 +21,8 @@ import org.apache.logging.log4j.message.ParameterizedMessage; import org.apache.logging.log4j.util.Supplier; +import org.apache.lucene.index.DirectoryReader; +import org.apache.lucene.index.IndexCommit; import org.apache.lucene.store.AlreadyClosedException; import org.apache.lucene.store.RateLimiter; import org.elasticsearch.ElasticsearchException; @@ -39,6 +41,7 @@ import org.elasticsearch.common.util.CancellableThreads; import org.elasticsearch.common.util.concurrent.AbstractRunnable; import org.elasticsearch.index.IndexNotFoundException; +import org.elasticsearch.index.engine.CombinedDeletionPolicy; import org.elasticsearch.index.engine.RecoveryEngineException; import org.elasticsearch.index.mapper.MapperException; import org.elasticsearch.index.seqno.SequenceNumbers; @@ -60,6 +63,7 @@ import org.elasticsearch.transport.TransportService; import java.io.IOException; +import java.util.List; import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicReference; @@ -108,8 +112,8 @@ public PeerRecoveryTargetService(Settings settings, ThreadPool threadPool, Trans FileChunkTransportRequestHandler()); transportService.registerRequestHandler(Actions.CLEAN_FILES, RecoveryCleanFilesRequest::new, ThreadPool.Names.GENERIC, new CleanFilesRequestHandler()); - transportService.registerRequestHandler(Actions.PREPARE_TRANSLOG, RecoveryPrepareForTranslogOperationsRequest::new, ThreadPool - .Names.GENERIC, new PrepareForTranslogOperationsRequestHandler()); + transportService.registerRequestHandler(Actions.PREPARE_TRANSLOG, ThreadPool.Names.GENERIC, + RecoveryPrepareForTranslogOperationsRequest::new, new PrepareForTranslogOperationsRequestHandler()); transportService.registerRequestHandler(Actions.TRANSLOG_OPS, RecoveryTranslogOperationsRequest::new, ThreadPool.Names.GENERIC, new TranslogOperationsRequestHandler()); transportService.registerRequestHandler(Actions.FINALIZE, RecoveryFinalizeRecoveryRequest::new, ThreadPool.Names.GENERIC, new @@ -353,7 +357,9 @@ private StartRecoveryRequest getStartRecoveryRequest(final RecoveryTarget recove public static long getStartingSeqNo(final RecoveryTarget recoveryTarget) { try { final long globalCheckpoint = Translog.readGlobalCheckpoint(recoveryTarget.translogLocation()); - final SequenceNumbers.CommitInfo seqNoStats = recoveryTarget.store().loadSeqNoInfo(null); + final List existingCommits = DirectoryReader.listCommits(recoveryTarget.store().directory()); + final IndexCommit safeCommit = CombinedDeletionPolicy.findSafeCommitPoint(existingCommits, globalCheckpoint); + final SequenceNumbers.CommitInfo seqNoStats = recoveryTarget.store().loadSeqNoInfo(safeCommit); if (seqNoStats.maxSeqNo <= globalCheckpoint) { assert seqNoStats.localCheckpoint <= globalCheckpoint; /* @@ -387,7 +393,7 @@ class PrepareForTranslogOperationsRequestHandler implements TransportRequestHand public void messageReceived(RecoveryPrepareForTranslogOperationsRequest request, TransportChannel channel) throws Exception { try (RecoveryRef recoveryRef = onGoingRecoveries.getRecoverySafe(request.recoveryId(), request.shardId() )) { - recoveryRef.target().prepareForTranslogOperations(request.totalTranslogOps()); + recoveryRef.target().prepareForTranslogOperations(request.deleteLocalTranslog(), request.totalTranslogOps()); } channel.sendResponse(TransportResponse.Empty.INSTANCE); } diff --git a/server/src/main/java/org/elasticsearch/indices/recovery/RecoveryPrepareForTranslogOperationsRequest.java b/server/src/main/java/org/elasticsearch/indices/recovery/RecoveryPrepareForTranslogOperationsRequest.java index 61cd986a1aef4..ae8c7472f89b4 100644 --- a/server/src/main/java/org/elasticsearch/indices/recovery/RecoveryPrepareForTranslogOperationsRequest.java +++ b/server/src/main/java/org/elasticsearch/indices/recovery/RecoveryPrepareForTranslogOperationsRequest.java @@ -28,19 +28,33 @@ import java.io.IOException; -public class RecoveryPrepareForTranslogOperationsRequest extends TransportRequest { +class RecoveryPrepareForTranslogOperationsRequest extends TransportRequest { - private long recoveryId; - private ShardId shardId; - private int totalTranslogOps = RecoveryState.Translog.UNKNOWN; + private final long recoveryId; + private final ShardId shardId; + private final int totalTranslogOps; + private final boolean deleteLocalTranslog; - public RecoveryPrepareForTranslogOperationsRequest() { - } - - RecoveryPrepareForTranslogOperationsRequest(long recoveryId, ShardId shardId, int totalTranslogOps) { + RecoveryPrepareForTranslogOperationsRequest(long recoveryId, ShardId shardId, int totalTranslogOps, boolean deleteLocalTranslog) { this.recoveryId = recoveryId; this.shardId = shardId; this.totalTranslogOps = totalTranslogOps; + this.deleteLocalTranslog = deleteLocalTranslog; + } + + RecoveryPrepareForTranslogOperationsRequest(StreamInput in) throws IOException { + super.readFrom(in); + recoveryId = in.readLong(); + shardId = ShardId.readShardId(in); + totalTranslogOps = in.readVInt(); + if (in.getVersion().before(Version.V_6_0_0_alpha1)) { + in.readLong(); // maxUnsafeAutoIdTimestamp + } + if (in.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { + deleteLocalTranslog = in.readBoolean(); + } else { + deleteLocalTranslog = true; + } } public long recoveryId() { @@ -55,15 +69,11 @@ public int totalTranslogOps() { return totalTranslogOps; } - @Override - public void readFrom(StreamInput in) throws IOException { - super.readFrom(in); - recoveryId = in.readLong(); - shardId = ShardId.readShardId(in); - totalTranslogOps = in.readVInt(); - if (in.getVersion().before(Version.V_6_0_0_alpha1)) { - in.readLong(); // maxUnsafeAutoIdTimestamp - } + /** + * Whether or not the recover target should delete its local translog + */ + boolean deleteLocalTranslog() { + return deleteLocalTranslog; } @Override @@ -75,5 +85,8 @@ public void writeTo(StreamOutput out) throws IOException { if (out.getVersion().before(Version.V_6_0_0_alpha1)) { out.writeLong(IndexRequest.UNSET_AUTO_GENERATED_TIMESTAMP); // maxUnsafeAutoIdTimestamp } + if (out.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { + out.writeBoolean(deleteLocalTranslog); + } } } diff --git a/server/src/main/java/org/elasticsearch/indices/recovery/RecoverySourceHandler.java b/server/src/main/java/org/elasticsearch/indices/recovery/RecoverySourceHandler.java index 7afe6c977da21..3ee9b953757c3 100644 --- a/server/src/main/java/org/elasticsearch/indices/recovery/RecoverySourceHandler.java +++ b/server/src/main/java/org/elasticsearch/indices/recovery/RecoverySourceHandler.java @@ -150,9 +150,9 @@ public RecoveryResponse recoverToTarget() throws IOException { final long startingSeqNo; final long requiredSeqNoRangeStart; - final boolean isSequenceNumberBasedRecoveryPossible = request.startingSeqNo() != SequenceNumbers.UNASSIGNED_SEQ_NO && + final boolean isSequenceNumberBasedRecovery = request.startingSeqNo() != SequenceNumbers.UNASSIGNED_SEQ_NO && isTargetSameHistory() && isTranslogReadyForSequenceNumberBasedRecovery(); - if (isSequenceNumberBasedRecoveryPossible) { + if (isSequenceNumberBasedRecovery) { logger.trace("performing sequence numbers based recovery. starting at [{}]", request.startingSeqNo()); startingSeqNo = request.startingSeqNo(); requiredSeqNoRangeStart = startingSeqNo; @@ -188,7 +188,8 @@ public RecoveryResponse recoverToTarget() throws IOException { runUnderPrimaryPermit(() -> shard.initiateTracking(request.targetAllocationId())); try { - prepareTargetForTranslog(translog.estimateTotalOperationsFromMinSeq(startingSeqNo)); + // For a sequence based recovery, the target can keep its local translog + prepareTargetForTranslog(isSequenceNumberBasedRecovery == false, translog.estimateTotalOperationsFromMinSeq(startingSeqNo)); } catch (final Exception e) { throw new RecoveryEngineException(shard.shardId(), 1, "prepare target for translog failed", e); } @@ -421,13 +422,13 @@ public void phase1(final IndexCommit snapshot, final Supplier translogO } } - void prepareTargetForTranslog(final int totalTranslogOps) throws IOException { + void prepareTargetForTranslog(final boolean createNewTranslog, final int totalTranslogOps) throws IOException { StopWatch stopWatch = new StopWatch().start(); logger.trace("recovery [phase1]: prepare remote engine for translog"); final long startEngineStart = stopWatch.totalTime().millis(); // Send a request preparing the new shard's translog to receive operations. This ensures the shard engine is started and disables // garbage collection (not the JVM's GC!) of tombstone deletes. - cancellableThreads.executeIO(() -> recoveryTarget.prepareForTranslogOperations(totalTranslogOps)); + cancellableThreads.executeIO(() -> recoveryTarget.prepareForTranslogOperations(createNewTranslog, totalTranslogOps)); stopWatch.stop(); response.startTime = stopWatch.totalTime().millis() - startEngineStart; diff --git a/server/src/main/java/org/elasticsearch/indices/recovery/RecoveryTarget.java b/server/src/main/java/org/elasticsearch/indices/recovery/RecoveryTarget.java index d383891345818..1bbcb9efa9644 100644 --- a/server/src/main/java/org/elasticsearch/indices/recovery/RecoveryTarget.java +++ b/server/src/main/java/org/elasticsearch/indices/recovery/RecoveryTarget.java @@ -362,10 +362,14 @@ private void ensureRefCount() { /*** Implementation of {@link RecoveryTargetHandler } */ @Override - public void prepareForTranslogOperations(int totalTranslogOps) throws IOException { + public void prepareForTranslogOperations(boolean createNewTranslog, int totalTranslogOps) throws IOException { state().getTranslog().totalOperations(totalTranslogOps); - // TODO: take the local checkpoint from store as global checkpoint, once we know it's safe - indexShard().openIndexAndCreateTranslog(false, SequenceNumbers.UNASSIGNED_SEQ_NO); + if (createNewTranslog) { + // TODO: Assigns the global checkpoint to the max_seqno of the safe commit if the index version >= 6.2 + indexShard().openIndexAndCreateTranslog(false, SequenceNumbers.UNASSIGNED_SEQ_NO); + } else { + indexShard().openIndexAndSkipTranslogRecovery(); + } } @Override diff --git a/server/src/main/java/org/elasticsearch/indices/recovery/RecoveryTargetHandler.java b/server/src/main/java/org/elasticsearch/indices/recovery/RecoveryTargetHandler.java index e7403986dc233..736d602044656 100644 --- a/server/src/main/java/org/elasticsearch/indices/recovery/RecoveryTargetHandler.java +++ b/server/src/main/java/org/elasticsearch/indices/recovery/RecoveryTargetHandler.java @@ -32,10 +32,10 @@ public interface RecoveryTargetHandler { /** * Prepares the target to receive translog operations, after all file have been copied - * - * @param totalTranslogOps total translog operations expected to be sent + * @param createNewTranslog whether or not to delete the local translog on the target + * @param totalTranslogOps total translog operations expected to be sent */ - void prepareForTranslogOperations(int totalTranslogOps) throws IOException; + void prepareForTranslogOperations(boolean createNewTranslog, int totalTranslogOps) throws IOException; /** * The finalize request refreshes the engine now that new segments are available, enables garbage collection of tombstone files, and diff --git a/server/src/main/java/org/elasticsearch/indices/recovery/RemoteRecoveryTargetHandler.java b/server/src/main/java/org/elasticsearch/indices/recovery/RemoteRecoveryTargetHandler.java index 279bec186a433..4ea2be0e72659 100644 --- a/server/src/main/java/org/elasticsearch/indices/recovery/RemoteRecoveryTargetHandler.java +++ b/server/src/main/java/org/elasticsearch/indices/recovery/RemoteRecoveryTargetHandler.java @@ -76,9 +76,9 @@ public RemoteRecoveryTargetHandler(long recoveryId, ShardId shardId, TransportSe } @Override - public void prepareForTranslogOperations(int totalTranslogOps) throws IOException { + public void prepareForTranslogOperations(boolean createNewTranslog, int totalTranslogOps) throws IOException { transportService.submitRequest(targetNode, PeerRecoveryTargetService.Actions.PREPARE_TRANSLOG, - new RecoveryPrepareForTranslogOperationsRequest(recoveryId, shardId, totalTranslogOps), + new RecoveryPrepareForTranslogOperationsRequest(recoveryId, shardId, totalTranslogOps, createNewTranslog), TransportRequestOptions.builder().withTimeout(recoverySettings.internalActionTimeout()).build(), EmptyTransportResponseHandler.INSTANCE_SAME).txGet(); } diff --git a/server/src/test/java/org/elasticsearch/index/replication/RecoveryDuringReplicationTests.java b/server/src/test/java/org/elasticsearch/index/replication/RecoveryDuringReplicationTests.java index 2bf7de6b94a82..881eb16d619d0 100644 --- a/server/src/test/java/org/elasticsearch/index/replication/RecoveryDuringReplicationTests.java +++ b/server/src/test/java/org/elasticsearch/index/replication/RecoveryDuringReplicationTests.java @@ -31,7 +31,9 @@ import org.elasticsearch.cluster.routing.ShardRouting; import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.lucene.uid.Versions; +import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentType; +import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.VersionType; import org.elasticsearch.index.engine.Engine; import org.elasticsearch.index.engine.EngineConfig; @@ -226,7 +228,6 @@ public void testRecoveryAfterPrimaryPromotion() throws Exception { final IndexShard oldPrimary = shards.getPrimary(); final IndexShard newPrimary = shards.getReplicas().get(0); final IndexShard replica = shards.getReplicas().get(1); - boolean expectSeqNoRecovery = true; if (randomBoolean()) { // simulate docs that were inflight when primary failed, these will be rolled back final int rollbackDocs = randomIntBetween(1, 5); @@ -239,7 +240,6 @@ public void testRecoveryAfterPrimaryPromotion() throws Exception { } if (randomBoolean()) { oldPrimary.flush(new FlushRequest(index.getName())); - expectSeqNoRecovery = false; } } @@ -252,9 +252,30 @@ public void testRecoveryAfterPrimaryPromotion() throws Exception { equalTo(totalDocs - 1L)); // index some more - totalDocs += shards.indexDocs(randomIntBetween(0, 5)); + int moreDocs = shards.indexDocs(randomIntBetween(0, 5)); + totalDocs += moreDocs; + + // As a replica keeps a safe commit, the file-based recovery only happens if the required translog + // for the sequence based recovery are not fully retained and extra documents were added to the primary. + boolean expectSeqNoRecovery = (moreDocs == 0 || randomBoolean()); + int uncommittedOpsOnPrimary = 0; + if (expectSeqNoRecovery == false) { + IndexMetaData.Builder builder = IndexMetaData.builder(newPrimary.indexSettings().getIndexMetaData()); + builder.settings(Settings.builder().put(newPrimary.indexSettings().getSettings()) + .put(IndexSettings.INDEX_TRANSLOG_RETENTION_AGE_SETTING.getKey(), "-1") + .put(IndexSettings.INDEX_TRANSLOG_RETENTION_SIZE_SETTING.getKey(), "-1") + ); + newPrimary.indexSettings().updateIndexMetaData(builder.build()); + newPrimary.onSettingsChanged(); + shards.syncGlobalCheckpoint(); + newPrimary.flush(new FlushRequest()); + uncommittedOpsOnPrimary = shards.indexDocs(randomIntBetween(0, 10)); + totalDocs += uncommittedOpsOnPrimary; + } if (randomBoolean()) { + uncommittedOpsOnPrimary = 0; + shards.syncGlobalCheckpoint(); newPrimary.flush(new FlushRequest()); } @@ -269,7 +290,7 @@ public void testRecoveryAfterPrimaryPromotion() throws Exception { assertThat(newReplica.recoveryState().getTranslog().recoveredOperations(), equalTo(totalDocs - committedDocs)); } else { assertThat(newReplica.recoveryState().getIndex().fileDetails(), not(empty())); - assertThat(newReplica.recoveryState().getTranslog().recoveredOperations(), equalTo(totalDocs)); + assertThat(newReplica.recoveryState().getTranslog().recoveredOperations(), equalTo(uncommittedOpsOnPrimary)); } // roll back the extra ops in the replica diff --git a/server/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java b/server/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java index 48887aa4c11c7..cd75c7a08fbc3 100644 --- a/server/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java +++ b/server/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java @@ -22,7 +22,6 @@ import org.apache.lucene.index.CorruptIndexException; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexCommit; -import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.Term; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.TermQuery; @@ -2109,7 +2108,7 @@ public void testShardActiveDuringInternalRecovery() throws IOException { shard.prepareForIndexRecovery(); // Shard is still inactive since we haven't started recovering yet assertFalse(shard.isActive()); - shard.openIndexAndTranslog(); + shard.openIndexAndRecoveryFromTranslog(); // Shard should now be active since we did recover: assertTrue(shard.isActive()); closeShards(shard); @@ -2137,8 +2136,8 @@ public void testShardActiveDuringPeerRecovery() throws IOException { new RecoveryTarget(shard, discoveryNode, recoveryListener, aLong -> { }) { @Override - public void prepareForTranslogOperations(int totalTranslogOps) throws IOException { - super.prepareForTranslogOperations(totalTranslogOps); + public void prepareForTranslogOperations(boolean createNewTranslog, int totalTranslogOps) throws IOException { + super.prepareForTranslogOperations(createNewTranslog, totalTranslogOps); // Shard is still inactive since we haven't started recovering yet assertFalse(replica.isActive()); @@ -2186,8 +2185,8 @@ public void testRefreshListenersDuringPeerRecovery() throws IOException { }) { // we're only checking that listeners are called when the engine is open, before there is no point @Override - public void prepareForTranslogOperations(int totalTranslogOps) throws IOException { - super.prepareForTranslogOperations(totalTranslogOps); + public void prepareForTranslogOperations(boolean createNewTranslog, int totalTranslogOps) throws IOException { + super.prepareForTranslogOperations(createNewTranslog, totalTranslogOps); assertListenerCalled.accept(replica); } diff --git a/server/src/test/java/org/elasticsearch/indices/recovery/PeerRecoveryTargetServiceTests.java b/server/src/test/java/org/elasticsearch/indices/recovery/PeerRecoveryTargetServiceTests.java index f691cfd0238d4..31521e33f21b6 100644 --- a/server/src/test/java/org/elasticsearch/indices/recovery/PeerRecoveryTargetServiceTests.java +++ b/server/src/test/java/org/elasticsearch/indices/recovery/PeerRecoveryTargetServiceTests.java @@ -19,103 +19,63 @@ package org.elasticsearch.indices.recovery; -import org.elasticsearch.action.admin.indices.flush.FlushRequest; -import org.elasticsearch.action.index.IndexRequest; -import org.elasticsearch.common.bytes.BytesArray; -import org.elasticsearch.common.xcontent.XContentType; -import org.elasticsearch.index.VersionType; -import org.elasticsearch.index.mapper.SourceToParse; -import org.elasticsearch.index.seqno.SequenceNumbers; import org.elasticsearch.index.shard.IndexShard; import org.elasticsearch.index.shard.IndexShardTestCase; -import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.index.translog.Translog; -import org.elasticsearch.index.translog.TranslogConfig; -import org.elasticsearch.index.translog.TranslogWriter; - -import java.io.IOException; -import java.nio.channels.FileChannel; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.concurrent.atomic.AtomicReference; import static org.hamcrest.Matchers.equalTo; public class PeerRecoveryTargetServiceTests extends IndexShardTestCase { public void testGetStartingSeqNo() throws Exception { - IndexShard replica = newShard(false); - final AtomicReference translogLocation = new AtomicReference<>(); - RecoveryTarget recoveryTarget = new RecoveryTarget(replica, null, null, null) { - @Override - Path translogLocation() { - return translogLocation.get(); - } - }; + final IndexShard replica = newShard(false); try { - recoveryEmptyReplica(replica); - int docs = randomIntBetween(1, 10); - final String index = replica.shardId().getIndexName(); - long seqNo = 0; - for (int i = 0; i < docs; i++) { - replica.applyIndexOperationOnReplica(seqNo++, 1, VersionType.EXTERNAL, - IndexRequest.UNSET_AUTO_GENERATED_TIMESTAMP, false, - SourceToParse.source(index, "type", "doc_" + i, new BytesArray("{}"), XContentType.JSON), - update -> {}); - if (rarely()) { - // insert a gap - seqNo++; + // Empty store + { + recoveryEmptyReplica(replica); + final RecoveryTarget recoveryTarget = new RecoveryTarget(replica, null, null, null); + assertThat(PeerRecoveryTargetService.getStartingSeqNo(recoveryTarget), equalTo(0L)); + recoveryTarget.decRef(); + } + // Last commit is good - use it. + final long initDocs = scaledRandomIntBetween(1, 10); + { + for (int i = 0; i < initDocs; i++) { + indexDoc(replica, "doc", Integer.toString(i)); + if (randomBoolean()) { + flushShard(replica); + } } + flushShard(replica); + replica.updateGlobalCheckpointOnReplica(initDocs - 1, "test"); + replica.getTranslog().sync(); + final RecoveryTarget recoveryTarget = new RecoveryTarget(replica, null, null, null); + assertThat(PeerRecoveryTargetService.getStartingSeqNo(recoveryTarget), equalTo(initDocs)); + recoveryTarget.decRef(); + } + // Global checkpoint does not advance, last commit is not good - use the previous commit + final int moreDocs = randomIntBetween(1, 10); + { + for (int i = 0; i < moreDocs; i++) { + indexDoc(replica, "doc", Long.toString(i)); + if (randomBoolean()) { + flushShard(replica); + } + } + flushShard(replica); + final RecoveryTarget recoveryTarget = new RecoveryTarget(replica, null, null, null); + assertThat(PeerRecoveryTargetService.getStartingSeqNo(recoveryTarget), equalTo(initDocs)); + recoveryTarget.decRef(); + } + // Advances the global checkpoint, a safe commit also advances + { + replica.updateGlobalCheckpointOnReplica(initDocs + moreDocs - 1, "test"); + replica.getTranslog().sync(); + final RecoveryTarget recoveryTarget = new RecoveryTarget(replica, null, null, null); + assertThat(PeerRecoveryTargetService.getStartingSeqNo(recoveryTarget), equalTo(initDocs + moreDocs)); + recoveryTarget.decRef(); } - - final long maxSeqNo = replica.seqNoStats().getMaxSeqNo(); - final long localCheckpoint = replica.getLocalCheckpoint(); - - translogLocation.set(replica.getTranslog().location()); - - final Translog translog = replica.getTranslog(); - final String translogUUID = translog.getTranslogUUID(); - assertThat(PeerRecoveryTargetService.getStartingSeqNo(recoveryTarget), equalTo(0L)); - - translogLocation.set(writeTranslog(replica.shardId(), translogUUID, translog.currentFileGeneration(), maxSeqNo - 1)); - - // commit is good, global checkpoint is at least max *committed* which is NO_OPS_PERFORMED - assertThat(PeerRecoveryTargetService.getStartingSeqNo(recoveryTarget), equalTo(0L)); - - replica.flush(new FlushRequest()); - - translogLocation.set(replica.getTranslog().location()); - - // commit is not good, global checkpoint is below max - assertThat(PeerRecoveryTargetService.getStartingSeqNo(recoveryTarget), equalTo(SequenceNumbers.UNASSIGNED_SEQ_NO)); - - translogLocation.set(writeTranslog(replica.shardId(), translogUUID, translog.currentFileGeneration(), maxSeqNo)); - - // commit is good, global checkpoint is above max - assertThat(PeerRecoveryTargetService.getStartingSeqNo(recoveryTarget), equalTo(localCheckpoint + 1)); } finally { closeShards(replica); - recoveryTarget.decRef(); } } - - private Path writeTranslog( - final ShardId shardId, - final String translogUUID, - final long generation, - final long globalCheckpoint - ) throws IOException { - final Path tempDir = createTempDir(); - final Path resolve = tempDir.resolve(Translog.getFilename(generation)); - Files.createFile(tempDir.resolve(Translog.CHECKPOINT_FILE_NAME)); - try (TranslogWriter ignored = TranslogWriter.create( - shardId, - translogUUID, - generation, - resolve, - FileChannel::open, - TranslogConfig.DEFAULT_BUFFER_SIZE, generation, globalCheckpoint, () -> globalCheckpoint, () -> generation)) {} - return tempDir; - } - } diff --git a/server/src/test/java/org/elasticsearch/indices/recovery/RecoverySourceHandlerTests.java b/server/src/test/java/org/elasticsearch/indices/recovery/RecoverySourceHandlerTests.java index 4963c1b74a53f..7ab6925ce57b9 100644 --- a/server/src/test/java/org/elasticsearch/indices/recovery/RecoverySourceHandlerTests.java +++ b/server/src/test/java/org/elasticsearch/indices/recovery/RecoverySourceHandlerTests.java @@ -423,7 +423,7 @@ public void phase1(final IndexCommit snapshot, final Supplier translogO } @Override - void prepareTargetForTranslog(final int totalTranslogOps) throws IOException { + void prepareTargetForTranslog(final boolean createNewTranslog, final int totalTranslogOps) throws IOException { prepareTargetForTranslogCalled.set(true); } diff --git a/server/src/test/java/org/elasticsearch/indices/recovery/RecoveryTests.java b/server/src/test/java/org/elasticsearch/indices/recovery/RecoveryTests.java index 85dc3a5fc3906..2089c36d06bc0 100644 --- a/server/src/test/java/org/elasticsearch/indices/recovery/RecoveryTests.java +++ b/server/src/test/java/org/elasticsearch/indices/recovery/RecoveryTests.java @@ -41,6 +41,7 @@ import org.elasticsearch.index.replication.RecoveryDuringReplicationTests; import org.elasticsearch.index.seqno.SequenceNumbers; import org.elasticsearch.index.shard.IndexShard; +import org.elasticsearch.index.translog.SnapshotMatchers; import org.elasticsearch.index.translog.Translog; import org.elasticsearch.index.translog.TranslogConfig; @@ -271,4 +272,38 @@ public void testPeerRecoverySendSafeCommitInFileBased() throws Exception { assertThat(maxSeqNo, lessThanOrEqualTo(globalCheckpoint)); closeShards(primaryShard, replicaShard); } + + public void testSequenceBasedRecoveryKeepsTranslog() throws Exception { + try (ReplicationGroup shards = createGroup(1)) { + shards.startAll(); + final IndexShard replica = shards.getReplicas().get(0); + final int initDocs = scaledRandomIntBetween(0, 20); + int uncommittedDocs = 0; + for (int i = 0; i < initDocs; i++) { + shards.indexDocs(1); + uncommittedDocs++; + if (randomBoolean()) { + shards.syncGlobalCheckpoint(); + shards.flush(); + uncommittedDocs = 0; + } + } + shards.removeReplica(replica); + final int moreDocs = shards.indexDocs(scaledRandomIntBetween(0, 20)); + if (randomBoolean()) { + shards.flush(); + } + replica.close("test", randomBoolean()); + replica.store().close(); + final IndexShard newReplica = shards.addReplicaWithExistingPath(replica.shardPath(), replica.routingEntry().currentNodeId()); + shards.recoverReplica(newReplica); + + try (Translog.Snapshot snapshot = newReplica.getTranslog().newSnapshot()) { + assertThat("Sequence based recovery should keep existing translog", snapshot, SnapshotMatchers.size(initDocs + moreDocs)); + } + assertThat(newReplica.recoveryState().getTranslog().recoveredOperations(), equalTo(uncommittedDocs + moreDocs)); + assertThat(newReplica.recoveryState().getIndex().fileDetails(), empty()); + } + } + } From 82722ebad362968fb316116b581945479137b5b6 Mon Sep 17 00:00:00 2001 From: Nhat Nguyen Date: Fri, 12 Jan 2018 20:09:34 -0500 Subject: [PATCH 68/74] TEST: init unassigned gcp in testAcquireIndexCommit The global checkpoint should be assigned to unassigned rather than 0. If a single document is indexed and the global checkpoint is initialized with 0, the first commit is safe which the test does not suppose. Relates #28038 --- .../org/elasticsearch/index/engine/InternalEngineTests.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java b/server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java index 9755304d2f1eb..a508d691ed3a6 100644 --- a/server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java +++ b/server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java @@ -4324,7 +4324,7 @@ public void testConcurrentAppendUpdateAndRefresh() throws InterruptedException, public void testAcquireIndexCommit() throws Exception { IOUtils.close(engine, store); store = createStore(); - final AtomicLong globalCheckpoint = new AtomicLong(); + final AtomicLong globalCheckpoint = new AtomicLong(SequenceNumbers.UNASSIGNED_SEQ_NO); try (InternalEngine engine = createEngine(store, createTempDir(), globalCheckpoint::get)) { int numDocs = between(1, 20); for (int i = 0; i < numDocs; i++) { From fafdb8d9e3ea741150d09503c73b3d6a2f28dac5 Mon Sep 17 00:00:00 2001 From: Nhat Nguyen Date: Sat, 13 Jan 2018 11:43:15 -0500 Subject: [PATCH 69/74] AwaitsFix #testRecoveryAfterPrimaryPromotion Relates #28209 --- .../index/replication/RecoveryDuringReplicationTests.java | 1 + 1 file changed, 1 insertion(+) diff --git a/server/src/test/java/org/elasticsearch/index/replication/RecoveryDuringReplicationTests.java b/server/src/test/java/org/elasticsearch/index/replication/RecoveryDuringReplicationTests.java index 881eb16d619d0..77576426252d9 100644 --- a/server/src/test/java/org/elasticsearch/index/replication/RecoveryDuringReplicationTests.java +++ b/server/src/test/java/org/elasticsearch/index/replication/RecoveryDuringReplicationTests.java @@ -215,6 +215,7 @@ public void testRecoveryToReplicaThatReceivedExtraDocument() throws Exception { } @TestLogging("org.elasticsearch.index.shard:TRACE,org.elasticsearch.indices.recovery:TRACE") + @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/28209") public void testRecoveryAfterPrimaryPromotion() throws Exception { try (ReplicationGroup shards = createGroup(2)) { shards.startAll(); From e44e34f42a127fe90004006b6f3ceec355166841 Mon Sep 17 00:00:00 2001 From: Nhat Nguyen Date: Fri, 12 Jan 2018 21:01:35 -0500 Subject: [PATCH 70/74] Rename deleteLocalTranslog to createNewTranslog We introduced a new option `createNewTranslog` in #28181. However, we named that parameter as deleteLocalTranslog in other places. This commit makes sure to have a consistent naming in these places. Relates #28181 --- .../recovery/PeerRecoveryTargetService.java | 2 +- ...eryPrepareForTranslogOperationsRequest.java | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/server/src/main/java/org/elasticsearch/indices/recovery/PeerRecoveryTargetService.java b/server/src/main/java/org/elasticsearch/indices/recovery/PeerRecoveryTargetService.java index 88b0f23d72a99..5920e286aa194 100644 --- a/server/src/main/java/org/elasticsearch/indices/recovery/PeerRecoveryTargetService.java +++ b/server/src/main/java/org/elasticsearch/indices/recovery/PeerRecoveryTargetService.java @@ -393,7 +393,7 @@ class PrepareForTranslogOperationsRequestHandler implements TransportRequestHand public void messageReceived(RecoveryPrepareForTranslogOperationsRequest request, TransportChannel channel) throws Exception { try (RecoveryRef recoveryRef = onGoingRecoveries.getRecoverySafe(request.recoveryId(), request.shardId() )) { - recoveryRef.target().prepareForTranslogOperations(request.deleteLocalTranslog(), request.totalTranslogOps()); + recoveryRef.target().prepareForTranslogOperations(request.createNewTranslog(), request.totalTranslogOps()); } channel.sendResponse(TransportResponse.Empty.INSTANCE); } diff --git a/server/src/main/java/org/elasticsearch/indices/recovery/RecoveryPrepareForTranslogOperationsRequest.java b/server/src/main/java/org/elasticsearch/indices/recovery/RecoveryPrepareForTranslogOperationsRequest.java index ae8c7472f89b4..2b0220b265990 100644 --- a/server/src/main/java/org/elasticsearch/indices/recovery/RecoveryPrepareForTranslogOperationsRequest.java +++ b/server/src/main/java/org/elasticsearch/indices/recovery/RecoveryPrepareForTranslogOperationsRequest.java @@ -33,13 +33,13 @@ class RecoveryPrepareForTranslogOperationsRequest extends TransportRequest { private final long recoveryId; private final ShardId shardId; private final int totalTranslogOps; - private final boolean deleteLocalTranslog; + private final boolean createNewTranslog; - RecoveryPrepareForTranslogOperationsRequest(long recoveryId, ShardId shardId, int totalTranslogOps, boolean deleteLocalTranslog) { + RecoveryPrepareForTranslogOperationsRequest(long recoveryId, ShardId shardId, int totalTranslogOps, boolean createNewTranslog) { this.recoveryId = recoveryId; this.shardId = shardId; this.totalTranslogOps = totalTranslogOps; - this.deleteLocalTranslog = deleteLocalTranslog; + this.createNewTranslog = createNewTranslog; } RecoveryPrepareForTranslogOperationsRequest(StreamInput in) throws IOException { @@ -51,9 +51,9 @@ class RecoveryPrepareForTranslogOperationsRequest extends TransportRequest { in.readLong(); // maxUnsafeAutoIdTimestamp } if (in.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { - deleteLocalTranslog = in.readBoolean(); + createNewTranslog = in.readBoolean(); } else { - deleteLocalTranslog = true; + createNewTranslog = true; } } @@ -70,10 +70,10 @@ public int totalTranslogOps() { } /** - * Whether or not the recover target should delete its local translog + * Whether or not the recover target should create a new local translog */ - boolean deleteLocalTranslog() { - return deleteLocalTranslog; + boolean createNewTranslog() { + return createNewTranslog; } @Override @@ -86,7 +86,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeLong(IndexRequest.UNSET_AUTO_GENERATED_TIMESTAMP); // maxUnsafeAutoIdTimestamp } if (out.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { - out.writeBoolean(deleteLocalTranslog); + out.writeBoolean(createNewTranslog); } } } From 0151c1565d2f2fe2518b011bba08125fafb6c616 Mon Sep 17 00:00:00 2001 From: Nhat Nguyen Date: Fri, 12 Jan 2018 21:02:31 -0500 Subject: [PATCH 71/74] Backport replica rollback to 6.2 (#28181) Relates #28181 --- .../recovery/RecoveryPrepareForTranslogOperationsRequest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/src/main/java/org/elasticsearch/indices/recovery/RecoveryPrepareForTranslogOperationsRequest.java b/server/src/main/java/org/elasticsearch/indices/recovery/RecoveryPrepareForTranslogOperationsRequest.java index 2b0220b265990..ce96013d343e2 100644 --- a/server/src/main/java/org/elasticsearch/indices/recovery/RecoveryPrepareForTranslogOperationsRequest.java +++ b/server/src/main/java/org/elasticsearch/indices/recovery/RecoveryPrepareForTranslogOperationsRequest.java @@ -50,7 +50,7 @@ class RecoveryPrepareForTranslogOperationsRequest extends TransportRequest { if (in.getVersion().before(Version.V_6_0_0_alpha1)) { in.readLong(); // maxUnsafeAutoIdTimestamp } - if (in.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { + if (in.getVersion().onOrAfter(Version.V_6_2_0)) { createNewTranslog = in.readBoolean(); } else { createNewTranslog = true; @@ -82,7 +82,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeLong(recoveryId); shardId.writeTo(out); out.writeVInt(totalTranslogOps); - if (out.getVersion().before(Version.V_6_0_0_alpha1)) { + if (out.getVersion().before(Version.V_6_2_0)) { out.writeLong(IndexRequest.UNSET_AUTO_GENERATED_TIMESTAMP); // maxUnsafeAutoIdTimestamp } if (out.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { From 9774ba35a18115ee62403d312ea74c4178821c54 Mon Sep 17 00:00:00 2001 From: Nhat Nguyen Date: Sat, 13 Jan 2018 14:10:23 -0500 Subject: [PATCH 72/74] Correct backport replica rollback to 6.2 (#28181) The previous backport was not corect. Relates #28181 --- .../recovery/RecoveryPrepareForTranslogOperationsRequest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/src/main/java/org/elasticsearch/indices/recovery/RecoveryPrepareForTranslogOperationsRequest.java b/server/src/main/java/org/elasticsearch/indices/recovery/RecoveryPrepareForTranslogOperationsRequest.java index ce96013d343e2..28df2897d9778 100644 --- a/server/src/main/java/org/elasticsearch/indices/recovery/RecoveryPrepareForTranslogOperationsRequest.java +++ b/server/src/main/java/org/elasticsearch/indices/recovery/RecoveryPrepareForTranslogOperationsRequest.java @@ -82,10 +82,10 @@ public void writeTo(StreamOutput out) throws IOException { out.writeLong(recoveryId); shardId.writeTo(out); out.writeVInt(totalTranslogOps); - if (out.getVersion().before(Version.V_6_2_0)) { + if (out.getVersion().before(Version.V_6_0_0_alpha1)) { out.writeLong(IndexRequest.UNSET_AUTO_GENERATED_TIMESTAMP); // maxUnsafeAutoIdTimestamp } - if (out.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { + if (out.getVersion().onOrAfter(Version.V_6_2_0)) { out.writeBoolean(createNewTranslog); } } From fbb840b5c870b238163b3e4726d490e2b6711c23 Mon Sep 17 00:00:00 2001 From: Nhat Nguyen Date: Sat, 13 Jan 2018 21:59:26 -0500 Subject: [PATCH 73/74] TEST: Tightens file-based condition in peer-recovery As a replica always keeps a safe commit and starts peer-recovery with that commit; file-based recovery only happens if new operations are added to the primary and the required translog is not fully retained. In the test, we tried to produce this condition by flushing a new commit in order to trim all translog. However, if the new global checkpoint is not persisted yet, we will keep two commits and not trim translog. This commit tightens the file-based condition in the test by waiting for the global checkpoint persisted properly on the new primary before flushing. Close #28209 Relates #28181 --- .../index/replication/RecoveryDuringReplicationTests.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/server/src/test/java/org/elasticsearch/index/replication/RecoveryDuringReplicationTests.java b/server/src/test/java/org/elasticsearch/index/replication/RecoveryDuringReplicationTests.java index 77576426252d9..aa97c2049915f 100644 --- a/server/src/test/java/org/elasticsearch/index/replication/RecoveryDuringReplicationTests.java +++ b/server/src/test/java/org/elasticsearch/index/replication/RecoveryDuringReplicationTests.java @@ -215,7 +215,6 @@ public void testRecoveryToReplicaThatReceivedExtraDocument() throws Exception { } @TestLogging("org.elasticsearch.index.shard:TRACE,org.elasticsearch.indices.recovery:TRACE") - @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/28209") public void testRecoveryAfterPrimaryPromotion() throws Exception { try (ReplicationGroup shards = createGroup(2)) { shards.startAll(); @@ -268,7 +267,12 @@ public void testRecoveryAfterPrimaryPromotion() throws Exception { ); newPrimary.indexSettings().updateIndexMetaData(builder.build()); newPrimary.onSettingsChanged(); - shards.syncGlobalCheckpoint(); + // Make sure the global checkpoint on the new primary is persisted properly, + // otherwise the deletion policy won't trim translog + assertBusy(() -> { + shards.syncGlobalCheckpoint(); + assertThat(newPrimary.getTranslog().getLastSyncedGlobalCheckpoint(), equalTo(newPrimary.seqNoStats().getMaxSeqNo())); + }); newPrimary.flush(new FlushRequest()); uncommittedOpsOnPrimary = shards.indexDocs(randomIntBetween(0, 10)); totalDocs += uncommittedOpsOnPrimary; From aec0c0f9b6b9e511e56c725f68f9010a8298ed02 Mon Sep 17 00:00:00 2001 From: Igor Motov Date: Sun, 14 Jan 2018 19:20:32 -0500 Subject: [PATCH 74/74] Update version of TaskInfo header serialization after backport Update the serialization version after backporting #27764 to 6.x. --- server/src/main/java/org/elasticsearch/tasks/TaskInfo.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/src/main/java/org/elasticsearch/tasks/TaskInfo.java b/server/src/main/java/org/elasticsearch/tasks/TaskInfo.java index 2bd16a9addf6a..19e9baedd753b 100644 --- a/server/src/main/java/org/elasticsearch/tasks/TaskInfo.java +++ b/server/src/main/java/org/elasticsearch/tasks/TaskInfo.java @@ -97,7 +97,7 @@ public TaskInfo(StreamInput in) throws IOException { runningTimeNanos = in.readLong(); cancellable = in.readBoolean(); parentTaskId = TaskId.readFromStream(in); - if (in.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { + if (in.getVersion().onOrAfter(Version.V_6_2_0)) { headers = in.readMap(StreamInput::readString, StreamInput::readString); } else { headers = Collections.emptyMap(); @@ -115,7 +115,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeLong(runningTimeNanos); out.writeBoolean(cancellable); parentTaskId.writeTo(out); - if (out.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { + if (out.getVersion().onOrAfter(Version.V_6_2_0)) { out.writeMap(headers, StreamOutput::writeString, StreamOutput::writeString); } }