diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2019-08-22 15:07:59 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2019-08-22 15:35:16 +0200 |
commit | 302dff5c91b80c6badfa50389b67291b6f3bc762 (patch) | |
tree | aea9d39cd19fa36a90fb4acc9cf8bbda004b3432 | |
parent | 5e6a6f708ea01f05b27795ca77fa79dc5d57a6aa (diff) |
Deprecate getId(version) and remove usage.
5 files changed, 11 insertions, 10 deletions
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/SearchImporterTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/SearchImporterTestCase.java index 6a49f446ff6..66ff1877994 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/SearchImporterTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/SearchImporterTestCase.java @@ -181,9 +181,9 @@ public class SearchImporterTestCase extends SearchDefinitionTestCase { public void testIdImporting() throws IOException, ParseException { Search search = SearchBuilder.buildFromFile("src/test/examples/strange.sd"); SDField idecidemyide=(SDField) search.getDocument().getField("idecidemyide"); - assertEquals(5,idecidemyide.getId(Document.SERIALIZED_VERSION)); + assertEquals(5,idecidemyide.getId()); SDField sodoi=(SDField) search.getDocument().getField("sodoi"); - assertEquals(7,sodoi.getId(Document.SERIALIZED_VERSION)); + assertEquals(7,sodoi.getId()); } } diff --git a/document/src/main/java/com/yahoo/document/BaseStructDataType.java b/document/src/main/java/com/yahoo/document/BaseStructDataType.java index c7be3dd829c..282c795ce90 100755 --- a/document/src/main/java/com/yahoo/document/BaseStructDataType.java +++ b/document/src/main/java/com/yahoo/document/BaseStructDataType.java @@ -43,7 +43,7 @@ public abstract class BaseStructDataType extends StructuredDataType { type.fields = new LinkedHashMap<>(); for (Field field : fieldIds.values()) { type.fields.put(field.getName(), field); - type.fieldIds.put(field.getId(Document.SERIALIZED_VERSION), field); + type.fieldIds.put(field.getId(), field); } return type; } @@ -52,18 +52,18 @@ public abstract class BaseStructDataType extends StructuredDataType { if (fields.containsKey(field.getName())) { throw new IllegalArgumentException("Struct " + getName() + " already contains field with name " + field.getName()); } - if (fieldIds.containsKey(field.getId(Document.SERIALIZED_VERSION))) { - throw new IllegalArgumentException("Struct " + getName() + " already contains field with id " + field.getId(Document.SERIALIZED_VERSION)); + if (fieldIds.containsKey(field.getId())) { + throw new IllegalArgumentException("Struct " + getName() + " already contains field with id " + field.getId()); } fields.put(field.getName(), field); - fieldIds.put(field.getId(Document.SERIALIZED_VERSION), field); + fieldIds.put(field.getId(), field); } public Field removeField(String fieldName) { Field old = fields.remove(fieldName); if (old != null) { - fieldIds.remove(old.getId(Document.SERIALIZED_VERSION)); + fieldIds.remove(old.getId()); } return old; } diff --git a/document/src/main/java/com/yahoo/document/Field.java b/document/src/main/java/com/yahoo/document/Field.java index 9523c333a78..671c8c7f763 100644 --- a/document/src/main/java/com/yahoo/document/Field.java +++ b/document/src/main/java/com/yahoo/document/Field.java @@ -176,6 +176,7 @@ public class Field extends FieldBase implements FieldSet, Comparable, Serializab } /** Returns the numeric ID used to represent this field when serialized */ + @Deprecated public final int getId(int version) { return getId(); } diff --git a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializer6.java b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializer6.java index 8f033c84635..b12e54a0f12 100644 --- a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializer6.java +++ b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializer6.java @@ -344,7 +344,7 @@ public class VespaDocumentSerializer6 extends BufferSerializer implements Docume value.getValue().serialize(value.getKey(), this); fieldLengths.add(buffer.position() - startPos); - fieldIds.add(value.getKey().getId(s.getVersion())); + fieldIds.add(value.getKey().getId()); } // Switch buffers again: @@ -627,7 +627,7 @@ public class VespaDocumentSerializer6 extends BufferSerializer implements Docume @Override public void write(FieldUpdate update) { - putInt(null, update.getField().getId(Document.SERIALIZED_VERSION)); + putInt(null, update.getField().getId()); putInt(null, update.getValueUpdates().size()); for (ValueUpdate vupd : update.getValueUpdates()) { putInt(null, vupd.getValueUpdateClassID().id); diff --git a/document/src/main/java/com/yahoo/document/update/FieldUpdate.java b/document/src/main/java/com/yahoo/document/update/FieldUpdate.java index 338062270ee..1702eb6b9c0 100644 --- a/document/src/main/java/com/yahoo/document/update/FieldUpdate.java +++ b/document/src/main/java/com/yahoo/document/update/FieldUpdate.java @@ -305,7 +305,7 @@ public class FieldUpdate { @Override public int hashCode() { - return field.getId(Document.SERIALIZED_VERSION) + valueUpdates.hashCode(); + return field.getId() + valueUpdates.hashCode(); } @Override |