Skip to content

fix #1076: Add support for palantir-java-format #1083

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Jan 12, 2022
Merged

fix #1076: Add support for palantir-java-format #1083

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
57d0c0b
fix #1076: Add support for palantir-java-format
carterkozak Jan 10, 2022
fb02b2d
Release notes in CHANGES.md
carterkozak Jan 10, 2022
220276f
Merge branch 'main' into ckozak/palantir_java_format
carterkozak Jan 10, 2022
d7dd8cd
Fix PalantirJavaFormatIntegrationTest gradle integration test
carterkozak Jan 10, 2022
6aff52d
Remove unused, fix `OPTIONS_STYLE` casing
carterkozak Jan 11, 2022
368c75f
Bump no_maven_15 to no_maven_17 since it is now the latest available …
nedtwigg Jan 11, 2022
b38c3b5
Attempt to resolve `java.lang.OutOfMemoryError: Metaspace` on CI.
nedtwigg Jan 11, 2022
e742e2e
Fix broken nomaven_15.
nedtwigg Jan 11, 2022
9ab3a25
Java 17 doesn't support footers in javadoc anymore.
nedtwigg Jan 11, 2022
e9352f6
Go back to no_maven_15, I shouldn't have squashed that into this PR.
nedtwigg Jan 11, 2022
0d83dca
Simplify the PJF step using a compileOnly dependency
Jan 11, 2022
f761b4d
Merge remote-tracking branch 'upstream/main' into ckozak/palantir_jav…
Jan 11, 2022
ac019eb
remove test with reference to the removed style field
Jan 11, 2022
a5bf1fe
Remove the CodeQL workflow because it is using jcenter which is now d…
nedtwigg Jan 12, 2022
f4db9e0
Revert "Remove the CodeQL workflow because it is using jcenter which …
nedtwigg Jan 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove unused, fix OPTIONS_STYLE casing
  • Loading branch information
@carterkozak
carterkozak committed Jan 11, 2022
commit 6aff52d7f8ea25d05772ec8cd76688946a16f1e9
22 changes: 3 additions & 19 deletions lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@ private PalantirJavaFormatStep() {}
private static final String OPTIONS_BUILDER_CLASS = "com.palantir.javaformat.java.JavaFormatterOptions$Builder";
private static final String OPTIONS_BUILDER_STYLE_METHOD = "style";
private static final String OPTIONS_BUILDER_BUILD_METHOD = "build";
private static final String OPTIONS_Style = "com.palantir.javaformat.java.JavaFormatterOptions$Style";
private static final String OPTIONS_MAX_LINE_LENGTH_METHOD = "maxLineLength";
private static final String OPTIONS_STYLE = "com.palantir.javaformat.java.JavaFormatterOptions$Style";

private static final String REMOVE_UNUSED_CLASS = "com.palantir.javaformat.java.RemoveUnusedImports";
private static final String REMOVE_UNUSED_METHOD = "removeUnusedImports";
Expand Down Expand Up @@ -101,14 +100,6 @@ static final class State implements Serializable {
final String version;
final String style;

State(String stepName, String version, Provisioner provisioner) throws Exception {
this(stepName, version, DEFAULT_STYLE, provisioner);
}

State(String stepName, String version, String style, Provisioner provisioner) throws Exception {
this(stepName, MAVEN_COORDINATE, version, style, provisioner);
}

State(String stepName, String groupArtifact, String version, String style, Provisioner provisioner) throws Exception {
JVM_SUPPORT.assertFormatterSupported(version);
this.jarState = JarState.from(groupArtifact + ":" + version, provisioner);
Expand All @@ -127,7 +118,7 @@ FormatterFunc createFormat() throws Exception {
Method optionsBuilderMethod = optionsClass.getMethod(OPTIONS_BUILDER_METHOD);
Object optionsBuilder = optionsBuilderMethod.invoke(null);

Class<?> optionsStyleClass = classLoader.loadClass(OPTIONS_Style);
Class<?> optionsStyleClass = classLoader.loadClass(OPTIONS_STYLE);
Object styleConstant = Enum.valueOf((Class<Enum>) optionsStyleClass, style);
Method optionsBuilderStyleMethod = optionsBuilderClass.getMethod(OPTIONS_BUILDER_STYLE_METHOD, optionsStyleClass);
optionsBuilderStyleMethod.invoke(optionsBuilder, styleConstant);
Expand All @@ -147,17 +138,10 @@ FormatterFunc createFormat() throws Exception {
return JVM_SUPPORT.suggestLaterVersionOnError(version, (input -> {
String formatted = (String) formatterMethod.invoke(formatter, input);
String removedUnused = removeUnused.apply(formatted);
String sortedImports = (String) importOrdererMethod.invoke(null, removedUnused);
return sortedImports;
return (String) importOrdererMethod.invoke(null, removedUnused);
}));
}

FormatterFunc createRemoveUnusedImportsOnly() throws Exception {
ClassLoader classLoader = jarState.getClassLoader();
Function<String, String> removeUnused = constructRemoveUnusedFunction(classLoader);
return JVM_SUPPORT.suggestLaterVersionOnError(version, removeUnused::apply);
}

private static Function<String, String> constructRemoveUnusedFunction(ClassLoader classLoader)
throws NoSuchMethodException, ClassNotFoundException {
Class<?> removeUnusedClass = classLoader.loadClass(REMOVE_UNUSED_CLASS);
Expand Down