diff --git a/palantir-java-format-spi/src/main/java/com/palantir/javaformat/java/JavaFormatterOptions.java b/palantir-java-format-spi/src/main/java/com/palantir/javaformat/java/JavaFormatterOptions.java index e7be557be..29eb2f7d7 100644 --- a/palantir-java-format-spi/src/main/java/com/palantir/javaformat/java/JavaFormatterOptions.java +++ b/palantir-java-format-spi/src/main/java/com/palantir/javaformat/java/JavaFormatterOptions.java @@ -36,7 +36,10 @@ public enum Style { GOOGLE(1, 100), /** The AOSP-compliant configuration. */ - AOSP(2, 100); + AOSP(2, 100), + + /** The Walmart Java Style configuration. */ + WALMART(1, 120); private final int indentationMultiplier; private final int maxLineLength; diff --git a/palantir-java-format/src/main/java/com/palantir/javaformat/java/ImportOrderer.java b/palantir-java-format/src/main/java/com/palantir/javaformat/java/ImportOrderer.java index 1ba037e11..9760d9378 100644 --- a/palantir-java-format/src/main/java/com/palantir/javaformat/java/ImportOrderer.java +++ b/palantir-java-format/src/main/java/com/palantir/javaformat/java/ImportOrderer.java @@ -171,7 +171,7 @@ private ImportOrderer(String text, ImmutableList toks, Style style) { this.text = text; this.toks = toks; this.lineSeparator = Newlines.guessLineSeparator(text); - if (style.equals(Style.GOOGLE) || style.equals(Style.PALANTIR)) { + if (style.equals(Style.GOOGLE) || style.equals(Style.PALANTIR) || style.equals(Style.WALMART)) { this.importComparator = GOOGLE_IMPORT_COMPARATOR; this.shouldInsertBlankLineFn = ImportOrderer::shouldInsertBlankLineGoogle; } else if (style.equals(Style.AOSP)) {