-
Notifications
You must be signed in to change notification settings - Fork 458
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
30 changed files
with
1,675 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
106 changes: 106 additions & 0 deletions
106
lib/src/main/java/com/diffplug/spotless/json/JsonSimpleStep.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,106 @@ | ||
/* | ||
* Copyright 2021 DiffPlug | ||
* | ||
* 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. | ||
*/ | ||
package com.diffplug.spotless.json; | ||
|
||
import java.io.IOException; | ||
import java.io.Serializable; | ||
import java.lang.reflect.Constructor; | ||
import java.lang.reflect.InvocationTargetException; | ||
import java.lang.reflect.Method; | ||
import java.util.Objects; | ||
|
||
import com.diffplug.spotless.FormatterFunc; | ||
import com.diffplug.spotless.FormatterStep; | ||
import com.diffplug.spotless.JarState; | ||
import com.diffplug.spotless.Provisioner; | ||
|
||
/** | ||
* Simple JSON formatter which reformats the file according to the org.json library's default pretty-printing, but has no ability to customise more than the indentation size. | ||
*/ | ||
public final class JsonSimpleStep { | ||
private static final String MAVEN_COORDINATE = "org.json:json:"; | ||
private static final String DEFAULT_VERSION = "20210307"; | ||
|
||
public static FormatterStep create(int indent, Provisioner provisioner) { | ||
Objects.requireNonNull(provisioner, "provisioner cannot be null"); | ||
return FormatterStep.createLazy("json", () -> new State(indent, provisioner), State::toFormatter); | ||
} | ||
|
||
private static final class State implements Serializable { | ||
private static final long serialVersionUID = 1L; | ||
|
||
private final int indentSpaces; | ||
private final JarState jarState; | ||
|
||
private State(int indent, Provisioner provisioner) throws IOException { | ||
this.indentSpaces = indent; | ||
this.jarState = JarState.from(MAVEN_COORDINATE + DEFAULT_VERSION, provisioner); | ||
} | ||
|
||
FormatterFunc toFormatter() { | ||
Method objectToString; | ||
Method arrayToString; | ||
Constructor<?> objectConstructor; | ||
Constructor<?> arrayConstructor; | ||
try { | ||
ClassLoader classLoader = jarState.getClassLoader(); | ||
Class<?> jsonObject = classLoader.loadClass("org.json.JSONObject"); | ||
Class<?>[] constructorArguments = new Class[]{String.class}; | ||
objectConstructor = jsonObject.getConstructor(constructorArguments); | ||
objectToString = jsonObject.getMethod("toString", int.class); | ||
|
||
Class<?> jsonArray = classLoader.loadClass("org.json.JSONArray"); | ||
arrayConstructor = jsonArray.getConstructor(constructorArguments); | ||
arrayToString = jsonArray.getMethod("toString", int.class); | ||
} catch (ClassNotFoundException | NoSuchMethodException e) { | ||
throw new IllegalStateException("There was a problem preparing org.json dependencies", e); | ||
} | ||
|
||
return s -> { | ||
String prettyPrinted = null; | ||
if (s.isEmpty()) { | ||
prettyPrinted = s; | ||
} | ||
if (s.startsWith("{")) { | ||
try { | ||
Object parsed = objectConstructor.newInstance(s); | ||
prettyPrinted = objectToString.invoke(parsed, indentSpaces) + "\n"; | ||
} catch (InvocationTargetException ignored) { | ||
// ignore if we cannot convert to JSON string | ||
} | ||
} | ||
if (s.startsWith("[")) { | ||
try { | ||
Object parsed = arrayConstructor.newInstance(s); | ||
prettyPrinted = arrayToString.invoke(parsed, indentSpaces) + "\n"; | ||
} catch (InvocationTargetException ignored) { | ||
// ignore if we cannot convert to JSON string | ||
} | ||
} | ||
|
||
if (prettyPrinted == null) { | ||
throw new AssertionError("Invalid JSON file provided"); | ||
} | ||
|
||
return prettyPrinted; | ||
}; | ||
} | ||
} | ||
|
||
private JsonSimpleStep() { | ||
// cannot be directly instantiated | ||
} | ||
} |
7 changes: 7 additions & 0 deletions
7
lib/src/main/java/com/diffplug/spotless/json/package-info.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
@ParametersAreNonnullByDefault | ||
@ReturnValuesAreNonnullByDefault | ||
package com.diffplug.spotless.extra.json.java; | ||
|
||
import javax.annotation.ParametersAreNonnullByDefault; | ||
|
||
import com.diffplug.spotless.annotations.ReturnValuesAreNonnullByDefault; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
62 changes: 62 additions & 0 deletions
62
plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JsonExtension.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,62 @@ | ||
/* | ||
* Copyright 2016-2021 DiffPlug | ||
* | ||
* 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. | ||
*/ | ||
package com.diffplug.gradle.spotless; | ||
|
||
import javax.inject.Inject; | ||
|
||
import com.diffplug.spotless.FormatterStep; | ||
import com.diffplug.spotless.json.JsonSimpleStep; | ||
|
||
public class JsonExtension extends FormatExtension { | ||
private static final int DEFAULT_INDENTATION = 4; | ||
static final String NAME = "json"; | ||
|
||
@Inject | ||
public JsonExtension(SpotlessExtension spotless) { | ||
super(spotless); | ||
} | ||
|
||
@Override | ||
protected void setupTask(SpotlessTask task) { | ||
if (target == null) { | ||
throw noDefaultTargetException(); | ||
} | ||
super.setupTask(task); | ||
} | ||
|
||
public SimpleConfig simple() { | ||
return new SimpleConfig(DEFAULT_INDENTATION); | ||
} | ||
|
||
public class SimpleConfig { | ||
private int indent; | ||
|
||
public SimpleConfig(int indent) { | ||
this.indent = indent; | ||
addStep(createStep()); | ||
} | ||
|
||
public void indentWithSpaces(int indent) { | ||
this.indent = indent; | ||
replaceStep(createStep()); | ||
} | ||
|
||
private FormatterStep createStep() { | ||
return JsonSimpleStep.create(indent, provisioner()); | ||
} | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
62 changes: 62 additions & 0 deletions
62
plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JsonExtensionTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,62 @@ | ||
/* | ||
* Copyright 2021 DiffPlug | ||
* | ||
* 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. | ||
*/ | ||
package com.diffplug.gradle.spotless; | ||
|
||
import java.io.IOException; | ||
|
||
import org.junit.Test; | ||
|
||
public class JsonExtensionTest extends GradleIntegrationHarness { | ||
@Test | ||
public void defaultFormatting() throws IOException { | ||
setFile("build.gradle").toLines( | ||
"buildscript { repositories { mavenCentral() } }", | ||
"plugins {", | ||
" id 'java'", | ||
" id 'com.diffplug.spotless'", | ||
"}", | ||
"spotless {", | ||
" json {", | ||
" target 'examples/**/*.json'", | ||
" simple()", | ||
"}", | ||
"}"); | ||
setFile("src/main/resources/example.json").toResource("json/nestedObjectBefore.json"); | ||
setFile("examples/main/resources/example.json").toResource("json/nestedObjectBefore.json"); | ||
gradleRunner().withArguments("spotlessApply").build(); | ||
assertFile("src/main/resources/example.json").sameAsResource("json/nestedObjectBefore.json"); | ||
assertFile("examples/main/resources/example.json").sameAsResource("json/nestedObjectAfter.json"); | ||
} | ||
|
||
@Test | ||
public void formattingWithCustomNumberOfSpaces() throws IOException { | ||
setFile("build.gradle").toLines( | ||
"buildscript { repositories { mavenCentral() } }", | ||
"plugins {", | ||
" id 'java'", | ||
" id 'com.diffplug.spotless'", | ||
"}", | ||
"spotless {", | ||
" json {", | ||
" target 'src/**/*.json'", | ||
" simple().indentWithSpaces(6)", | ||
"}", | ||
"}"); | ||
setFile("src/main/resources/example.json").toResource("json/singletonArrayBefore.json"); | ||
gradleRunner().withArguments("spotlessApply").build(); | ||
assertFile("src/main/resources/example.json").sameAsResource("json/singletonArrayAfter6Spaces.json"); | ||
} | ||
} |
Oops, something went wrong.