Skip to content

Commit 54e95a0

Browse files
committed
Address code review comments, added @PathSensitive(PathSensitivity.RELATIVE) where applicable
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
1 parent 4815eff commit 54e95a0

File tree

7 files changed

+29
-0
lines changed

7 files changed

+29
-0
lines changed

buildSrc/src/main/groovy/org/opensearch/gradle/precommit/LicenseHeadersTask.groovy

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ import org.gradle.api.tasks.Input
3737
import org.gradle.api.tasks.InputFiles
3838
import org.gradle.api.tasks.IgnoreEmptyDirectories;
3939
import org.gradle.api.tasks.OutputFile
40+
import org.gradle.api.tasks.PathSensitive
41+
import org.gradle.api.tasks.PathSensitivity
4042
import org.gradle.api.tasks.SkipWhenEmpty
4143

4244
import java.nio.file.Files
@@ -80,6 +82,7 @@ class LicenseHeadersTask extends AntTask {
8082
@InputFiles
8183
@SkipWhenEmpty
8284
@IgnoreEmptyDirectories
85+
@PathSensitive(PathSensitivity.RELATIVE)
8386
List<FileCollection> getJavaFiles() {
8487
return project.sourceSets.collect({it.allJava})
8588
}

buildSrc/src/main/java/org/opensearch/gradle/precommit/FilePermissionsTask.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@
4949
import org.gradle.api.tasks.IgnoreEmptyDirectories;
5050
import org.gradle.api.tasks.InputFiles;
5151
import org.gradle.api.tasks.OutputFile;
52+
import org.gradle.api.tasks.PathSensitive;
53+
import org.gradle.api.tasks.PathSensitivity;
5254
import org.gradle.api.tasks.SkipWhenEmpty;
5355
import org.gradle.api.tasks.StopExecutionException;
5456
import org.gradle.api.tasks.TaskAction;
@@ -94,6 +96,7 @@ private static boolean isExecutableFile(File file) {
9496
@InputFiles
9597
@SkipWhenEmpty
9698
@IgnoreEmptyDirectories
99+
@PathSensitive(PathSensitivity.RELATIVE)
97100
public FileCollection getFiles() {
98101
return GradleUtils.getJavaSourceSets(getProject())
99102
.stream()

buildSrc/src/main/java/org/opensearch/gradle/precommit/ForbiddenPatternsTask.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@
4141
import org.gradle.api.tasks.Input;
4242
import org.gradle.api.tasks.InputFiles;
4343
import org.gradle.api.tasks.OutputFile;
44+
import org.gradle.api.tasks.PathSensitive;
45+
import org.gradle.api.tasks.PathSensitivity;
4446
import org.gradle.api.tasks.SkipWhenEmpty;
4547
import org.gradle.api.tasks.TaskAction;
4648
import org.gradle.api.tasks.util.PatternFilterable;
@@ -102,6 +104,7 @@ public ForbiddenPatternsTask() {
102104
@InputFiles
103105
@SkipWhenEmpty
104106
@IgnoreEmptyDirectories
107+
@PathSensitive(PathSensitivity.RELATIVE)
105108
public FileCollection getFiles() {
106109
return getProject().getConvention()
107110
.getPlugin(JavaPluginConvention.class)

buildSrc/src/main/java/org/opensearch/gradle/test/rest/CopyRestApiTask.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@
4747
import org.gradle.api.tasks.Input;
4848
import org.gradle.api.tasks.InputFiles;
4949
import org.gradle.api.tasks.OutputDirectory;
50+
import org.gradle.api.tasks.PathSensitive;
51+
import org.gradle.api.tasks.PathSensitivity;
5052
import org.gradle.api.tasks.SkipWhenEmpty;
5153
import org.gradle.api.tasks.SourceSet;
5254
import org.gradle.api.tasks.TaskAction;
@@ -116,6 +118,7 @@ public boolean isSkipHasRestTestCheck() {
116118
@IgnoreEmptyDirectories
117119
@SkipWhenEmpty
118120
@InputFiles
121+
@PathSensitive(PathSensitivity.RELATIVE)
119122
public FileTree getInputDir() {
120123
FileTree coreFileTree = null;
121124
boolean projectHasYamlRestTests = skipHasRestTestCheck || projectHasYamlRestTests();

buildSrc/src/main/java/org/opensearch/gradle/test/rest/CopyRestTestsTask.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@
4747
import org.gradle.api.tasks.Input;
4848
import org.gradle.api.tasks.InputFiles;
4949
import org.gradle.api.tasks.OutputDirectory;
50+
import org.gradle.api.tasks.PathSensitive;
51+
import org.gradle.api.tasks.PathSensitivity;
5052
import org.gradle.api.tasks.SkipWhenEmpty;
5153
import org.gradle.api.tasks.SourceSet;
5254
import org.gradle.api.tasks.TaskAction;
@@ -108,6 +110,7 @@ String getSourceSetName() {
108110
@IgnoreEmptyDirectories
109111
@SkipWhenEmpty
110112
@InputFiles
113+
@PathSensitive(PathSensitivity.RELATIVE)
111114
public FileTree getInputDir() {
112115
FileTree coreFileTree = null;
113116
if (includeCore.get().isEmpty() == false) {

gradle/missing-javadoc.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
*/
88

99
import javax.annotation.Nullable
10+
import org.gradle.api.tasks.PathSensitive;
11+
import org.gradle.api.tasks.PathSensitivity;
1012
import org.gradle.internal.jvm.Jvm
1113

1214
/**
@@ -179,6 +181,7 @@ class MissingJavadocTask extends DefaultTask {
179181
@InputFiles
180182
@SkipWhenEmpty
181183
@IgnoreEmptyDirectories
184+
@PathSensitive(PathSensitivity.RELATIVE)
182185
SourceDirectorySet srcDirSet;
183186

184187
@OutputDirectory

gradle/wrapper/gradle-wrapper.properties

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
#
2+
# SPDX-License-Identifier: Apache-2.0
3+
#
4+
# The OpenSearch Contributors require contributions made to
5+
# this file be licensed under the Apache-2.0 license or a
6+
# compatible open source license.
7+
#
8+
# Modifications Copyright OpenSearch Contributors. See
9+
# GitHub history for details.
10+
#
11+
112
distributionBase=GRADLE_USER_HOME
213
distributionPath=wrapper/dists
314
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-all.zip

0 commit comments

Comments
 (0)