Skip to content

Commit 1e84e0d

Browse files
authored
Remove unused Transport#version field (#120202) (#120217)
1 parent 7325c6c commit 1e84e0d

File tree

6 files changed

+6
-19
lines changed

6 files changed

+6
-19
lines changed

modules/transport-netty4/src/test/java/org/elasticsearch/transport/netty4/SimpleNetty4TransportTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public void executeHandshake(
7979
if (doHandshake) {
8080
super.executeHandshake(node, channel, profile, listener);
8181
} else {
82-
assert getVersion().equals(TransportVersion.current());
82+
assert version.equals(TransportVersion.current());
8383
listener.onResponse(TransportVersions.MINIMUM_COMPATIBLE);
8484
}
8585
}

server/src/main/java/org/elasticsearch/client/internal/RemoteClusterClient.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ <Request extends ActionRequest, Response extends TransportResponse> void execute
4747

4848
/**
4949
* Obtain a connection to the remote cluster for use with the {@link #execute} override that allows to specify the connection. Useful
50-
* for cases where you need to inspect {@link Transport.Connection#getVersion} before deciding the exact remote action to invoke.
50+
* for cases where you need to inspect {@link Transport.Connection#getTransportVersion} before deciding the exact remote action to
51+
* invoke.
5152
*/
5253
<Request extends ActionRequest> void getConnection(@Nullable Request request, ActionListener<Transport.Connection> listener);
5354
}

server/src/main/java/org/elasticsearch/transport/TcpTransport.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@ public abstract class TcpTransport extends AbstractLifecycleComponent implements
114114
protected final NetworkService networkService;
115115
protected final Set<ProfileSettings> profileSettingsSet;
116116
protected final boolean rstOnClose;
117-
private final TransportVersion version;
118117
private final CircuitBreakerService circuitBreakerService;
119118

120119
private final ConcurrentMap<String, BoundTransportAddress> profileBoundAddresses = newConcurrentMap();
@@ -148,7 +147,6 @@ public TcpTransport(
148147
) {
149148
this.settings = settings;
150149
this.profileSettingsSet = getProfileSettings(settings);
151-
this.version = version;
152150
this.threadPool = threadPool;
153151
this.circuitBreakerService = circuitBreakerService;
154152
this.networkService = networkService;
@@ -199,11 +197,6 @@ public TcpTransport(
199197
);
200198
}
201199

202-
@Override
203-
public TransportVersion getVersion() {
204-
return version;
205-
}
206-
207200
public StatsTracker getStatsTracker() {
208201
return statsTracker;
209202
}

server/src/main/java/org/elasticsearch/transport/Transport.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,6 @@ default boolean isSecure() {
5050
return false;
5151
}
5252

53-
default TransportVersion getVersion() {
54-
return TransportVersion.current();
55-
}
56-
5753
/**
5854
* The address the transport is bound on.
5955
*/

test/framework/src/main/java/org/elasticsearch/test/transport/StubbableTransport.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -138,11 +138,6 @@ Transport getDelegate() {
138138
return delegate;
139139
}
140140

141-
@Override
142-
public TransportVersion getVersion() {
143-
return delegate.getVersion();
144-
}
145-
146141
@Override
147142
public void setMessageListener(TransportMessageListener listener) {
148143
delegate.setMessageListener(listener);

x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/transport/netty4/SimpleSecurityNetty4ServerTransportTests.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1016,6 +1016,7 @@ private TcpChannel getSingleChannel(Transport.Connection connection) {
10161016

10171017
static class TestSecurityNetty4ServerTransport extends SecurityNetty4ServerTransport {
10181018
private final boolean doHandshake;
1019+
private final TransportVersion version;
10191020

10201021
TestSecurityNetty4ServerTransport(
10211022
Settings settings,
@@ -1043,6 +1044,7 @@ static class TestSecurityNetty4ServerTransport extends SecurityNetty4ServerTrans
10431044
sharedGroupFactory,
10441045
mock(CrossClusterAccessAuthenticationService.class)
10451046
);
1047+
this.version = version;
10461048
this.doHandshake = doHandshake;
10471049
}
10481050

@@ -1056,7 +1058,7 @@ public void executeHandshake(
10561058
if (doHandshake) {
10571059
super.executeHandshake(node, channel, profile, listener);
10581060
} else {
1059-
assert getVersion().equals(TransportVersion.current());
1061+
assert version.equals(TransportVersion.current());
10601062
listener.onResponse(TransportVersions.MINIMUM_COMPATIBLE);
10611063
}
10621064
}

0 commit comments

Comments
 (0)