Skip to content

Commit 6254fe9

Browse files
author
elasticsearchmachine
committed
[CI] Auto commit changes from spotless
1 parent 90c6fef commit 6254fe9

File tree

7 files changed

+376
-369
lines changed

7 files changed

+376
-369
lines changed

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

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,15 @@ public class CheckTransportVersionPlugin implements Plugin<Project> {
2020
@Override
2121
public void apply(Project project) {
2222
// TODO figure out what the classpath needs to be to be able to scan the server classes
23-
// Does this need to be a lib (to limit scanning by making this a jar, to exclude gradle)? Ask Mark
23+
// Does this need to be a lib (to limit scanning by making this a jar, to exclude gradle)? Ask Mark
2424
// "/Users/john.verwolf/code/elasticsearch/build-tools-internal/build/classes/java/main"
2525

26-
final var checkTransportVersion = project.getTasks().register(
27-
"checkTransportVersion",
28-
CheckTransportVersionTask.class,
29-
t -> {
30-
SourceSet mainSourceSet = GradleUtils.getJavaSourceSets(project).findByName(SourceSet.MAIN_SOURCE_SET_NAME);
31-
FileCollection compiledPluginClasses = mainSourceSet.getOutput().getClassesDirs();
32-
t.getClassDirs().set(compiledPluginClasses);
26+
final var checkTransportVersion = project.getTasks().register("checkTransportVersion", CheckTransportVersionTask.class, t -> {
27+
SourceSet mainSourceSet = GradleUtils.getJavaSourceSets(project).findByName(SourceSet.MAIN_SOURCE_SET_NAME);
28+
FileCollection compiledPluginClasses = mainSourceSet.getOutput().getClassesDirs();
29+
t.getClassDirs().set(compiledPluginClasses);
3330

34-
t.getOutputFile().set(project.getLayout().getBuildDirectory().file("generated-transport-info/transport-version-set-names.txt"));
35-
}
36-
);
31+
t.getOutputFile().set(project.getLayout().getBuildDirectory().file("generated-transport-info/transport-version-set-names.txt"));
32+
});
3733
}
3834
}
39-

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

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public abstract class CheckTransportVersionTask extends DefaultTask {
5555

5656
@TaskAction
5757
public void checkTransportVersion() {
58-
///Users/john.verwolf/code/elasticsearch/build-tools-internal/build/classes/java/main
58+
/// Users/john.verwolf/code/elasticsearch/build-tools-internal/build/classes/java/main
5959

6060
var tvNames = getTVDeclarationNames(getClassDirs().get().getFiles());
6161
File file = new File(getOutputFile().get().getAsFile().getAbsolutePath());
@@ -70,40 +70,51 @@ public void checkTransportVersion() {
7070

7171
public static Set<String> getTVDeclarationNames(Collection<File> classDirs) {
7272

73-
7473
var javaFiles = findJavaFiles(classDirs);
7574

7675
var results = new HashSet<String>();
77-
for (
78-
File javaFile : javaFiles) {
76+
for (File javaFile : javaFiles) {
7977
// Print the path of each Java file found
80-
// System.out.println("Found Java file: " + javaFile.getAbsolutePath());
78+
// System.out.println("Found Java file: " + javaFile.getAbsolutePath());
8179
try (InputStream inputStream = new FileInputStream(javaFile)) {
8280

8381
ClassVisitor classVisitor = new ClassVisitor(Opcodes.ASM9) {
8482
@Override
8583
public MethodVisitor visitMethod(int access, String name, String descriptor, String signature, String[] exceptions) {
86-
// System.out.println("name: " + name + " descriptor: " + descriptor + " signature: " + signature);
84+
// System.out.println("name: " + name + " descriptor: " + descriptor + " signature: " + signature);
8785

8886
return new MethodNode(Opcodes.ASM9, access, name, descriptor, signature, exceptions) {
8987

9088
@Override
9189
public void visitMethodInsn(int opcode, String owner, String name, String descriptor, boolean isInterface) {
92-
// if (owner.equals(TRANSPORT_VERSION_CLASS) && name.equals("<init>")) {
90+
// if (owner.equals(TRANSPORT_VERSION_CLASS) && name.equals("<init>")) {
9391
if (owner.equals(TRANSPORT_VERSION_SET_CLASS) && name.equals("get")) {
94-
// System.out.println("Potato: opcode: " + opcode + " owner: " + owner + " name: " + name);
92+
// System.out.println("Potato: opcode: " + opcode + " owner: " + owner + " name: " + name);
9593
var abstractInstruction = this.instructions.getLast();
9694
if (abstractInstruction instanceof LdcInsnNode ldcInsnNode) {
9795
if (ldcInsnNode.cst instanceof String tvName && tvName.isEmpty() == false) {
9896
System.out.println("constant: " + tvName);
9997
results.add(tvName);
10098
} else {
101-
System.out.println("Transport Versions must be declared with a constant string. " +
102-
"file: " + javaFile.getPath());
99+
System.out.println(
100+
"Transport Versions must be declared with a constant string. "
101+
+ "file: "
102+
+ javaFile.getPath()
103+
);
103104
}
104105
}
105-
System.out.println("visitMethodInsn: opcode: " + opcode + " owner: " + owner
106-
+ " name: " + name + " descriptor: " + descriptor + " file: " + javaFile.getPath());
106+
System.out.println(
107+
"visitMethodInsn: opcode: "
108+
+ opcode
109+
+ " owner: "
110+
+ owner
111+
+ " name: "
112+
+ name
113+
+ " descriptor: "
114+
+ descriptor
115+
+ " file: "
116+
+ javaFile.getPath()
117+
);
107118
}
108119
super.visitMethodInsn(opcode, owner, name, descriptor, isInterface);
109120
}

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

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,13 @@ public class GenerateTransportVersionManifestPlugin implements Plugin<Project> {
1717

1818
@Override
1919
public void apply(Project project) {
20-
var transportVersionManifestTask = project.getTasks().register(
21-
"generateTransportVersionManifest",
22-
GenerateTransportVersionManifestTask.class,
23-
t -> {
20+
var transportVersionManifestTask = project.getTasks()
21+
.register("generateTransportVersionManifest", GenerateTransportVersionManifestTask.class, t -> {
2422
var dir = project.getLayout().getProjectDirectory().file("src/main/resources/org/elasticsearch/transport/");
2523
t.getManifestDirectory().set(dir);
26-
t.getManifestFile().set(project.getLayout().getBuildDirectory().file("generated-transport-info/transport-versions-files-manifest.txt"));
27-
}
28-
);
24+
t.getManifestFile()
25+
.set(project.getLayout().getBuildDirectory().file("generated-transport-info/transport-versions-files-manifest.txt"));
26+
});
2927

3028
// Add the manifest file to the jar
3129
project.getTasks().withType(ProcessResources.class).named("processResources").configure(task -> {

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,12 @@
2020

2121
public abstract class GenerateTransportVersionManifestTask extends DefaultTask {
2222

23-
2423
@InputDirectory
2524
public abstract RegularFileProperty getManifestDirectory();
2625

2726
@OutputFile
2827
public abstract RegularFileProperty getManifestFile();
2928

30-
3129
@TaskAction
3230
public void generateTransportVersionManifest() {
3331
// 1. Go through the directory returned by getManifestDirectory();

0 commit comments

Comments
 (0)