Skip to content

Commit d28d79d

Browse files
author
elasticsearchmachine
committed
[CI] Auto commit changes from spotless
1 parent 26689f5 commit d28d79d

File tree

5 files changed

+24
-21
lines changed

5 files changed

+24
-21
lines changed

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,9 @@ public void apply(Project project) {
1919
project.getTasks().register("generateTransportVersionData", GenerateTransportVersionDataTask.class, t -> {
2020
t.setDescription("Generate transport version data"); // todo update this to be more descriptive
2121
t.setGroup("Transport Versions"); // todo
22-
t.getDataFileDirectory().set(
23-
project.getLayout().getProjectDirectory().file("src/main/resources/org/elasticsearch/transport/"));
24-
t.getTVSetName().set("test"); //todo
22+
t.getDataFileDirectory().set(project.getLayout().getProjectDirectory().file("src/main/resources/org/elasticsearch/transport/"));
23+
t.getTVSetName().set("test"); // todo
2524
t.getReleaseVersionMajorMinor().set("9.2"); // todo
26-
});
25+
});
2726
}
2827
}

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

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
package org.elasticsearch.gradle.internal.transport;
1111

1212
import com.google.common.collect.Streams;
13+
1314
import org.gradle.api.DefaultTask;
1415
import org.gradle.api.GradleException;
1516
import org.gradle.api.file.RegularFileProperty;
@@ -65,7 +66,6 @@ public abstract class GenerateTransportVersionDataTask extends DefaultTask {
6566
@Input
6667
public abstract Property<String> getReleaseVersionMajorMinor();
6768

68-
6969
@TaskAction
7070
public void generateTransportVersionData() {
7171
var tvDataDir = Objects.requireNonNull(getDataFileDirectory().getAsFile().get());
@@ -85,7 +85,7 @@ public void generateTransportVersionData() {
8585
var priorLatestTVSetDataFileName = getPriorLatestTVSetFilename(tvDataDir, major, minor);
8686
var priorLatestTVSetData = TransportVersionUtils.getLatestTVSetData(tvDataDir, priorLatestTVSetDataFileName);
8787
if (priorLatestTVSetData == null) {
88-
// TODO Can this ever be null? No, must populate the data file for the latest branch we can no longer backport to.
88+
// TODO Can this ever be null? No, must populate the data file for the latest branch we can no longer backport to.
8989
}
9090

9191
// Bump the version number
@@ -96,7 +96,7 @@ public void generateTransportVersionData() {
9696
// This is major bump
9797
nextVersion = major * 1_000_000;
9898
} else {
99-
// This is a minor bump. Just increment as usual but from the prior version.
99+
// This is a minor bump. Just increment as usual but from the prior version.
100100
assert priorLatestTVSetData != null;
101101
nextVersion = bumpVersionNumber(priorLatestTVSetData.ids.getFirst());
102102
}
@@ -105,7 +105,6 @@ public void generateTransportVersionData() {
105105
}
106106
System.out.println("Latest transport version set: " + latestTVSetData.name + " with IDs: " + latestTVSetData.ids);
107107

108-
109108
// Load the tvSetData for the specified name.
110109
var tvSetDataFromFile = TransportVersionUtils.getTVSetData(tvDataDir, newTVName);
111110

@@ -114,16 +113,20 @@ public void generateTransportVersionData() {
114113
// Create a new data file for the case where this is a new TV
115114
new TransportVersionUtils.TransportVersionSetData(newTVName, List.of(nextVersion)).writeToDataDir(tvDataDir);
116115
} else {
117-
// This is not a new TV. We are backporting an existing TVSet.
116+
// This is not a new TV. We are backporting an existing TVSet.
118117
// Check to ensure that there isn't already a TV number for this change (e.g. if this task has been run twice).
119118
var existingIDsForReleaseVersion = tvSetDataFromFile.ids.stream().filter(id -> {
120119
var priorLatestID = priorLatestTVSetData.ids.getFirst();
121120
var latestID = latestTVSetData.ids.getFirst();
122121
return priorLatestID < id && id < latestID;
123122
}).toList();
124123
if (existingIDsForReleaseVersion.isEmpty() == false) {
125-
throw new GradleException("TransportVersion already exists for this release! Release version: " +
126-
majorMinor + "TransportVersion Id: " + existingIDsForReleaseVersion.stream().findFirst());
124+
throw new GradleException(
125+
"TransportVersion already exists for this release! Release version: "
126+
+ majorMinor
127+
+ "TransportVersion Id: "
128+
+ existingIDsForReleaseVersion.stream().findFirst()
129+
);
127130
}
128131

129132
// Update the existing data file for the backport.
@@ -141,8 +144,7 @@ public void generateTransportVersionData() {
141144
);
142145
}
143146

144-
145-
// TODO account for bumping majors. Need to make a new data file too.
147+
// TODO account for bumping majors. Need to make a new data file too.
146148
private static int bumpVersionNumber(int versionNumber) {
147149
var main = false; // TODO how do we know if we are on main?
148150

@@ -184,7 +186,10 @@ private static String getPriorLatestTVSetFilename(File tvDataDir, int major, int
184186
var localMajor = Integer.parseInt(matcher.group(1));
185187
var localMinor = Integer.parseInt(matcher.group(2));
186188
return localMajor == major - 1 ? Stream.of(localMinor) : Stream.empty();
187-
}).sorted().toList().getLast();
189+
})
190+
.sorted()
191+
.toList()
192+
.getLast();
188193

189194
return formatLatestTVSetFilename(major - 1, highestMinorOfPrevMajor);
190195
}

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,10 @@ public class TransportVersionUtils {
2121
public static final String LATEST_SUFFIX = "-LATEST.json";
2222
public static final String JSON_SUFFIX = ".json";
2323

24-
2524
public static class TransportVersionSetData implements Serializable {
2625
public String name;
2726
public List<Integer> ids;
2827

29-
3028
public TransportVersionSetData(String name, List<Integer> ids) {
3129
this.name = name;
3230
this.ids = ids;
@@ -51,7 +49,6 @@ public static void writeTVSetData(File tvDataDir, String filename, TransportVers
5149
}
5250
}
5351

54-
5552
public static TransportVersionSetData getLatestTVSetData(File tvDataDir, String majorMinor) {
5653
return getTVSetData(tvDataDir.toPath().resolve(majorMinor + LATEST_SUFFIX));
5754

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,12 @@ public void validateTransportVersions() throws IOException {
6262
try (var reader = new BufferedReader(new FileReader(tvSetDeclaredNamesFile))) {
6363
reader.lines().forEach(declaredName -> {
6464
if (tvSetNamesInDataFiles.contains(declaredName) == false) {
65-
throw new RuntimeException("TransportVersionSetData.get(\"" + declaredName + "\") was used, but lacks a" +
66-
" data file with a corresponding transport version. This can be generated with the <TODO> task"); //TODO
65+
throw new RuntimeException(
66+
"TransportVersionSetData.get(\""
67+
+ declaredName
68+
+ "\") was used, but lacks a"
69+
+ " data file with a corresponding transport version. This can be generated with the <TODO> task"
70+
); // TODO
6771
}
6872
});
6973
}

server/src/main/java/org/elasticsearch/TransportVersions.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -319,8 +319,6 @@ static TransportVersion def(int id) {
319319
public static final TransportVersion ML_INFERENCE_SAGEMAKER_ELASTIC = def(9_106_0_00);
320320
public static final TransportVersion SPARSE_VECTOR_FIELD_PRUNING_OPTIONS = def(9_107_0_00);
321321

322-
323-
324322
/*
325323
* STOP! READ THIS FIRST! No, really,
326324
* ____ _____ ___ ____ _ ____ _____ _ ____ _____ _ _ ___ ____ _____ ___ ____ ____ _____ _

0 commit comments

Comments
 (0)