clean up GettMappingsResponse

Signed-off-by: Nicholas Walter Knize <nknize@apache.org>
opensearch-project · Mar 2, 2022 · 7567f4c · 7567f4c
1 parent ab637c6
commit 7567f4c
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/...er/src/main/java/org/opensearch/action/admin/indices/mapping/get/GetMappingsResponse.java b/...er/src/main/java/org/opensearch/action/admin/indices/mapping/get/GetMappingsResponse.java
@@ -65,13 +65,16 @@ public GetMappingsResponse(ImmutableOpenMap<String, MappingMetadata> mappings) {
             String index = in.readString();
             if (in.getVersion().before(Version.V_2_0_0)) {
                 int mappingCount = in.readVInt();
-                assert mappingCount == 1 || mappingCount == 0 : "Expected 0 or 1 mappings but got " + mappingCount;
-                if (mappingCount == 1) {
+                if (mappingCount == 0) {
+                    indexMapBuilder.put(index, MappingMetadata.EMPTY_MAPPINGS);
+                } else if (mappingCount == 1) {
                     String type = in.readString();
-                    assert MapperService.SINGLE_MAPPING_NAME.equals(type) : "Expected type [_doc] but got [" + type + "]";
+                    if (MapperService.SINGLE_MAPPING_NAME.equals(type) == false) {
+                        throw new IllegalStateException("Expected " + MapperService.SINGLE_MAPPING_NAME + " but got [" + type + "]");
+                    }
                     indexMapBuilder.put(index, new MappingMetadata(in));
                 } else {
-                    indexMapBuilder.put(index, MappingMetadata.EMPTY_MAPPINGS);
+                    throw new IllegalStateException("Expected 0 or 1 mappings but got: " + mappingCount);
                 }
             } else {
                 boolean hasMapping = in.readBoolean();
@@ -101,10 +104,7 @@ public void writeTo(StreamOutput out) throws IOException {
                     indexEntry.value.writeTo(out);
                 }
             } else {
-                out.writeBoolean(indexEntry.value != MappingMetadata.EMPTY_MAPPINGS);
-                if (indexEntry.value != MappingMetadata.EMPTY_MAPPINGS) {
-                    indexEntry.value.writeTo(out);
-                }
+                out.writeOptionalWriteable(indexEntry.value);
             }
         }
     }