From a9f39d19c96524dfb52264bb1573f1d1ec00a2ca Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@pivotal.io>
Date: Wed, 8 Mar 2017 11:41:08 +0100
Subject: [PATCH] #321 - Provide importorder file and provide guidance for
 IntelliJ users.

Remove intellij-formatting.jar to avoid ambiguity in favor of the IntelliJ Eclipse Code Formatter plugin.
---
 etc/ide/README.md               |  17 +++++++++++++++++
 etc/ide/intellij-formatting.jar | Bin 1542 -> 0 bytes
 etc/ide/springdata.importorder  |   8 ++++++++
 3 files changed, 25 insertions(+)
 create mode 100644 etc/ide/README.md
 delete mode 100644 etc/ide/intellij-formatting.jar
 create mode 100644 etc/ide/springdata.importorder

diff --git a/etc/ide/README.md b/etc/ide/README.md
new file mode 100644
index 00000000..32c74a94
--- /dev/null
+++ b/etc/ide/README.md
@@ -0,0 +1,17 @@
+# Spring Data Code Formatting Settings
+
+This directory contains `eclipse-formatting.xml` and `springdata.importorder` settings files to be used with Eclipse and IntelliJ.
+
+## Eclipse Setup
+
+Import both files in Eclipse through the Preferences dialog.
+
+## IntelliJ Setup
+
+Use the IntelliJ [Eclipse Code Formatter](https://plugins.jetbrains.com/plugin/6546-eclipse-code-formatter) plugin to configure code formatting and import ordering with the newest Eclipse formatter version.
+
+Additionally, make sure to configure your import settings in `Editor -> Code Style -> Java` with the following explicit settings:
+
+* Use tab character indents
+* Class count to use import with `*`: 10
+* Names count to use static import with `*`: 1
diff --git a/etc/ide/intellij-formatting.jar b/etc/ide/intellij-formatting.jar
deleted file mode 100644
index eea8ae54f77aec464948ba23b55e94ce6e6aef0f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1542
zcmWIWW@h1H0D-I&V`ne}N^mo<FeK-vq!yP{=A;(u|2xIN5CBvx!oUH9r*cpgO93?@
zDGn|u%FIhwa7ipl)T_wNc^lzdJljBE@9%JfJJG7!<x-4{)(A@p^ax}YUkY$9y>shE
z^HY<b-=}WuJ;<jxuTW^xN#EVKYJY#@PHQ>;PCfatU)tx3CU0jgkN5X+Ue^5btcGma
z*%{yW*BGB)!*@+e^I3DW<wUnxJ}K9G(q?Wmoa3Up?5ZJ;&0Njijr*1!Y4^C{=(F=d
zV~4W9I(fF9?glRQ8YkJyJG_r^=T>J)WymMyzMJ@3;hMyf=Z<pjx1ZLn-aIYs<b!;p
zI~R<4>y=BTb?eq%{k(4FrdE^QonBWmHcSk7sHblH^+9h?<fTx>|0?AtYn9)<PqA6g
z@V;55@1oB;2cMp<M~PcjeXo1D-@2*dou#N^;*smIUuqZFXi0^&t@+q8->l`%)w6bI
zehVpxJZS$DRiW1^wf?Dz+p9z!<&{(B9olK=cj=+i^7W1<L~rtVvD&u3t89r|x1e>m
z%JT#FWX!C-Es!@5SaZB%Z>jytLjCGVcI;|7{Vo%CFg#+&?zvZf@N(!<lLspLFZkUK
z9pB^jvezec!tZn4nJW`?uLtB$+Mr*OoEz5_cay6}?%*NMX)l#t^E<5K`jTiCd!{Qv
z`e@iSsjmi;uUQtz`abuU6<m8x;;DJ+<;*f=<Lt;h+u1)WxqGxuWEaj(+a__^sDEk9
z!FeiK1<}_s=B5Q-&5+&CckonpUtrxm(+|wYuYNzn^?2U%TN0vOQKvI*?o5yT7VEXg
z%DJbEBYDeYQMapm;+OL1JXnx^^5+_sjru1oJ0|Q5Z#kT9Yxla~3csuOX6t+ZwwoMG
zUSH~c`Okxww$+^XAB#VmAY0S_Q+8j|d&ATHbMH>(z7cfJxB6<(t@F{-r%kGtzT_`x
zlg44aKrnsdS>|s^jakwUnD=u?S${Cw|6QF^&Y11OjryA$dQT7hI?{IieZjviS01rl
z|B%hGagrH-V8(M*uEl%5JFMOuv~K>IwSLd-1H9QeO8gzu_c1Xryc9#u1?X8u4wwt_
z3raHc^NRIBxj_${cl3&rGg5O?i$OUdv~M?GlY@v$^}a{XzIBy}*(4S8@`~tON!fho
zgxYVeH7@_}9d!|YZE0M*=~Jf38Wa6fH)Z;NGc!fLbW442`R#6L`Jqi7Mi2Lf1+{pH
zayqEZ{djH?Z$j%r8EtbRetq8<zm$$(j>5!)ynQ=9M}I#3E%)@Sya!i%ujXW&Gj)z=
ztvk~5+w$83r6vat`|y|VwX2rYE1i@Ed2qMukwsI1&fgEjh;05V7d4yn0%bGvic1o6
za#B<DN-9dc&z-+|`i!>c*^?*FJYoXsWas$pBkaQuR0mQEG6_<;pqnHMl=aLjNzKX0
z^iuG2adlL1&&f|p%uxtVEhzz(9mN6Oj7(e%xQiyBek6cY_CN|MMkWykL{WtteW0QW
z0d#>(B+Y0A7swGXb3l=e97>?bMgU`GLQ#)w7AQ23!wD2t2q40O7RtzBfh`~rTH}CP
X2?Q%E8%Q}T5QZ}{Fw6vMU|;|M&8Ib8

diff --git a/etc/ide/springdata.importorder b/etc/ide/springdata.importorder
new file mode 100644
index 00000000..a974f58e
--- /dev/null
+++ b/etc/ide/springdata.importorder
@@ -0,0 +1,8 @@
+#Organize Import Order
+#Mon Nov 14 09:58:12 CET 2016
+5=com
+4=org
+3=javax
+2=java
+1=
+0=\#