Java 9: Replace 'new Long' with 'Long.valueOf'

8 files changed, 8 insertions, 8 deletions

diff --git a/config/src/main/java/com/yahoo/vespa/config/ConfigDefinitionBuilder.java b/config/src/main/java/com/yahoo/vespa/config/ConfigDefinitionBuilder.java
index 460558866fe..7fd4a9a3b43 100644
--- a/config/src/main/java/com/yahoo/vespa/config/ConfigDefinitionBuilder.java
+++ b/config/src/main/java/com/yahoo/vespa/config/ConfigDefinitionBuilder.java
@@ -120,7 +120,7 @@ public class ConfigDefinitionBuilder {
 
     static void addNode(ConfigDefinition def, LeafCNode.LongLeaf leaf) {
         if (leaf.getDefaultValue() != null) {
-            def.addLongDef(leaf.getName(), new Long(leaf.getDefaultValue().getValue()));
+            def.addLongDef(leaf.getName(), Long.valueOf(leaf.getDefaultValue().getValue()));
         } else {
             def.addLongDef(leaf.getName());
         }
diff --git a/container-accesslogging/src/main/java/com/yahoo/container/logging/LogFileHandler.java b/container-accesslogging/src/main/java/com/yahoo/container/logging/LogFileHandler.java
index 52d26236ec7..c7e2a777695 100644
--- a/container-accesslogging/src/main/java/com/yahoo/container/logging/LogFileHandler.java
+++ b/container-accesslogging/src/main/java/com/yahoo/container/logging/LogFileHandler.java
@@ -345,7 +345,7 @@ public class LogFileHandler extends StreamHandler {
                 etc = true;
                 break;
             }
-            list.add(new Long(times.substring(j,i)));
+            list.add(Long.valueOf(times.substring(j,i)));
         }
 
         int size = list.size();
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/IntItem.java b/container-search/src/main/java/com/yahoo/prelude/query/IntItem.java
index 1f99bb50725..93b4687a2da 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/IntItem.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/IntItem.java
@@ -152,7 +152,7 @@ public class IntItem extends TermItem {
 
     private Number asNumber(String numberString) {
         try {
-            if (!numberString.contains(".")) return new Long(numberString);
+            if (!numberString.contains(".")) return Long.valueOf(numberString);
         }
         catch (NumberFormatException e) {
             return new BigInteger(numberString);
diff --git a/document/src/test/java/com/yahoo/document/DocumentTestCase.java b/document/src/test/java/com/yahoo/document/DocumentTestCase.java
index c503e0bdf67..f7cc6974176 100644
--- a/document/src/test/java/com/yahoo/document/DocumentTestCase.java
+++ b/document/src/test/java/com/yahoo/document/DocumentTestCase.java
@@ -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/documentapi/src/main/java/com/yahoo/documentapi/Response.java b/documentapi/src/main/java/com/yahoo/documentapi/Response.java
index ad3e7538c4c..39b77c40e1d 100644
--- a/documentapi/src/main/java/com/yahoo/documentapi/Response.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/Response.java
@@ -58,7 +58,7 @@ public class Response {
     public long getRequestId() { return requestId; }
 
     public int hashCode() {
-        return (new Long(requestId).hashCode()) + (textMessage == null ? 0 : textMessage.hashCode()) +
+        return (Long.valueOf(requestId).hashCode()) + (textMessage == null ? 0 : textMessage.hashCode()) +
                 (success ? 1 : 0);
     }
 
diff --git a/processing/src/main/java/com/yahoo/processing/request/Properties.java b/processing/src/main/java/com/yahoo/processing/request/Properties.java
index fae0407815b..33c8b861c9c 100644
--- a/processing/src/main/java/com/yahoo/processing/request/Properties.java
+++ b/processing/src/main/java/com/yahoo/processing/request/Properties.java
@@ -484,7 +484,7 @@ public class Properties implements Cloneable {
             if (stringValue.isEmpty())
                 return defaultValue;
 
-            return new Long(value.toString());
+            return Long.valueOf(value.toString());
         } catch (IllegalArgumentException e) {
             throw new NumberFormatException("Not a valid long");
         }
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/IntegerResultNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/IntegerResultNode.java
index 5107cbbd849..039e52f57af 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/IntegerResultNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/IntegerResultNode.java
@@ -138,7 +138,7 @@ public class IntegerResultNode extends NumericResultNode {
 
     @Override
     public Object getNumber() {
-        return new Long(value);
+        return Long.valueOf(value);
     }
 
     @Override
diff --git a/searchlib/src/test/java/com/yahoo/searchlib/expression/ExpressionTestCase.java b/searchlib/src/test/java/com/yahoo/searchlib/expression/ExpressionTestCase.java
index d76db4e8147..d3b98703a01 100644
--- a/searchlib/src/test/java/com/yahoo/searchlib/expression/ExpressionTestCase.java
+++ b/searchlib/src/test/java/com/yahoo/searchlib/expression/ExpressionTestCase.java
@@ -363,7 +363,7 @@ public class ExpressionTestCase extends TestCase {
         assertEquals(a.getInteger(), 7);
         assertEquals(a.getFloat(), 7.0);
         assertEquals(a.getString(), "7");
-        assertEquals(a.getNumber(), new Long(7));
+        assertEquals(a.getNumber(), Long.valueOf(7));
         byte[] raw = a.getRaw();
         assertEquals(raw.length, 8);
         assertResultNode(a);