|
@@ -7,7 +7,7 @@
|
|
|
|
|
|
package org.elasticsearch.xpack.application.search;
|
|
package org.elasticsearch.xpack.application.search;
|
|
|
|
|
|
-import org.elasticsearch.Version;
|
|
|
|
|
|
+import org.elasticsearch.TransportVersion;
|
|
import org.elasticsearch.common.bytes.BytesArray;
|
|
import org.elasticsearch.common.bytes.BytesArray;
|
|
import org.elasticsearch.common.bytes.BytesReference;
|
|
import org.elasticsearch.common.bytes.BytesReference;
|
|
import org.elasticsearch.common.io.stream.BytesStreamOutput;
|
|
import org.elasticsearch.common.io.stream.BytesStreamOutput;
|
|
@@ -49,7 +49,7 @@ public class SearchApplicationTests extends ESTestCase {
|
|
SearchApplication testInstance = SearchApplicationTestUtils.randomSearchApplication();
|
|
SearchApplication testInstance = SearchApplicationTestUtils.randomSearchApplication();
|
|
assertTransportSerialization(testInstance);
|
|
assertTransportSerialization(testInstance);
|
|
assertXContent(testInstance, randomBoolean());
|
|
assertXContent(testInstance, randomBoolean());
|
|
- assertIndexSerialization(testInstance, Version.CURRENT);
|
|
|
|
|
|
+ assertIndexSerialization(testInstance);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -128,24 +128,19 @@ public class SearchApplicationTests extends ESTestCase {
|
|
}
|
|
}
|
|
|
|
|
|
private SearchApplication assertTransportSerialization(SearchApplication testInstance) throws IOException {
|
|
private SearchApplication assertTransportSerialization(SearchApplication testInstance) throws IOException {
|
|
- return assertTransportSerialization(testInstance, Version.CURRENT);
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- private SearchApplication assertTransportSerialization(SearchApplication testInstance, Version version) throws IOException {
|
|
|
|
- SearchApplication deserializedInstance = copyInstance(testInstance, version);
|
|
|
|
|
|
+ SearchApplication deserializedInstance = copyInstance(testInstance);
|
|
assertNotSame(testInstance, deserializedInstance);
|
|
assertNotSame(testInstance, deserializedInstance);
|
|
assertThat(testInstance, equalTo(deserializedInstance));
|
|
assertThat(testInstance, equalTo(deserializedInstance));
|
|
return deserializedInstance;
|
|
return deserializedInstance;
|
|
}
|
|
}
|
|
|
|
|
|
- private SearchApplication assertIndexSerialization(SearchApplication testInstance, Version version) throws IOException {
|
|
|
|
|
|
+ private SearchApplication assertIndexSerialization(SearchApplication testInstance) throws IOException {
|
|
final SearchApplication deserializedInstance;
|
|
final SearchApplication deserializedInstance;
|
|
try (BytesStreamOutput output = new BytesStreamOutput()) {
|
|
try (BytesStreamOutput output = new BytesStreamOutput()) {
|
|
- output.setTransportVersion(version.transportVersion);
|
|
|
|
SearchApplicationIndexService.writeSearchApplicationBinaryWithVersion(
|
|
SearchApplicationIndexService.writeSearchApplicationBinaryWithVersion(
|
|
testInstance,
|
|
testInstance,
|
|
output,
|
|
output,
|
|
- version.minimumCompatibilityVersion()
|
|
|
|
|
|
+ TransportVersion.MINIMUM_COMPATIBLE
|
|
);
|
|
);
|
|
try (
|
|
try (
|
|
StreamInput in = new NamedWriteableAwareStreamInput(
|
|
StreamInput in = new NamedWriteableAwareStreamInput(
|
|
@@ -161,7 +156,7 @@ public class SearchApplicationTests extends ESTestCase {
|
|
return deserializedInstance;
|
|
return deserializedInstance;
|
|
}
|
|
}
|
|
|
|
|
|
- private SearchApplication copyInstance(SearchApplication instance, Version version) throws IOException {
|
|
|
|
- return copyWriteable(instance, namedWriteableRegistry, SearchApplication::new, version.transportVersion);
|
|
|
|
|
|
+ private SearchApplication copyInstance(SearchApplication instance) throws IOException {
|
|
|
|
+ return copyWriteable(instance, namedWriteableRegistry, SearchApplication::new);
|
|
}
|
|
}
|
|
}
|
|
}
|