Skip to content

Commit fecfd7c

Browse files
[CI] Auto commit changes from spotless
1 parent 1b6c4ff commit fecfd7c

File tree

5 files changed

+9
-20
lines changed

5 files changed

+9
-20
lines changed

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/ElasticsearchJavadocPlugin.java

+5-8
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import org.gradle.api.Project;
1717
import org.gradle.api.Task;
1818
import org.gradle.api.artifacts.Configuration;
19-
import org.gradle.api.artifacts.Dependency;
2019
import org.gradle.api.artifacts.ProjectDependency;
2120
import org.gradle.api.plugins.BasePluginExtension;
2221
import org.gradle.api.plugins.JavaPlugin;
@@ -25,7 +24,6 @@
2524
import org.gradle.external.javadoc.StandardJavadocDocletOptions;
2625

2726
import java.io.File;
28-
import java.util.Comparator;
2927
import java.util.List;
3028

3129
// Handle javadoc dependencies across projects. Order matters: the linksOffline for
@@ -77,12 +75,11 @@ public void execute(Task task) {
7775
}
7876

7977
private void configureJavadocForConfiguration(Project project, boolean shadow, Configuration configuration) {
80-
configuration.getAllDependencies()
81-
.configureEach(dependency -> {
82-
if(dependency instanceof ProjectDependency) {
83-
configureDependency(project, shadow, (ProjectDependency) dependency);
84-
}
85-
});
78+
configuration.getAllDependencies().configureEach(dependency -> {
79+
if (dependency instanceof ProjectDependency) {
80+
configureDependency(project, shadow, (ProjectDependency) dependency);
81+
}
82+
});
8683
}
8784

8885
private void configureDependency(Project project, boolean shadowed, ProjectDependency dep) {

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/ForbiddenPatternsPrecommitPlugin.java

+4-8
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616
import org.gradle.api.provider.ProviderFactory;
1717
import org.gradle.api.tasks.TaskProvider;
1818

19-
import java.util.stream.Collectors;
20-
2119
import javax.inject.Inject;
2220

2321
public class ForbiddenPatternsPrecommitPlugin extends PrecommitPlugin {
@@ -33,12 +31,10 @@ public ForbiddenPatternsPrecommitPlugin(ProviderFactory providerFactory) {
3331
@Override
3432
public TaskProvider<? extends Task> createTask(Project project) {
3533
return project.getTasks().register(FORBIDDEN_PATTERNS_TASK_NAME, ForbiddenPatternsTask.class, forbiddenPatternsTask -> {
36-
GradleUtils.getJavaSourceSets(project).configureEach(
37-
sourceSet -> {
38-
forbiddenPatternsTask.getSourceFolders().add(sourceSet.getAllSource());
39-
forbiddenPatternsTask.dependsOn(sourceSet.getProcessResourcesTaskName());
40-
}
41-
);
34+
GradleUtils.getJavaSourceSets(project).configureEach(sourceSet -> {
35+
forbiddenPatternsTask.getSourceFolders().add(sourceSet.getAllSource());
36+
forbiddenPatternsTask.dependsOn(sourceSet.getProcessResourcesTaskName());
37+
});
4238
forbiddenPatternsTask.getRootDir().set(project.getRootDir());
4339
});
4440
}

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/JavaModulePrecommitPlugin.java

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
import org.elasticsearch.gradle.internal.conventions.precommit.PrecommitPlugin;
1313
import org.elasticsearch.gradle.util.GradleUtils;
14-
import org.gradle.api.Action;
1514
import org.gradle.api.Project;
1615
import org.gradle.api.Task;
1716
import org.gradle.api.plugins.JavaPlugin;

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/rest/RestTestBasePlugin.java

-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
import org.gradle.api.file.FileTree;
4747
import org.gradle.api.internal.artifacts.dependencies.ProjectDependencyInternal;
4848
import org.gradle.api.plugins.JavaBasePlugin;
49-
import org.gradle.api.plugins.JvmTestSuitePlugin;
5049
import org.gradle.api.plugins.jvm.JvmTestSuiteTarget;
5150
import org.gradle.api.provider.ProviderFactory;
5251
import org.gradle.api.tasks.ClasspathNormalizer;

build-tools/src/main/java/org/elasticsearch/gradle/util/GradleUtils.java

-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
import org.gradle.api.UnknownTaskException;
1616
import org.gradle.api.artifacts.Configuration;
1717
import org.gradle.api.artifacts.ExternalModuleDependency;
18-
import org.gradle.api.artifacts.ModuleDependency;
19-
import org.gradle.api.artifacts.ProjectDependency;
2018
import org.gradle.api.plugins.JavaBasePlugin;
2119
import org.gradle.api.plugins.JavaPlugin;
2220
import org.gradle.api.plugins.JavaPluginExtension;

0 commit comments

Comments
 (0)