|
16 | 16 |
|
17 | 17 | package org.springframework.boot.build; |
18 | 18 |
|
19 | | -import java.io.File; |
20 | 19 | import java.util.Arrays; |
21 | 20 | import java.util.Collections; |
22 | 21 | import java.util.List; |
23 | 22 | import java.util.Map; |
24 | 23 | import java.util.Set; |
25 | 24 | import java.util.TreeMap; |
26 | 25 | import java.util.stream.Collectors; |
27 | | -import java.util.stream.Stream; |
28 | 26 |
|
29 | 27 | import io.spring.javaformat.gradle.SpringJavaFormatPlugin; |
30 | 28 | import io.spring.javaformat.gradle.tasks.CheckFormat; |
31 | 29 | import io.spring.javaformat.gradle.tasks.Format; |
32 | | -import org.gradle.api.Action; |
33 | | -import org.gradle.api.GradleException; |
34 | 30 | import org.gradle.api.JavaVersion; |
35 | 31 | import org.gradle.api.Project; |
36 | | -import org.gradle.api.Task; |
37 | 32 | import org.gradle.api.artifacts.Configuration; |
38 | 33 | import org.gradle.api.artifacts.ConfigurationContainer; |
39 | 34 | import org.gradle.api.artifacts.Dependency; |
40 | 35 | import org.gradle.api.artifacts.DependencySet; |
41 | | -import org.gradle.api.file.FileTree; |
42 | 36 | import org.gradle.api.plugins.JavaBasePlugin; |
43 | 37 | import org.gradle.api.plugins.JavaPlugin; |
44 | 38 | import org.gradle.api.plugins.JavaPluginExtension; |
@@ -184,10 +178,7 @@ private boolean isCi() { |
184 | 178 | } |
185 | 179 |
|
186 | 180 | private void configureJavadocConventions(Project project) { |
187 | | - project.getTasks().withType(Javadoc.class, (javadoc) -> { |
188 | | - javadoc.getOptions().source("1.8").encoding("UTF-8"); |
189 | | - javadoc.doFirst(new VerifyPackageInfo()); |
190 | | - }); |
| 181 | + project.getTasks().withType(Javadoc.class, (javadoc) -> javadoc.getOptions().source("1.8").encoding("UTF-8")); |
191 | 182 | } |
192 | 183 |
|
193 | 184 | private void configureJavaConventions(Project project) { |
@@ -273,22 +264,4 @@ private void createProhibitedDependenciesCheck(Configuration classpath, Project |
273 | 264 | project.getTasks().getByName(JavaBasePlugin.CHECK_TASK_NAME).dependsOn(checkClasspathForProhibitedDependencies); |
274 | 265 | } |
275 | 266 |
|
276 | | - private static final class VerifyPackageInfo implements Action<Task> { |
277 | | - |
278 | | - @Override |
279 | | - public void execute(Task javadoc) { |
280 | | - FileTree source = ((Javadoc) javadoc).getSource(); |
281 | | - Stream<File> dirs = source.getFiles().stream().map((file) -> file.getParentFile()).distinct(); |
282 | | - Set<File> missingPackageInfo = dirs.map((file) -> new File(file, "package-info.java")) |
283 | | - .filter((packageInfo) -> !packageInfo.isFile()).collect(Collectors.toSet()); |
284 | | - if (!missingPackageInfo.isEmpty()) { |
285 | | - StringBuilder message = new StringBuilder( |
286 | | - "A package-info.java file was missing from the following directories:\n"); |
287 | | - missingPackageInfo.forEach((packageInfo) -> message.append("\t" + packageInfo.getParentFile() + "\n")); |
288 | | - throw new GradleException(message.toString()); |
289 | | - } |
290 | | - } |
291 | | - |
292 | | - } |
293 | | - |
294 | 267 | } |
0 commit comments