Switch formatting to spotless

bitwiseman · bitwiseman · commit a15e67f06545 · 2020-12-23T17:13:27.000-08:00
This is change includes minimal changes required to make the switch
diff --git a/pom.xml b/pom.xml
@@ -39,8 +39,7 @@
     <hamcrest.version>2.2</hamcrest.version>
     <okhttp3.version>4.4.1</okhttp3.version>
     <okio.version>2.5.0</okio.version>
-    <formatter-maven-plugin.goal>format</formatter-maven-plugin.goal>
-    <impsort-maven-plugin.goal>sort</impsort-maven-plugin.goal>
+    <spotless-maven-plugin.goal>apply</spotless-maven-plugin.goal>
     <!-- Using this as the minimum bar for code coverage.  Adding methods without covering them will fail this. -->
     <jacoco.coverage.target.bundle.method>0.60</jacoco.coverage.target.bundle.method>
     <jacoco.coverage.target.class.method>0.25</jacoco.coverage.target.class.method>
@@ -343,37 +342,30 @@
         </executions>
       </plugin>
       <plugin>
-        <groupId>net.revelc.code.formatter</groupId>
-        <artifactId>formatter-maven-plugin</artifactId>
-        <version>2.12.1</version>
+        <groupId>com.diffplug.spotless</groupId>
+        <artifactId>spotless-maven-plugin</artifactId>
+        <version>2.6.1</version>
         <executions>
           <execution>
+            <id>spotless-check</id>
+            <phase>process-sources</phase>
             <goals>
-              <goal>${formatter-maven-plugin.goal}</goal>
+              <goal>${spotless-maven-plugin.goal}</goal>
             </goals>
-            <configuration>
-              <configFile>src/main/resources/eclipse/formatter.xml</configFile>
-              <cachedir>${project.build.directory}/.cache</cachedir>
-            </configuration>
           </execution>
         </executions>
-      </plugin>
-      <plugin>
-        <groupId>net.revelc.code</groupId>
-        <artifactId>impsort-maven-plugin</artifactId>
-        <version>1.4.1</version>
         <configuration>
-          <groups>*,java.,javax.</groups>
-          <removeUnused>true</removeUnused>
-          <staticAfter>true</staticAfter>
+          <java>
+            <eclipse>
+              <file>${basedir}/src/build/eclipse/formatter.xml</file>
+            </eclipse>
+
+            <importOrder>
+              <file>${basedir}/src/build/eclipse/eclipse.importorder</file>
+            </importOrder>
+            <removeUnusedImports />
+          </java>
         </configuration>
-        <executions>
-          <execution>
-            <goals>
-              <goal>${impsort-maven-plugin.goal}</goal>
-            </goals>
-          </execution>
-        </executions>
       </plugin>
       <plugin>
         <groupId>com.github.spotbugs</groupId>
@@ -595,8 +587,7 @@
         </os>
       </activation>
       <properties>
-        <formatter-maven-plugin.goal>validate</formatter-maven-plugin.goal>
-        <impsort-maven-plugin.goal>check</impsort-maven-plugin.goal>
+        <spotless-maven-plugin.goal>check</spotless-maven-plugin.goal>
       </properties>
     </profile>
     <profile>
@@ -621,8 +612,7 @@
     <profile>
       <id>release</id>
       <properties>
-        <formatter-maven-plugin.goal>validate</formatter-maven-plugin.goal>
-        <impsort-maven-plugin.goal>check</impsort-maven-plugin.goal>
+        <spotless-maven-plugin.goal>check</spotless-maven-plugin.goal>
       </properties>
       <build>
         <plugins>
diff --git a/src/build/eclipse/eclipse.importorder b/src/build/eclipse/eclipse.importorder
@@ -0,0 +1,6 @@
+#Organize Import Order
+# Import this file in Window -> Preferences -> Java -> Code Style -> Organize Imports -> Import...
+0=
+1=java
+2=javax
+3=\#
diff --git a/src/build/eclipse/formatter.xml b/src/build/eclipse/formatter.xml
diff --git a/src/main/java/org/kohsuke/github/extras/okhttp3/ObsoleteUrlFactory.java b/src/main/java/org/kohsuke/github/extras/okhttp3/ObsoleteUrlFactory.java
@@ -1,5 +1,21 @@
 package org.kohsuke.github.extras.okhttp3;
 
+/*
+ * Copyright (C) 2014 Square, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import okhttp3.Call;
 import okhttp3.Callback;
@@ -21,21 +37,6 @@
 import okio.Pipe;
 import okio.Timeout;
 
-/*
- * Copyright (C) 2014 Square, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;

-Original file line number
+Diff line change
@@ @@ -0,0 +1,6 @@ @@
 +#Organize Import Order
 +# Import this file in Window -> Preferences -> Java -> Code Style -> Organize Imports -> Import...
 +0=
 +1=java
 +2=javax
 +3=\#