Skip to content

Commit 1f107c3

Browse files
philwebbphilwebb
committed
Reformat our own code to width of 120
1 parent f793b7e commit 1f107c3

File tree

63 files changed

+240
-420
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+240
-420
lines changed

‎.eclipse/org.eclipse.jdt.core.prefs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
384384
org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
385385
org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
386386
org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
387-
org.eclipse.jdt.core.formatter.lineSplit=90
387+
org.eclipse.jdt.core.formatter.lineSplit=120
388388
org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
389389
org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
390390
org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

‎spring-javaformat-eclipse/io.spring.javaformat.eclipse.tests/src/io/spring/javaformat/eclipse/MessagesTests.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@ public class MessagesTests {
3131
@Test
3232
public void bindHasCorrectMessage() {
3333
String message = NLS.bind(Messages.springFormatSettingsImportError, "reason");
34-
assertThat(message)
35-
.isEqualTo("Error importing project specific settings: reason");
34+
assertThat(message).isEqualTo("Error importing project specific settings: reason");
3635
}
3736

3837
}

‎spring-javaformat-eclipse/io.spring.javaformat.eclipse.tests/src/io/spring/javaformat/eclipse/projectsettings/ProjectPropertiesTests.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,10 @@ public void getModifiedContentReplacesCopyrightYear() throws IOException {
8080
writeProperties(file, "2016-2020");
8181
ProjectProperties properties = new ProjectProperties();
8282
properties.addFromFolder(folder);
83-
ProjectSettingsFiles files = new ProjectSettingsFilesLocator()
84-
.locateSettingsFiles();
83+
ProjectSettingsFiles files = new ProjectSettingsFilesLocator().locateSettingsFiles();
8584
ProjectSettingsFile prefs = getFile(files, "org.eclipse.jdt.ui.prefs");
8685
String content = loadContent(properties.getModifiedContent(prefs));
87-
assertThat(content)
88-
.contains("Copyright 2016-2020 the original author or authors");
86+
assertThat(content).contains("Copyright 2016-2020 the original author or authors");
8987

9088
}
9189

‎spring-javaformat-eclipse/io.spring.javaformat.eclipse.tests/src/io/spring/javaformat/eclipse/projectsettings/ProjectSettingsFileTests.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,17 +43,14 @@ public void fromFileAdaptsFile() throws Exception {
4343
writeText(file, "test");
4444
ProjectSettingsFile projectSettingsFile = ProjectSettingsFile.fromFile(file);
4545
assertThat(projectSettingsFile.getName()).isEqualTo(file.getName());
46-
assertThat(projectSettingsFile.getContent())
47-
.hasSameContentAs(new ByteArrayInputStream("test".getBytes()));
46+
assertThat(projectSettingsFile.getContent()).hasSameContentAs(new ByteArrayInputStream("test".getBytes()));
4847
}
4948

5049
@Test
5150
public void fromClasspathResourceAdaptsResource() throws Exception {
52-
ProjectSettingsFile projectSettingsFile = ProjectSettingsFile
53-
.fromClasspath(getClass(), "test.txt");
51+
ProjectSettingsFile projectSettingsFile = ProjectSettingsFile.fromClasspath(getClass(), "test.txt");
5452
assertThat(projectSettingsFile.getName()).isEqualTo("test.txt");
55-
assertThat(projectSettingsFile.getContent())
56-
.hasSameContentAs(new ByteArrayInputStream("test".getBytes()));
53+
assertThat(projectSettingsFile.getContent()).hasSameContentAs(new ByteArrayInputStream("test".getBytes()));
5754
}
5855

5956
private void writeText(File file, String s) throws FileNotFoundException {

‎spring-javaformat-eclipse/io.spring.javaformat.eclipse.tests/src/io/spring/javaformat/eclipse/projectsettings/ProjectSettingsFilesLocatorTests.java

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -41,22 +41,19 @@ public class ProjectSettingsFilesLocatorTests {
4141

4242
@Test
4343
public void locateSettingsFilesWhenNoFoldersShouldReturnDefault() throws IOException {
44-
ProjectSettingsFiles files = new ProjectSettingsFilesLocator()
45-
.locateSettingsFiles();
46-
assertThat(files.iterator()).extracting(ProjectSettingsFile::getName)
47-
.containsOnly("org.eclipse.jdt.core.prefs", "org.eclipse.jdt.ui.prefs");
44+
ProjectSettingsFiles files = new ProjectSettingsFilesLocator().locateSettingsFiles();
45+
assertThat(files.iterator()).extracting(ProjectSettingsFile::getName).containsOnly("org.eclipse.jdt.core.prefs",
46+
"org.eclipse.jdt.ui.prefs");
4847
}
4948

5049
@Test
5150
public void locateSettingsFilesOnlyFindPrefs() throws Exception {
5251
File folder = this.temp.newFolder();
5352
writeFile(folder, "foo.prefs");
5453
writeFile(folder, "bar.notprefs");
55-
ProjectSettingsFiles files = new ProjectSettingsFilesLocator(folder)
56-
.locateSettingsFiles();
57-
assertThat(files.iterator()).extracting(ProjectSettingsFile::getName)
58-
.containsOnly("org.eclipse.jdt.core.prefs", "org.eclipse.jdt.ui.prefs",
59-
"foo.prefs");
54+
ProjectSettingsFiles files = new ProjectSettingsFilesLocator(folder).locateSettingsFiles();
55+
assertThat(files.iterator()).extracting(ProjectSettingsFile::getName).containsOnly("org.eclipse.jdt.core.prefs",
56+
"org.eclipse.jdt.ui.prefs", "foo.prefs");
6057
}
6158

6259
@Test
@@ -66,12 +63,10 @@ public void locateSettingsFilesWhenMultipleFoldersFindsInEarliest() throws Excep
6663
File folder2 = this.temp.newFolder();
6764
writeFile(folder2, "foo.prefs", "foo2");
6865
writeFile(folder2, "org.eclipse.jdt.core.prefs", "core2");
69-
ProjectSettingsFiles files = new ProjectSettingsFilesLocator(folder1, folder2)
70-
.locateSettingsFiles();
66+
ProjectSettingsFiles files = new ProjectSettingsFilesLocator(folder1, folder2).locateSettingsFiles();
7167
Map<String, ProjectSettingsFile> found = new LinkedHashMap<>();
7268
files.iterator().forEachRemaining((f) -> found.put(f.getName(), f));
73-
assertThat(found.get("foo.prefs").getContent())
74-
.hasSameContentAs(new ByteArrayInputStream("foo1".getBytes()));
69+
assertThat(found.get("foo.prefs").getContent()).hasSameContentAs(new ByteArrayInputStream("foo1".getBytes()));
7570
assertThat(found.get("org.eclipse.jdt.core.prefs").getContent())
7671
.hasSameContentAs(new ByteArrayInputStream("core2".getBytes()));
7772
}

‎spring-javaformat-eclipse/io.spring.javaformat.eclipse.tests/src/io/spring/javaformat/eclipse/projectsettings/ProjectSettingsFilesTests.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,17 +45,14 @@ public class ProjectSettingsFilesTests {
4545
@Test
4646
public void iteratorIteratesFiles() throws Exception {
4747
ProjectSettingsFile file = ProjectSettingsFile.fromFile(this.temp.newFile());
48-
ProjectSettingsFiles files = new ProjectSettingsFiles(Collections.singleton(file),
49-
new ProjectProperties());
48+
ProjectSettingsFiles files = new ProjectSettingsFiles(Collections.singleton(file), new ProjectProperties());
5049
assertThat(files).containsOnly(file);
5150
}
5251

5352
@Test
5453
public void applyToProjectCopiesToDotSettings() throws Exception {
55-
ProjectSettingsFile file = ProjectSettingsFile
56-
.fromFile(this.temp.newFile("foo.prefs"));
57-
ProjectSettingsFiles files = new ProjectSettingsFiles(Collections.singleton(file),
58-
new ProjectProperties());
54+
ProjectSettingsFile file = ProjectSettingsFile.fromFile(this.temp.newFile("foo.prefs"));
55+
ProjectSettingsFiles files = new ProjectSettingsFiles(Collections.singleton(file), new ProjectProperties());
5956
IProject project = mock(IProject.class);
6057
IProgressMonitor monitor = mock(IProgressMonitor.class);
6158
IFile projectFile = mock(IFile.class);

‎spring-javaformat-eclipse/io.spring.javaformat.eclipse/src/io/spring/javaformat/eclipse/Executor.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,7 @@ public void run(Command command) throws CoreException {
5252
throw (CoreException) ex;
5353
}
5454
String msg = NLS.bind(this.failureMessage, ex.getMessage());
55-
throw new CoreException(
56-
new Status(IStatus.ERROR, Activator.PLUGIN_ID, -1, msg, ex));
55+
throw new CoreException(new Status(IStatus.ERROR, Activator.PLUGIN_ID, -1, msg, ex));
5756
}
5857
}
5958

‎spring-javaformat-eclipse/io.spring.javaformat.eclipse/src/io/spring/javaformat/eclipse/Messages.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@
2525
*/
2626
public final class Messages extends NLS {
2727

28-
private static final String BUNDLE_NAME = Messages.class.getPackage().getName()
29-
+ ".messages"; //$NON-NLS-1$
28+
private static final String BUNDLE_NAME = Messages.class.getPackage().getName() + ".messages"; //$NON-NLS-1$
3029

3130
/**
3231
* General error message.

‎spring-javaformat-eclipse/io.spring.javaformat.eclipse/src/io/spring/javaformat/eclipse/formatter/SpringCodeFormatter.java

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,14 @@ public class SpringCodeFormatter extends CodeFormatter {
3434
private Formatter delegate = new Formatter();
3535

3636
@Override
37-
public TextEdit format(int kind, String source, int offset, int length,
38-
int indentationLevel, String lineSeparator) {
39-
return this.delegate.format(kind, source, offset, length, indentationLevel,
40-
lineSeparator);
37+
public TextEdit format(int kind, String source, int offset, int length, int indentationLevel,
38+
String lineSeparator) {
39+
return this.delegate.format(kind, source, offset, length, indentationLevel, lineSeparator);
4140
}
4241

4342
@Override
44-
public TextEdit format(int kind, String source, IRegion[] regions,
45-
int indentationLevel, String lineSeparator) {
46-
return this.delegate.format(kind, source, regions, indentationLevel,
47-
lineSeparator);
43+
public TextEdit format(int kind, String source, IRegion[] regions, int indentationLevel, String lineSeparator) {
44+
return this.delegate.format(kind, source, regions, indentationLevel, lineSeparator);
4845
}
4946

5047
@Override

‎spring-javaformat-eclipse/io.spring.javaformat.eclipse/src/io/spring/javaformat/eclipse/gradle/RefreshProjectSettingsListeners.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,7 @@ public void preExecute(String commandId, ExecutionEvent event) {
7878

7979
static void attach() {
8080
if (PlatformUI.isWorkbenchRunning()) {
81-
ICommandService commandService = PlatformUI.getWorkbench()
82-
.getAdapter(ICommandService.class);
81+
ICommandService commandService = PlatformUI.getWorkbench().getAdapter(ICommandService.class);
8382
Command command = commandService.getCommand(COMMAND_NAME);
8483
if (command != null) {
8584
command.addExecutionListener(new CommandListener());
@@ -96,8 +95,7 @@ private static class ProjectListener implements EventListener {
9695

9796
@Override
9897
public void onEvent(Event event) {
99-
if (event instanceof ProjectCreatedEvent
100-
|| event instanceof GradleNatureAddedEvent) {
98+
if (event instanceof ProjectCreatedEvent || event instanceof GradleNatureAddedEvent) {
10199
new RefreshProjectsSettingsJob().schedule();
102100
}
103101
}

‎spring-javaformat-eclipse/io.spring.javaformat.eclipse/src/io/spring/javaformat/eclipse/gradle/RefreshProjectsSettingsJob.java

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,7 @@ protected IStatus run(IProgressMonitor monitor) {
7474
return Status.OK_STATUS;
7575
}
7676

77-
private void configureProjects(IProgressMonitor monitor)
78-
throws CoreException, IOException {
77+
private void configureProjects(IProgressMonitor monitor) throws CoreException, IOException {
7978
InternalGradleWorkspace workspace = CorePlugin.internalGradleWorkspace();
8079
for (IProject project : ResourcesPlugin.getWorkspace().getRoot().getProjects()) {
8180
Optional<GradleBuild> build = workspace.getBuild(project);
@@ -85,13 +84,12 @@ private void configureProjects(IProgressMonitor monitor)
8584
}
8685
}
8786

88-
private void configureProject(IProject project, InternalGradleBuild build,
89-
IProgressMonitor monitor) throws CoreException, IOException {
90-
Set<EclipseProject> projects = ModelProviderUtil.fetchAllEclipseProjects(build,
91-
this.tokenSource, FetchStrategy.FORCE_RELOAD, monitor);
87+
private void configureProject(IProject project, InternalGradleBuild build, IProgressMonitor monitor)
88+
throws CoreException, IOException {
89+
Set<EclipseProject> projects = ModelProviderUtil.fetchAllEclipseProjects(build, this.tokenSource,
90+
FetchStrategy.FORCE_RELOAD, monitor);
9291
if (hasSpringFormatPlugin(projects)) {
93-
ProjectSettingsFilesLocator locator = new ProjectSettingsFilesLocator(
94-
getSearchFolders(projects));
92+
ProjectSettingsFilesLocator locator = new ProjectSettingsFilesLocator(getSearchFolders(projects));
9593
locator.locateSettingsFiles().applyToProject(project, monitor);
9694
}
9795
}

‎spring-javaformat-eclipse/io.spring.javaformat.eclipse/src/io/spring/javaformat/eclipse/m2e/ProjectSettingsConfigurator.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,10 @@
3939
public class ProjectSettingsConfigurator extends AbstractProjectConfigurator {
4040

4141
@Override
42-
public void configure(ProjectConfigurationRequest request, IProgressMonitor monitor)
43-
throws CoreException {
42+
public void configure(ProjectConfigurationRequest request, IProgressMonitor monitor) throws CoreException {
4443
new Executor(Messages.springFormatSettingsImportError).run(() -> {
4544
List<File> searchFolders = getSearchFolders(request);
46-
ProjectSettingsFiles settingsFiles = new ProjectSettingsFilesLocator(
47-
searchFolders).locateSettingsFiles();
45+
ProjectSettingsFiles settingsFiles = new ProjectSettingsFilesLocator(searchFolders).locateSettingsFiles();
4846
settingsFiles.applyToProject(request.getProject(), monitor);
4947
});
5048
}

‎spring-javaformat-eclipse/io.spring.javaformat.eclipse/src/io/spring/javaformat/eclipse/projectsettings/ProjectProperties.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,7 @@ class ProjectProperties {
4242

4343
private static final String COPYRIGHT_YEAR = "copyright-year";
4444

45-
private static final DateTimeFormatter YEAR_FORMATTER = DateTimeFormatter
46-
.ofPattern("yyyy");
45+
private static final DateTimeFormatter YEAR_FORMATTER = DateTimeFormatter.ofPattern("yyyy");
4746

4847
private static final Map<String, Supplier<String>> DEFAULTS;
4948
static {
@@ -79,16 +78,14 @@ public InputStream getModifiedContent(ProjectSettingsFile file) throws IOExcepti
7978
if (file.getName().equals("org.eclipse.jdt.ui.prefs")) {
8079
String content = loadContent(file);
8180
content = content.replace("Copyright the original author or authors",
82-
"Copyright " + get(COPYRIGHT_YEAR)
83-
+ " the original author or authors");
81+
"Copyright " + get(COPYRIGHT_YEAR) + " the original author or authors");
8482
return new ByteArrayInputStream(content.getBytes(StandardCharsets.UTF_8));
8583
}
8684
return file.getContent();
8785
}
8886

8987
private String loadContent(ProjectSettingsFile file) throws IOException {
90-
try (BufferedReader reader = new BufferedReader(
91-
new InputStreamReader(file.getContent()))) {
88+
try (BufferedReader reader = new BufferedReader(new InputStreamReader(file.getContent()))) {
9289
return reader.lines().collect(Collectors.joining("\n"));
9390
}
9491
}

‎spring-javaformat-eclipse/io.spring.javaformat.eclipse/src/io/spring/javaformat/eclipse/projectsettings/ProjectSettingsFiles.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,7 @@ public class ProjectSettingsFiles implements Iterable<ProjectSettingsFile> {
4545
* @param files the project settings files
4646
* @param projectProperties project properties
4747
*/
48-
public ProjectSettingsFiles(Collection<ProjectSettingsFile> files,
49-
ProjectProperties projectProperties) {
48+
public ProjectSettingsFiles(Collection<ProjectSettingsFile> files, ProjectProperties projectProperties) {
5049
this.files = new ArrayList<>(files);
5150
this.projectProperties = projectProperties;
5251
}
@@ -63,8 +62,7 @@ public Iterator<ProjectSettingsFile> iterator() {
6362
* @throws IOException on IO error
6463
* @throws CoreException on eclipse file creation failure
6564
*/
66-
public void applyToProject(IProject project, IProgressMonitor monitor)
67-
throws IOException, CoreException {
65+
public void applyToProject(IProject project, IProgressMonitor monitor) throws IOException, CoreException {
6866
for (ProjectSettingsFile file : this) {
6967
IFile destination = project.getFile(".settings/" + file.getName());
7068
if (destination.exists()) {

‎spring-javaformat-eclipse/io.spring.javaformat.eclipse/src/io/spring/javaformat/eclipse/projectsettings/ProjectSettingsFilesLocator.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@ public class ProjectSettingsFilesLocator {
3131

3232
private static final String[] SOURCE_FOLDERS = { "eclipse", ".eclipse" };
3333

34-
private static final String[] DEFAULT_FILES = { "org.eclipse.jdt.core.prefs",
35-
"org.eclipse.jdt.ui.prefs" };
34+
private static final String[] DEFAULT_FILES = { "org.eclipse.jdt.core.prefs", "org.eclipse.jdt.ui.prefs" };
3635

3736
private final File[] searchFolders;
3837

@@ -58,8 +57,8 @@ public ProjectSettingsFiles locateSettingsFiles() throws IOException {
5857
return new ProjectSettingsFiles(files.values(), projectProperties);
5958
}
6059

61-
private void add(ProjectProperties projectProperties,
62-
Map<String, ProjectSettingsFile> files, File folder) throws IOException {
60+
private void add(ProjectProperties projectProperties, Map<String, ProjectSettingsFile> files, File folder)
61+
throws IOException {
6362
if (folder.exists() && folder.isDirectory()) {
6463
for (File file : folder.listFiles(this::isPrefsFile)) {
6564
putIfAbsent(files, ProjectSettingsFile.fromFile(file));
@@ -72,8 +71,7 @@ private boolean isPrefsFile(File file) {
7271
return file.getName().toLowerCase().endsWith(".prefs");
7372
}
7473

75-
private void putIfAbsent(Map<String, ProjectSettingsFile> files,
76-
ProjectSettingsFile candidate) {
74+
private void putIfAbsent(Map<String, ProjectSettingsFile> files, ProjectSettingsFile candidate) {
7775
files.putIfAbsent(candidate.getName(), candidate);
7876
}
7977

‎spring-javaformat-gradle/spring-javaformat-gradle-plugin/src/main/java/io/spring/javaformat/gradle/CheckTask.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,10 @@ public class CheckTask extends FormatterTask {
4545

4646
@TaskAction
4747
public void checkFormatting() throws IOException, InterruptedException {
48-
List<File> problems = formatFiles().filter(FileEdit::hasEdits)
49-
.map(FileEdit::getFile).collect(Collectors.toList());
48+
List<File> problems = formatFiles().filter(FileEdit::hasEdits).map(FileEdit::getFile)
49+
.collect(Collectors.toList());
5050
if (!problems.isEmpty()) {
51-
StringBuilder message = new StringBuilder(
52-
"Formatting violations found in the following files:\n");
51+
StringBuilder message = new StringBuilder("Formatting violations found in the following files:\n");
5352
problems.stream().forEach((f) -> message.append(" * " + f + "\n"));
5453
message.append("\nRun `format` to fix.");
5554
throw new GradleException(message.toString());

‎spring-javaformat-gradle/spring-javaformat-gradle-plugin/src/main/java/io/spring/javaformat/gradle/FormatterTask.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,7 @@ public void setEncoding(String encoding) {
5959
*/
6060
protected final Stream<FileEdit> formatFiles() {
6161
FileFormatter formatter = new FileFormatter();
62-
Charset encoding = (getEncoding() != null ? Charset.forName(getEncoding())
63-
: Charset.defaultCharset());
62+
Charset encoding = (getEncoding() != null ? Charset.forName(getEncoding()) : Charset.defaultCharset());
6463
return formatter.formatFiles(getSource().getFiles(), encoding);
6564
}
6665

‎spring-javaformat-gradle/spring-javaformat-gradle-plugin/src/main/java/io/spring/javaformat/gradle/SpringJavaFormatPlugin.java

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,26 +44,23 @@ private void addSourceTasks() {
4444
formatAll.setDescription(FormatTask.DESCRIPTION);
4545
Task checkAll = this.project.task(CheckTask.NAME);
4646
checkAll.setDescription(CheckTask.DESCRIPTION);
47-
this.project.getTasks().getByName(JavaBasePlugin.CHECK_TASK_NAME)
48-
.dependsOn(checkAll);
49-
this.project.getConvention().getPlugin(JavaPluginConvention.class)
50-
.getSourceSets()
47+
this.project.getTasks().getByName(JavaBasePlugin.CHECK_TASK_NAME).dependsOn(checkAll);
48+
this.project.getConvention().getPlugin(JavaPluginConvention.class).getSourceSets()
5149
.all((sourceSet) -> addSourceTasks(sourceSet, checkAll, formatAll));
5250
});
5351
}
5452

5553
private void addSourceTasks(SourceSet sourceSet, Task checkAll, Task formatAll) {
56-
CheckTask checkTask = addSourceTask(sourceSet, CheckTask.class, CheckTask.NAME,
57-
CheckTask.DESCRIPTION);
54+
CheckTask checkTask = addSourceTask(sourceSet, CheckTask.class, CheckTask.NAME, CheckTask.DESCRIPTION);
5855
checkAll.dependsOn(checkTask);
59-
FormatTask formatSourceSet = addSourceTask(sourceSet, FormatTask.class,
60-
FormatTask.NAME, FormatTask.DESCRIPTION);
56+
FormatTask formatSourceSet = addSourceTask(sourceSet, FormatTask.class, FormatTask.NAME,
57+
FormatTask.DESCRIPTION);
6158
formatSourceSet.conventionMapping("encoding", () -> "UTF-8");
6259
formatAll.dependsOn(formatSourceSet);
6360
}
6461

65-
private <T extends FormatterTask> T addSourceTask(SourceSet sourceSet,
66-
Class<T> taskType, String name, String desc) {
62+
private <T extends FormatterTask> T addSourceTask(SourceSet sourceSet, Class<T> taskType, String name,
63+
String desc) {
6764
String taskName = sourceSet.getTaskName(name, null);
6865
T task = this.project.getTasks().create(taskName, taskType);
6966
task.setDescription(desc + " for " + sourceSet.getName());

‎spring-javaformat-gradle/spring-javaformat-gradle-plugin/src/test/java/io/spring/javaformat/gradle/CheckTaskTests.java

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,18 +39,14 @@ public class CheckTaskTests {
3939

4040
@Test
4141
public void checkOk() throws IOException {
42-
BuildResult result = this.gradleBuild.source("src/test/resources/check-ok")
43-
.build("check");
44-
assertThat(result.task(":checkFormatMain").getOutcome())
45-
.isEqualTo(TaskOutcome.SUCCESS);
42+
BuildResult result = this.gradleBuild.source("src/test/resources/check-ok").build("check");
43+
assertThat(result.task(":checkFormatMain").getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
4644
}
4745

4846
@Test
4947
public void checkBad() throws IOException {
50-
BuildResult result = this.gradleBuild.source("src/test/resources/check-bad")
51-
.buildAndFail("check");
52-
assertThat(result.task(":checkFormatMain").getOutcome())
53-
.isEqualTo(TaskOutcome.FAILED);
48+
BuildResult result = this.gradleBuild.source("src/test/resources/check-bad").buildAndFail("check");
49+
assertThat(result.task(":checkFormatMain").getOutcome()).isEqualTo(TaskOutcome.FAILED);
5450
}
5551

5652
}

0 commit comments

Comments
 (0)