Merge pull request #62 from vpavic

philwebb · philwebb · commit 68cf0b482b65 · 2019-04-01T11:27:46.000-07:00
* pr/62:
  Add tests and for SpringImportOrderCheck
  Add SpringImportOrderCheck with package support
  Reorder imports based on `io.spring` package
diff --git a/.eclipse/org.eclipse.jdt.ui.prefs b/.eclipse/org.eclipse.jdt.ui.prefs
@@ -64,7 +64,7 @@ formatter_settings_version=13
 org.eclipse.jdt.ui.exception.name=e
 org.eclipse.jdt.ui.gettersetter.use.is=true
 org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;;org.springframework;\#;
+org.eclipse.jdt.ui.importorder=java;javax;;io.spring;\#;
 org.eclipse.jdt.ui.javadoc=true
 org.eclipse.jdt.ui.keywordthis=false
 org.eclipse.jdt.ui.ondemandthreshold=9999
diff --git a/spring-javaformat-eclipse/io.spring.javaformat.eclipse/src/io/spring/javaformat/eclipse/Activator.java b/spring-javaformat-eclipse/io.spring.javaformat.eclipse/src/io/spring/javaformat/eclipse/Activator.java
@@ -16,10 +16,11 @@
 
 package io.spring.javaformat.eclipse;
 
-import io.spring.javaformat.eclipse.gradle.RefreshProjectSettingsListeners;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
 
+import io.spring.javaformat.eclipse.gradle.RefreshProjectSettingsListeners;
+
 /**
  * The activator class controls the plug-in life cycle.
  *
diff --git a/spring-javaformat-eclipse/io.spring.javaformat.eclipse/src/io/spring/javaformat/eclipse/formatter/SpringCodeFormatter.java b/spring-javaformat-eclipse/io.spring.javaformat.eclipse/src/io/spring/javaformat/eclipse/formatter/SpringCodeFormatter.java
@@ -18,11 +18,12 @@
 
 import java.util.Map;
 
-import io.spring.javaformat.formatter.Formatter;
 import org.eclipse.jdt.core.formatter.CodeFormatter;
 import org.eclipse.jface.text.IRegion;
 import org.eclipse.text.edits.TextEdit;
 
+import io.spring.javaformat.formatter.Formatter;
+
 /**
  * Eclipse {@link CodeFormatter} for Spring formatting.
  *
diff --git a/spring-javaformat-eclipse/io.spring.javaformat.eclipse/src/io/spring/javaformat/eclipse/gradle/RefreshProjectsSettingsJob.java b/spring-javaformat-eclipse/io.spring.javaformat.eclipse/src/io/spring/javaformat/eclipse/gradle/RefreshProjectsSettingsJob.java
@@ -22,9 +22,6 @@
 import java.util.Optional;
 import java.util.Set;
 
-import io.spring.javaformat.eclipse.Executor;
-import io.spring.javaformat.eclipse.Messages;
-import io.spring.javaformat.eclipse.projectsettings.ProjectSettingsFilesLocator;
 import org.eclipse.buildship.core.GradleBuild;
 import org.eclipse.buildship.core.internal.CorePlugin;
 import org.eclipse.buildship.core.internal.workspace.FetchStrategy;
@@ -43,6 +40,10 @@
 import org.gradle.tooling.model.GradleTask;
 import org.gradle.tooling.model.eclipse.EclipseProject;
 
+import io.spring.javaformat.eclipse.Executor;
+import io.spring.javaformat.eclipse.Messages;
+import io.spring.javaformat.eclipse.projectsettings.ProjectSettingsFilesLocator;
+
 /**
  * Job to trigger refresh of project specific settings when the gradle plugin is used.
  *
diff --git a/spring-javaformat-eclipse/io.spring.javaformat.eclipse/src/io/spring/javaformat/eclipse/m2e/ProjectSettingsConfigurator.java b/spring-javaformat-eclipse/io.spring.javaformat.eclipse/src/io/spring/javaformat/eclipse/m2e/ProjectSettingsConfigurator.java
@@ -20,16 +20,17 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import io.spring.javaformat.eclipse.Executor;
-import io.spring.javaformat.eclipse.Messages;
-import io.spring.javaformat.eclipse.projectsettings.ProjectSettingsFiles;
-import io.spring.javaformat.eclipse.projectsettings.ProjectSettingsFilesLocator;
 import org.apache.maven.project.MavenProject;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.m2e.core.project.configurator.AbstractProjectConfigurator;
 import org.eclipse.m2e.core.project.configurator.ProjectConfigurationRequest;
 
+import io.spring.javaformat.eclipse.Executor;
+import io.spring.javaformat.eclipse.Messages;
+import io.spring.javaformat.eclipse.projectsettings.ProjectSettingsFiles;
+import io.spring.javaformat.eclipse.projectsettings.ProjectSettingsFilesLocator;
+
 /**
  * Configurator to apply project specific settings.
  *
diff --git a/spring-javaformat-gradle/spring-javaformat-gradle-plugin/src/main/java/io/spring/javaformat/gradle/CheckTask.java b/spring-javaformat-gradle/spring-javaformat-gradle-plugin/src/main/java/io/spring/javaformat/gradle/CheckTask.java
@@ -21,10 +21,11 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import io.spring.javaformat.formatter.FileEdit;
 import org.gradle.api.GradleException;
 import org.gradle.api.tasks.TaskAction;
 
+import io.spring.javaformat.formatter.FileEdit;
+
 /**
  * {@link FormatterTask} to check formatting.
  *
diff --git a/spring-javaformat-gradle/spring-javaformat-gradle-plugin/src/main/java/io/spring/javaformat/gradle/FormatTask.java b/spring-javaformat-gradle/spring-javaformat-gradle-plugin/src/main/java/io/spring/javaformat/gradle/FormatTask.java
@@ -18,11 +18,12 @@
 
 import java.io.IOException;
 
-import io.spring.javaformat.formatter.FileEdit;
-import io.spring.javaformat.formatter.FileFormatterException;
 import org.gradle.api.GradleException;
 import org.gradle.api.tasks.TaskAction;
 
+import io.spring.javaformat.formatter.FileEdit;
+import io.spring.javaformat.formatter.FileFormatterException;
+
 /**
  * {@link FormatterTask} to apply formatting.
  *
diff --git a/spring-javaformat-gradle/spring-javaformat-gradle-plugin/src/main/java/io/spring/javaformat/gradle/FormatterTask.java b/spring-javaformat-gradle/spring-javaformat-gradle-plugin/src/main/java/io/spring/javaformat/gradle/FormatterTask.java
@@ -19,12 +19,13 @@
 import java.nio.charset.Charset;
 import java.util.stream.Stream;
 
-import io.spring.javaformat.formatter.FileEdit;
-import io.spring.javaformat.formatter.FileFormatter;
 import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.Optional;
 import org.gradle.api.tasks.SourceTask;
 
+import io.spring.javaformat.formatter.FileEdit;
+import io.spring.javaformat.formatter.FileFormatter;
+
 /**
  * Abstract base class for formatter tasks.
  *
diff --git a/spring-javaformat-gradle/spring-javaformat-gradle-plugin/src/test/java/io/spring/javaformat/gradle/CheckTaskTests.java b/spring-javaformat-gradle/spring-javaformat-gradle-plugin/src/test/java/io/spring/javaformat/gradle/CheckTaskTests.java
@@ -18,12 +18,13 @@
 
 import java.io.IOException;
 
-import io.spring.javaformat.gradle.testkit.GradleBuild;
 import org.gradle.testkit.runner.BuildResult;
 import org.gradle.testkit.runner.TaskOutcome;
 import org.junit.Rule;
 import org.junit.Test;
 
+import io.spring.javaformat.gradle.testkit.GradleBuild;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
diff --git a/spring-javaformat-gradle/spring-javaformat-gradle-plugin/src/test/java/io/spring/javaformat/gradle/FormatTaskTests.java b/spring-javaformat-gradle/spring-javaformat-gradle-plugin/src/test/java/io/spring/javaformat/gradle/FormatTaskTests.java
@@ -20,12 +20,13 @@
 import java.io.IOException;
 import java.nio.file.Files;
 
-import io.spring.javaformat.gradle.testkit.GradleBuild;
 import org.gradle.testkit.runner.BuildResult;
 import org.gradle.testkit.runner.TaskOutcome;
 import org.junit.Rule;
 import org.junit.Test;
 
+import io.spring.javaformat.gradle.testkit.GradleBuild;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
diff --git a/spring-javaformat-gradle/spring-javaformat-gradle-plugin/src/test/java/io/spring/javaformat/gradle/testkit/GradleBuild.java b/spring-javaformat-gradle/spring-javaformat-gradle-plugin/src/test/java/io/spring/javaformat/gradle/testkit/GradleBuild.java
@@ -31,8 +31,6 @@
 import javax.xml.xpath.XPathExpression;
 import javax.xml.xpath.XPathFactory;
 
-import io.spring.javaformat.formatter.Formatter;
-import io.spring.javaformat.formatter.eclipse.Preparator;
 import org.eclipse.jdt.core.formatter.CodeFormatter;
 import org.gradle.internal.impldep.com.google.common.base.Charsets;
 import org.gradle.testkit.runner.BuildResult;
@@ -43,6 +41,9 @@
 import org.junit.runners.model.Statement;
 import org.xml.sax.InputSource;
 
+import io.spring.javaformat.formatter.Formatter;
+import io.spring.javaformat.formatter.eclipse.Preparator;
+
 /**
  * A {@link TestRule} for running a Gradle build using {@link GradleRunner}.
  *
diff --git a/spring-javaformat-intellij/spring-javaformat-intellij-plugin/src/main/java/io/spring/format/formatter/intellij/SpringFormatComponent.java b/spring-javaformat-intellij/spring-javaformat-intellij-plugin/src/main/java/io/spring/format/formatter/intellij/SpringFormatComponent.java
@@ -27,13 +27,14 @@
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.codeStyle.CodeStyleManager;
+import org.picocontainer.MutablePicoContainer;
+
 import io.spring.format.formatter.intellij.codestyle.SpringCodeStyleManager;
 import io.spring.format.formatter.intellij.codestyle.monitor.FileMonitor;
 import io.spring.format.formatter.intellij.codestyle.monitor.GradleMonitor;
 import io.spring.format.formatter.intellij.codestyle.monitor.MavenMonitor;
 import io.spring.format.formatter.intellij.codestyle.monitor.Monitors;
 import io.spring.format.formatter.intellij.codestyle.monitor.Trigger.State;
-import org.picocontainer.MutablePicoContainer;
 
 /**
  * {@link ProjectComponent} to add Spring Java Format IntelliJ support.
diff --git a/spring-javaformat-intellij/spring-javaformat-intellij-plugin/src/main/java/io/spring/format/formatter/intellij/StatusIndicator.java b/spring-javaformat-intellij/spring-javaformat-intellij-plugin/src/main/java/io/spring/format/formatter/intellij/StatusIndicator.java
@@ -29,6 +29,7 @@
 import com.intellij.openapi.wm.WindowManager;
 import com.intellij.openapi.wm.WindowManagerListener;
 import com.intellij.util.Consumer;
+
 import io.spring.format.formatter.intellij.codestyle.monitor.Trigger.State;
 
 /**
diff --git a/spring-javaformat-intellij/spring-javaformat-intellij-plugin/src/main/java/io/spring/format/formatter/intellij/codestyle/SpringReformatter.java b/spring-javaformat-intellij/spring-javaformat-intellij-plugin/src/main/java/io/spring/format/formatter/intellij/codestyle/SpringReformatter.java
@@ -33,10 +33,11 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.util.IncorrectOperationException;
-import io.spring.javaformat.formatter.Formatter;
 import org.eclipse.jface.text.IRegion;
 import org.eclipse.text.edits.TextEdit;
 
+import io.spring.javaformat.formatter.Formatter;
+
 /**
  * Reformatter used by {@link SpringCodeStyleManager} to determine when formatting can
  * apply and to perform the actual formatting.
diff --git a/spring-javaformat-intellij/spring-javaformat-intellij-plugin/src/main/java/io/spring/format/formatter/intellij/codestyle/monitor/FileMonitor.java b/spring-javaformat-intellij/spring-javaformat-intellij-plugin/src/main/java/io/spring/format/formatter/intellij/codestyle/monitor/FileMonitor.java
@@ -23,6 +23,7 @@
 import com.intellij.openapi.vfs.VirtualFileManager;
 import com.intellij.openapi.vfs.VirtualFileMoveEvent;
 import com.intellij.openapi.vfs.VirtualFilePropertyEvent;
+
 import io.spring.format.formatter.intellij.codestyle.monitor.Trigger.State;
 
 /**
diff --git a/spring-javaformat-intellij/spring-javaformat-intellij-plugin/src/main/java/io/spring/format/formatter/intellij/codestyle/monitor/GradleMonitor.java b/spring-javaformat-intellij/spring-javaformat-intellij-plugin/src/main/java/io/spring/format/formatter/intellij/codestyle/monitor/GradleMonitor.java
@@ -26,9 +26,10 @@
 import com.intellij.openapi.externalSystem.service.project.manage.ProjectDataImportListener;
 import com.intellij.openapi.project.Project;
 import com.intellij.util.messages.MessageBusConnection;
-import io.spring.format.formatter.intellij.codestyle.monitor.Trigger.State;
 import org.jetbrains.plugins.gradle.util.GradleConstants;
 
+import io.spring.format.formatter.intellij.codestyle.monitor.Trigger.State;
+
 /**
  * {@link Monitor} that looks for a {@code spring-javaformat-gradle-plugin} declaration in
  * the build.gradle file.
diff --git a/spring-javaformat-intellij/spring-javaformat-intellij-plugin/src/main/java/io/spring/format/formatter/intellij/codestyle/monitor/MavenMonitor.java b/spring-javaformat-intellij/spring-javaformat-intellij-plugin/src/main/java/io/spring/format/formatter/intellij/codestyle/monitor/MavenMonitor.java
@@ -20,13 +20,14 @@
 
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Pair;
-import io.spring.format.formatter.intellij.codestyle.monitor.Trigger.State;
 import org.jetbrains.idea.maven.project.MavenProject;
 import org.jetbrains.idea.maven.project.MavenProjectChanges;
 import org.jetbrains.idea.maven.project.MavenProjectsManager;
 import org.jetbrains.idea.maven.project.MavenProjectsTree.Listener;
 import org.jetbrains.idea.maven.server.NativeMavenProjectHolder;
 
+import io.spring.format.formatter.intellij.codestyle.monitor.Trigger.State;
+
 /**
  * {@link Monitor} that looks for a {@code spring-javaformat-maven-plugin} declaration in
  * the POM.xml file.
diff --git a/spring-javaformat-intellij/spring-javaformat-intellij-plugin/src/main/java/io/spring/format/formatter/intellij/codestyle/monitor/Monitors.java b/spring-javaformat-intellij/spring-javaformat-intellij-plugin/src/main/java/io/spring/format/formatter/intellij/codestyle/monitor/Monitors.java
@@ -23,6 +23,7 @@
 import java.util.function.Consumer;
 
 import com.intellij.openapi.project.Project;
+
 import io.spring.format.formatter.intellij.codestyle.monitor.Trigger.State;
 
 /**
diff --git a/spring-javaformat-maven/spring-javaformat-maven-plugin/src/main/java/io/spring/format/maven/ApplyMojo.java b/spring-javaformat-maven/spring-javaformat-maven-plugin/src/main/java/io/spring/format/maven/ApplyMojo.java
@@ -20,14 +20,15 @@
 import java.nio.charset.Charset;
 import java.util.List;
 
-import io.spring.javaformat.formatter.FileEdit;
-import io.spring.javaformat.formatter.FileFormatter;
-import io.spring.javaformat.formatter.FileFormatterException;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
 
+import io.spring.javaformat.formatter.FileEdit;
+import io.spring.javaformat.formatter.FileFormatter;
+import io.spring.javaformat.formatter.FileFormatterException;
+
 /**
  * Applies source formatting to the codebase.
  *
diff --git a/spring-javaformat-maven/spring-javaformat-maven-plugin/src/main/java/io/spring/format/maven/ValidateMojo.java b/spring-javaformat-maven/spring-javaformat-maven-plugin/src/main/java/io/spring/format/maven/ValidateMojo.java
@@ -21,14 +21,15 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import io.spring.javaformat.formatter.FileEdit;
-import io.spring.javaformat.formatter.FileFormatter;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
 
+import io.spring.javaformat.formatter.FileEdit;
+import io.spring.javaformat.formatter.FileFormatter;
+
 /**
  * Validates that source formatting matches the required style.
  *
diff --git a/spring-javaformat/spring-javaformat-checkstyle/src/main/java/io/spring/javaformat/checkstyle/SpringChecks.java b/spring-javaformat/spring-javaformat-checkstyle/src/main/java/io/spring/javaformat/checkstyle/SpringChecks.java
@@ -36,7 +36,9 @@
 import com.puppycrawl.tools.checkstyle.api.FileText;
 import com.puppycrawl.tools.checkstyle.api.LocalizedMessage;
 import com.puppycrawl.tools.checkstyle.filters.SuppressFilterElement;
+
 import io.spring.javaformat.checkstyle.check.SpringHeaderCheck;
+import io.spring.javaformat.checkstyle.check.SpringImportOrderCheck;
 
 /**
  * {@link FileSetCheck} that applies Spring checkstype rules.
@@ -61,6 +63,8 @@ public class SpringChecks extends AbstractFileSetCheck implements ExternalResour
 
 	private String headerFile;
 
+	private String projectRootPackage = SpringImportOrderCheck.DEFAULT_PROJECT_ROOT_PACKAGE;
+
 	/**
 	 * Sets tab width.
 	 * @param tabWidth the distance between tab stops
@@ -96,6 +100,7 @@ public void finishLocalSetup() {
 		put(properties, "headerType", this.headerType);
 		put(properties, "headerCopyrightPattern", this.headerCopyrightPattern);
 		put(properties, "headerFile", this.headerFile);
+		put(properties, "projectRootPackage", this.projectRootPackage);
 		this.checks = new SpringConfigurationLoader(context, this.moduleFactory)
 				.load(new PropertiesExpander(properties));
 	}
@@ -160,4 +165,8 @@ public void setHeaderFile(String headerFile) {
 		this.headerFile = headerFile;
 	}
 
+	public void setProjectRootPackage(String projectRootPackage) {
+		this.projectRootPackage = projectRootPackage;
+	}
+
 }
diff --git a/spring-javaformat/spring-javaformat-checkstyle/src/main/java/io/spring/javaformat/checkstyle/check/SpringImportOrderCheck.java b/spring-javaformat/spring-javaformat-checkstyle/src/main/java/io/spring/javaformat/checkstyle/check/SpringImportOrderCheck.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2017-2019 the original author or authors.
+ *
+ * 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
+ *
+ *      https://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 io.spring.javaformat.checkstyle.check;
+
+import com.puppycrawl.tools.checkstyle.checks.imports.ImportOrderCheck;
+
+/**
+ * Checks that the order of imports follow Spring conventions.
+ *
+ * @author Vedran Pavic
+ */
+public class SpringImportOrderCheck extends ImportOrderCheck {
+
+	/**
+	 * The default root package.
+	 */
+	public static final String DEFAULT_PROJECT_ROOT_PACKAGE = "org.springframework";
+
+	public SpringImportOrderCheck() {
+		setProjectRootPackage(DEFAULT_PROJECT_ROOT_PACKAGE);
+		setOrdered(true);
+		setSeparated(true);
+		setOption("bottom");
+		setSortStaticImportsAlphabetically(true);
+	}
+
+	public void setProjectRootPackage(String projectRootPackage) {
+		setGroups("java", "/^javax?\\./", "*", projectRootPackage);
+	}
+
+}
diff --git a/spring-javaformat/spring-javaformat-checkstyle/src/main/resources/io/spring/javaformat/checkstyle/spring-checkstyle.xml b/spring-javaformat/spring-javaformat-checkstyle/src/main/resources/io/spring/javaformat/checkstyle/spring-checkstyle.xml
@@ -81,12 +81,8 @@
 		<module name="com.puppycrawl.tools.checkstyle.checks.imports.UnusedImportsCheck">
 			<property name="processJavadoc" value="true" />
 		</module>
-		<module name="com.puppycrawl.tools.checkstyle.checks.imports.ImportOrderCheck">
-			<property name="groups" value="java,/^javax?\./,*,org.springframework" />
-			<property name="ordered" value="true" />
-			<property name="separated" value="true" />
-			<property name="option" value="bottom" />
-			<property name="sortStaticImportsAlphabetically" value="true" />
+		<module name="io.spring.javaformat.checkstyle.check.SpringImportOrderCheck">
+			<property name="projectRootPackage" value="${projectRootPackage}"/>
 		</module>
 
 		<!-- Javadoc Comments -->
diff --git a/spring-javaformat/spring-javaformat-checkstyle/src/test/java/io/spring/javaformat/checkstyle/SpringConfigurationLoaderTests.java b/spring-javaformat/spring-javaformat-checkstyle/src/test/java/io/spring/javaformat/checkstyle/SpringConfigurationLoaderTests.java
diff --git a/spring-javaformat/spring-javaformat-checkstyle/src/test/resources/check/ImportOrderCustomPackageInvalid.txt b/spring-javaformat/spring-javaformat-checkstyle/src/test/resources/check/ImportOrderCustomPackageInvalid.txt
diff --git a/spring-javaformat/spring-javaformat-checkstyle/src/test/resources/check/ImportOrderCustomPackageValid.txt b/spring-javaformat/spring-javaformat-checkstyle/src/test/resources/check/ImportOrderCustomPackageValid.txt
diff --git a/spring-javaformat/spring-javaformat-checkstyle/src/test/resources/config/ImportOrderCustomPackageInvalid.xml b/spring-javaformat/spring-javaformat-checkstyle/src/test/resources/config/ImportOrderCustomPackageInvalid.xml
diff --git a/spring-javaformat/spring-javaformat-checkstyle/src/test/resources/config/ImportOrderCustomPackageValid.xml b/spring-javaformat/spring-javaformat-checkstyle/src/test/resources/config/ImportOrderCustomPackageValid.xml
diff --git a/spring-javaformat/spring-javaformat-checkstyle/src/test/resources/source/ImportOrderCustomPackageInvalid.java b/spring-javaformat/spring-javaformat-checkstyle/src/test/resources/source/ImportOrderCustomPackageInvalid.java
diff --git a/spring-javaformat/spring-javaformat-checkstyle/src/test/resources/source/ImportOrderCustomPackageValid.java b/spring-javaformat/spring-javaformat-checkstyle/src/test/resources/source/ImportOrderCustomPackageValid.java
diff --git a/spring-javaformat/spring-javaformat-formatter/src/main/java/io/spring/javaformat/formatter/Formatter.java b/spring-javaformat/spring-javaformat-formatter/src/main/java/io/spring/javaformat/formatter/Formatter.java
diff --git a/spring-javaformat/spring-javaformat-formatter/src/main/java/io/spring/javaformat/formatter/preparator/CodeLineBreakPreparator.java b/spring-javaformat/spring-javaformat-formatter/src/main/java/io/spring/javaformat/formatter/preparator/CodeLineBreakPreparator.java
diff --git a/spring-javaformat/spring-javaformat-formatter/src/main/java/io/spring/javaformat/formatter/preparator/JavadocLineBreakPreparator.java b/spring-javaformat/spring-javaformat-formatter/src/main/java/io/spring/javaformat/formatter/preparator/JavadocLineBreakPreparator.java
diff --git a/src/checkstyle/checkstyle.xml b/src/checkstyle/checkstyle.xml
