[1.x] Remove remaining Flavor Serialization (#1751) (#1757)

* [Remove] Remaining Flavor Serialization (#1751) This commit removes unnecessary serialization of unused flavor variable in build metadata from V_1_3_0+ Signed-off-by: Nicholas Walter Knize <[email protected]> * change flavor version check to V_1_3_0 This commit changes the flavor serialization check in Build from V_2_0_0 to V_1_3_0. Signed-off-by: Nicholas Walter Knize <[email protected]>
opensearch-project · Jan 6, 2022 · 3f28311 · 3f28311
1 parent 7e15a83
commit 3f28311
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/server/src/main/java/org/opensearch/Build.java b/server/src/main/java/org/opensearch/Build.java
@@ -201,7 +201,6 @@ public String date() {
 
     public static Build readBuild(StreamInput in) throws IOException {
         final String distribution;
-        final String flavor;
         final Type type;
         // the following is new for opensearch: we write the distribution to support any "forks"
         if (in.getVersion().onOrAfter(Version.V_1_0_0)) {
@@ -215,8 +214,8 @@ public static Build readBuild(StreamInput in) throws IOException {
         // TODO - clean this up when OSS flavor is removed in all of the code base
         // (Integ test zip still write OSS as distribution)
         // See issue: https://github.com/opendistro-for-elasticsearch/search/issues/159
-        if (in.getVersion().onOrAfter(LegacyESVersion.V_6_3_0)) {
-            flavor = in.readString();
+        if (in.getVersion().onOrAfter(LegacyESVersion.V_6_3_0) && in.getVersion().before(Version.V_1_3_0)) {
+            String flavor = in.readString();
         }
         if (in.getVersion().onOrAfter(LegacyESVersion.V_6_3_0)) {
             // be lenient when reading on the wire, the enumeration values from other versions might be different than what we know
@@ -246,8 +245,7 @@ public static void writeBuild(Build build, StreamOutput out) throws IOException
         // The following block is kept for existing BWS tests to pass.
         // TODO - clean up this code when we remove all v6 bwc tests.
         // TODO - clean this up when OSS flavor is removed in all of the code base
-        // See issue: https://github.com/opendistro-for-elasticsearch/search/issues/159
-        if (out.getVersion().onOrAfter(LegacyESVersion.V_6_3_0)) {
+        if (out.getVersion().onOrAfter(LegacyESVersion.V_6_3_0) && out.getVersion().before(Version.V_1_3_0)) {
             out.writeString("oss");
         }
         if (out.getVersion().onOrAfter(LegacyESVersion.V_6_3_0)) {