Merge pull request #3033 from vespa-engine/bratseth/validate-validation-override

Validate validation-overrides.xml files

2 files changed, 1 insertions, 7 deletions

diff --git a/document/src/main/java/com/yahoo/document/BucketId.java b/document/src/main/java/com/yahoo/document/BucketId.java
index 750b7bfd7e6..36ec53c51d3 100755
--- a/document/src/main/java/com/yahoo/document/BucketId.java
+++ b/document/src/main/java/com/yahoo/document/BucketId.java
@@ -6,7 +6,6 @@ package com.yahoo.document;
  */
 public class BucketId implements Comparable<BucketId> {
     public static final int COUNT_BITS = 6;
-    private static final long STRIP_MASK = 0xFC000000FFFFFFFFl;
     private long id = 0;
     private static long[] usedMask;
 
diff --git a/document/src/main/java/com/yahoo/document/GlobalId.java b/document/src/main/java/com/yahoo/document/GlobalId.java
index 91419459f2d..e2d3e4510f4 100644
--- a/document/src/main/java/com/yahoo/document/GlobalId.java
+++ b/document/src/main/java/com/yahoo/document/GlobalId.java
@@ -3,21 +3,16 @@ package com.yahoo.document;
 
 import com.yahoo.collections.MD5;
 import com.yahoo.document.idstring.IdString;
-import com.yahoo.text.Utf8;
-import com.yahoo.text.Utf8String;
 import com.yahoo.vespa.objects.Deserializer;
 import com.yahoo.vespa.objects.Serializer;
 
-import java.nio.ByteBuffer;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
 import java.util.Arrays;
 
 /**
  * Implements an incredibly light-weight version of the document global id. There is a lot of functionality in the C++
  * version of this that is missing. However, this should be sufficient for now.
  *
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen
  */
 public class GlobalId implements Comparable {