Browse Source

Update RemoteConnectionInfo version constants (#52780)

Recent work was implemented to add proxy mode support for remote
conneciton info. This work has been backported to 7.6. This commit
updates the version constants on master to reflect this fact.
Tim Brooks 5 years ago
parent
commit
18f5e5a370

+ 2 - 4
server/src/main/java/org/elasticsearch/transport/RemoteConnectionInfo.java

@@ -51,8 +51,7 @@ public final class RemoteConnectionInfo implements ToXContentFragment, Writeable
     }
     }
 
 
     public RemoteConnectionInfo(StreamInput input) throws IOException {
     public RemoteConnectionInfo(StreamInput input) throws IOException {
-        // TODO: Change to 7.6 after backport
-        if (input.getVersion().onOrAfter(Version.V_8_0_0)) {
+        if (input.getVersion().onOrAfter(Version.V_7_6_0)) {
             RemoteConnectionStrategy.ConnectionStrategy mode = input.readEnum(RemoteConnectionStrategy.ConnectionStrategy.class);
             RemoteConnectionStrategy.ConnectionStrategy mode = input.readEnum(RemoteConnectionStrategy.ConnectionStrategy.class);
             modeInfo = mode.getReader().read(input);
             modeInfo = mode.getReader().read(input);
             initialConnectionTimeout = input.readTimeValue();
             initialConnectionTimeout = input.readTimeValue();
@@ -91,8 +90,7 @@ public final class RemoteConnectionInfo implements ToXContentFragment, Writeable
 
 
     @Override
     @Override
     public void writeTo(StreamOutput out) throws IOException {
     public void writeTo(StreamOutput out) throws IOException {
-        // TODO: Change to 7.6 after backport
-        if (out.getVersion().onOrAfter(Version.V_8_0_0)) {
+        if (out.getVersion().onOrAfter(Version.V_7_6_0)) {
             out.writeEnum(modeInfo.modeType());
             out.writeEnum(modeInfo.modeType());
             modeInfo.writeTo(out);
             modeInfo.writeTo(out);
             out.writeTimeValue(initialConnectionTimeout);
             out.writeTimeValue(initialConnectionTimeout);