prepare for PR (diffplug#326)

moved formatter to lib use formatter version available on maven central
matthiasbalke · Dec 28, 2018 · 40daf9a · 40daf9a
1 parent 66f486a
commit 40daf9a
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 33 deletions.
diff --git a/...ess/extra/antlr4/Antlr4FormatterStep.java → .../spotless/antlr4/Antlr4FormatterStep.java b/...ess/extra/antlr4/Antlr4FormatterStep.java → .../spotless/antlr4/Antlr4FormatterStep.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.diffplug.spotless.extra.antlr4;
+package com.diffplug.spotless.antlr4;
 
 import java.io.IOException;
 import java.io.Serializable;
@@ -28,17 +28,15 @@ public class Antlr4FormatterStep {
 
 	private Antlr4FormatterStep() {}
 
-	private static final String MAVEN_COORDINATE = "com.khubla.antlr4formatter:antlr4formatter:";
-	private static final String DEFAULT_VERSION = "0.1.0-SNAPSHOT";
+	private static final String MAVEN_COORDINATE = "com.khubla.antlr4formatter:antlr4-formatter:";
+	private static final String DEFAULT_VERSION = "1.1.0";
 
 	public static FormatterStep create(Provisioner provisioner) {
-		return create(DEFAULT_VERSION, provisioner);
+		return create(defaultVersion(), provisioner);
 	}
 
 	public static FormatterStep create(String version, Provisioner provisioner) {
-		//		return FormatterStep.createNeverUpToDate(NAME, Antlr4Formatter::format);
-
-		return FormatterStep.createLazy(NAME, () -> new State(defaultVersion(), provisioner), State::createFormat);
+		return FormatterStep.createLazy(NAME, () -> new State(version, provisioner), State::createFormat);
 	}
 
 	public static String defaultVersion() {
@@ -57,19 +55,16 @@ static final class State implements Serializable {
 			this.jarState = JarState.from(MAVEN_COORDINATE + version, provisioner);
 		}
 
-		FormatterFunc createFormat() throws ClassNotFoundException, NoSuchMethodException, IllegalAccessException, InstantiationException {
+		FormatterFunc createFormat() throws ClassNotFoundException, NoSuchMethodException {
 			ClassLoader classLoader = jarState.getClassLoader();
 
 			// String Antlr4Formatter::format(String input)
-
 			Class<?> formatter = classLoader.loadClass("com.khubla.antlr4formatter.Antlr4Formatter");
-			Object formatterInstance = formatter.newInstance();
-			// and its format method
 			Method formatterMethod = formatter.getMethod("format", String.class);
 
 			return input -> {
 				try {
-					return (String) formatterMethod.invoke(formatterInstance, input);
+					return (String) formatterMethod.invoke(null, input);
 				} catch (InvocationTargetException e) {
 					throw ThrowingEx.unwrapCause(e);
 				}

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java
@@ -16,7 +16,7 @@
 package com.diffplug.gradle.spotless;
 
 import com.diffplug.spotless.FormatterStep;
-import com.diffplug.spotless.extra.antlr4.Antlr4FormatterStep;
+import com.diffplug.spotless.antlr4.Antlr4FormatterStep;
 
 public class Antlr4Extension extends FormatExtension {
 	static final String NAME = "antlr4";

diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/Antlr4ExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/Antlr4ExtensionTest.java
@@ -17,13 +17,12 @@
 
 import java.io.IOException;
 
-import org.gradle.api.GradleException;
 import org.junit.Test;
 
 public class Antlr4ExtensionTest extends GradleIntegrationTest {
 
 	@Test
-	public void formatSingleGrammar() throws IOException, InterruptedException {
+	public void formatSingleGrammar() throws IOException {
 		String testFile = "src/main/antlr4/Hello.g4";
 
 		setFile("build.gradle").toLines(
@@ -44,18 +43,4 @@ public void formatSingleGrammar() throws IOException, InterruptedException {
 
 		assertFile(testFile).sameAsResource(formatted);
 	}
-
-	@Test(expected = GradleException.class)
-	public void missingTargetArgumentFailsFormatting() throws IOException {
-		setFile("build.gradle").toLines(
-				"plugins {",
-				"    id 'com.diffplug.gradle.spotless'",
-				"}",
-				"repositories { mavenCentral() }",
-				"spotless {",
-				"    antlr4 {",
-				"    }",
-				"}");
-	}
-
 }
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/Antlr4TaskTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/Antlr4TaskTest.java
@@ -28,11 +28,11 @@
 import com.diffplug.spotless.Provisioner;
 import com.diffplug.spotless.ResourceHarness;
 import com.diffplug.spotless.TestProvisioner;
-import com.diffplug.spotless.extra.antlr4.Antlr4FormatterStep;
+import com.diffplug.spotless.antlr4.Antlr4FormatterStep;
 
 public class Antlr4TaskTest extends ResourceHarness {
 
-	private Provisioner provisioner = TestProvisioner.mavenLocal();
+	private Provisioner provisioner = TestProvisioner.mavenCentral();
 
 	private SpotlessTask checkTask;
 	private SpotlessTask applyTask;

diff --git a/...extra/antlr4/Antlr4FormatterStepTest.java → ...tless/antlr4/Antlr4FormatterStepTest.java b/...extra/antlr4/Antlr4FormatterStepTest.java → ...tless/antlr4/Antlr4FormatterStepTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.diffplug.spotless.extra.antlr4;
+package com.diffplug.spotless.antlr4;
 
 import org.junit.Test;
 
@@ -25,7 +25,7 @@ public class Antlr4FormatterStepTest extends ResourceHarness {
 
 	@Test
 	public void formatGrammar() throws Throwable {
-		FormatterStep step = Antlr4FormatterStep.create(TestProvisioner.mavenLocal());
+		FormatterStep step = Antlr4FormatterStep.create(TestProvisioner.mavenCentral());
 		assertOnResources(step, "antlr4/Hello.unformatted.g4", "antlr4/Hello.formatted.g4");
 	}