diff options
author | Harald Musum <musum@oath.com> | 2018-10-23 07:56:05 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-23 07:56:05 +0200 |
commit | bb42d0c6f30de25b9ca6b8e232b6920aeb51a7d1 (patch) | |
tree | 0de964ad5fbd29021a4797f09afb856e3ccdd474 /document | |
parent | 1cb09174cb579936eae49f7db632113795b0666a (diff) |
Revert "Disallow complex types as keys for nested types in arrays"
Diffstat (limited to 'document')
-rw-r--r-- | document/src/main/java/com/yahoo/document/json/JsonSerializationHelper.java | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/document/src/main/java/com/yahoo/document/json/JsonSerializationHelper.java b/document/src/main/java/com/yahoo/document/json/JsonSerializationHelper.java index afe14cf1e6a..8e934001381 100644 --- a/document/src/main/java/com/yahoo/document/json/JsonSerializationHelper.java +++ b/document/src/main/java/com/yahoo/document/json/JsonSerializationHelper.java @@ -2,11 +2,9 @@ package com.yahoo.document.json; import com.fasterxml.jackson.core.JsonGenerator; -import com.yahoo.document.DataType; import com.yahoo.document.DocumentId; import com.yahoo.document.Field; import com.yahoo.document.PositionDataType; -import com.yahoo.document.PrimitiveDataType; import com.yahoo.document.datatypes.Array; import com.yahoo.document.datatypes.ByteFieldValue; import com.yahoo.document.datatypes.CollectionFieldValue; @@ -188,12 +186,7 @@ public class JsonSerializationHelper { generator.writeStartObject(); for (Map.Entry<K, V> entry : map.entrySet()) { - K key = entry.getKey(); - DataType keyType = key.getDataType(); - if ( ! (keyType instanceof PrimitiveDataType)) { - throw new IllegalArgumentException("Can't use complex types as keys for map fields. Type: " + keyType); - } - generator.writeFieldName(key.toString()); + generator.writeFieldName(entry.getKey().toString()); entry.getValue().serialize(null, fieldWriter); } |