diff options
Diffstat (limited to 'document')
9 files changed, 56 insertions, 56 deletions
diff --git a/document/src/main/java/com/yahoo/vespaxmlparser/VespaXMLFieldReader.java b/document/src/main/java/com/yahoo/vespaxmlparser/VespaXMLFieldReader.java index bfe15c8c45b..c0db20032cb 100644 --- a/document/src/main/java/com/yahoo/vespaxmlparser/VespaXMLFieldReader.java +++ b/document/src/main/java/com/yahoo/vespaxmlparser/VespaXMLFieldReader.java @@ -302,7 +302,7 @@ public class VespaXMLFieldReader extends VespaXMLReader implements FieldReader { try { String dataParsed = reader.getElementText(); try { - value.assign(new Double(dataParsed)); + value.assign(Double.valueOf(dataParsed)); } catch (Exception e) { throw newDeserializeException(field, "Invalid double \"" + dataParsed + "\"."); } diff --git a/document/src/test/java/com/yahoo/document/DataTypeTestCase.java b/document/src/test/java/com/yahoo/document/DataTypeTestCase.java index e497845248e..ee70c427aee 100644 --- a/document/src/test/java/com/yahoo/document/DataTypeTestCase.java +++ b/document/src/test/java/com/yahoo/document/DataTypeTestCase.java @@ -90,7 +90,7 @@ public class DataTypeTestCase { Map<String, Integer> wsetMap = new LinkedHashMap<>(); wsetMap.put("foo", 1); WeightedSet<StringFieldValue> ws = (WeightedSet<StringFieldValue>) DataType.getWeightedSet(DataType.STRING).createFieldValue(wsetMap); - assertEquals(ws.get(new StringFieldValue("foo")), new Integer(1)); + assertEquals(ws.get(new StringFieldValue("foo")), Integer.valueOf(1)); } { List<String> arrayArray = new ArrayList<>(); diff --git a/document/src/test/java/com/yahoo/document/DocumentCalculatorTestCase.java b/document/src/test/java/com/yahoo/document/DocumentCalculatorTestCase.java index 0f8e28f107c..619f6598247 100755 --- a/document/src/test/java/com/yahoo/document/DocumentCalculatorTestCase.java +++ b/document/src/test/java/com/yahoo/document/DocumentCalculatorTestCase.java @@ -90,8 +90,8 @@ public class DocumentCalculatorTestCase { @Test public void testVariables() throws Exception { HashMap<String, Object> vars = new HashMap<>(); - vars.put("x", new Double(3.0)); - vars.put("y", new Double(5.0)); + vars.put("x", Double.valueOf(3.0)); + vars.put("y", Double.valueOf(5.0)); DocumentCalculator calculator = new DocumentCalculator("($x + $y) / 2"); assertEquals(4.0, calculator.evaluate(doc, vars)); } diff --git a/document/src/test/java/com/yahoo/document/DocumentPathUpdateTestCase.java b/document/src/test/java/com/yahoo/document/DocumentPathUpdateTestCase.java index a14640a2f86..a0c891a3f30 100755 --- a/document/src/test/java/com/yahoo/document/DocumentPathUpdateTestCase.java +++ b/document/src/test/java/com/yahoo/document/DocumentPathUpdateTestCase.java @@ -131,7 +131,7 @@ public class DocumentPathUpdateTestCase { docUp.applyTo(doc); assertEquals(1, ((WeightedSet) doc.getFieldValue("strwset")).size()); WeightedSet docWset = (WeightedSet) doc.getFieldValue("strwset"); - assertEquals(new Integer(10), docWset.get(new StringFieldValue("hello hello"))); + assertEquals(Integer.valueOf(10), docWset.get(new StringFieldValue("hello hello"))); } @Test @@ -240,8 +240,8 @@ public class DocumentPathUpdateTestCase { docUp.applyTo(doc); assertEquals(2, ((WeightedSet) doc.getFieldValue("strwset")).size()); WeightedSet docWset = (WeightedSet) doc.getFieldValue("strwset"); - assertEquals(new Integer(5), docWset.get(new StringFieldValue("assigned val 0"))); - assertEquals(new Integer(10), docWset.get(new StringFieldValue("assigned val 1"))); + assertEquals(Integer.valueOf(5), docWset.get(new StringFieldValue("assigned val 0"))); + assertEquals(Integer.valueOf(10), docWset.get(new StringFieldValue("assigned val 1"))); } @Test @@ -260,7 +260,7 @@ public class DocumentPathUpdateTestCase { docUp.applyTo(doc); WeightedSet docWset = (WeightedSet) doc.getFieldValue(doc.getField("strwset")); assertEquals(1, docWset.size()); - assertEquals(new Integer(243), docWset.get(new StringFieldValue("blahdi blahdi"))); + assertEquals(Integer.valueOf(243), docWset.get(new StringFieldValue("blahdi blahdi"))); } @Test diff --git a/document/src/test/java/com/yahoo/document/DocumentTestCase.java b/document/src/test/java/com/yahoo/document/DocumentTestCase.java index 44c82042d5c..f7cc6974176 100644 --- a/document/src/test/java/com/yahoo/document/DocumentTestCase.java +++ b/document/src/test/java/com/yahoo/document/DocumentTestCase.java @@ -553,7 +553,7 @@ public class DocumentTestCase extends DocumentTestCaseBase { FieldValue fv = doc.getRecursiveValue("l1s1.ss.iarray"); - assertFalse(((Array)fv).contains(new Integer(12))); + assertFalse(((Array)fv).contains(Integer.valueOf(12))); assertEquals(3, ((Array)fv).size()); } @@ -690,8 +690,8 @@ public class DocumentTestCase extends DocumentTestCaseBase { assertEquals(new FloatFieldValue(2.0f), array.get(1)); WeightedSet<StringFieldValue> wset = (WeightedSet<StringFieldValue>)doc.getFieldValue("wsfield"); - assertEquals(new Integer(50), wset.get(new StringFieldValue("Weighted 0"))); - assertEquals(new Integer(199), wset.get(new StringFieldValue("Weighted 1"))); + assertEquals(Integer.valueOf(50), wset.get(new StringFieldValue("Weighted 0"))); + assertEquals(Integer.valueOf(199), wset.get(new StringFieldValue("Weighted 1"))); } @Test @@ -722,8 +722,8 @@ public class DocumentTestCase extends DocumentTestCaseBase { assertEquals(new DocumentId("doc:docindoc:http://embedded"), docindoc.getId()); WeightedSet wset = (WeightedSet)doc.getFieldValue("wsfield"); - assertEquals(new Integer(50), wset.get(new StringFieldValue("Weighted 0"))); - assertEquals(new Integer(199), wset.get(new StringFieldValue("Weighted 1"))); + assertEquals(Integer.valueOf(50), wset.get(new StringFieldValue("Weighted 0"))); + assertEquals(Integer.valueOf(199), wset.get(new StringFieldValue("Weighted 1"))); } @Test @@ -1137,7 +1137,7 @@ public class DocumentTestCase extends DocumentTestCaseBase { Document doc = new Document(docMan.getDocumentType("testdoc"), new DocumentId("doc:testdoc:timetest")); assertNull(doc.getLastModified()); doc.setLastModified(4350129845023985L); - assertEquals(new Long(4350129845023985L), doc.getLastModified()); + assertEquals(Long.valueOf(4350129845023985L), doc.getLastModified()); doc.setLastModified(null); assertNull(doc.getLastModified()); diff --git a/document/src/test/java/com/yahoo/document/DocumentUpdateTestCase.java b/document/src/test/java/com/yahoo/document/DocumentUpdateTestCase.java index 13474efc282..4392ea932b2 100644 --- a/document/src/test/java/com/yahoo/document/DocumentUpdateTestCase.java +++ b/document/src/test/java/com/yahoo/document/DocumentUpdateTestCase.java @@ -163,7 +163,7 @@ public class DocumentUpdateTestCase { docUp.applyTo(doc); assertEquals(1, ((WeightedSet)doc.getFieldValue("strwset")).size()); WeightedSet docWset = (WeightedSet)doc.getFieldValue("strwset"); - assertEquals(new Integer(10), docWset.get(new StringFieldValue("hello hello"))); + assertEquals(Integer.valueOf(10), docWset.get(new StringFieldValue("hello hello"))); } @Test @@ -205,8 +205,8 @@ public class DocumentUpdateTestCase { docUp.applyTo(doc); assertEquals(2, ((WeightedSet)doc.getFieldValue("strwset")).size()); WeightedSet docWset = (WeightedSet)doc.getFieldValue("strwset"); - assertEquals(new Integer(5), docWset.get(new StringFieldValue("assigned val 0"))); - assertEquals(new Integer(10), docWset.get(new StringFieldValue("assigned val 1"))); + assertEquals(Integer.valueOf(5), docWset.get(new StringFieldValue("assigned val 0"))); + assertEquals(Integer.valueOf(10), docWset.get(new StringFieldValue("assigned val 1"))); } @Test diff --git a/document/src/test/java/com/yahoo/document/datatypes/WeightedSetTestCase.java b/document/src/test/java/com/yahoo/document/datatypes/WeightedSetTestCase.java index 19d5b4b3a7e..3436c73feae 100644 --- a/document/src/test/java/com/yahoo/document/datatypes/WeightedSetTestCase.java +++ b/document/src/test/java/com/yahoo/document/datatypes/WeightedSetTestCase.java @@ -33,7 +33,7 @@ public class WeightedSetTestCase { assertEquals(5, ok); assertEquals(1, wset.size()); - assertEquals(wset.get(new StringFieldValue("this is a test")), new Integer(10)); + assertEquals(wset.get(new StringFieldValue("this is a test")), Integer.valueOf(10)); //REMOVE: @@ -75,8 +75,8 @@ public class WeightedSetTestCase { set.put(new StringFieldValue("hello"), 5); set.put(new StringFieldValue("aba"), 10); assertEquals(2, set.size()); - assertEquals(new Integer(5), set.get(new StringFieldValue("hello"))); - assertEquals(new Integer(10), set.get(new StringFieldValue("aba"))); + assertEquals(Integer.valueOf(5), set.get(new StringFieldValue("hello"))); + assertEquals(Integer.valueOf(10), set.get(new StringFieldValue("aba"))); DataType type2 = DataType.getWeightedSet(DataType.STRING, true, true); WeightedSet<StringFieldValue> set2 = new WeightedSet<>(type2); @@ -84,9 +84,9 @@ public class WeightedSetTestCase { set2.put(new StringFieldValue("bye"), 13); set2.put(new StringFieldValue("see you"), 15); assertEquals(3, set2.size()); - assertEquals(new Integer(6), set2.get(new StringFieldValue("hi"))); - assertEquals(new Integer(13), set2.get(new StringFieldValue("bye"))); - assertEquals(new Integer(15), set2.get(new StringFieldValue("see you"))); + assertEquals(Integer.valueOf(6), set2.get(new StringFieldValue("hi"))); + assertEquals(Integer.valueOf(13), set2.get(new StringFieldValue("bye"))); + assertEquals(Integer.valueOf(15), set2.get(new StringFieldValue("see you"))); try { set.assign(set2); @@ -96,8 +96,8 @@ public class WeightedSetTestCase { } assertEquals(2, set.size()); - assertEquals(new Integer(5), set.get(new StringFieldValue("hello"))); - assertEquals(new Integer(10), set.get(new StringFieldValue("aba"))); + assertEquals(Integer.valueOf(5), set.get(new StringFieldValue("hello"))); + assertEquals(Integer.valueOf(10), set.get(new StringFieldValue("aba"))); } @Test @@ -154,7 +154,7 @@ public class WeightedSetTestCase { assertEquals(3, ws.size()); assertEquals(3, map.size()); - assertEquals(new Integer(1), ws.get(new StringFieldValue("sitronbrus"))); + assertEquals(Integer.valueOf(1), ws.get(new StringFieldValue("sitronbrus"))); } @Test diff --git a/document/src/test/java/com/yahoo/document/json/JsonReaderTestCase.java b/document/src/test/java/com/yahoo/document/json/JsonReaderTestCase.java index 29ba244a9f1..07f0a172caf 100644 --- a/document/src/test/java/com/yahoo/document/json/JsonReaderTestCase.java +++ b/document/src/test/java/com/yahoo/document/json/JsonReaderTestCase.java @@ -477,8 +477,8 @@ public class JsonReaderTestCase { assertSame(WeightedSet.class, f.getClass()); WeightedSet<?> w = (WeightedSet<?>) f; assertEquals(2, w.size()); - assertEquals(new Integer(2), w.get(new StringFieldValue("nalle"))); - assertEquals(new Integer(7), w.get(new StringFieldValue("tralle"))); + assertEquals(Integer.valueOf(2), w.get(new StringFieldValue("nalle"))); + assertEquals(Integer.valueOf(7), w.get(new StringFieldValue("tralle"))); } @Test @@ -700,8 +700,8 @@ public class JsonReaderTestCase { AssignValueUpdate assign = (AssignValueUpdate) x.getValueUpdate(0); WeightedSet<?> w = (WeightedSet<?>) assign.getValue(); assertEquals(2, w.size()); - assertEquals(new Integer(37), w.get(new StringFieldValue("person"))); - assertEquals(new Integer(41), w.get(new StringFieldValue("another person"))); + assertEquals(Integer.valueOf(37), w.get(new StringFieldValue("person"))); + assertEquals(Integer.valueOf(41), w.get(new StringFieldValue("another person"))); } diff --git a/document/src/test/java/com/yahoo/vespaxmlparser/VespaXMLReaderTestCase.java b/document/src/test/java/com/yahoo/vespaxmlparser/VespaXMLReaderTestCase.java index b5f74c8973e..4c64f7c35cb 100755 --- a/document/src/test/java/com/yahoo/vespaxmlparser/VespaXMLReaderTestCase.java +++ b/document/src/test/java/com/yahoo/vespaxmlparser/VespaXMLReaderTestCase.java @@ -96,12 +96,12 @@ public class VespaXMLReaderTestCase { assertEquals(new FloatFieldValue(10.0f), floatArr.get(1)); WeightedSet intWset = (WeightedSet)doc.getFieldValue("weightedsetint"); - assertEquals(new Integer(11), intWset.get(new IntegerFieldValue(11))); - assertEquals(new Integer(12), intWset.get(new IntegerFieldValue(12))); + assertEquals(Integer.valueOf(11), intWset.get(new IntegerFieldValue(11))); + assertEquals(Integer.valueOf(12), intWset.get(new IntegerFieldValue(12))); WeightedSet strWset = (WeightedSet)doc.getFieldValue("weightedsetstring"); - assertEquals(new Integer(13), strWset.get(new StringFieldValue("string13"))); - assertEquals(new Integer(14), strWset.get(new StringFieldValue("string14"))); + assertEquals(Integer.valueOf(13), strWset.get(new StringFieldValue("string13"))); + assertEquals(Integer.valueOf(14), strWset.get(new StringFieldValue("string14"))); MapFieldValue strMap = (MapFieldValue)doc.getFieldValue("stringmap"); assertEquals(new StringFieldValue("slovakia"), strMap.get(new StringFieldValue("italia"))); @@ -196,14 +196,14 @@ public class VespaXMLReaderTestCase { //weightedsetint WeightedSet weightedsetint = (WeightedSet)docUpdate.getFieldUpdate("weightedsetint").getValueUpdate(0).getValue(); - assertEquals(new Integer(11), weightedsetint.get(new IntegerFieldValue(11))); - assertEquals(new Integer(12), weightedsetint.get(new IntegerFieldValue(12))); + assertEquals(Integer.valueOf(11), weightedsetint.get(new IntegerFieldValue(11))); + assertEquals(Integer.valueOf(12), weightedsetint.get(new IntegerFieldValue(12))); //weightedsetstring WeightedSet weightedsetstring = (WeightedSet)docUpdate.getFieldUpdate("weightedsetstring").getValueUpdate(0).getValue(); - assertEquals(new Integer(13), weightedsetstring.get(new StringFieldValue("assign13"))); - assertEquals(new Integer(14), weightedsetstring.get(new StringFieldValue("assign14"))); + assertEquals(Integer.valueOf(13), weightedsetstring.get(new StringFieldValue("assign13"))); + assertEquals(Integer.valueOf(14), weightedsetstring.get(new StringFieldValue("assign14"))); } @@ -255,8 +255,8 @@ public class VespaXMLReaderTestCase { //weightedsetint WeightedSet weightedsetint = (WeightedSet)docUpdate.getFieldUpdate("weightedsetint").getValueUpdate(0).getValue(); - assertEquals(new Integer(11), weightedsetint.get(new IntegerFieldValue(11))); - assertEquals(new Integer(12), weightedsetint.get(new IntegerFieldValue(12))); + assertEquals(Integer.valueOf(11), weightedsetint.get(new IntegerFieldValue(11))); + assertEquals(Integer.valueOf(12), weightedsetint.get(new IntegerFieldValue(12))); //weightedsetstring assertNull(docUpdate.getFieldUpdate("weightedsetstring")); @@ -309,17 +309,17 @@ public class VespaXMLReaderTestCase { //weightedsetint assertEquals(new IntegerFieldValue(11), docUpdate.getFieldUpdate("weightedsetint").getValueUpdate(0).getValue()); - assertEquals(new Integer(11), + assertEquals(Integer.valueOf(11), (Integer)((AddValueUpdate)docUpdate.getFieldUpdate("weightedsetint").getValueUpdate(0)) .getWeight()); assertEquals(new IntegerFieldValue(12), docUpdate.getFieldUpdate("weightedsetint").getValueUpdate(1).getValue()); - assertEquals(new Integer(12), + assertEquals(Integer.valueOf(12), (Integer)((AddValueUpdate)docUpdate.getFieldUpdate("weightedsetint").getValueUpdate(1)) .getWeight()); //weightedsetstring assertEquals(new StringFieldValue("add13"), docUpdate.getFieldUpdate("weightedsetstring").getValueUpdate(0).getValue()); - assertEquals(new Integer(1), + assertEquals(Integer.valueOf(1), (Integer)((AddValueUpdate)docUpdate.getFieldUpdate("weightedsetstring").getValueUpdate(0)) .getWeight()); } @@ -575,12 +575,12 @@ public class VespaXMLReaderTestCase { assertEquals(new FloatFieldValue(10.0f), floatArr.get(1)); WeightedSet intWset = (WeightedSet)doc.getFieldValue("weightedsetint"); - assertEquals(new Integer(11), intWset.get(new IntegerFieldValue(11))); - assertEquals(new Integer(12), intWset.get(new IntegerFieldValue(12))); + assertEquals(Integer.valueOf(11), intWset.get(new IntegerFieldValue(11))); + assertEquals(Integer.valueOf(12), intWset.get(new IntegerFieldValue(12))); WeightedSet strWset = (WeightedSet)doc.getFieldValue("weightedsetstring"); - assertEquals(new Integer(13), strWset.get(new StringFieldValue("string13"))); - assertEquals(new Integer(14), strWset.get(new StringFieldValue("string14"))); + assertEquals(Integer.valueOf(13), strWset.get(new StringFieldValue("string13"))); + assertEquals(Integer.valueOf(14), strWset.get(new StringFieldValue("string14"))); } { VespaXMLFeedReader.Operation op = new VespaXMLFeedReader.Operation(); @@ -613,16 +613,16 @@ public class VespaXMLReaderTestCase { assertNull(upd.getFieldUpdate("floatarr")); assertEquals(new IntegerFieldValue(11), upd.getFieldUpdate("weightedsetint").getValueUpdate(0).getValue()); - assertEquals(new Integer(11), + assertEquals(Integer.valueOf(11), (Integer)((AddValueUpdate)upd.getFieldUpdate("weightedsetint").getValueUpdate(0)) .getWeight()); assertEquals(new IntegerFieldValue(12), upd.getFieldUpdate("weightedsetint").getValueUpdate(1).getValue()); - assertEquals(new Integer(12), + assertEquals(Integer.valueOf(12), (Integer)((AddValueUpdate)upd.getFieldUpdate("weightedsetint").getValueUpdate(1)) .getWeight()); assertEquals(new StringFieldValue("add13"), upd.getFieldUpdate("weightedsetstring").getValueUpdate(0).getValue()); - assertEquals(new Integer(1), + assertEquals(Integer.valueOf(1), (Integer)((AddValueUpdate)upd.getFieldUpdate("weightedsetstring").getValueUpdate(0)) .getWeight()); } @@ -653,8 +653,8 @@ public class VespaXMLReaderTestCase { assertNull(upd.getFieldUpdate("floatarr")); WeightedSet intWset = (WeightedSet)upd.getFieldUpdate("weightedsetint").getValueUpdate(0).getValue(); - assertEquals(new Integer(11), intWset.get(new IntegerFieldValue(11))); - assertEquals(new Integer(12), intWset.get(new IntegerFieldValue(12))); + assertEquals(Integer.valueOf(11), intWset.get(new IntegerFieldValue(11))); + assertEquals(Integer.valueOf(12), intWset.get(new IntegerFieldValue(12))); assertNull(upd.getFieldUpdate("weightedsetstring")); } @@ -738,15 +738,15 @@ public class VespaXMLReaderTestCase { AssignFieldPathUpdate ass = (AssignFieldPathUpdate)docUpdate.getFieldPathUpdates().get(10); assertEquals("weightedsetint", ass.getOriginalFieldPath()); WeightedSet set = (WeightedSet)ass.getNewValue(); - assertEquals(new Integer(11), set.get(new IntegerFieldValue(11))); - assertEquals(new Integer(12), set.get(new IntegerFieldValue(12))); + assertEquals(Integer.valueOf(11), set.get(new IntegerFieldValue(11))); + assertEquals(Integer.valueOf(12), set.get(new IntegerFieldValue(12))); } { AssignFieldPathUpdate ass = (AssignFieldPathUpdate)docUpdate.getFieldPathUpdates().get(11); assertEquals("weightedsetstring", ass.getOriginalFieldPath()); WeightedSet set = (WeightedSet)ass.getNewValue(); - assertEquals(new Integer(13), set.get(new StringFieldValue("assign13"))); - assertEquals(new Integer(14), set.get(new StringFieldValue("assign14"))); + assertEquals(Integer.valueOf(13), set.get(new StringFieldValue("assign13"))); + assertEquals(Integer.valueOf(14), set.get(new StringFieldValue("assign14"))); } { AddFieldPathUpdate ass = (AddFieldPathUpdate)docUpdate.getFieldPathUpdates().get(12); |