Skip to content

Commit e607a7f

Browse files
elasticsearchmachinejozala
authored andcommitted
[CI] Auto commit changes from spotless
1 parent 42c682e commit e607a7f

File tree

4 files changed

+6
-12
lines changed

4 files changed

+6
-12
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ private Map<Version, UnreleasedVersionInfo> computeUnreleased(List<DevelopmentBr
158158
DevelopmentBranch previousMinorBranch = previousMinorBranches.get(i);
159159
result.put(
160160
previousMinorBranch.version(),
161-
new UnreleasedVersionInfo(previousMinorBranch.version(), previousMinorBranch.name(), ":distribution:bwc:minor" + (i+1))
161+
new UnreleasedVersionInfo(previousMinorBranch.version(), previousMinorBranch.name(), ":distribution:bwc:minor" + (i + 1))
162162
);
163163
}
164164

@@ -167,7 +167,7 @@ private Map<Version, UnreleasedVersionInfo> computeUnreleased(List<DevelopmentBr
167167
DevelopmentBranch previousMajorBranch = previousMajorBranches.get(i);
168168
result.put(
169169
previousMajorBranch.version(),
170-
new UnreleasedVersionInfo(previousMajorBranch.version(), previousMajorBranch.name(), ":distribution:bwc:major" + (i+1))
170+
new UnreleasedVersionInfo(previousMajorBranch.version(), previousMajorBranch.name(), ":distribution:bwc:major" + (i + 1))
171171
);
172172
}
173173

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

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

1212
import com.fasterxml.jackson.databind.JsonNode;
13-
1413
import com.fasterxml.jackson.databind.ObjectMapper;
1514

1615
import org.elasticsearch.gradle.Version;
@@ -36,12 +35,7 @@ public List<DevelopmentBranch> parse(byte[] bytes) {
3635
try {
3736
JsonNode json = objectMapper.readTree(bytes);
3837
for (JsonNode node : json.get("branches")) {
39-
branches.add(
40-
new DevelopmentBranch(
41-
node.get("branch").asText(),
42-
Version.fromString(node.get("version").asText())
43-
)
44-
);
38+
branches.add(new DevelopmentBranch(node.get("branch").asText(), Version.fromString(node.get("version").asText())));
4539
}
4640
} catch (IOException e) {
4741
throw new UncheckedIOException("Failed to parse content of branches.json", e);

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,8 @@ private BwcVersions resolveBwcVersions() {
204204
}
205205

206206
private List<DevelopmentBranch> getDevelopmentBranches() {
207-
String branchesFileLocation = project.getProviders().gradleProperty(BRANCHES_FILE_LOCATION_PROPERTY)
207+
String branchesFileLocation = project.getProviders()
208+
.gradleProperty(BRANCHES_FILE_LOCATION_PROPERTY)
208209
.getOrElse(DEFAULT_BRANCHES_FILE_URL);
209210
LOGGER.info("Reading branches.json from {}", branchesFileLocation);
210211
byte[] branchesBytes;

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,7 @@ public void executeTask() throws IOException {
133133

134134
private List<DevelopmentBranch> readBranches(File branchesFile) {
135135
if (branchesFile.isFile() == false) {
136-
throw new InvalidUserDataException("File branches.json has not been found in " +
137-
branchesFile.getAbsolutePath());
136+
throw new InvalidUserDataException("File branches.json has not been found in " + branchesFile.getAbsolutePath());
138137
}
139138

140139
try {

0 commit comments

Comments
 (0)