Skip to content

Commit 34ce617

Browse files
author
elasticsearchmachine
committed
[CI] Auto commit changes from spotless
1 parent 6d438ef commit 34ce617

File tree

5 files changed

+5
-14
lines changed

5 files changed

+5
-14
lines changed

qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/upgrades/TVBackportRollingUpgradeIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
package org.elasticsearch.upgrades;
1111

1212
import com.carrotsearch.randomizedtesting.annotations.Name;
13-
import org.apache.logging.log4j.Logger;
1413

1514
public class TVBackportRollingUpgradeIT extends AbstractRollingUpgradeTestCase {
1615

1716
public TVBackportRollingUpgradeIT(@Name("upgradedNodes") int upgradedNodes) {
1817
super(upgradedNodes);
1918
}
19+
2020
// We'd be most interested to see this failing on the patch issue where 9.0 thinks it's ahead of 8.x but it's not.
2121
/*
2222
v2 TV1,TV3,

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
*/
3030
public class TransportVersions {
3131

32-
3332
static final TreeSet<Integer> ALL_VERSIONS = new TreeSet<>();
3433

3534
public static void register(TransportVersionsGroup transportVersionsGroup) {

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import java.util.ArrayList;
1313
import java.util.Collections;
1414
import java.util.List;
15-
import java.util.stream.Collectors;
1615

1716
public abstract class TransportVersionsGroup {
1817
public final TransportVersion localTV;
@@ -48,8 +47,7 @@ public TransportVersionsGroup(List<TransportVersion> transportVersions) {
4847
}
4948

5049
public boolean isCompatible(TransportVersion version) {
51-
return version.onOrAfter(localTV)
52-
|| backportTVs.stream().anyMatch(version::isPatchFrom);
50+
return version.onOrAfter(localTV) || backportTVs.stream().anyMatch(version::isPatchFrom);
5351
}
5452

5553
public List<Integer> getLocalAndBackportedTVIds() {

server/src/main/java/org/elasticsearch/action/tvbackport/TransportTVBackportAction.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,7 @@ public class TransportTVBackportAction extends TransportAction<TVBackportRequest
2323
private static final Logger logger = LogManager.getLogger(TransportTVBackportAction.class);
2424

2525
@Inject
26-
public TransportTVBackportAction(
27-
ActionFilters actionFilters,
28-
TransportService transportService
29-
) {
26+
public TransportTVBackportAction(ActionFilters actionFilters, TransportService transportService) {
3027
super(TVBackportAction.NAME, actionFilters, transportService.getTaskManager(), EsExecutors.DIRECT_EXECUTOR_SERVICE);
3128
}
3229

server/src/main/java/org/elasticsearch/versions/TestTV.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99

1010
package org.elasticsearch.versions;
1111

12-
import org.elasticsearch.TransportVersionsGroup;
1312
import org.elasticsearch.TransportVersion;
1413
import org.elasticsearch.TransportVersions;
14+
import org.elasticsearch.TransportVersionsGroup;
1515

1616
import java.util.List;
1717

@@ -23,9 +23,6 @@ public class TestTV extends TransportVersionsGroup {
2323
}
2424

2525
private TestTV() {
26-
super(List.of(
27-
new TransportVersion(9_111_0_00),
28-
new TransportVersion(8_111_0_00)
29-
));
26+
super(List.of(new TransportVersion(9_111_0_00), new TransportVersion(8_111_0_00)));
3027
}
3128
}

0 commit comments

Comments
 (0)