From 63ab72220f5ec6831cc9567949abe05b8056caef Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Sat, 3 Dec 2016 15:33:31 -0800 Subject: Rename method --- document/src/main/java/com/yahoo/document/DataType.java | 6 +++--- document/src/main/java/com/yahoo/document/datatypes/Struct.java | 2 +- .../main/java/com/yahoo/document/json/JsonSerializationHelper.java | 2 +- .../yahoo/document/serialization/VespaDocumentDeserializer42.java | 4 ++-- .../src/main/java/com/yahoo/vespaxmlparser/VespaXMLFieldReader.java | 2 +- .../src/test/java/com/yahoo/document/datatypes/StructTestCase.java | 2 +- .../test/java/com/yahoo/vespaxmlparser/VespaXMLReaderTestCase.java | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) (limited to 'document') diff --git a/document/src/main/java/com/yahoo/document/DataType.java b/document/src/main/java/com/yahoo/document/DataType.java index 51af799efd9..bd4d41ca2ea 100644 --- a/document/src/main/java/com/yahoo/document/DataType.java +++ b/document/src/main/java/com/yahoo/document/DataType.java @@ -168,7 +168,7 @@ public abstract class DataType extends Identifiable implements Serializable, Com } /** - * Returns an array datatype, where the array elements are of the given type + * Returns an array datatype, where the array labels are of the given type * * @param type the type to create an array of * @return the array data type @@ -189,7 +189,7 @@ public abstract class DataType extends Identifiable implements Serializable, Com } /** - * Returns a weighted set datatype, where the elements are of the given type + * Returns a weighted set datatype, where the labels are of the given type * * @param type the type to create a weighted set of * @return the weighted set data type @@ -199,7 +199,7 @@ public abstract class DataType extends Identifiable implements Serializable, Com } /** - * Returns a weighted set datatype, where the elements are of the given type, and which supports the properties + * Returns a weighted set datatype, where the labels are of the given type, and which supports the properties * createIfNonExistent and removeIfZero * * @param type the type to create a weighted set of diff --git a/document/src/main/java/com/yahoo/document/datatypes/Struct.java b/document/src/main/java/com/yahoo/document/datatypes/Struct.java index 5a01dc33aa1..ac99b8a1c80 100644 --- a/document/src/main/java/com/yahoo/document/datatypes/Struct.java +++ b/document/src/main/java/com/yahoo/document/datatypes/Struct.java @@ -349,7 +349,7 @@ public class Struct extends StructuredFieldValue { public Map.Entry next() { if (position >= increasing.length) { - throw new NoSuchElementException("No more elements in collection"); + throw new NoSuchElementException("No more labels in collection"); } FieldEntry retval = new FieldEntry(increasing[position]); position++; 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 043c36faf93..e1444c5145f 100644 --- a/document/src/main/java/com/yahoo/document/json/JsonSerializationHelper.java +++ b/document/src/main/java/com/yahoo/document/json/JsonSerializationHelper.java @@ -99,7 +99,7 @@ public class JsonSerializationHelper { private static void serializeTensorAddress(JsonGenerator generator, TensorAddress address, TensorType type) throws IOException { generator.writeObjectFieldStart(JsonReader.TENSOR_ADDRESS); for (int i = 0; i < type.dimensions().size(); i++) - generator.writeStringField(type.dimensions().get(i).name(), address.elements().get(i)); + generator.writeStringField(type.dimensions().get(i).name(), address.labels().get(i)); generator.writeEndObject(); } diff --git a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializer42.java b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializer42.java index 9e764aae798..2f746a9160f 100644 --- a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializer42.java +++ b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializer42.java @@ -206,7 +206,7 @@ public class VespaDocumentDeserializer42 extends VespaDocumentSerializer42 imple numElements = getInt1_2_4Bytes(null); } if (numElements < 0) { - throw new DeserializationException("Bad number of array/map elements, " + numElements); + throw new DeserializationException("Bad number of array/map labels, " + numElements); } return numElements; } @@ -374,7 +374,7 @@ public class VespaDocumentDeserializer42 extends VespaDocumentSerializer42 imple int numElements = getInt(null); if (numElements < 0) { - throw new DeserializationException("Bad number of weighted set elements, " + numElements); + throw new DeserializationException("Bad number of weighted set labels, " + numElements); } ws.clearAndReserve(numElements * 2); // Avoid resizing diff --git a/document/src/main/java/com/yahoo/vespaxmlparser/VespaXMLFieldReader.java b/document/src/main/java/com/yahoo/vespaxmlparser/VespaXMLFieldReader.java index cdc676eca5f..b7fd392436e 100644 --- a/document/src/main/java/com/yahoo/vespaxmlparser/VespaXMLFieldReader.java +++ b/document/src/main/java/com/yahoo/vespaxmlparser/VespaXMLFieldReader.java @@ -47,7 +47,7 @@ public class VespaXMLFieldReader extends VespaXMLReader implements FieldReader { } /** - * Optional test and set condition. Common for document/update/remove elements + * Optional test and set condition. Common for document/update/remove labels * This variable is either set in VespaXMLFieldReader#read (reader for document) * or in VespaXMLUpdateReader#read (reader for update). */ diff --git a/document/src/test/java/com/yahoo/document/datatypes/StructTestCase.java b/document/src/test/java/com/yahoo/document/datatypes/StructTestCase.java index 76e1588b2a1..174817972f3 100644 --- a/document/src/test/java/com/yahoo/document/datatypes/StructTestCase.java +++ b/document/src/test/java/com/yahoo/document/datatypes/StructTestCase.java @@ -41,7 +41,7 @@ public class StructTestCase { } { - //add three elements and remove one of them, and replace the last one: + //add three labels and remove one of them, and replace the last one: assertEquals(0, struct.getFields().size()); IntegerFieldValue ifv = new IntegerFieldValue(5); diff --git a/document/src/test/java/com/yahoo/vespaxmlparser/VespaXMLReaderTestCase.java b/document/src/test/java/com/yahoo/vespaxmlparser/VespaXMLReaderTestCase.java index 19f753484d3..6131ee70069 100755 --- a/document/src/test/java/com/yahoo/vespaxmlparser/VespaXMLReaderTestCase.java +++ b/document/src/test/java/com/yahoo/vespaxmlparser/VespaXMLReaderTestCase.java @@ -145,7 +145,7 @@ public class VespaXMLReaderTestCase { @Test public void testNews3() throws Exception { - // Updating all elements in a documentType + // Updating all labels in a documentType VespaXMLFeedReader parser = new VespaXMLFeedReader("src/test/vespaxmlparser/test03.xml", manager); VespaXMLFeedReader.Operation op = new VespaXMLFeedReader.Operation(); parser.read(op); -- cgit v1.2.3