Copyright header

212 files changed, 2229 insertions, 2225 deletions

diff --git a/document/src/main/java/com/yahoo/document/ArrayDataType.java b/document/src/main/java/com/yahoo/document/ArrayDataType.java
index 4b24bb1ae00..2cc3e529d06 100644
--- a/document/src/main/java/com/yahoo/document/ArrayDataType.java
+++ b/document/src/main/java/com/yahoo/document/ArrayDataType.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document;
 
 import com.yahoo.document.datatypes.Array;
diff --git a/document/src/main/java/com/yahoo/document/BaseStructDataType.java b/document/src/main/java/com/yahoo/document/BaseStructDataType.java
index 76ee98331ab..b010ed8c033 100755
--- a/document/src/main/java/com/yahoo/document/BaseStructDataType.java
+++ b/document/src/main/java/com/yahoo/document/BaseStructDataType.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document;
 
 import com.yahoo.compress.CompressionType;
diff --git a/document/src/main/java/com/yahoo/document/BucketDistribution.java b/document/src/main/java/com/yahoo/document/BucketDistribution.java
index bb4792b5982..d4dd6fb3749 100644
--- a/document/src/main/java/com/yahoo/document/BucketDistribution.java
+++ b/document/src/main/java/com/yahoo/document/BucketDistribution.java
@@ -1,205 +1,205 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.document;

-

-import com.yahoo.document.BucketId;

-

-import java.util.ArrayList;

-import java.util.List;

-import java.util.logging.Level;

-import java.util.logging.Logger;

-

-/**

- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>

- */

-public class BucketDistribution {

-

-    // A logger object to enable proper logging.

-    private static Logger log = Logger.getLogger(BucketDistribution.class.getName());

-

-    // A map from bucket id to column index.

-    private int[] bucketToColumn;

-

-    // The number of columns to distribute to.

-    private int numColumns;

-

-    // The number of bits to use for bucket identification.

-    private int numBucketBits;

-

-    /**

-     * Constructs a new bucket distribution object with a given number of columns and buckets.

-     *

-     * @param numColumns    The number of columns to distribute to.

-     * @param numBucketBits The number of bits to use for bucket id.

-     */

-    public BucketDistribution(int numColumns, int numBucketBits) {

-        this.numBucketBits = numBucketBits;

-        bucketToColumn = new int[getNumBuckets()];

-        reset();

-        setNumColumns(numColumns);

-    }

-

-    /**

-     * Constructs a new bucket distribution object as a copy of another.

-     *

-     * @param other The distribution object to copy.

-     */

-    public BucketDistribution(BucketDistribution other) {

-        bucketToColumn = other.bucketToColumn.clone();

-        numColumns = other.numColumns;

-        numBucketBits = other.numBucketBits;

-    }

-

-    /**

-     * Returns the number of buckets that the given number of bucket bits will allow.

-     *

-     * @param numBucketBits The number of bits to use for bucket id.

-     * @return The number of buckets allowed.

-     */

-    private static int getNumBuckets(int numBucketBits) {

-        return 1 << numBucketBits;

-    }

-

-    /**

-     * This method returns a list that contains the distributions of the given number of buckets over the given number

-     * of columns.

-     *

-     * @param numColumns    The number of columns to distribute to.

-     * @param numBucketBits The number of bits to use for bucket id.

-     * @return The bucket distribution.

-     */

-    private static List<Integer> getBucketCount(int numColumns, int numBucketBits) {

-        List<Integer> ret = new ArrayList<Integer>(numColumns);

-        int cnt = getNumBuckets(numBucketBits) / numColumns;

-        int rst = getNumBuckets(numBucketBits) % numColumns;

-        for (int i = 0; i < numColumns; ++i) {

-            ret.add(cnt + (i < rst ? 1 : 0));

-        }

-        return ret;

-    }

-

-    /**

-     * This method returns a list similar to {@link BucketDistribution#getBucketCount(int, int)}, except that the returned list

-     * contains the number of buckets that will have to be migrated from each column if an additional column was added.

-     *

-     * @param numColumns    The original number of columns.

-     * @param numBucketBits The number of bits to use for bucket id.

-     * @return The number of buckets to migrate, one value per column.

-     */

-    private static List<Integer> getBucketMigrateCount(int numColumns, int numBucketBits) {

-        List<Integer> ret = getBucketCount(numColumns++, numBucketBits);

-        int cnt = getNumBuckets(numBucketBits) / numColumns;

-        int rst = getNumBuckets(numBucketBits) % numColumns;

-        for (int i = 0; i < numColumns - 1; ++i) {

-            ret.set(i, ret.get(i) - (cnt + (i < rst ? 1 : 0)));

-        }

-        return ret;

-    }

-

-    /**

-     * Sets the number of columns to distribute to to 1, and resets the content of the internal bucket-to-column map so

-     * that it all buckets point to that single column.

-     */

-    public void reset() {

-        for (int i = 0; i < bucketToColumn.length; ++i) {

-            bucketToColumn[i] = 0;

-        }

-        numColumns = 1;

-    }

-

-    /**

-     * Adds a single column to this bucket distribution object. This will modify the internal bucket-to-column map so

-     * that it takes into account the new column.

-     */

-    private void addColumn() {

-        int newColumns = numColumns + 1;

-        List<Integer> migrate = getBucketMigrateCount(numColumns, numBucketBits);

-        int numBuckets = getNumBuckets(numBucketBits);

-        for (int i = 0; i < numBuckets; ++i) {

-            int old = bucketToColumn[i];

-            if (migrate.get(old) > 0) {

-                bucketToColumn[i] = numColumns; // move this bucket to the new column

-                migrate.set(old, migrate.get(old) - 1);

-            }

-        }

-        numColumns = newColumns;

-    }

-

-    /**

-     * Sets the number of columns to use for this document distribution object. This will reset and setup this object

-     * from scratch. The original number of buckets is maintained.

-     *

-     * @param numColumns The new number of columns to distribute to.

-     */

-    public synchronized void setNumColumns(int numColumns) {

-        if (numColumns < this.numColumns) {

-            reset();

-        }

-        if (numColumns == this.numColumns) {

-            return;

-        }

-        for (int i = numColumns - this.numColumns; --i >= 0; ) {

-            addColumn();

-        }

-    }

-

-    /**

-     * Returns the number of columns to distribute to.

-     *

-     * @return The number of columns.

-     */

-    public int getNumColumns() {

-        return numColumns;

-    }

-

-    /**

-     * Sets the number of buckets to use for this document distribution object. This will reset and setup this object

-     * from scratch. The original number of columns is maintained.

-     *

-     * @param numBucketBits The new number of bits to use for bucket id.

-     */

-    public synchronized void setNumBucketBits(int numBucketBits) {

-        if (numBucketBits == this.numBucketBits) {

-            return;

-        }

-        this.numBucketBits = numBucketBits;

-        bucketToColumn = new int[getNumBuckets(numBucketBits)];

-        int numColumns = this.numColumns;

-        reset();

-        setNumColumns(numColumns);

-    }

-

-    /**

-     * Returns the number of bits used for bucket identifiers.

-     *

-     * @return The number of bits.

-     */

-    public int getNumBucketBits() {

-        return numBucketBits;

-    }

-

-    /**

-     * Returns the number of buckets available using the configured number of bucket bits.

-     *

-     * @return The number of buckets.

-     */

-    public int getNumBuckets() {

-        return getNumBuckets(numBucketBits);

-    }

-

-    /**

-     * This method maps the given bucket id to its corresponding column.

-     *

-     * @param bucketId The bucket whose column to lookup.

-     * @return The column to distribute the bucket to.

-     */

-    public int getColumn(BucketId bucketId) {

-        int ret = (int)(bucketId.getId() & (getNumBuckets(numBucketBits) - 1));

-        if (ret >= bucketToColumn.length) {

-            log.log(Level.SEVERE,

-                    "The bucket distribution map is not in sync with the number of bucket bits. " +

-                    "This should never happen! Distribution is broken!!");

-            return 0;

-        }

-        return bucketToColumn[ret];

-    }

-}

+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.document;
+
+import com.yahoo.document.BucketId;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ */
+public class BucketDistribution {
+
+    // A logger object to enable proper logging.
+    private static Logger log = Logger.getLogger(BucketDistribution.class.getName());
+
+    // A map from bucket id to column index.
+    private int[] bucketToColumn;
+
+    // The number of columns to distribute to.
+    private int numColumns;
+
+    // The number of bits to use for bucket identification.
+    private int numBucketBits;
+
+    /**
+     * Constructs a new bucket distribution object with a given number of columns and buckets.
+     *
+     * @param numColumns    The number of columns to distribute to.
+     * @param numBucketBits The number of bits to use for bucket id.
+     */
+    public BucketDistribution(int numColumns, int numBucketBits) {
+        this.numBucketBits = numBucketBits;
+        bucketToColumn = new int[getNumBuckets()];
+        reset();
+        setNumColumns(numColumns);
+    }
+
+    /**
+     * Constructs a new bucket distribution object as a copy of another.
+     *
+     * @param other The distribution object to copy.
+     */
+    public BucketDistribution(BucketDistribution other) {
+        bucketToColumn = other.bucketToColumn.clone();
+        numColumns = other.numColumns;
+        numBucketBits = other.numBucketBits;
+    }
+
+    /**
+     * Returns the number of buckets that the given number of bucket bits will allow.
+     *
+     * @param numBucketBits The number of bits to use for bucket id.
+     * @return The number of buckets allowed.
+     */
+    private static int getNumBuckets(int numBucketBits) {
+        return 1 << numBucketBits;
+    }
+
+    /**
+     * This method returns a list that contains the distributions of the given number of buckets over the given number
+     * of columns.
+     *
+     * @param numColumns    The number of columns to distribute to.
+     * @param numBucketBits The number of bits to use for bucket id.
+     * @return The bucket distribution.
+     */
+    private static List<Integer> getBucketCount(int numColumns, int numBucketBits) {
+        List<Integer> ret = new ArrayList<Integer>(numColumns);
+        int cnt = getNumBuckets(numBucketBits) / numColumns;
+        int rst = getNumBuckets(numBucketBits) % numColumns;
+        for (int i = 0; i < numColumns; ++i) {
+            ret.add(cnt + (i < rst ? 1 : 0));
+        }
+        return ret;
+    }
+
+    /**
+     * This method returns a list similar to {@link BucketDistribution#getBucketCount(int, int)}, except that the returned list
+     * contains the number of buckets that will have to be migrated from each column if an additional column was added.
+     *
+     * @param numColumns    The original number of columns.
+     * @param numBucketBits The number of bits to use for bucket id.
+     * @return The number of buckets to migrate, one value per column.
+     */
+    private static List<Integer> getBucketMigrateCount(int numColumns, int numBucketBits) {
+        List<Integer> ret = getBucketCount(numColumns++, numBucketBits);
+        int cnt = getNumBuckets(numBucketBits) / numColumns;
+        int rst = getNumBuckets(numBucketBits) % numColumns;
+        for (int i = 0; i < numColumns - 1; ++i) {
+            ret.set(i, ret.get(i) - (cnt + (i < rst ? 1 : 0)));
+        }
+        return ret;
+    }
+
+    /**
+     * Sets the number of columns to distribute to to 1, and resets the content of the internal bucket-to-column map so
+     * that it all buckets point to that single column.
+     */
+    public void reset() {
+        for (int i = 0; i < bucketToColumn.length; ++i) {
+            bucketToColumn[i] = 0;
+        }
+        numColumns = 1;
+    }
+
+    /**
+     * Adds a single column to this bucket distribution object. This will modify the internal bucket-to-column map so
+     * that it takes into account the new column.
+     */
+    private void addColumn() {
+        int newColumns = numColumns + 1;
+        List<Integer> migrate = getBucketMigrateCount(numColumns, numBucketBits);
+        int numBuckets = getNumBuckets(numBucketBits);
+        for (int i = 0; i < numBuckets; ++i) {
+            int old = bucketToColumn[i];
+            if (migrate.get(old) > 0) {
+                bucketToColumn[i] = numColumns; // move this bucket to the new column
+                migrate.set(old, migrate.get(old) - 1);
+            }
+        }
+        numColumns = newColumns;
+    }
+
+    /**
+     * Sets the number of columns to use for this document distribution object. This will reset and setup this object
+     * from scratch. The original number of buckets is maintained.
+     *
+     * @param numColumns The new number of columns to distribute to.
+     */
+    public synchronized void setNumColumns(int numColumns) {
+        if (numColumns < this.numColumns) {
+            reset();
+        }
+        if (numColumns == this.numColumns) {
+            return;
+        }
+        for (int i = numColumns - this.numColumns; --i >= 0; ) {
+            addColumn();
+        }
+    }
+
+    /**
+     * Returns the number of columns to distribute to.
+     *
+     * @return The number of columns.
+     */
+    public int getNumColumns() {
+        return numColumns;
+    }
+
+    /**
+     * Sets the number of buckets to use for this document distribution object. This will reset and setup this object
+     * from scratch. The original number of columns is maintained.
+     *
+     * @param numBucketBits The new number of bits to use for bucket id.
+     */
+    public synchronized void setNumBucketBits(int numBucketBits) {
+        if (numBucketBits == this.numBucketBits) {
+            return;
+        }
+        this.numBucketBits = numBucketBits;
+        bucketToColumn = new int[getNumBuckets(numBucketBits)];
+        int numColumns = this.numColumns;
+        reset();
+        setNumColumns(numColumns);
+    }
+
+    /**
+     * Returns the number of bits used for bucket identifiers.
+     *
+     * @return The number of bits.
+     */
+    public int getNumBucketBits() {
+        return numBucketBits;
+    }
+
+    /**
+     * Returns the number of buckets available using the configured number of bucket bits.
+     *
+     * @return The number of buckets.
+     */
+    public int getNumBuckets() {
+        return getNumBuckets(numBucketBits);
+    }
+
+    /**
+     * This method maps the given bucket id to its corresponding column.
+     *
+     * @param bucketId The bucket whose column to lookup.
+     * @return The column to distribute the bucket to.
+     */
+    public int getColumn(BucketId bucketId) {
+        int ret = (int)(bucketId.getId() & (getNumBuckets(numBucketBits) - 1));
+        if (ret >= bucketToColumn.length) {
+            log.log(Level.SEVERE,
+                    "The bucket distribution map is not in sync with the number of bucket bits. " +
+                    "This should never happen! Distribution is broken!!");
+            return 0;
+        }
+        return bucketToColumn[ret];
+    }
+}
diff --git a/document/src/main/java/com/yahoo/document/BucketId.java b/document/src/main/java/com/yahoo/document/BucketId.java
index d0e360ddb2d..750b7bfd7e6 100755
--- a/document/src/main/java/com/yahoo/document/BucketId.java
+++ b/document/src/main/java/com/yahoo/document/BucketId.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document;
 
 /**
diff --git a/document/src/main/java/com/yahoo/document/BucketIdFactory.java b/document/src/main/java/com/yahoo/document/BucketIdFactory.java
index f327d907448..7ff09dd62e9 100644
--- a/document/src/main/java/com/yahoo/document/BucketIdFactory.java
+++ b/document/src/main/java/com/yahoo/document/BucketIdFactory.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document;
 
 import com.yahoo.document.idstring.*;
diff --git a/document/src/main/java/com/yahoo/document/CollectionDataType.java b/document/src/main/java/com/yahoo/document/CollectionDataType.java
index 87f1f2947bf..a73588a710c 100644
--- a/document/src/main/java/com/yahoo/document/CollectionDataType.java
+++ b/document/src/main/java/com/yahoo/document/CollectionDataType.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document;
 
 import com.yahoo.document.datatypes.CollectionFieldValue;
diff --git a/document/src/main/java/com/yahoo/document/CompressionConfig.java b/document/src/main/java/com/yahoo/document/CompressionConfig.java
index c827ea23b03..81eda13f7b2 100644
--- a/document/src/main/java/com/yahoo/document/CompressionConfig.java
+++ b/document/src/main/java/com/yahoo/document/CompressionConfig.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document;
 
 import com.yahoo.compress.CompressionType;
diff --git a/document/src/main/java/com/yahoo/document/DataType.java b/document/src/main/java/com/yahoo/document/DataType.java
index 184340f295e..c8a04866aa9 100644
--- a/document/src/main/java/com/yahoo/document/DataType.java
+++ b/document/src/main/java/com/yahoo/document/DataType.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document;
 
 import com.yahoo.collections.Pair;
diff --git a/document/src/main/java/com/yahoo/document/DataTypeName.java b/document/src/main/java/com/yahoo/document/DataTypeName.java
index b7d5be5c5c0..1012fd69b30 100644
--- a/document/src/main/java/com/yahoo/document/DataTypeName.java
+++ b/document/src/main/java/com/yahoo/document/DataTypeName.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document;
 
 import com.yahoo.text.Lowercase;
diff --git a/document/src/main/java/com/yahoo/document/Document.java b/document/src/main/java/com/yahoo/document/Document.java
index b71d8d8dac3..025166b5ef9 100644
--- a/document/src/main/java/com/yahoo/document/Document.java
+++ b/document/src/main/java/com/yahoo/document/Document.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document;
 
 import com.yahoo.document.datatypes.FieldValue;
diff --git a/document/src/main/java/com/yahoo/document/DocumentCalculator.java b/document/src/main/java/com/yahoo/document/DocumentCalculator.java
index 312f72e432d..8fcd3e1acd8 100644
--- a/document/src/main/java/com/yahoo/document/DocumentCalculator.java
+++ b/document/src/main/java/com/yahoo/document/DocumentCalculator.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document;
 
 import com.yahoo.document.select.Context;
diff --git a/document/src/main/java/com/yahoo/document/DocumentId.java b/document/src/main/java/com/yahoo/document/DocumentId.java
index 59650ea23f0..3ba977fec9e 100644
--- a/document/src/main/java/com/yahoo/document/DocumentId.java
+++ b/document/src/main/java/com/yahoo/document/DocumentId.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document;
 
 import com.yahoo.document.idstring.IdString;
diff --git a/document/src/main/java/com/yahoo/document/DocumentOperation.java b/document/src/main/java/com/yahoo/document/DocumentOperation.java
index d141171bb22..22ee0fd93eb 100644
--- a/document/src/main/java/com/yahoo/document/DocumentOperation.java
+++ b/document/src/main/java/com/yahoo/document/DocumentOperation.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document;
 
 /**
diff --git a/document/src/main/java/com/yahoo/document/DocumentPut.java b/document/src/main/java/com/yahoo/document/DocumentPut.java
index f02d1e6d6d8..e5ddc2c67a3 100644
--- a/document/src/main/java/com/yahoo/document/DocumentPut.java
+++ b/document/src/main/java/com/yahoo/document/DocumentPut.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document;
 
 /**
diff --git a/document/src/main/java/com/yahoo/document/DocumentRemove.java b/document/src/main/java/com/yahoo/document/DocumentRemove.java
index aa0ffbc000a..79f80713c44 100644
--- a/document/src/main/java/com/yahoo/document/DocumentRemove.java
+++ b/document/src/main/java/com/yahoo/document/DocumentRemove.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document;
 
 /**
diff --git a/document/src/main/java/com/yahoo/document/DocumentType.java b/document/src/main/java/com/yahoo/document/DocumentType.java
index b703a22255d..61e9a9ba83f 100755
--- a/document/src/main/java/com/yahoo/document/DocumentType.java
+++ b/document/src/main/java/com/yahoo/document/DocumentType.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document;
 
 import com.google.common.collect.ImmutableList;
diff --git a/document/src/main/java/com/yahoo/document/DocumentTypeId.java b/document/src/main/java/com/yahoo/document/DocumentTypeId.java
index 46e5040c998..d7ecfb11c31 100644
--- a/document/src/main/java/com/yahoo/document/DocumentTypeId.java
+++ b/document/src/main/java/com/yahoo/document/DocumentTypeId.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document;
 
 /**
diff --git a/document/src/main/java/com/yahoo/document/DocumentTypeManager.java b/document/src/main/java/com/yahoo/document/DocumentTypeManager.java
index dc6d5b7db95..8c9318199d8 100644
--- a/document/src/main/java/com/yahoo/document/DocumentTypeManager.java
+++ b/document/src/main/java/com/yahoo/document/DocumentTypeManager.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document;
 
 import com.google.inject.Inject;
diff --git a/document/src/main/java/com/yahoo/document/DocumentTypeManagerConfigurer.java b/document/src/main/java/com/yahoo/document/DocumentTypeManagerConfigurer.java
index 6ab27bb0e8e..4ae5e6a713c 100644
--- a/document/src/main/java/com/yahoo/document/DocumentTypeManagerConfigurer.java
+++ b/document/src/main/java/com/yahoo/document/DocumentTypeManagerConfigurer.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document;
 
 import com.yahoo.compress.CompressionType;
diff --git a/document/src/main/java/com/yahoo/document/DocumentUpdate.java b/document/src/main/java/com/yahoo/document/DocumentUpdate.java
index f486ab6d33d..2a9ab9e6169 100644
--- a/document/src/main/java/com/yahoo/document/DocumentUpdate.java
+++ b/document/src/main/java/com/yahoo/document/DocumentUpdate.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document;
 
 import com.yahoo.document.fieldpathupdate.FieldPathUpdate;
diff --git a/document/src/main/java/com/yahoo/document/DocumentUtil.java b/document/src/main/java/com/yahoo/document/DocumentUtil.java
index bce88a67ba8..6e781ce9011 100644
--- a/document/src/main/java/com/yahoo/document/DocumentUtil.java
+++ b/document/src/main/java/com/yahoo/document/DocumentUtil.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document;
 
 /**
diff --git a/document/src/main/java/com/yahoo/document/ExtendedField.java b/document/src/main/java/com/yahoo/document/ExtendedField.java
index 55087d16974..ac4fc0c58c5 100644
--- a/document/src/main/java/com/yahoo/document/ExtendedField.java
+++ b/document/src/main/java/com/yahoo/document/ExtendedField.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document;
 
 import com.yahoo.document.datatypes.FieldValue;
diff --git a/document/src/main/java/com/yahoo/document/ExtendedStringField.java b/document/src/main/java/com/yahoo/document/ExtendedStringField.java
index 1e84b374372..46678065b34 100644
--- a/document/src/main/java/com/yahoo/document/ExtendedStringField.java
+++ b/document/src/main/java/com/yahoo/document/ExtendedStringField.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document;
 
 import com.yahoo.document.annotation.SpanTree;
diff --git a/document/src/main/java/com/yahoo/document/Field.java b/document/src/main/java/com/yahoo/document/Field.java
index b80d92e0e4d..4098c85b3e3 100644
--- a/document/src/main/java/com/yahoo/document/Field.java
+++ b/document/src/main/java/com/yahoo/document/Field.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document;
 
 import com.yahoo.collections.BobHash;
diff --git a/document/src/main/java/com/yahoo/document/FieldPath.java b/document/src/main/java/com/yahoo/document/FieldPath.java
index 53e4ffafd58..295b1c9dd5c 100755
--- a/document/src/main/java/com/yahoo/document/FieldPath.java
+++ b/document/src/main/java/com/yahoo/document/FieldPath.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document;
 
 import java.util.ArrayList;
diff --git a/document/src/main/java/com/yahoo/document/FieldPathEntry.java b/document/src/main/java/com/yahoo/document/FieldPathEntry.java
index d542acd430e..58e59647500 100755
--- a/document/src/main/java/com/yahoo/document/FieldPathEntry.java
+++ b/document/src/main/java/com/yahoo/document/FieldPathEntry.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document;
 
 import com.yahoo.document.datatypes.FieldValue;
diff --git a/document/src/main/java/com/yahoo/document/Generated.java b/document/src/main/java/com/yahoo/document/Generated.java
index 40026eed51f..6c02bc7ee0a 100644
--- a/document/src/main/java/com/yahoo/document/Generated.java
+++ b/document/src/main/java/com/yahoo/document/Generated.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document;
 
 import java.lang.annotation.Retention;
diff --git a/document/src/main/java/com/yahoo/document/GlobalId.java b/document/src/main/java/com/yahoo/document/GlobalId.java
index d1ab8c9cea9..91419459f2d 100644
--- a/document/src/main/java/com/yahoo/document/GlobalId.java
+++ b/document/src/main/java/com/yahoo/document/GlobalId.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document;
 
 import com.yahoo.collections.MD5;
diff --git a/document/src/main/java/com/yahoo/document/MapDataType.java b/document/src/main/java/com/yahoo/document/MapDataType.java
index 2f3c6be99dc..34f50eb9e33 100644
--- a/document/src/main/java/com/yahoo/document/MapDataType.java
+++ b/document/src/main/java/com/yahoo/document/MapDataType.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document;
 
 import com.yahoo.document.datatypes.FieldValue;
diff --git a/document/src/main/java/com/yahoo/document/NumericDataType.java b/document/src/main/java/com/yahoo/document/NumericDataType.java
index 20e02914a07..f4a92eca5a1 100644
--- a/document/src/main/java/com/yahoo/document/NumericDataType.java
+++ b/document/src/main/java/com/yahoo/document/NumericDataType.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document;
 
 import com.yahoo.vespa.objects.Ids;
diff --git a/document/src/main/java/com/yahoo/document/PositionDataType.java b/document/src/main/java/com/yahoo/document/PositionDataType.java
index a989422ab92..b5b3fceece6 100644
--- a/document/src/main/java/com/yahoo/document/PositionDataType.java
+++ b/document/src/main/java/com/yahoo/document/PositionDataType.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document;
 
 import com.yahoo.document.datatypes.FieldValue;
diff --git a/document/src/main/java/com/yahoo/document/PrimitiveDataType.java b/document/src/main/java/com/yahoo/document/PrimitiveDataType.java
index 23bf4b43ccf..963bebd1b7b 100644
--- a/document/src/main/java/com/yahoo/document/PrimitiveDataType.java
+++ b/document/src/main/java/com/yahoo/document/PrimitiveDataType.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document;
 
 import com.yahoo.document.datatypes.FieldValue;
diff --git a/document/src/main/java/com/yahoo/document/ReferenceDataType.java b/document/src/main/java/com/yahoo/document/ReferenceDataType.java
index 2dd8cd2ae2a..5b5ba256f43 100644
--- a/document/src/main/java/com/yahoo/document/ReferenceDataType.java
+++ b/document/src/main/java/com/yahoo/document/ReferenceDataType.java
@@ -1,4 +1,4 @@
-// Copyright 2017 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document;
 
 import com.yahoo.document.datatypes.FieldValue;
diff --git a/document/src/main/java/com/yahoo/document/SimpleDocument.java b/document/src/main/java/com/yahoo/document/SimpleDocument.java
index b461356ecef..11a05d26f8f 100644
--- a/document/src/main/java/com/yahoo/document/SimpleDocument.java
+++ b/document/src/main/java/com/yahoo/document/SimpleDocument.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document;
 
 import com.yahoo.document.datatypes.FieldValue;
diff --git a/document/src/main/java/com/yahoo/document/StructDataType.java b/document/src/main/java/com/yahoo/document/StructDataType.java
index 3f26cbe054f..e39049c2b05 100644
--- a/document/src/main/java/com/yahoo/document/StructDataType.java
+++ b/document/src/main/java/com/yahoo/document/StructDataType.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document;
 
 import com.google.common.collect.ImmutableList;
diff --git a/document/src/main/java/com/yahoo/document/StructuredDataType.java b/document/src/main/java/com/yahoo/document/StructuredDataType.java
index 2cf1d75e8b1..e4bb94a5465 100644
--- a/document/src/main/java/com/yahoo/document/StructuredDataType.java
+++ b/document/src/main/java/com/yahoo/document/StructuredDataType.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document;
 
 import com.yahoo.document.datatypes.FieldValue;
diff --git a/document/src/main/java/com/yahoo/document/TemporaryDataType.java b/document/src/main/java/com/yahoo/document/TemporaryDataType.java
index a0c6fcb889d..ea6ce9daa88 100644
--- a/document/src/main/java/com/yahoo/document/TemporaryDataType.java
+++ b/document/src/main/java/com/yahoo/document/TemporaryDataType.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document;
 
 import com.yahoo.document.datatypes.FieldValue;
diff --git a/document/src/main/java/com/yahoo/document/TemporaryStructuredDataType.java b/document/src/main/java/com/yahoo/document/TemporaryStructuredDataType.java
index 96698abc5d5..1f99cc7bf0e 100644
--- a/document/src/main/java/com/yahoo/document/TemporaryStructuredDataType.java
+++ b/document/src/main/java/com/yahoo/document/TemporaryStructuredDataType.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document;
 
 /**
diff --git a/document/src/main/java/com/yahoo/document/TensorDataType.java b/document/src/main/java/com/yahoo/document/TensorDataType.java
index 808d2612825..aefdc030a12 100644
--- a/document/src/main/java/com/yahoo/document/TensorDataType.java
+++ b/document/src/main/java/com/yahoo/document/TensorDataType.java
@@ -1,3 +1,4 @@
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document;
 
 import com.yahoo.document.datatypes.FieldValue;
diff --git a/document/src/main/java/com/yahoo/document/TestAndSetCondition.java b/document/src/main/java/com/yahoo/document/TestAndSetCondition.java
index 5c0d83678c8..78e75ba8e95 100644
--- a/document/src/main/java/com/yahoo/document/TestAndSetCondition.java
+++ b/document/src/main/java/com/yahoo/document/TestAndSetCondition.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document;
 
 import com.google.common.annotations.Beta;
diff --git a/document/src/main/java/com/yahoo/document/WeightedSetDataType.java b/document/src/main/java/com/yahoo/document/WeightedSetDataType.java
index 0b51fc6a119..d89967048d6 100644
--- a/document/src/main/java/com/yahoo/document/WeightedSetDataType.java
+++ b/document/src/main/java/com/yahoo/document/WeightedSetDataType.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document;
 
 import com.yahoo.document.datatypes.WeightedSet;
diff --git a/document/src/main/java/com/yahoo/document/annotation/AlternateSpanList.java b/document/src/main/java/com/yahoo/document/annotation/AlternateSpanList.java
index 9f2f8a9b160..bfac5c2c620 100644
--- a/document/src/main/java/com/yahoo/document/annotation/AlternateSpanList.java
+++ b/document/src/main/java/com/yahoo/document/annotation/AlternateSpanList.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.annotation;
 
 import com.yahoo.document.serialization.SpanNodeReader;
diff --git a/document/src/main/java/com/yahoo/document/annotation/Annotation.java b/document/src/main/java/com/yahoo/document/annotation/Annotation.java
index 1823584eb6d..4b9452f3400 100644
--- a/document/src/main/java/com/yahoo/document/annotation/Annotation.java
+++ b/document/src/main/java/com/yahoo/document/annotation/Annotation.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.annotation;
 
 import com.yahoo.document.DataType;
diff --git a/document/src/main/java/com/yahoo/document/annotation/AnnotationContainer.java b/document/src/main/java/com/yahoo/document/annotation/AnnotationContainer.java
index 3a44d2a78f6..40651bdc123 100644
--- a/document/src/main/java/com/yahoo/document/annotation/AnnotationContainer.java
+++ b/document/src/main/java/com/yahoo/document/annotation/AnnotationContainer.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.annotation;
 
 import java.util.Collection;
diff --git a/document/src/main/java/com/yahoo/document/annotation/AnnotationReference.java b/document/src/main/java/com/yahoo/document/annotation/AnnotationReference.java
index aa6ea1b0040..be6f4955dcf 100644
--- a/document/src/main/java/com/yahoo/document/annotation/AnnotationReference.java
+++ b/document/src/main/java/com/yahoo/document/annotation/AnnotationReference.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.annotation;
 
 import com.yahoo.document.DataType;
diff --git a/document/src/main/java/com/yahoo/document/annotation/AnnotationReferenceDataType.java b/document/src/main/java/com/yahoo/document/annotation/AnnotationReferenceDataType.java
index e75e29f5e75..9adf7397a52 100644
--- a/document/src/main/java/com/yahoo/document/annotation/AnnotationReferenceDataType.java
+++ b/document/src/main/java/com/yahoo/document/annotation/AnnotationReferenceDataType.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.annotation;
 
 import com.yahoo.document.DataType;
diff --git a/document/src/main/java/com/yahoo/document/annotation/AnnotationType.java b/document/src/main/java/com/yahoo/document/annotation/AnnotationType.java
index f66080e3a5a..15e30b1f882 100644
--- a/document/src/main/java/com/yahoo/document/annotation/AnnotationType.java
+++ b/document/src/main/java/com/yahoo/document/annotation/AnnotationType.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.annotation;
 
 import com.google.common.collect.ImmutableList;
diff --git a/document/src/main/java/com/yahoo/document/annotation/AnnotationType2AnnotationContainer.java b/document/src/main/java/com/yahoo/document/annotation/AnnotationType2AnnotationContainer.java
index 778e6f50a40..121ccfb2cda 100644
--- a/document/src/main/java/com/yahoo/document/annotation/AnnotationType2AnnotationContainer.java
+++ b/document/src/main/java/com/yahoo/document/annotation/AnnotationType2AnnotationContainer.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.annotation;
 
 import org.apache.commons.collections.map.MultiValueMap;
diff --git a/document/src/main/java/com/yahoo/document/annotation/AnnotationTypeRegistry.java b/document/src/main/java/com/yahoo/document/annotation/AnnotationTypeRegistry.java
index 21e0338ae0e..08dc602a720 100644
--- a/document/src/main/java/com/yahoo/document/annotation/AnnotationTypeRegistry.java
+++ b/document/src/main/java/com/yahoo/document/annotation/AnnotationTypeRegistry.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.annotation;
 
 import java.util.Collections;
diff --git a/document/src/main/java/com/yahoo/document/annotation/AnnotationTypes.java b/document/src/main/java/com/yahoo/document/annotation/AnnotationTypes.java
index 6d868ed4079..e1e61e13119 100644
--- a/document/src/main/java/com/yahoo/document/annotation/AnnotationTypes.java
+++ b/document/src/main/java/com/yahoo/document/annotation/AnnotationTypes.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.annotation;
 
 import com.yahoo.document.DataType;
diff --git a/document/src/main/java/com/yahoo/document/annotation/DummySpanNode.java b/document/src/main/java/com/yahoo/document/annotation/DummySpanNode.java
index c891e8c686b..69f462f777c 100644
--- a/document/src/main/java/com/yahoo/document/annotation/DummySpanNode.java
+++ b/document/src/main/java/com/yahoo/document/annotation/DummySpanNode.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.annotation;
 
 import java.util.Collections;
diff --git a/document/src/main/java/com/yahoo/document/annotation/InvalidatingIterator.java b/document/src/main/java/com/yahoo/document/annotation/InvalidatingIterator.java
index 3542ee247a2..a780b6d16bf 100644
--- a/document/src/main/java/com/yahoo/document/annotation/InvalidatingIterator.java
+++ b/document/src/main/java/com/yahoo/document/annotation/InvalidatingIterator.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.annotation;
 
 import java.util.ListIterator;
diff --git a/document/src/main/java/com/yahoo/document/annotation/IteratingAnnotationContainer.java b/document/src/main/java/com/yahoo/document/annotation/IteratingAnnotationContainer.java
index 588bf5f2826..3a305361700 100644
--- a/document/src/main/java/com/yahoo/document/annotation/IteratingAnnotationContainer.java
+++ b/document/src/main/java/com/yahoo/document/annotation/IteratingAnnotationContainer.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.annotation;
 
 import java.util.IdentityHashMap;
diff --git a/document/src/main/java/com/yahoo/document/annotation/ListAnnotationContainer.java b/document/src/main/java/com/yahoo/document/annotation/ListAnnotationContainer.java
index 0f03b9b269b..9fe2f8d1cdc 100644
--- a/document/src/main/java/com/yahoo/document/annotation/ListAnnotationContainer.java
+++ b/document/src/main/java/com/yahoo/document/annotation/ListAnnotationContainer.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.annotation;
 
 import java.util.Collection;
diff --git a/document/src/main/java/com/yahoo/document/annotation/PeekableListIterator.java b/document/src/main/java/com/yahoo/document/annotation/PeekableListIterator.java
index 53a8a1b803e..5a2cb544426 100644
--- a/document/src/main/java/com/yahoo/document/annotation/PeekableListIterator.java
+++ b/document/src/main/java/com/yahoo/document/annotation/PeekableListIterator.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.annotation;
 
 import java.util.ListIterator;
diff --git a/document/src/main/java/com/yahoo/document/annotation/RecursiveNodeIterator.java b/document/src/main/java/com/yahoo/document/annotation/RecursiveNodeIterator.java
index ceecfcc2917..9ded7b41732 100644
--- a/document/src/main/java/com/yahoo/document/annotation/RecursiveNodeIterator.java
+++ b/document/src/main/java/com/yahoo/document/annotation/RecursiveNodeIterator.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.annotation;
 
 import java.util.ListIterator;
diff --git a/document/src/main/java/com/yahoo/document/annotation/SerialIterator.java b/document/src/main/java/com/yahoo/document/annotation/SerialIterator.java
index d86d90dc0d0..00d41e1d1cb 100644
--- a/document/src/main/java/com/yahoo/document/annotation/SerialIterator.java
+++ b/document/src/main/java/com/yahoo/document/annotation/SerialIterator.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.annotation;
 
 
diff --git a/document/src/main/java/com/yahoo/document/annotation/Span.java b/document/src/main/java/com/yahoo/document/annotation/Span.java
index a6132078c54..fd030f01be1 100644
--- a/document/src/main/java/com/yahoo/document/annotation/Span.java
+++ b/document/src/main/java/com/yahoo/document/annotation/Span.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.annotation;
 
 import com.yahoo.document.serialization.SpanNodeReader;
diff --git a/document/src/main/java/com/yahoo/document/annotation/SpanList.java b/document/src/main/java/com/yahoo/document/annotation/SpanList.java
index baa86bd7a6f..5afe4678c5b 100644
--- a/document/src/main/java/com/yahoo/document/annotation/SpanList.java
+++ b/document/src/main/java/com/yahoo/document/annotation/SpanList.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.annotation;
 
 import com.yahoo.document.serialization.SpanNodeReader;
diff --git a/document/src/main/java/com/yahoo/document/annotation/SpanNode.java b/document/src/main/java/com/yahoo/document/annotation/SpanNode.java
index 712bb7bf5c5..e1a7b11d2e0 100644
--- a/document/src/main/java/com/yahoo/document/annotation/SpanNode.java
+++ b/document/src/main/java/com/yahoo/document/annotation/SpanNode.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.annotation;
 
 import com.yahoo.document.datatypes.FieldValue;
diff --git a/document/src/main/java/com/yahoo/document/annotation/SpanNode2AnnotationContainer.java b/document/src/main/java/com/yahoo/document/annotation/SpanNode2AnnotationContainer.java
index 8f10d7c0140..b65b6b7b4d6 100644
--- a/document/src/main/java/com/yahoo/document/annotation/SpanNode2AnnotationContainer.java
+++ b/document/src/main/java/com/yahoo/document/annotation/SpanNode2AnnotationContainer.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.annotation;
 
 import org.apache.commons.collections.map.MultiValueMap;
diff --git a/document/src/main/java/com/yahoo/document/annotation/SpanNodeParent.java b/document/src/main/java/com/yahoo/document/annotation/SpanNodeParent.java
index 8618685d77a..b39e92a1f3c 100644
--- a/document/src/main/java/com/yahoo/document/annotation/SpanNodeParent.java
+++ b/document/src/main/java/com/yahoo/document/annotation/SpanNodeParent.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.annotation;
 
 import com.yahoo.document.datatypes.StringFieldValue;
diff --git a/document/src/main/java/com/yahoo/document/annotation/SpanTree.java b/document/src/main/java/com/yahoo/document/annotation/SpanTree.java
index 7385461504d..2206d95aa38 100644
--- a/document/src/main/java/com/yahoo/document/annotation/SpanTree.java
+++ b/document/src/main/java/com/yahoo/document/annotation/SpanTree.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.annotation;
 
 import com.google.common.collect.ImmutableList;
diff --git a/document/src/main/java/com/yahoo/document/annotation/SpanTrees.java b/document/src/main/java/com/yahoo/document/annotation/SpanTrees.java
index 449e803a248..ff9c8c07a47 100644
--- a/document/src/main/java/com/yahoo/document/annotation/SpanTrees.java
+++ b/document/src/main/java/com/yahoo/document/annotation/SpanTrees.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.annotation;
 
 /**
diff --git a/document/src/main/java/com/yahoo/document/annotation/package-info.java b/document/src/main/java/com/yahoo/document/annotation/package-info.java
index 235252cd030..75ce02f7940 100644
--- a/document/src/main/java/com/yahoo/document/annotation/package-info.java
+++ b/document/src/main/java/com/yahoo/document/annotation/package-info.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 /**
  * Provides classes and interfaces for creating trees of spans over string
  * values in Vespa documents, and annotating these spans.
diff --git a/document/src/main/java/com/yahoo/document/config/package-info.java b/document/src/main/java/com/yahoo/document/config/package-info.java
index d28ae619a10..3522c2a1ad5 100644
--- a/document/src/main/java/com/yahoo/document/config/package-info.java
+++ b/document/src/main/java/com/yahoo/document/config/package-info.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 @ExportPackage
 package com.yahoo.document.config;
 
diff --git a/document/src/main/java/com/yahoo/document/datatypes/Array.java b/document/src/main/java/com/yahoo/document/datatypes/Array.java
index 09fb8b71db1..e37a32f28f4 100644
--- a/document/src/main/java/com/yahoo/document/datatypes/Array.java
+++ b/document/src/main/java/com/yahoo/document/datatypes/Array.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.datatypes;
 
 import com.yahoo.collections.CollectionComparator;
diff --git a/document/src/main/java/com/yahoo/document/datatypes/ByteFieldValue.java b/document/src/main/java/com/yahoo/document/datatypes/ByteFieldValue.java
index c6606dd9886..4aa4c29db48 100644
--- a/document/src/main/java/com/yahoo/document/datatypes/ByteFieldValue.java
+++ b/document/src/main/java/com/yahoo/document/datatypes/ByteFieldValue.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.datatypes;
 
 import com.yahoo.document.DataType;
diff --git a/document/src/main/java/com/yahoo/document/datatypes/CollectionFieldValue.java b/document/src/main/java/com/yahoo/document/datatypes/CollectionFieldValue.java
index aeeb4abf632..fe135ccfd05 100644
--- a/document/src/main/java/com/yahoo/document/datatypes/CollectionFieldValue.java
+++ b/document/src/main/java/com/yahoo/document/datatypes/CollectionFieldValue.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.datatypes;
 
 import com.yahoo.document.CollectionDataType;
diff --git a/document/src/main/java/com/yahoo/document/datatypes/CompositeFieldValue.java b/document/src/main/java/com/yahoo/document/datatypes/CompositeFieldValue.java
index a1f0f81eea7..3202c6b40af 100644
--- a/document/src/main/java/com/yahoo/document/datatypes/CompositeFieldValue.java
+++ b/document/src/main/java/com/yahoo/document/datatypes/CompositeFieldValue.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.datatypes;
 
 import com.yahoo.document.DataType;
diff --git a/document/src/main/java/com/yahoo/document/datatypes/DoubleFieldValue.java b/document/src/main/java/com/yahoo/document/datatypes/DoubleFieldValue.java
index 2d9d900a092..0f1fe50818b 100644
--- a/document/src/main/java/com/yahoo/document/datatypes/DoubleFieldValue.java
+++ b/document/src/main/java/com/yahoo/document/datatypes/DoubleFieldValue.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.datatypes;
 
 import com.yahoo.document.DataType;
diff --git a/document/src/main/java/com/yahoo/document/datatypes/FieldPathIteratorHandler.java b/document/src/main/java/com/yahoo/document/datatypes/FieldPathIteratorHandler.java
index 47c7b5b4d94..de645aff297 100644
--- a/document/src/main/java/com/yahoo/document/datatypes/FieldPathIteratorHandler.java
+++ b/document/src/main/java/com/yahoo/document/datatypes/FieldPathIteratorHandler.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.datatypes;
 
 import java.util.HashMap;
diff --git a/document/src/main/java/com/yahoo/document/datatypes/FieldValue.java b/document/src/main/java/com/yahoo/document/datatypes/FieldValue.java
index 9c64ee0d1b5..0460e303426 100644
--- a/document/src/main/java/com/yahoo/document/datatypes/FieldValue.java
+++ b/document/src/main/java/com/yahoo/document/datatypes/FieldValue.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.datatypes;
 
 import com.yahoo.document.ArrayDataType;
diff --git a/document/src/main/java/com/yahoo/document/datatypes/FloatFieldValue.java b/document/src/main/java/com/yahoo/document/datatypes/FloatFieldValue.java
index a8c83f426ed..5a94bb43a77 100644
--- a/document/src/main/java/com/yahoo/document/datatypes/FloatFieldValue.java
+++ b/document/src/main/java/com/yahoo/document/datatypes/FloatFieldValue.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.datatypes;
 
 import com.yahoo.document.DataType;
diff --git a/document/src/main/java/com/yahoo/document/datatypes/IntegerFieldValue.java b/document/src/main/java/com/yahoo/document/datatypes/IntegerFieldValue.java
index 4f54c4c6cb1..19f34acde9a 100644
--- a/document/src/main/java/com/yahoo/document/datatypes/IntegerFieldValue.java
+++ b/document/src/main/java/com/yahoo/document/datatypes/IntegerFieldValue.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.datatypes;
 
 import com.yahoo.document.DataType;
diff --git a/document/src/main/java/com/yahoo/document/datatypes/LongFieldValue.java b/document/src/main/java/com/yahoo/document/datatypes/LongFieldValue.java
index 3705d89e146..2d3797f6735 100644
--- a/document/src/main/java/com/yahoo/document/datatypes/LongFieldValue.java
+++ b/document/src/main/java/com/yahoo/document/datatypes/LongFieldValue.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.datatypes;
 
 import com.yahoo.document.DataType;
diff --git a/document/src/main/java/com/yahoo/document/datatypes/MapFieldValue.java b/document/src/main/java/com/yahoo/document/datatypes/MapFieldValue.java
index 261d40161d0..6d6c18755c1 100644
--- a/document/src/main/java/com/yahoo/document/datatypes/MapFieldValue.java
+++ b/document/src/main/java/com/yahoo/document/datatypes/MapFieldValue.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.datatypes;
 
 import com.yahoo.collections.CollectionComparator;
diff --git a/document/src/main/java/com/yahoo/document/datatypes/NumericFieldValue.java b/document/src/main/java/com/yahoo/document/datatypes/NumericFieldValue.java
index 776ca42c47d..cd2b2590d50 100644
--- a/document/src/main/java/com/yahoo/document/datatypes/NumericFieldValue.java
+++ b/document/src/main/java/com/yahoo/document/datatypes/NumericFieldValue.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.datatypes;
 
 public abstract class NumericFieldValue extends FieldValue {
diff --git a/document/src/main/java/com/yahoo/document/datatypes/PredicateFieldValue.java b/document/src/main/java/com/yahoo/document/datatypes/PredicateFieldValue.java
index 4978acc19d2..67d03de658e 100644
--- a/document/src/main/java/com/yahoo/document/datatypes/PredicateFieldValue.java
+++ b/document/src/main/java/com/yahoo/document/datatypes/PredicateFieldValue.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.datatypes;
 
 import com.yahoo.document.DataType;
diff --git a/document/src/main/java/com/yahoo/document/datatypes/Raw.java b/document/src/main/java/com/yahoo/document/datatypes/Raw.java
index 7d4d2430984..2a5383705df 100644
--- a/document/src/main/java/com/yahoo/document/datatypes/Raw.java
+++ b/document/src/main/java/com/yahoo/document/datatypes/Raw.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.datatypes;
 
 import com.yahoo.document.DataType;
diff --git a/document/src/main/java/com/yahoo/document/datatypes/ReferenceFieldValue.java b/document/src/main/java/com/yahoo/document/datatypes/ReferenceFieldValue.java
index 1e4079dd3fe..eb8ce4d3b24 100644
--- a/document/src/main/java/com/yahoo/document/datatypes/ReferenceFieldValue.java
+++ b/document/src/main/java/com/yahoo/document/datatypes/ReferenceFieldValue.java
@@ -1,4 +1,4 @@
-// Copyright 2017 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.datatypes;
 
 import com.yahoo.document.DataType;
diff --git a/document/src/main/java/com/yahoo/document/datatypes/StringFieldValue.java b/document/src/main/java/com/yahoo/document/datatypes/StringFieldValue.java
index 3df7dccb035..7b8f96b3481 100644
--- a/document/src/main/java/com/yahoo/document/datatypes/StringFieldValue.java
+++ b/document/src/main/java/com/yahoo/document/datatypes/StringFieldValue.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.datatypes;
 
 import com.google.common.collect.ImmutableList;
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 b5920cb4758..7d4e615b27b 100644
--- a/document/src/main/java/com/yahoo/document/datatypes/Struct.java
+++ b/document/src/main/java/com/yahoo/document/datatypes/Struct.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.datatypes;
 
 import com.yahoo.collections.Hashlet;
diff --git a/document/src/main/java/com/yahoo/document/datatypes/StructuredFieldValue.java b/document/src/main/java/com/yahoo/document/datatypes/StructuredFieldValue.java
index 7957d9b812f..b3ea93d8467 100644
--- a/document/src/main/java/com/yahoo/document/datatypes/StructuredFieldValue.java
+++ b/document/src/main/java/com/yahoo/document/datatypes/StructuredFieldValue.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.datatypes;
 
 import com.yahoo.document.*;
diff --git a/document/src/main/java/com/yahoo/document/datatypes/TensorFieldValue.java b/document/src/main/java/com/yahoo/document/datatypes/TensorFieldValue.java
index 4d18c5ca51a..ae8d5cf596a 100644
--- a/document/src/main/java/com/yahoo/document/datatypes/TensorFieldValue.java
+++ b/document/src/main/java/com/yahoo/document/datatypes/TensorFieldValue.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.datatypes;
 
 import com.yahoo.document.Field;
diff --git a/document/src/main/java/com/yahoo/document/datatypes/UriFieldValue.java b/document/src/main/java/com/yahoo/document/datatypes/UriFieldValue.java
index a1e0b12b6a0..13688c8e311 100644
--- a/document/src/main/java/com/yahoo/document/datatypes/UriFieldValue.java
+++ b/document/src/main/java/com/yahoo/document/datatypes/UriFieldValue.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.datatypes;
 
 import com.yahoo.document.DataType;
diff --git a/document/src/main/java/com/yahoo/document/datatypes/WeightedSet.java b/document/src/main/java/com/yahoo/document/datatypes/WeightedSet.java
index 96f9932f4a5..0e4c56406f0 100644
--- a/document/src/main/java/com/yahoo/document/datatypes/WeightedSet.java
+++ b/document/src/main/java/com/yahoo/document/datatypes/WeightedSet.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.datatypes;
 
 import com.yahoo.collections.CollectionComparator;
diff --git a/document/src/main/java/com/yahoo/document/datatypes/package-info.java b/document/src/main/java/com/yahoo/document/datatypes/package-info.java
index 67ed3c15393..16bc154a0a9 100644
--- a/document/src/main/java/com/yahoo/document/datatypes/package-info.java
+++ b/document/src/main/java/com/yahoo/document/datatypes/package-info.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 @ExportPackage
 @PublicApi
 package com.yahoo.document.datatypes;
diff --git a/document/src/main/java/com/yahoo/document/fieldpathupdate/AddFieldPathUpdate.java b/document/src/main/java/com/yahoo/document/fieldpathupdate/AddFieldPathUpdate.java
index d66de429b3c..9fac025c15e 100644
--- a/document/src/main/java/com/yahoo/document/fieldpathupdate/AddFieldPathUpdate.java
+++ b/document/src/main/java/com/yahoo/document/fieldpathupdate/AddFieldPathUpdate.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.fieldpathupdate;
 
 import com.yahoo.document.Document;
diff --git a/document/src/main/java/com/yahoo/document/fieldpathupdate/AssignFieldPathUpdate.java b/document/src/main/java/com/yahoo/document/fieldpathupdate/AssignFieldPathUpdate.java
index 92fc0458d4e..e31eefa2c00 100644
--- a/document/src/main/java/com/yahoo/document/fieldpathupdate/AssignFieldPathUpdate.java
+++ b/document/src/main/java/com/yahoo/document/fieldpathupdate/AssignFieldPathUpdate.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.fieldpathupdate;
 
 import com.yahoo.document.Document;
diff --git a/document/src/main/java/com/yahoo/document/fieldpathupdate/FieldPathUpdate.java b/document/src/main/java/com/yahoo/document/fieldpathupdate/FieldPathUpdate.java
index 9ecdb6f27f0..82dea23bb85 100644
--- a/document/src/main/java/com/yahoo/document/fieldpathupdate/FieldPathUpdate.java
+++ b/document/src/main/java/com/yahoo/document/fieldpathupdate/FieldPathUpdate.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.fieldpathupdate;
 
 import com.yahoo.document.Document;
diff --git a/document/src/main/java/com/yahoo/document/fieldpathupdate/RemoveFieldPathUpdate.java b/document/src/main/java/com/yahoo/document/fieldpathupdate/RemoveFieldPathUpdate.java
index 96a3fadc66c..13b53c58fc1 100644
--- a/document/src/main/java/com/yahoo/document/fieldpathupdate/RemoveFieldPathUpdate.java
+++ b/document/src/main/java/com/yahoo/document/fieldpathupdate/RemoveFieldPathUpdate.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.fieldpathupdate;
 
 import com.yahoo.document.Document;
@@ -52,4 +52,4 @@ public class RemoveFieldPathUpdate extends FieldPathUpdate {
     public String toString() {
         return "Remove: " + super.toString();
     }
-}
\ No newline at end of file
+}
diff --git a/document/src/main/java/com/yahoo/document/fieldpathupdate/package-info.java b/document/src/main/java/com/yahoo/document/fieldpathupdate/package-info.java
index 8e9f4069386..0c773f61505 100644
--- a/document/src/main/java/com/yahoo/document/fieldpathupdate/package-info.java
+++ b/document/src/main/java/com/yahoo/document/fieldpathupdate/package-info.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 @ExportPackage
 @PublicApi
 package com.yahoo.document.fieldpathupdate;
diff --git a/document/src/main/java/com/yahoo/document/fieldset/AllFields.java b/document/src/main/java/com/yahoo/document/fieldset/AllFields.java
index 3dff7c1e4e6..27bd2a878c7 100644
--- a/document/src/main/java/com/yahoo/document/fieldset/AllFields.java
+++ b/document/src/main/java/com/yahoo/document/fieldset/AllFields.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.fieldset;
 
 /**
diff --git a/document/src/main/java/com/yahoo/document/fieldset/BodyFields.java b/document/src/main/java/com/yahoo/document/fieldset/BodyFields.java
index 50a72fa2fde..912ec798fdb 100644
--- a/document/src/main/java/com/yahoo/document/fieldset/BodyFields.java
+++ b/document/src/main/java/com/yahoo/document/fieldset/BodyFields.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.fieldset;
 
 import com.yahoo.document.Field;
diff --git a/document/src/main/java/com/yahoo/document/fieldset/DocIdOnly.java b/document/src/main/java/com/yahoo/document/fieldset/DocIdOnly.java
index 96deedf34f0..29b8348d501 100644
--- a/document/src/main/java/com/yahoo/document/fieldset/DocIdOnly.java
+++ b/document/src/main/java/com/yahoo/document/fieldset/DocIdOnly.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.fieldset;
 
 /**
diff --git a/document/src/main/java/com/yahoo/document/fieldset/FieldCollection.java b/document/src/main/java/com/yahoo/document/fieldset/FieldCollection.java
index bec47bb9c2e..182980133ff 100644
--- a/document/src/main/java/com/yahoo/document/fieldset/FieldCollection.java
+++ b/document/src/main/java/com/yahoo/document/fieldset/FieldCollection.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.fieldset;
 
 import com.yahoo.document.DocumentType;
diff --git a/document/src/main/java/com/yahoo/document/fieldset/FieldSet.java b/document/src/main/java/com/yahoo/document/fieldset/FieldSet.java
index 0d0b9244e35..1f8e32613c5 100644
--- a/document/src/main/java/com/yahoo/document/fieldset/FieldSet.java
+++ b/document/src/main/java/com/yahoo/document/fieldset/FieldSet.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.fieldset;
 
 import com.yahoo.document.Document;
diff --git a/document/src/main/java/com/yahoo/document/fieldset/FieldSetRepo.java b/document/src/main/java/com/yahoo/document/fieldset/FieldSetRepo.java
index c0da7fd9bc7..38ea190b0d4 100644
--- a/document/src/main/java/com/yahoo/document/fieldset/FieldSetRepo.java
+++ b/document/src/main/java/com/yahoo/document/fieldset/FieldSetRepo.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.fieldset;
 
 import com.yahoo.document.Document;
diff --git a/document/src/main/java/com/yahoo/document/fieldset/HeaderFields.java b/document/src/main/java/com/yahoo/document/fieldset/HeaderFields.java
index a9e9375f9ac..e3b8befa226 100644
--- a/document/src/main/java/com/yahoo/document/fieldset/HeaderFields.java
+++ b/document/src/main/java/com/yahoo/document/fieldset/HeaderFields.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.fieldset;
 
 import com.yahoo.document.Field;
diff --git a/document/src/main/java/com/yahoo/document/fieldset/NoFields.java b/document/src/main/java/com/yahoo/document/fieldset/NoFields.java
index 43d9412f94d..fe3426db143 100644
--- a/document/src/main/java/com/yahoo/document/fieldset/NoFields.java
+++ b/document/src/main/java/com/yahoo/document/fieldset/NoFields.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.fieldset;
 
 /**
diff --git a/document/src/main/java/com/yahoo/document/fieldset/package-info.java b/document/src/main/java/com/yahoo/document/fieldset/package-info.java
index 33534f3396c..51fa1d0590a 100644
--- a/document/src/main/java/com/yahoo/document/fieldset/package-info.java
+++ b/document/src/main/java/com/yahoo/document/fieldset/package-info.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 @ExportPackage
 @PublicApi
 package com.yahoo.document.fieldset;
diff --git a/document/src/main/java/com/yahoo/document/idstring/DocIdString.java b/document/src/main/java/com/yahoo/document/idstring/DocIdString.java
index 85ed7451fbe..7ce9d6150e2 100644
--- a/document/src/main/java/com/yahoo/document/idstring/DocIdString.java
+++ b/document/src/main/java/com/yahoo/document/idstring/DocIdString.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.idstring;
 
 import com.yahoo.collections.MD5;
diff --git a/document/src/main/java/com/yahoo/document/idstring/GroupDocIdString.java b/document/src/main/java/com/yahoo/document/idstring/GroupDocIdString.java
index aed7c78d0ef..ff975efa274 100644
--- a/document/src/main/java/com/yahoo/document/idstring/GroupDocIdString.java
+++ b/document/src/main/java/com/yahoo/document/idstring/GroupDocIdString.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.idstring;
 
 import com.yahoo.collections.MD5;
diff --git a/document/src/main/java/com/yahoo/document/idstring/IdIdString.java b/document/src/main/java/com/yahoo/document/idstring/IdIdString.java
index 6fd5c578ee8..7fcb530b347 100644
--- a/document/src/main/java/com/yahoo/document/idstring/IdIdString.java
+++ b/document/src/main/java/com/yahoo/document/idstring/IdIdString.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.idstring;
 
 import com.yahoo.collections.MD5;
diff --git a/document/src/main/java/com/yahoo/document/idstring/IdString.java b/document/src/main/java/com/yahoo/document/idstring/IdString.java
index 55fd601dd0d..468dc9a38b1 100644
--- a/document/src/main/java/com/yahoo/document/idstring/IdString.java
+++ b/document/src/main/java/com/yahoo/document/idstring/IdString.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.idstring;
 
 import com.yahoo.text.Utf8String;
diff --git a/document/src/main/java/com/yahoo/document/idstring/OrderDocIdString.java b/document/src/main/java/com/yahoo/document/idstring/OrderDocIdString.java
index 111be0110b5..8c9ec506249 100644
--- a/document/src/main/java/com/yahoo/document/idstring/OrderDocIdString.java
+++ b/document/src/main/java/com/yahoo/document/idstring/OrderDocIdString.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.idstring;
 
 import com.yahoo.collections.MD5;
diff --git a/document/src/main/java/com/yahoo/document/idstring/UserDocIdString.java b/document/src/main/java/com/yahoo/document/idstring/UserDocIdString.java
index 631c199e6bf..4da56bfbb6e 100644
--- a/document/src/main/java/com/yahoo/document/idstring/UserDocIdString.java
+++ b/document/src/main/java/com/yahoo/document/idstring/UserDocIdString.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.idstring;
 
 import java.math.BigInteger;
diff --git a/document/src/main/java/com/yahoo/document/idstring/package-info.java b/document/src/main/java/com/yahoo/document/idstring/package-info.java
index 4ddd539ccd5..3ee22fe683a 100644
--- a/document/src/main/java/com/yahoo/document/idstring/package-info.java
+++ b/document/src/main/java/com/yahoo/document/idstring/package-info.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 @ExportPackage
 @PublicApi
 package com.yahoo.document.idstring;
diff --git a/document/src/main/java/com/yahoo/document/json/DocumentUpdateJsonSerializer.java b/document/src/main/java/com/yahoo/document/json/DocumentUpdateJsonSerializer.java
index 1c5e6efdda6..caa2d2a3174 100644
--- a/document/src/main/java/com/yahoo/document/json/DocumentUpdateJsonSerializer.java
+++ b/document/src/main/java/com/yahoo/document/json/DocumentUpdateJsonSerializer.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.json;
 
 import com.fasterxml.jackson.core.JsonFactory;
@@ -407,4 +407,4 @@ public class DocumentUpdateJsonSerializer
             return this;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/document/src/main/java/com/yahoo/document/json/JsonFeedReader.java b/document/src/main/java/com/yahoo/document/json/JsonFeedReader.java
index 2f892144c66..ec0d29a53a6 100644
--- a/document/src/main/java/com/yahoo/document/json/JsonFeedReader.java
+++ b/document/src/main/java/com/yahoo/document/json/JsonFeedReader.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.json;
 
 import java.io.InputStream;
diff --git a/document/src/main/java/com/yahoo/document/json/JsonReader.java b/document/src/main/java/com/yahoo/document/json/JsonReader.java
index 8851f5d0fa5..bedfbdc3da5 100644
--- a/document/src/main/java/com/yahoo/document/json/JsonReader.java
+++ b/document/src/main/java/com/yahoo/document/json/JsonReader.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.json;
 
 import com.fasterxml.jackson.core.JsonFactory;
diff --git a/document/src/main/java/com/yahoo/document/json/JsonReaderException.java b/document/src/main/java/com/yahoo/document/json/JsonReaderException.java
index 3346ecc3bd6..f919d00d20c 100644
--- a/document/src/main/java/com/yahoo/document/json/JsonReaderException.java
+++ b/document/src/main/java/com/yahoo/document/json/JsonReaderException.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.json;
 
 import com.yahoo.document.DocumentId;
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 c15e61d10f1..e486e2647cf 100644
--- a/document/src/main/java/com/yahoo/document/json/JsonSerializationHelper.java
+++ b/document/src/main/java/com/yahoo/document/json/JsonSerializationHelper.java
@@ -1,3 +1,4 @@
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.json;
 
 import com.fasterxml.jackson.core.JsonGenerator;
diff --git a/document/src/main/java/com/yahoo/document/json/JsonWriter.java b/document/src/main/java/com/yahoo/document/json/JsonWriter.java
index bc90141747f..ecec34c5d3f 100644
--- a/document/src/main/java/com/yahoo/document/json/JsonWriter.java
+++ b/document/src/main/java/com/yahoo/document/json/JsonWriter.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.json;
 
 import com.fasterxml.jackson.core.JsonFactory;
diff --git a/document/src/main/java/com/yahoo/document/json/SingleDocumentParser.java b/document/src/main/java/com/yahoo/document/json/SingleDocumentParser.java
index 9da04eb6ae4..8012ebafb13 100644
--- a/document/src/main/java/com/yahoo/document/json/SingleDocumentParser.java
+++ b/document/src/main/java/com/yahoo/document/json/SingleDocumentParser.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.json;
 
 import com.fasterxml.jackson.core.JsonFactory;
diff --git a/document/src/main/java/com/yahoo/document/json/TokenBuffer.java b/document/src/main/java/com/yahoo/document/json/TokenBuffer.java
index 4902dc65f3d..e6fc8171a1a 100644
--- a/document/src/main/java/com/yahoo/document/json/TokenBuffer.java
+++ b/document/src/main/java/com/yahoo/document/json/TokenBuffer.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.json;
 
 import java.io.IOException;
diff --git a/document/src/main/java/com/yahoo/document/json/document/DocumentParser.java b/document/src/main/java/com/yahoo/document/json/document/DocumentParser.java
index 088753a4dfc..c64950614ca 100644
--- a/document/src/main/java/com/yahoo/document/json/document/DocumentParser.java
+++ b/document/src/main/java/com/yahoo/document/json/document/DocumentParser.java
@@ -1,4 +1,4 @@
-// Copyright 2017 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.json.document;
 
 import com.fasterxml.jackson.core.JsonParser;
diff --git a/document/src/main/java/com/yahoo/document/json/package-info.java b/document/src/main/java/com/yahoo/document/json/package-info.java
index 85d939f5b18..e4332b5eff7 100644
--- a/document/src/main/java/com/yahoo/document/json/package-info.java
+++ b/document/src/main/java/com/yahoo/document/json/package-info.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 /**
  * Infrastructure for building Vespa documents and feed operations from JSON.
  */
diff --git a/document/src/main/java/com/yahoo/document/json/readers/AddRemoveCreator.java b/document/src/main/java/com/yahoo/document/json/readers/AddRemoveCreator.java
index ce78ec80b67..a5af14a1cde 100644
--- a/document/src/main/java/com/yahoo/document/json/readers/AddRemoveCreator.java
+++ b/document/src/main/java/com/yahoo/document/json/readers/AddRemoveCreator.java
@@ -1,4 +1,4 @@
-// Copyright 2017 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.json.readers;
 
 import com.fasterxml.jackson.core.JsonToken;
diff --git a/document/src/main/java/com/yahoo/document/json/readers/ArrayReader.java b/document/src/main/java/com/yahoo/document/json/readers/ArrayReader.java
index d51bdac53df..779d706ac3c 100644
--- a/document/src/main/java/com/yahoo/document/json/readers/ArrayReader.java
+++ b/document/src/main/java/com/yahoo/document/json/readers/ArrayReader.java
@@ -1,4 +1,4 @@
-// Copyright 2017 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.json.readers;
 
 import com.yahoo.document.DataType;
diff --git a/document/src/main/java/com/yahoo/document/json/readers/CompositeReader.java b/document/src/main/java/com/yahoo/document/json/readers/CompositeReader.java
index 2d016223f88..e8b3e514cb2 100644
--- a/document/src/main/java/com/yahoo/document/json/readers/CompositeReader.java
+++ b/document/src/main/java/com/yahoo/document/json/readers/CompositeReader.java
@@ -1,4 +1,4 @@
-// Copyright 2017 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.json.readers;
 
 import com.fasterxml.jackson.core.JsonToken;
diff --git a/document/src/main/java/com/yahoo/document/json/readers/DocumentParseInfo.java b/document/src/main/java/com/yahoo/document/json/readers/DocumentParseInfo.java
index 7401e33c607..da7f18b1a7e 100644
--- a/document/src/main/java/com/yahoo/document/json/readers/DocumentParseInfo.java
+++ b/document/src/main/java/com/yahoo/document/json/readers/DocumentParseInfo.java
@@ -1,4 +1,4 @@
-// Copyright 2017 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.json.readers;
 
 import com.yahoo.document.DocumentId;
diff --git a/document/src/main/java/com/yahoo/document/json/readers/JsonParserHelpers.java b/document/src/main/java/com/yahoo/document/json/readers/JsonParserHelpers.java
index 691123e21e0..e3bfdb7bb2c 100644
--- a/document/src/main/java/com/yahoo/document/json/readers/JsonParserHelpers.java
+++ b/document/src/main/java/com/yahoo/document/json/readers/JsonParserHelpers.java
@@ -1,3 +1,4 @@
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.json.readers;
 
 
diff --git a/document/src/main/java/com/yahoo/document/json/readers/MapReader.java b/document/src/main/java/com/yahoo/document/json/readers/MapReader.java
index 1e7e2353fab..7cd92deda70 100644
--- a/document/src/main/java/com/yahoo/document/json/readers/MapReader.java
+++ b/document/src/main/java/com/yahoo/document/json/readers/MapReader.java
@@ -1,4 +1,4 @@
-// Copyright 2017 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.json.readers;
 
 import com.fasterxml.jackson.core.JsonToken;
diff --git a/document/src/main/java/com/yahoo/document/json/readers/SingleValueReader.java b/document/src/main/java/com/yahoo/document/json/readers/SingleValueReader.java
index 067513b24dc..89a5134943a 100644
--- a/document/src/main/java/com/yahoo/document/json/readers/SingleValueReader.java
+++ b/document/src/main/java/com/yahoo/document/json/readers/SingleValueReader.java
@@ -1,4 +1,4 @@
-// Copyright 2017 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.json.readers;
 
 import com.fasterxml.jackson.core.JsonToken;
diff --git a/document/src/main/java/com/yahoo/document/json/readers/StructReader.java b/document/src/main/java/com/yahoo/document/json/readers/StructReader.java
index ef3e6911df1..3d2d08842dc 100644
--- a/document/src/main/java/com/yahoo/document/json/readers/StructReader.java
+++ b/document/src/main/java/com/yahoo/document/json/readers/StructReader.java
@@ -1,4 +1,4 @@
-// Copyright 2017 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.json.readers;
 
 import com.yahoo.document.Field;
diff --git a/document/src/main/java/com/yahoo/document/json/readers/TensorReader.java b/document/src/main/java/com/yahoo/document/json/readers/TensorReader.java
index 5dd32753ed6..5b08dfe3604 100644
--- a/document/src/main/java/com/yahoo/document/json/readers/TensorReader.java
+++ b/document/src/main/java/com/yahoo/document/json/readers/TensorReader.java
@@ -1,4 +1,4 @@
-// Copyright 2017 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.json.readers;
 
 import com.yahoo.document.datatypes.TensorFieldValue;
diff --git a/document/src/main/java/com/yahoo/document/json/readers/VespaJsonDocumentReader.java b/document/src/main/java/com/yahoo/document/json/readers/VespaJsonDocumentReader.java
index c421cc5680d..8e381c8e2fe 100644
--- a/document/src/main/java/com/yahoo/document/json/readers/VespaJsonDocumentReader.java
+++ b/document/src/main/java/com/yahoo/document/json/readers/VespaJsonDocumentReader.java
@@ -1,3 +1,4 @@
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.json.readers;
 
 import com.fasterxml.jackson.core.JsonToken;
diff --git a/document/src/main/java/com/yahoo/document/json/readers/WeightedSetReader.java b/document/src/main/java/com/yahoo/document/json/readers/WeightedSetReader.java
index af4f5a8d226..cf5fbd16b4d 100644
--- a/document/src/main/java/com/yahoo/document/json/readers/WeightedSetReader.java
+++ b/document/src/main/java/com/yahoo/document/json/readers/WeightedSetReader.java
@@ -1,4 +1,4 @@
-// Copyright 2017 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.json.readers;
 
 import com.yahoo.document.DataType;
diff --git a/document/src/main/java/com/yahoo/document/package-info.java b/document/src/main/java/com/yahoo/document/package-info.java
index e27bbadacb7..69c6459a4c5 100644
--- a/document/src/main/java/com/yahoo/document/package-info.java
+++ b/document/src/main/java/com/yahoo/document/package-info.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 @ExportPackage
 @PublicApi
 package com.yahoo.document;
diff --git a/document/src/main/java/com/yahoo/document/select/BucketSelector.java b/document/src/main/java/com/yahoo/document/select/BucketSelector.java
index 96b8e4b617f..a3dfed98378 100644
--- a/document/src/main/java/com/yahoo/document/select/BucketSelector.java
+++ b/document/src/main/java/com/yahoo/document/select/BucketSelector.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.select;
 
 import com.yahoo.document.BucketIdFactory;
diff --git a/document/src/main/java/com/yahoo/document/select/BucketSet.java b/document/src/main/java/com/yahoo/document/select/BucketSet.java
index e7bb4ac7807..76a62bdeb87 100644
--- a/document/src/main/java/com/yahoo/document/select/BucketSet.java
+++ b/document/src/main/java/com/yahoo/document/select/BucketSet.java
@@ -1,72 +1,72 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.document.select;

-

-import com.yahoo.document.BucketId;

-

-import java.util.HashSet;

-

-/**

- * A set of bucket ids covered by a document selector.

- *

- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>

- */

-public class BucketSet extends HashSet<BucketId> {

-

-    /**

-     * Constructs a new bucket set that contains no ids.

-     */

-    public BucketSet() {

-        // empty

-    }

-

-    /**

-     * Constructs a new bucket set that contains a single id.

-     *

-     * @param id The id to add to this as initial value.

-     */

-    public BucketSet(BucketId id) {

-        add(id);

-    }

-

-    /**

-     * Constructs a new bucket set that is a copy of another.

-     *

-     * @param set The set to copy.

-     */

-    public BucketSet(BucketSet set) {

-        this.addAll(set);

-    }

-

-    /**

-     * Returns the intersection between this bucket set and another.

-     *

-     * @param rhs The set to form an intersection with.

-     * @return The intersection.

-     */

-    public BucketSet intersection(BucketSet rhs) {

-        if (rhs == null) {

-            return new BucketSet(this); // The other has all buckets marked, this is the smaller.

-        } else {

-            BucketSet ret = new BucketSet(this);

-            ret.retainAll(rhs);

-            return ret;

-        }

-    }

-

-    /**

-     * Returns the union between this bucket set and another.

-     *

-     * @param rhs The set to form a union with.

-     * @return The union.

-     */

-    public BucketSet union(BucketSet rhs) {

-        if (rhs == null) {

-            return null;

-        } else {

-            BucketSet ret = new BucketSet(this);

-            ret.addAll(rhs);

-            return ret;

-        }

-    }

-

-}

+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.document.select;
+
+import com.yahoo.document.BucketId;
+
+import java.util.HashSet;
+
+/**
+ * A set of bucket ids covered by a document selector.
+ *
+ * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ */
+public class BucketSet extends HashSet<BucketId> {
+
+    /**
+     * Constructs a new bucket set that contains no ids.
+     */
+    public BucketSet() {
+        // empty
+    }
+
+    /**
+     * Constructs a new bucket set that contains a single id.
+     *
+     * @param id The id to add to this as initial value.
+     */
+    public BucketSet(BucketId id) {
+        add(id);
+    }
+
+    /**
+     * Constructs a new bucket set that is a copy of another.
+     *
+     * @param set The set to copy.
+     */
+    public BucketSet(BucketSet set) {
+        this.addAll(set);
+    }
+
+    /**
+     * Returns the intersection between this bucket set and another.
+     *
+     * @param rhs The set to form an intersection with.
+     * @return The intersection.
+     */
+    public BucketSet intersection(BucketSet rhs) {
+        if (rhs == null) {
+            return new BucketSet(this); // The other has all buckets marked, this is the smaller.
+        } else {
+            BucketSet ret = new BucketSet(this);
+            ret.retainAll(rhs);
+            return ret;
+        }
+    }
+
+    /**
+     * Returns the union between this bucket set and another.
+     *
+     * @param rhs The set to form a union with.
+     * @return The union.
+     */
+    public BucketSet union(BucketSet rhs) {
+        if (rhs == null) {
+            return null;
+        } else {
+            BucketSet ret = new BucketSet(this);
+            ret.addAll(rhs);
+            return ret;
+        }
+    }
+
+}
diff --git a/document/src/main/java/com/yahoo/document/select/Context.java b/document/src/main/java/com/yahoo/document/select/Context.java
index 6cf5ab12bbf..ac2bb6b9f0d 100644
--- a/document/src/main/java/com/yahoo/document/select/Context.java
+++ b/document/src/main/java/com/yahoo/document/select/Context.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.select;
 
 import com.yahoo.document.DocumentOperation;
diff --git a/document/src/main/java/com/yahoo/document/select/DocumentSelector.java b/document/src/main/java/com/yahoo/document/select/DocumentSelector.java
index 8f287d4a213..270b70b92d3 100644
--- a/document/src/main/java/com/yahoo/document/select/DocumentSelector.java
+++ b/document/src/main/java/com/yahoo/document/select/DocumentSelector.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.select;
 
 import com.yahoo.document.DocumentOperation;
diff --git a/document/src/main/java/com/yahoo/document/select/NowCheckVisitor.java b/document/src/main/java/com/yahoo/document/select/NowCheckVisitor.java
index 50613f531b2..11721713c9b 100644
--- a/document/src/main/java/com/yahoo/document/select/NowCheckVisitor.java
+++ b/document/src/main/java/com/yahoo/document/select/NowCheckVisitor.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.select;
 
 import com.yahoo.document.select.Visitor;
diff --git a/document/src/main/java/com/yahoo/document/select/OrderingSpecification.java b/document/src/main/java/com/yahoo/document/select/OrderingSpecification.java
index 3388c6db23d..97908d3190f 100644
--- a/document/src/main/java/com/yahoo/document/select/OrderingSpecification.java
+++ b/document/src/main/java/com/yahoo/document/select/OrderingSpecification.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.select;
 
 public class OrderingSpecification {
diff --git a/document/src/main/java/com/yahoo/document/select/Result.java b/document/src/main/java/com/yahoo/document/select/Result.java
index 3f1fa75d4ef..f2f3f53a3f0 100644
--- a/document/src/main/java/com/yahoo/document/select/Result.java
+++ b/document/src/main/java/com/yahoo/document/select/Result.java
@@ -1,53 +1,53 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.document.select;

-

-import com.yahoo.document.select.rule.AttributeNode;

-

-/**

- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>

- */

-public enum Result {

-

-    /**

-     * Defines all enumeration constants.

-     */

-    TRUE,

-    FALSE,

-    INVALID;

-

-    // Inherit doc from Object.

-    public String toString() {

-        return name().toLowerCase();

-    }

-    

-    /**

-     * Inverts the result value to the appropriate value. True → False, False → True and Invalid → Invalid.

-     * @return inverted result

-     */

-    public static Result invert(Result result) {

-    	if (result == Result.TRUE) return Result.FALSE;

-    	if (result == Result.FALSE) return Result.TRUE;

-    	return Result.INVALID;

-    }

-

-    /**

-     * Converts the given object value into an instance of this Result enumeration.

-     *

-     * @param value The object to convert.

-     * @return The corresponding result value.

-     */

-    public static Result toResult(Object value) {

-        if (value == null || value == Result.FALSE || value == Boolean.FALSE ||

-            (Number.class.isInstance(value) && ((Number)value).doubleValue() == 0)) {

-            return Result.FALSE;

-        } else if (value == INVALID) {

-            return Result.INVALID;

-        } else if (value instanceof AttributeNode.VariableValueList) {

-            return ((AttributeNode.VariableValueList)value).isEmpty() ? Result.FALSE : Result.TRUE;

-        } else if (value instanceof ResultList) {

-            return ((ResultList)value).toResult();

-        } else {

-            return Result.TRUE;

-        }

-    }

-}

+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.document.select;
+
+import com.yahoo.document.select.rule.AttributeNode;
+
+/**
+ * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ */
+public enum Result {
+
+    /**
+     * Defines all enumeration constants.
+     */
+    TRUE,
+    FALSE,
+    INVALID;
+
+    // Inherit doc from Object.
+    public String toString() {
+        return name().toLowerCase();
+    }
+    
+    /**
+     * Inverts the result value to the appropriate value. True → False, False → True and Invalid → Invalid.
+     * @return inverted result
+     */
+    public static Result invert(Result result) {
+    	if (result == Result.TRUE) return Result.FALSE;
+    	if (result == Result.FALSE) return Result.TRUE;
+    	return Result.INVALID;
+    }
+
+    /**
+     * Converts the given object value into an instance of this Result enumeration.
+     *
+     * @param value The object to convert.
+     * @return The corresponding result value.
+     */
+    public static Result toResult(Object value) {
+        if (value == null || value == Result.FALSE || value == Boolean.FALSE ||
+            (Number.class.isInstance(value) && ((Number)value).doubleValue() == 0)) {
+            return Result.FALSE;
+        } else if (value == INVALID) {
+            return Result.INVALID;
+        } else if (value instanceof AttributeNode.VariableValueList) {
+            return ((AttributeNode.VariableValueList)value).isEmpty() ? Result.FALSE : Result.TRUE;
+        } else if (value instanceof ResultList) {
+            return ((ResultList)value).toResult();
+        } else {
+            return Result.TRUE;
+        }
+    }
+}
diff --git a/document/src/main/java/com/yahoo/document/select/ResultList.java b/document/src/main/java/com/yahoo/document/select/ResultList.java
index e3fc7cadce7..41f0fb5edef 100644
--- a/document/src/main/java/com/yahoo/document/select/ResultList.java
+++ b/document/src/main/java/com/yahoo/document/select/ResultList.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.select;
 
 import com.yahoo.document.datatypes.FieldPathIteratorHandler;
diff --git a/document/src/main/java/com/yahoo/document/select/Visitor.java b/document/src/main/java/com/yahoo/document/select/Visitor.java
index a28be4eadaf..7af792b9bc8 100644
--- a/document/src/main/java/com/yahoo/document/select/Visitor.java
+++ b/document/src/main/java/com/yahoo/document/select/Visitor.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.select;
 
 import com.yahoo.document.select.rule.*;
diff --git a/document/src/main/java/com/yahoo/document/select/convert/NowQueryExpression.java b/document/src/main/java/com/yahoo/document/select/convert/NowQueryExpression.java
index 7041f7b760b..e3541a2ea4d 100644
--- a/document/src/main/java/com/yahoo/document/select/convert/NowQueryExpression.java
+++ b/document/src/main/java/com/yahoo/document/select/convert/NowQueryExpression.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.select.convert;
 
 import com.yahoo.document.select.rule.ArithmeticNode;
diff --git a/document/src/main/java/com/yahoo/document/select/convert/NowQueryNode.java b/document/src/main/java/com/yahoo/document/select/convert/NowQueryNode.java
index 58b57cc2983..a236a44ea31 100644
--- a/document/src/main/java/com/yahoo/document/select/convert/NowQueryNode.java
+++ b/document/src/main/java/com/yahoo/document/select/convert/NowQueryNode.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.select.convert;
 
 import com.yahoo.document.select.rule.ArithmeticNode;
diff --git a/document/src/main/java/com/yahoo/document/select/convert/SelectionExpressionConverter.java b/document/src/main/java/com/yahoo/document/select/convert/SelectionExpressionConverter.java
index eec14ed7cee..0d0f92686f0 100644
--- a/document/src/main/java/com/yahoo/document/select/convert/SelectionExpressionConverter.java
+++ b/document/src/main/java/com/yahoo/document/select/convert/SelectionExpressionConverter.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.select.convert;
 
 import com.yahoo.document.select.NowCheckVisitor;
diff --git a/document/src/main/java/com/yahoo/document/select/convert/package-info.java b/document/src/main/java/com/yahoo/document/select/convert/package-info.java
index 08e965f317b..a3cd3c7c55b 100644
--- a/document/src/main/java/com/yahoo/document/select/convert/package-info.java
+++ b/document/src/main/java/com/yahoo/document/select/convert/package-info.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 @ExportPackage
 @PublicApi
 package com.yahoo.document.select.convert;
diff --git a/document/src/main/java/com/yahoo/document/select/package-info.java b/document/src/main/java/com/yahoo/document/select/package-info.java
index bbc33bcedf8..e6de6497008 100644
--- a/document/src/main/java/com/yahoo/document/select/package-info.java
+++ b/document/src/main/java/com/yahoo/document/select/package-info.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 @ExportPackage
 @PublicApi
 package com.yahoo.document.select;
diff --git a/document/src/main/java/com/yahoo/document/select/parser/SelectInput.java b/document/src/main/java/com/yahoo/document/select/parser/SelectInput.java
index 957a038d44a..7c75d21ab38 100644
--- a/document/src/main/java/com/yahoo/document/select/parser/SelectInput.java
+++ b/document/src/main/java/com/yahoo/document/select/parser/SelectInput.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.select.parser;
 
 import com.yahoo.javacc.FastCharStream;
diff --git a/document/src/main/java/com/yahoo/document/select/parser/SelectParserUtils.java b/document/src/main/java/com/yahoo/document/select/parser/SelectParserUtils.java
index c8458bcb5aa..94340355947 100644
--- a/document/src/main/java/com/yahoo/document/select/parser/SelectParserUtils.java
+++ b/document/src/main/java/com/yahoo/document/select/parser/SelectParserUtils.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.select.parser;
 
 import com.yahoo.javacc.UnicodeUtilities;
diff --git a/document/src/main/java/com/yahoo/document/select/parser/package-info.java b/document/src/main/java/com/yahoo/document/select/parser/package-info.java
index 7f058e86e28..11cda77e3e4 100644
--- a/document/src/main/java/com/yahoo/document/select/parser/package-info.java
+++ b/document/src/main/java/com/yahoo/document/select/parser/package-info.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 @ExportPackage
 @PublicApi
 package com.yahoo.document.select.parser;
diff --git a/document/src/main/java/com/yahoo/document/select/rule/ArithmeticNode.java b/document/src/main/java/com/yahoo/document/select/rule/ArithmeticNode.java
index 2fe4609b4e6..34bcf914d17 100644
--- a/document/src/main/java/com/yahoo/document/select/rule/ArithmeticNode.java
+++ b/document/src/main/java/com/yahoo/document/select/rule/ArithmeticNode.java
@@ -1,209 +1,209 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.document.select.rule;

-

-import com.yahoo.document.BucketIdFactory;

-import com.yahoo.document.datatypes.NumericFieldValue;

-import com.yahoo.document.select.*;

-

-import java.util.List;

-import java.util.ArrayList;

-import java.util.Stack;

-

-/**

- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>

- */

-public class ArithmeticNode implements ExpressionNode {

-

-    public static final int NOP = 0;

-    public static final int ADD = 1;

-    public static final int SUB = 2;

-    public static final int MOD = 3;

-    public static final int DIV = 4;

-    public static final int MUL = 5;

-

-    private final List<NodeItem> items = new ArrayList<NodeItem>();

-

-    public ArithmeticNode() {

-        // empty

-    }

-

-    public ArithmeticNode add(String operator, ExpressionNode node) {

-        items.add(new NodeItem(stringToOperator(operator), node));

-        return this;

-    }

-

-    public List<NodeItem> getItems() {

-        return items;

-    }

-

-    // Inherit doc from ExpressionNode.

-    public BucketSet getBucketSet(BucketIdFactory factory) {

-        return null;

-    }

-

-    // Inherit doc from ExpressionNode.

-    public Object evaluate(Context context) {

-        StringBuilder ret = null;        

-        Stack<ValueItem> buf = new Stack<ValueItem>();

-        for (int i = 0; i < items.size(); ++i) {

-            NodeItem item = items.get(i);

-            Object val = item.node.evaluate(context);

-

-            if (val == null) {

-                throw new IllegalStateException("Null value found!");

-            }

-

-            if (val instanceof AttributeNode.VariableValueList) {

-                AttributeNode.VariableValueList value = (AttributeNode.VariableValueList)val;

-                if (value.size() == 0) {

-                    throw new IllegalArgumentException("Can not perform arithmetic on missing field: "

-                            + item.node.toString());

-                } else if (value.size() != 1) {

-                    throw new IllegalStateException("Arithmetic is only valid for single values.");

-                } else {

-                    val = value.get(0).getValue();

-                }

-            }

-

-            if (val instanceof NumericFieldValue) {

-                val = ((NumericFieldValue)val).getNumber();  

-            }

-

-            if (val instanceof String) {

-                if (i == 0) {

-                    ret = new StringBuilder();

-                }

-                if (ret != null) {

-                    ret.append(val);

-                    continue;

-                }

-            } else if (Number.class.isInstance(val)) {

-                if (!buf.isEmpty()) {

-                    while (buf.peek().operator > item.operator) {

-                        popOffTheTop(buf);

-                    }

-                }

-                buf.push(new ValueItem(item.operator, (Number)val));

-                continue;

-            }

-            throw new IllegalStateException("Term '" + item.node + " with class " + val.getClass() + "' does not evaluate to a number.");

-        }

-        if (ret != null) {

-            return ret.toString();

-        }

-        while (buf.size() > 1) {

-            popOffTheTop(buf);

-        }

-        return buf.pop().value;

-    }

-

-    private void popOffTheTop(Stack<ValueItem> buf) {

-        ValueItem rhs = buf.pop();

-        ValueItem lhs = buf.pop();

-        switch (rhs.operator) {

-            case ADD:

-                lhs.value = lhs.value.doubleValue() + rhs.value.doubleValue();

-                break;

-            case SUB:

-                lhs.value = lhs.value.doubleValue() - rhs.value.doubleValue();

-                break;

-            case DIV:

-                lhs.value = lhs.value.doubleValue() / rhs.value.doubleValue();

-                break;

-            case MUL:

-                lhs.value = lhs.value.doubleValue() * rhs.value.doubleValue();

-                break;

-            case MOD:

-                lhs.value = lhs.value.longValue() % rhs.value.longValue();

-                break;

-            default:

-                throw new IllegalStateException("Arithmetic operator " + rhs.operator + " not supported.");

-        }

-        buf.push(lhs);

-    }

-

-    @Override

-    public String toString() {

-        StringBuilder ret = new StringBuilder();

-        for (NodeItem item : items) {

-            if (item.operator != NOP) {

-                ret.append(" ").append(operatorToString(item.operator)).append(" ");

-            }

-            ret.append(item.node);

-        }

-        return ret.toString();

-    }

-

-    public String operatorToString(int operator) {

-        switch (operator) {

-            case NOP:

-                return null;

-            case ADD:

-                return "+";

-            case SUB:

-                return "-";

-            case MOD:

-                return "%";

-            case DIV:

-                return "/";

-            case MUL:

-                return "*";

-            default:

-                throw new IllegalStateException("Arithmetic operator " + operator + " not supported.");

-        }

-    }

-

-    private int stringToOperator(String operator) {

-        if (operator == null) {

-            return NOP;

-        } else if (operator.equals("+")) {

-            return ADD;

-        } else if (operator.equals("-")) {

-            return SUB;

-        } else if (operator.equals("%")) {

-            return MOD;

-        } else if (operator.equals("/")) {

-            return DIV;

-        } else if (operator.equals("*")) {

-            return MUL;

-        } else {

-            throw new IllegalStateException("Arithmetic operator '" + operator + "' not supported.");

-        }

-    }

-

-    public OrderingSpecification getOrdering(int order) {

-        return null;

-    }

-

-    public void accept(Visitor visitor) {

-        visitor.visit(this);

-    }

-

-    private class ValueItem {

-        public int operator;

-        public Number value;

-

-        public ValueItem(int operator, Number value) {

-            this.operator = operator;

-            this.value = value;

-        }

-    }

-

-    public static class NodeItem {

-        private int operator;

-        private ExpressionNode node;

-

-        public NodeItem(int operator, ExpressionNode node) {

-            this.operator = operator;

-            this.node = node;

-        }

-        

-        public int getOperator() {

-            return operator;

-        }

-

-        public ExpressionNode getNode() {

-            return node;

-        }

-    }

-}

+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.document.select.rule;
+
+import com.yahoo.document.BucketIdFactory;
+import com.yahoo.document.datatypes.NumericFieldValue;
+import com.yahoo.document.select.*;
+
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Stack;
+
+/**
+ * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ */
+public class ArithmeticNode implements ExpressionNode {
+
+    public static final int NOP = 0;
+    public static final int ADD = 1;
+    public static final int SUB = 2;
+    public static final int MOD = 3;
+    public static final int DIV = 4;
+    public static final int MUL = 5;
+
+    private final List<NodeItem> items = new ArrayList<NodeItem>();
+
+    public ArithmeticNode() {
+        // empty
+    }
+
+    public ArithmeticNode add(String operator, ExpressionNode node) {
+        items.add(new NodeItem(stringToOperator(operator), node));
+        return this;
+    }
+
+    public List<NodeItem> getItems() {
+        return items;
+    }
+
+    // Inherit doc from ExpressionNode.
+    public BucketSet getBucketSet(BucketIdFactory factory) {
+        return null;
+    }
+
+    // Inherit doc from ExpressionNode.
+    public Object evaluate(Context context) {
+        StringBuilder ret = null;        
+        Stack<ValueItem> buf = new Stack<ValueItem>();
+        for (int i = 0; i < items.size(); ++i) {
+            NodeItem item = items.get(i);
+            Object val = item.node.evaluate(context);
+
+            if (val == null) {
+                throw new IllegalStateException("Null value found!");
+            }
+
+            if (val instanceof AttributeNode.VariableValueList) {
+                AttributeNode.VariableValueList value = (AttributeNode.VariableValueList)val;
+                if (value.size() == 0) {
+                    throw new IllegalArgumentException("Can not perform arithmetic on missing field: "
+                            + item.node.toString());
+                } else if (value.size() != 1) {
+                    throw new IllegalStateException("Arithmetic is only valid for single values.");
+                } else {
+                    val = value.get(0).getValue();
+                }
+            }
+
+            if (val instanceof NumericFieldValue) {
+                val = ((NumericFieldValue)val).getNumber();  
+            }
+
+            if (val instanceof String) {
+                if (i == 0) {
+                    ret = new StringBuilder();
+                }
+                if (ret != null) {
+                    ret.append(val);
+                    continue;
+                }
+            } else if (Number.class.isInstance(val)) {
+                if (!buf.isEmpty()) {
+                    while (buf.peek().operator > item.operator) {
+                        popOffTheTop(buf);
+                    }
+                }
+                buf.push(new ValueItem(item.operator, (Number)val));
+                continue;
+            }
+            throw new IllegalStateException("Term '" + item.node + " with class " + val.getClass() + "' does not evaluate to a number.");
+        }
+        if (ret != null) {
+            return ret.toString();
+        }
+        while (buf.size() > 1) {
+            popOffTheTop(buf);
+        }
+        return buf.pop().value;
+    }
+
+    private void popOffTheTop(Stack<ValueItem> buf) {
+        ValueItem rhs = buf.pop();
+        ValueItem lhs = buf.pop();
+        switch (rhs.operator) {
+            case ADD:
+                lhs.value = lhs.value.doubleValue() + rhs.value.doubleValue();
+                break;
+            case SUB:
+                lhs.value = lhs.value.doubleValue() - rhs.value.doubleValue();
+                break;
+            case DIV:
+                lhs.value = lhs.value.doubleValue() / rhs.value.doubleValue();
+                break;
+            case MUL:
+                lhs.value = lhs.value.doubleValue() * rhs.value.doubleValue();
+                break;
+            case MOD:
+                lhs.value = lhs.value.longValue() % rhs.value.longValue();
+                break;
+            default:
+                throw new IllegalStateException("Arithmetic operator " + rhs.operator + " not supported.");
+        }
+        buf.push(lhs);
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder ret = new StringBuilder();
+        for (NodeItem item : items) {
+            if (item.operator != NOP) {
+                ret.append(" ").append(operatorToString(item.operator)).append(" ");
+            }
+            ret.append(item.node);
+        }
+        return ret.toString();
+    }
+
+    public String operatorToString(int operator) {
+        switch (operator) {
+            case NOP:
+                return null;
+            case ADD:
+                return "+";
+            case SUB:
+                return "-";
+            case MOD:
+                return "%";
+            case DIV:
+                return "/";
+            case MUL:
+                return "*";
+            default:
+                throw new IllegalStateException("Arithmetic operator " + operator + " not supported.");
+        }
+    }
+
+    private int stringToOperator(String operator) {
+        if (operator == null) {
+            return NOP;
+        } else if (operator.equals("+")) {
+            return ADD;
+        } else if (operator.equals("-")) {
+            return SUB;
+        } else if (operator.equals("%")) {
+            return MOD;
+        } else if (operator.equals("/")) {
+            return DIV;
+        } else if (operator.equals("*")) {
+            return MUL;
+        } else {
+            throw new IllegalStateException("Arithmetic operator '" + operator + "' not supported.");
+        }
+    }
+
+    public OrderingSpecification getOrdering(int order) {
+        return null;
+    }
+
+    public void accept(Visitor visitor) {
+        visitor.visit(this);
+    }
+
+    private class ValueItem {
+        public int operator;
+        public Number value;
+
+        public ValueItem(int operator, Number value) {
+            this.operator = operator;
+            this.value = value;
+        }
+    }
+
+    public static class NodeItem {
+        private int operator;
+        private ExpressionNode node;
+
+        public NodeItem(int operator, ExpressionNode node) {
+            this.operator = operator;
+            this.node = node;
+        }
+        
+        public int getOperator() {
+            return operator;
+        }
+
+        public ExpressionNode getNode() {
+            return node;
+        }
+    }
+}
diff --git a/document/src/main/java/com/yahoo/document/select/rule/AttributeNode.java b/document/src/main/java/com/yahoo/document/select/rule/AttributeNode.java
index 048eb70ac94..b8281b9ed0a 100644
--- a/document/src/main/java/com/yahoo/document/select/rule/AttributeNode.java
+++ b/document/src/main/java/com/yahoo/document/select/rule/AttributeNode.java
@@ -1,205 +1,205 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.document.select.rule;

-

-import com.yahoo.collections.BobHash;

-import com.yahoo.document.*;

-import com.yahoo.document.datatypes.FieldPathIteratorHandler;

-import com.yahoo.document.datatypes.FieldValue;

-import com.yahoo.document.select.*;

-

-import java.util.ArrayList;

-import java.util.List;

-

-/**

- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>

- */

-public class AttributeNode implements ExpressionNode {

-

-    private ExpressionNode value;

-    private final List<Item> items = new ArrayList<Item>();

-

-    public AttributeNode(ExpressionNode value, List items) {

-        this.value = value;

-        for (Object obj : items) {

-            if (obj instanceof Item) {

-                this.items.add((Item)obj);

-            } else {

-                throw new IllegalStateException("Can not add an instance of " + obj.getClass().getName() +

-                                                " as a function item.");

-            }

-        }

-    }

-

-    public ExpressionNode getValue() {

-        return value;

-    }

-

-    public AttributeNode setValue(ExpressionNode value) {

-        this.value = value;

-        return this;

-    }

-

-    public List<Item> getItems() {

-        return items;

-    }

-

-    // Inherit doc from ExpressionNode.

-    public BucketSet getBucketSet(BucketIdFactory factory) {

-        return null;

-    }

-

-    // Inherit doc from ExpressionNode.

-    public Object evaluate(Context context) {

-        String pos = value.toString();

-        Object obj = value.evaluate(context);

-

-        StringBuilder builder = new StringBuilder();

-        for (Item item : items) {

-            if (obj == null) {

-                throw new IllegalStateException("Can not invoke '" + item + "' on '" + pos + "' because that term " +

-                                                "evaluated to null.");

-            }

-            if (item.getType() != Item.FUNCTION) {

-                if (builder.length() > 0) {

-                    builder.append(".");

-                }

-

-                builder.append(item.getName());

-            } else {

-                if (builder.length() > 0) {

-                    obj = evaluateFieldPath(builder.toString(), obj);

-                    builder = new StringBuilder();

-                }

-

-                obj = evaluateFunction(item.getName(), obj);

-            }

-

-            pos = pos + "." + item;

-        }

-

-        if (builder.length() > 0) {

-            obj = evaluateFieldPath(builder.toString(), obj);

-        }

-        return obj;

-    }

-

-    public static class VariableValueList extends ArrayList<ResultList.VariableValue> {

-

-    }

-

-    static class IteratorHandler extends FieldPathIteratorHandler {

-        VariableValueList values = new VariableValueList();

-

-        @Override

-        public void onPrimitive(FieldValue fv) {

-            values.add(new ResultList.VariableValue((VariableMap)getVariables().clone(), fv));

-        }

-    }

-

-    private static Object applyFunction(String function, Object value) {

-        if (function.equalsIgnoreCase("abs")) {

-            if (Number.class.isInstance(value)) {

-                Number nValue = (Number)value;

-                if (value instanceof Double) {

-                    return nValue.doubleValue() * (nValue.doubleValue() < 0 ? -1 : 1);

-                } else if (value instanceof Float) {

-                    return nValue.floatValue() * (nValue.floatValue() < 0 ? -1 : 1);

-                } else if (value instanceof Long) {

-                    return nValue.longValue() * (nValue.longValue() < 0 ? -1 : 1);

-                } else if (value instanceof Integer) {

-                    return nValue.intValue() * (nValue.intValue() < 0 ? -1 : 1);

-                }

-            }

-            throw new IllegalStateException("Function 'abs' is only available for numerical values.");

-        } else if (function.equalsIgnoreCase("hash")) {

-            return BobHash.hash(value.toString());

-        } else if (function.equalsIgnoreCase("lowercase")) {

-            return value.toString().toLowerCase();

-        } else if (function.equalsIgnoreCase("uppercase")) {

-            return value.toString().toUpperCase();

-        }

-        throw new IllegalStateException("Function '" + function + "' is not supported.");

-    }

-

-    private static Object evaluateFieldPath(String fieldPth, Object value) {

-        if (value instanceof DocumentPut) {

-            final Document doc = ((DocumentPut) value).getDocument();

-            FieldPath fieldPath = doc.getDataType().buildFieldPath(fieldPth);

-            IteratorHandler handler = new IteratorHandler();

-            doc.iterateNested(fieldPath, 0, handler);

-            return handler.values;

-        } else if (value instanceof DocumentUpdate) {

-            return Result.INVALID;

-        }

-        return Result.FALSE;

-        //throw new IllegalStateException("Attributes are only available for document types for value '" + value + "'. Looking for " + fieldPth);

-    }

-

-    private static Object evaluateFunction(String function, Object value) {

-        if (value instanceof VariableValueList) {

-            VariableValueList retVal = new VariableValueList();

-

-            for (ResultList.VariableValue val : ((VariableValueList)value)) {

-                retVal.add(new ResultList.VariableValue(

-                        (FieldPathIteratorHandler.VariableMap)val.getVariables().clone(),

-                        applyFunction(function, val.getValue())));

-            }

-

-            return retVal;

-        }

-

-        return applyFunction(function, value);

-    }

-

-    public void accept(Visitor visitor) {

-        visitor.visit(this);

-    }

-

-    @Override

-    public String toString() {

-        StringBuilder ret = new StringBuilder();

-        ret.append(value);

-        for (Item item : items) {

-            ret.append(".").append(item);

-        }

-        return ret.toString();

-    }

-

-    public OrderingSpecification getOrdering(int order) {

-        return null;

-    }

-

-    public static class Item {

-        public static final int ATTRIBUTE = 0;

-        public static final int FUNCTION = 1;

-

-        private String name;

-        private int type = ATTRIBUTE;

-

-        public Item(String name) {

-            this.name = name;

-        }

-

-        public String getName() {

-            return name;

-        }

-

-        public Item setName(String name) {

-            this.name = name;

-            return this;

-        }

-

-        public int getType() {

-            return type;

-        }

-

-        public Item setType(int type) {

-            this.type = type;

-            return this;

-        }

-

-        @Override public String toString() {

-            return name + (type == FUNCTION ? "()" : "");

-        }

-    }

-}

+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.document.select.rule;
+
+import com.yahoo.collections.BobHash;
+import com.yahoo.document.*;
+import com.yahoo.document.datatypes.FieldPathIteratorHandler;
+import com.yahoo.document.datatypes.FieldValue;
+import com.yahoo.document.select.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ */
+public class AttributeNode implements ExpressionNode {
+
+    private ExpressionNode value;
+    private final List<Item> items = new ArrayList<Item>();
+
+    public AttributeNode(ExpressionNode value, List items) {
+        this.value = value;
+        for (Object obj : items) {
+            if (obj instanceof Item) {
+                this.items.add((Item)obj);
+            } else {
+                throw new IllegalStateException("Can not add an instance of " + obj.getClass().getName() +
+                                                " as a function item.");
+            }
+        }
+    }
+
+    public ExpressionNode getValue() {
+        return value;
+    }
+
+    public AttributeNode setValue(ExpressionNode value) {
+        this.value = value;
+        return this;
+    }
+
+    public List<Item> getItems() {
+        return items;
+    }
+
+    // Inherit doc from ExpressionNode.
+    public BucketSet getBucketSet(BucketIdFactory factory) {
+        return null;
+    }
+
+    // Inherit doc from ExpressionNode.
+    public Object evaluate(Context context) {
+        String pos = value.toString();
+        Object obj = value.evaluate(context);
+
+        StringBuilder builder = new StringBuilder();
+        for (Item item : items) {
+            if (obj == null) {
+                throw new IllegalStateException("Can not invoke '" + item + "' on '" + pos + "' because that term " +
+                                                "evaluated to null.");
+            }
+            if (item.getType() != Item.FUNCTION) {
+                if (builder.length() > 0) {
+                    builder.append(".");
+                }
+
+                builder.append(item.getName());
+            } else {
+                if (builder.length() > 0) {
+                    obj = evaluateFieldPath(builder.toString(), obj);
+                    builder = new StringBuilder();
+                }
+
+                obj = evaluateFunction(item.getName(), obj);
+            }
+
+            pos = pos + "." + item;
+        }
+
+        if (builder.length() > 0) {
+            obj = evaluateFieldPath(builder.toString(), obj);
+        }
+        return obj;
+    }
+
+    public static class VariableValueList extends ArrayList<ResultList.VariableValue> {
+
+    }
+
+    static class IteratorHandler extends FieldPathIteratorHandler {
+        VariableValueList values = new VariableValueList();
+
+        @Override
+        public void onPrimitive(FieldValue fv) {
+            values.add(new ResultList.VariableValue((VariableMap)getVariables().clone(), fv));
+        }
+    }
+
+    private static Object applyFunction(String function, Object value) {
+        if (function.equalsIgnoreCase("abs")) {
+            if (Number.class.isInstance(value)) {
+                Number nValue = (Number)value;
+                if (value instanceof Double) {
+                    return nValue.doubleValue() * (nValue.doubleValue() < 0 ? -1 : 1);
+                } else if (value instanceof Float) {
+                    return nValue.floatValue() * (nValue.floatValue() < 0 ? -1 : 1);
+                } else if (value instanceof Long) {
+                    return nValue.longValue() * (nValue.longValue() < 0 ? -1 : 1);
+                } else if (value instanceof Integer) {
+                    return nValue.intValue() * (nValue.intValue() < 0 ? -1 : 1);
+                }
+            }
+            throw new IllegalStateException("Function 'abs' is only available for numerical values.");
+        } else if (function.equalsIgnoreCase("hash")) {
+            return BobHash.hash(value.toString());
+        } else if (function.equalsIgnoreCase("lowercase")) {
+            return value.toString().toLowerCase();
+        } else if (function.equalsIgnoreCase("uppercase")) {
+            return value.toString().toUpperCase();
+        }
+        throw new IllegalStateException("Function '" + function + "' is not supported.");
+    }
+
+    private static Object evaluateFieldPath(String fieldPth, Object value) {
+        if (value instanceof DocumentPut) {
+            final Document doc = ((DocumentPut) value).getDocument();
+            FieldPath fieldPath = doc.getDataType().buildFieldPath(fieldPth);
+            IteratorHandler handler = new IteratorHandler();
+            doc.iterateNested(fieldPath, 0, handler);
+            return handler.values;
+        } else if (value instanceof DocumentUpdate) {
+            return Result.INVALID;
+        }
+        return Result.FALSE;
+        //throw new IllegalStateException("Attributes are only available for document types for value '" + value + "'. Looking for " + fieldPth);
+    }
+
+    private static Object evaluateFunction(String function, Object value) {
+        if (value instanceof VariableValueList) {
+            VariableValueList retVal = new VariableValueList();
+
+            for (ResultList.VariableValue val : ((VariableValueList)value)) {
+                retVal.add(new ResultList.VariableValue(
+                        (FieldPathIteratorHandler.VariableMap)val.getVariables().clone(),
+                        applyFunction(function, val.getValue())));
+            }
+
+            return retVal;
+        }
+
+        return applyFunction(function, value);
+    }
+
+    public void accept(Visitor visitor) {
+        visitor.visit(this);
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder ret = new StringBuilder();
+        ret.append(value);
+        for (Item item : items) {
+            ret.append(".").append(item);
+        }
+        return ret.toString();
+    }
+
+    public OrderingSpecification getOrdering(int order) {
+        return null;
+    }
+
+    public static class Item {
+        public static final int ATTRIBUTE = 0;
+        public static final int FUNCTION = 1;
+
+        private String name;
+        private int type = ATTRIBUTE;
+
+        public Item(String name) {
+            this.name = name;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public Item setName(String name) {
+            this.name = name;
+            return this;
+        }
+
+        public int getType() {
+            return type;
+        }
+
+        public Item setType(int type) {
+            this.type = type;
+            return this;
+        }
+
+        @Override public String toString() {
+            return name + (type == FUNCTION ? "()" : "");
+        }
+    }
+}
diff --git a/document/src/main/java/com/yahoo/document/select/rule/ComparisonNode.java b/document/src/main/java/com/yahoo/document/select/rule/ComparisonNode.java
index b0d5030978e..a13641adadf 100644
--- a/document/src/main/java/com/yahoo/document/select/rule/ComparisonNode.java
+++ b/document/src/main/java/com/yahoo/document/select/rule/ComparisonNode.java
@@ -1,435 +1,435 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.document.select.rule;

-

-import com.yahoo.document.BucketId;

-import com.yahoo.document.BucketIdFactory;

-import com.yahoo.document.DocumentId;

-import com.yahoo.document.datatypes.FieldPathIteratorHandler;

-import com.yahoo.document.datatypes.NumericFieldValue;

-import com.yahoo.document.idstring.GroupDocIdString;

-import com.yahoo.document.select.*;

-

-import java.util.List;

-import java.util.regex.Pattern;

-

-/**

- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>

- */

-public class ComparisonNode implements ExpressionNode {

-

-    // The left- and right-hand-side of this comparison.

-    private ExpressionNode lhs, rhs;

-

-    // The operator string for this.

-    private String operator;

-

-    /**

-     * Constructs a new comparison node.

-     *

-     * @param lhs The left-hand-side of the comparison.

-     * @param operator The comparison operator.

-     * @param rhs The right-hand-side of the comparison.

-     */

-    public ComparisonNode(ExpressionNode lhs, String operator, ExpressionNode rhs) {

-        this.lhs = lhs;

-        this.operator = operator;

-        this.rhs = rhs;

-    }

-

-    /**

-     * Returns the left hand side of this comparison.

-     *

-     * @return The left hand side expression.

-     */

-    public ExpressionNode getLHS() {

-        return lhs;

-    }

-

-    /**

-     * Sets the left hand side of this comparison.

-     *

-     * @param lhs The new left hand side.

-     * @return This, to allow chaining.

-     */

-    public ComparisonNode setLHS(ExpressionNode lhs) {

-        this.lhs = lhs;

-        return this;

-    }

-

-    /**

-     * Returns the comparison operator of this.

-     *

-     * @return The operator.

-     */

-    public String getOperator() {

-        return operator;

-    }

-

-    /**

-     * Sets the comparison operator of this.

-     *

-     * @param operator The operator string.

-     * @return This, to allow chaining.

-     */

-    public ComparisonNode setOperator(String operator) {

-        this.operator = operator;

-        return this;

-    }

-

-    /**

-     * Returns the right hand side of this comparison.

-     *

-     * @return The right hand side expression.

-     */

-    public ExpressionNode getRHS() {

-        return rhs;

-    }

-

-    /**

-     * Sets the right hand side of this comparison.

-     *

-     * @param rhs The new right hand side.

-     * @return This, to allow chaining.

-     */

-    public ComparisonNode setRHS(ExpressionNode rhs) {

-        this.rhs = rhs;

-        return this;

-    }

-

-    public OrderingSpecification getOrdering(IdNode lhs, LiteralNode rhs, String operator, int order) {

-        if (lhs.getWidthBits() == -1 || lhs.getDivisionBits() == -1 || !(rhs.getValue() instanceof Long)) {

-            return null;

-        }

-

-        if (operator.equals("==") || operator.equals("=")) {

-            return new OrderingSpecification(order, (Long)rhs.getValue(), lhs.getWidthBits(), lhs.getDivisionBits());

-        } 

-

-        if (order == OrderingSpecification.ASCENDING) {

-            if ((operator.equals("<") || operator.equals("<="))) {

-                return new OrderingSpecification(order, 0, lhs.getWidthBits(), lhs.getDivisionBits());

-            } 

-            if (operator.equals(">")) {

-                return new OrderingSpecification(order, (Long)rhs.getValue() + 1, lhs.getWidthBits(), lhs.getDivisionBits());

-            }

-            if (operator.equals(">=")) {

-                return new OrderingSpecification(order, (Long)rhs.getValue(), lhs.getWidthBits(), lhs.getDivisionBits());

-            }

-        } else {

-            if (operator.equals("<")) {

-                return new OrderingSpecification(order, (Long)rhs.getValue() - 1, lhs.getWidthBits(), lhs.getDivisionBits());

-            }

-            if (operator.equals("<=")) {

-                return new OrderingSpecification(order, (Long)rhs.getValue(), lhs.getWidthBits(), lhs.getDivisionBits());

-            }

-        }

-        return null;

-    }

-

-    public OrderingSpecification getOrdering(int order) {

-        if (lhs instanceof IdNode && rhs instanceof LiteralNode) {

-            return getOrdering((IdNode)lhs, (LiteralNode)rhs, operator, order);

-        } else if (rhs instanceof IdNode && lhs instanceof LiteralNode) {

-            return getOrdering((IdNode)rhs, (LiteralNode)rhs, operator, order);

-        }

-

-        return null;

-    }

-

-    // Inherit doc from ExpressionNode.

-    public BucketSet getBucketSet(BucketIdFactory factory) {

-        if (operator.equals("==") || operator.equals("=")) {

-            if (lhs instanceof IdNode && rhs instanceof LiteralNode) {

-                return compare(factory, (IdNode)lhs, (LiteralNode)rhs, operator);

-            } else if (rhs instanceof IdNode && lhs instanceof LiteralNode) {

-                return compare(factory, (IdNode)rhs, (LiteralNode)lhs, operator);

-            } else if (lhs instanceof SearchColumnNode && rhs instanceof LiteralNode) {

-                return compare(factory, (SearchColumnNode)lhs, (LiteralNode)rhs);

-            } else if (rhs instanceof SearchColumnNode && lhs instanceof LiteralNode) {

-                return compare(factory, (SearchColumnNode)rhs, (LiteralNode)lhs);

-            }

-        }

-        return null;

-    }

-

-    /**

-     * Compares a search column node with a literal node.

-     *

-     * @param factory The bucket id factory used.

-     * @param node The search column node.

-     * @param literal The literal node to compare to.

-     * @return The bucket set containing the buckets covered.

-     */

-    private BucketSet compare(BucketIdFactory factory, SearchColumnNode node, LiteralNode literal) {

-        Object value = literal.getValue();

-        int bucketCount = (int) Math.pow(2, 16);

-        if (value instanceof Long) {

-            BucketSet ret = new BucketSet();

-            for (int i = 0; i < bucketCount; i++) {

-                BucketId id = new BucketId(16, i);

-                if ((Long)value == node.getDistribution().getColumn(id)) {

-                    ret.add(new BucketId(16, i));

-                }

-            }

-            return ret;

-        }

-        return null;

-    }

-

-    private BucketSet compare(BucketIdFactory factory, IdNode id, LiteralNode literal, String operator) {

-        String field = id.getField();

-        Object value = literal.getValue();

-        if (field == null) {

-            if (value instanceof String) {

-                String name = (String)value;

-                if ((operator.equals("=") && name.contains("*")) ||

-                    (operator.equals("=~") && ((name.contains("*") || name.contains("?")))))

-                {

-                    return null; // no idea

-                }

-                return new BucketSet(factory.getBucketId(new DocumentId(name)));

-            }

-        } else if (field.equalsIgnoreCase("user")) {

-            if (value instanceof Long) {

-                return new BucketSet(new BucketId(factory.getLocationBitCount(), (Long)value));

-            }

-        } else if (field.equalsIgnoreCase("group")) {

-            if (value instanceof String) {

-                String name = (String)value;

-                if ((operator.equals("=") && name.contains("*")) ||

-                        (operator.equals("=~") && ((name.contains("*") || name.contains("?")))))

-                {

-                    return null; // no idea

-                }

-                return new BucketSet(new BucketId(factory.getLocationBitCount(), new GroupDocIdString("", name, "").getLocation()));

-            }

-        } else if (field.equalsIgnoreCase("bucket")) {

-            if (value instanceof Long) {

-                return new BucketSet(new BucketId((Long)value));

-            }

-        }

-        return null;

-    }

-

-    // Inherit doc from Node.

-    public Object evaluate(Context context) {

-        Object oLeft = lhs.evaluate(context);

-        Object oRight = rhs.evaluate(context);

-        if (oLeft == null && oRight == null) {

-            return new ResultList(Result.TRUE);

-        }

-        if (oLeft == Result.INVALID || oRight == Result.INVALID) {

-            return new ResultList(Result.INVALID);

-        }

-        if (oLeft instanceof AttributeNode.VariableValueList && oRight instanceof AttributeNode.VariableValueList) {

-            if (operator.equals("==")) {

-                return evaluateListsTrue((AttributeNode.VariableValueList)oLeft, (AttributeNode.VariableValueList)oRight);

-            } else if (operator.equals("!=")) {

-                return evaluateListsFalse((AttributeNode.VariableValueList)oLeft, (AttributeNode.VariableValueList)oRight);

-            } else {

-                return new ResultList(Result.INVALID);

-            }

-        } else if (oLeft instanceof AttributeNode.VariableValueList) {

-            return evaluateListAndSingle((AttributeNode.VariableValueList)oLeft, oRight);

-        } else if (oRight instanceof AttributeNode.VariableValueList) {

-            return evaluateListAndSingle((AttributeNode.VariableValueList)oRight, oLeft);

-        }

-        return new ResultList(evaluateBool(oLeft, oRight));

-    }

-

-    public ResultList evaluateListsTrue(AttributeNode.VariableValueList lhs, AttributeNode.VariableValueList rhs) {

-        if (lhs.size() != rhs.size()) {

-            return new ResultList(Result.FALSE);

-        }

-

-        for (int i = 0; i < lhs.size(); i++) {

-            if (!lhs.get(i).getVariables().equals(rhs.get(i).getVariables())) {

-                return new ResultList(Result.FALSE);

-            }

-

-            if (evaluateEquals(lhs.get(i).getValue(), rhs.get(i).getValue()) == Result.FALSE) {

-                return new ResultList(Result.FALSE);

-            }

-        }

-

-        return new ResultList(Result.TRUE);

-    }

-

-    public ResultList evaluateListsFalse(AttributeNode.VariableValueList lhs, AttributeNode.VariableValueList rhs) {

-        ResultList lst = evaluateListsTrue(lhs, rhs);

-        if (lst.toResult() == Result.TRUE) {

-            return new ResultList(Result.FALSE);

-        } else if (lst.toResult() == Result.FALSE) {

-            return new ResultList(Result.TRUE);

-        } else {

-            return lst;

-        }

-    }

-

-    public ResultList evaluateListAndSingle(AttributeNode.VariableValueList lhs, Object rhs) {

-        if (rhs == null && lhs == null) {

-            return new ResultList(Result.TRUE);

-        }

-

-        if (rhs == null || lhs == null) {

-            return new ResultList(Result.FALSE);

-        }

-

-        ResultList retVal = new ResultList();

-        for (int i = 0; i < lhs.size(); i++) {

-        	Result result = evaluateBool(lhs.get(i).getValue(), rhs);

-        	retVal.add((FieldPathIteratorHandler.VariableMap)lhs.get(i).getVariables().clone(), result);

-        }

-

-        return retVal;

-    }

-

-    /**

-     * Evaluate this expression on two operands, given that they are not invalid.

-     *

-     * @param lhs Left hand side of operation.

-     * @param rhs Right hand side of operation.

-     * @return The evaluation result.

-     */

-    private Result evaluateBool(Object lhs, Object rhs) {

-        if (operator.equals("==")) {

-            return evaluateEquals(lhs, rhs);

-        } else if (operator.equals("!=")) {

-            return Result.invert(evaluateEquals(lhs, rhs));

-        } else if (operator.equals("<") || operator.equals("<=") ||

-                   operator.equals(">") || operator.equals(">=")) {

-            return evaluateNumber(lhs, rhs);

-        } else if (operator.equals("=~") || operator.equals("=")) {

-            return evaluateString(lhs, rhs);

-        }

-        throw new IllegalStateException("Comparison operator '" + operator + "' is not supported.");

-    }

-

-    /**

-     * Compare two operands for equality.

-     *

-     * @param lhs Left hand side of operation.

-     * @param rhs Right hand side of operation.

-     * @return Wether or not the two operands are equal.

-     */

-    private Result evaluateEquals(Object lhs, Object rhs) {

-        if (lhs == null || rhs == null) {

-            return Result.toResult(lhs == rhs);

-        }

-

-        double a = getAsNumber(lhs);

-        double b = getAsNumber(rhs);

-        if (Double.isNaN(a) || Double.isNaN(b)) {

-        	return Result.toResult(lhs.toString().equals(rhs.toString()));

-        }

-        return Result.toResult(a == b); // Ugh, comparing doubles? Should be converted to long value perhaps...

-    }

-

-    private double getAsNumber(Object value) {

-        if (value instanceof Number) {

-            return ((Number)value).doubleValue();

-        } else if (value instanceof NumericFieldValue) {

-            return getAsNumber(((NumericFieldValue)value).getNumber());

-        } else {

-            return Double.NaN; //new IllegalStateException("Term '" + value + "' (" + value.getClass() + ") does not evaluate to a number.");

-        }

-    }

-

-    /**

-     * Evalutes the value of this term over a document, given that both operands must be numbers.

-     *

-     * @param lhs Left hand side of operation.

-     * @param rhs Right hand side of operation.

-     * @return The evaluation result.

-     */

-    private Result evaluateNumber(Object lhs, Object rhs) {

-    	double a = getAsNumber(lhs);

-    	double b = getAsNumber(rhs);

-    	if (Double.isNaN(a) || Double.isNaN(b)) {

-    		return Result.INVALID;

-    	}

-        if (operator.equals("<")) {

-            return Result.toResult(a < b);

-        } else if (operator.equals("<=")) {

-            return Result.toResult(a <= b);

-        } else if (operator.equals(">")) {

-            return Result.toResult(a > b);

-        } else {

-            return Result.toResult(a >= b);

-        }

-    }

-

-    /**

-     * Evalutes the value of this term over a document, given that both operands must be strings.

-     *

-     * @param lhs Left hand side of operation.

-     * @param rhs Right hand side of operation.

-     * @return The evaluation result.

-     */

-    private Result evaluateString(Object lhs, Object rhs) {

-        String left = "" + lhs; // Allows null objects to evaluate to string.

-        String right = "" + rhs;

-        if (operator.equals("=~")) {

-            return Result.toResult(Pattern.compile(right).matcher(left).find());

-        } else {

-            return Result.toResult(Pattern.compile(globToRegex(right)).matcher(left).find());

-        }

-    }

-

-    /**

-     * Converts a glob pattern to a corresponding regular expression string.

-     *

-     * @param glob The glob pattern.

-     * @return The regex string.

-     */

-    private String globToRegex(String glob) {

-        StringBuilder ret = new StringBuilder();

-        ret.append("^");

-        for (int i = 0; i < glob.length(); i++) {

-            ret.append(globToRegex(glob.charAt(i)));

-        }

-        ret.append("$");

-

-        return ret.toString();

-    }

-

-    /**

-     * Converts a single character in a glob expression to the corresponding regular expression string.

-     *

-     * @param glob The glob character.

-     * @return The regex string.

-     */

-    private String globToRegex(char glob) {

-        switch (glob) {

-            case'*':

-                return ".*";

-            case'?':

-                return ".";

-            case'^':

-            case'$':

-            case'|':

-            case'{':

-            case'}':

-            case'(':

-            case')':

-            case'[':

-            case']':

-            case'\\':

-            case'+':

-            case'.':

-                return "\\" + glob;

-            default:

-                return "" + glob;

-        }

-    }

-

-    public void accept(Visitor visitor) {

-        visitor.visit(this);

-    }

-

-    // Inherit doc from Object.

-    @Override

-    public String toString() {

-        return lhs + " " + operator + " " + rhs;

-    }

-}

+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.document.select.rule;
+
+import com.yahoo.document.BucketId;
+import com.yahoo.document.BucketIdFactory;
+import com.yahoo.document.DocumentId;
+import com.yahoo.document.datatypes.FieldPathIteratorHandler;
+import com.yahoo.document.datatypes.NumericFieldValue;
+import com.yahoo.document.idstring.GroupDocIdString;
+import com.yahoo.document.select.*;
+
+import java.util.List;
+import java.util.regex.Pattern;
+
+/**
+ * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ */
+public class ComparisonNode implements ExpressionNode {
+
+    // The left- and right-hand-side of this comparison.
+    private ExpressionNode lhs, rhs;
+
+    // The operator string for this.
+    private String operator;
+
+    /**
+     * Constructs a new comparison node.
+     *
+     * @param lhs The left-hand-side of the comparison.
+     * @param operator The comparison operator.
+     * @param rhs The right-hand-side of the comparison.
+     */
+    public ComparisonNode(ExpressionNode lhs, String operator, ExpressionNode rhs) {
+        this.lhs = lhs;
+        this.operator = operator;
+        this.rhs = rhs;
+    }
+
+    /**
+     * Returns the left hand side of this comparison.
+     *
+     * @return The left hand side expression.
+     */
+    public ExpressionNode getLHS() {
+        return lhs;
+    }
+
+    /**
+     * Sets the left hand side of this comparison.
+     *
+     * @param lhs The new left hand side.
+     * @return This, to allow chaining.
+     */
+    public ComparisonNode setLHS(ExpressionNode lhs) {
+        this.lhs = lhs;
+        return this;
+    }
+
+    /**
+     * Returns the comparison operator of this.
+     *
+     * @return The operator.
+     */
+    public String getOperator() {
+        return operator;
+    }
+
+    /**
+     * Sets the comparison operator of this.
+     *
+     * @param operator The operator string.
+     * @return This, to allow chaining.
+     */
+    public ComparisonNode setOperator(String operator) {
+        this.operator = operator;
+        return this;
+    }
+
+    /**
+     * Returns the right hand side of this comparison.
+     *
+     * @return The right hand side expression.
+     */
+    public ExpressionNode getRHS() {
+        return rhs;
+    }
+
+    /**
+     * Sets the right hand side of this comparison.
+     *
+     * @param rhs The new right hand side.
+     * @return This, to allow chaining.
+     */
+    public ComparisonNode setRHS(ExpressionNode rhs) {
+        this.rhs = rhs;
+        return this;
+    }
+
+    public OrderingSpecification getOrdering(IdNode lhs, LiteralNode rhs, String operator, int order) {
+        if (lhs.getWidthBits() == -1 || lhs.getDivisionBits() == -1 || !(rhs.getValue() instanceof Long)) {
+            return null;
+        }
+
+        if (operator.equals("==") || operator.equals("=")) {
+            return new OrderingSpecification(order, (Long)rhs.getValue(), lhs.getWidthBits(), lhs.getDivisionBits());
+        } 
+
+        if (order == OrderingSpecification.ASCENDING) {
+            if ((operator.equals("<") || operator.equals("<="))) {
+                return new OrderingSpecification(order, 0, lhs.getWidthBits(), lhs.getDivisionBits());
+            } 
+            if (operator.equals(">")) {
+                return new OrderingSpecification(order, (Long)rhs.getValue() + 1, lhs.getWidthBits(), lhs.getDivisionBits());
+            }
+            if (operator.equals(">=")) {
+                return new OrderingSpecification(order, (Long)rhs.getValue(), lhs.getWidthBits(), lhs.getDivisionBits());
+            }
+        } else {
+            if (operator.equals("<")) {
+                return new OrderingSpecification(order, (Long)rhs.getValue() - 1, lhs.getWidthBits(), lhs.getDivisionBits());
+            }
+            if (operator.equals("<=")) {
+                return new OrderingSpecification(order, (Long)rhs.getValue(), lhs.getWidthBits(), lhs.getDivisionBits());
+            }
+        }
+        return null;
+    }
+
+    public OrderingSpecification getOrdering(int order) {
+        if (lhs instanceof IdNode && rhs instanceof LiteralNode) {
+            return getOrdering((IdNode)lhs, (LiteralNode)rhs, operator, order);
+        } else if (rhs instanceof IdNode && lhs instanceof LiteralNode) {
+            return getOrdering((IdNode)rhs, (LiteralNode)rhs, operator, order);
+        }
+
+        return null;
+    }
+
+    // Inherit doc from ExpressionNode.
+    public BucketSet getBucketSet(BucketIdFactory factory) {
+        if (operator.equals("==") || operator.equals("=")) {
+            if (lhs instanceof IdNode && rhs instanceof LiteralNode) {
+                return compare(factory, (IdNode)lhs, (LiteralNode)rhs, operator);
+            } else if (rhs instanceof IdNode && lhs instanceof LiteralNode) {
+                return compare(factory, (IdNode)rhs, (LiteralNode)lhs, operator);
+            } else if (lhs instanceof SearchColumnNode && rhs instanceof LiteralNode) {
+                return compare(factory, (SearchColumnNode)lhs, (LiteralNode)rhs);
+            } else if (rhs instanceof SearchColumnNode && lhs instanceof LiteralNode) {
+                return compare(factory, (SearchColumnNode)rhs, (LiteralNode)lhs);
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Compares a search column node with a literal node.
+     *
+     * @param factory The bucket id factory used.
+     * @param node The search column node.
+     * @param literal The literal node to compare to.
+     * @return The bucket set containing the buckets covered.
+     */
+    private BucketSet compare(BucketIdFactory factory, SearchColumnNode node, LiteralNode literal) {
+        Object value = literal.getValue();
+        int bucketCount = (int) Math.pow(2, 16);
+        if (value instanceof Long) {
+            BucketSet ret = new BucketSet();
+            for (int i = 0; i < bucketCount; i++) {
+                BucketId id = new BucketId(16, i);
+                if ((Long)value == node.getDistribution().getColumn(id)) {
+                    ret.add(new BucketId(16, i));
+                }
+            }
+            return ret;
+        }
+        return null;
+    }
+
+    private BucketSet compare(BucketIdFactory factory, IdNode id, LiteralNode literal, String operator) {
+        String field = id.getField();
+        Object value = literal.getValue();
+        if (field == null) {
+            if (value instanceof String) {
+                String name = (String)value;
+                if ((operator.equals("=") && name.contains("*")) ||
+                    (operator.equals("=~") && ((name.contains("*") || name.contains("?")))))
+                {
+                    return null; // no idea
+                }
+                return new BucketSet(factory.getBucketId(new DocumentId(name)));
+            }
+        } else if (field.equalsIgnoreCase("user")) {
+            if (value instanceof Long) {
+                return new BucketSet(new BucketId(factory.getLocationBitCount(), (Long)value));
+            }
+        } else if (field.equalsIgnoreCase("group")) {
+            if (value instanceof String) {
+                String name = (String)value;
+                if ((operator.equals("=") && name.contains("*")) ||
+                        (operator.equals("=~") && ((name.contains("*") || name.contains("?")))))
+                {
+                    return null; // no idea
+                }
+                return new BucketSet(new BucketId(factory.getLocationBitCount(), new GroupDocIdString("", name, "").getLocation()));
+            }
+        } else if (field.equalsIgnoreCase("bucket")) {
+            if (value instanceof Long) {
+                return new BucketSet(new BucketId((Long)value));
+            }
+        }
+        return null;
+    }
+
+    // Inherit doc from Node.
+    public Object evaluate(Context context) {
+        Object oLeft = lhs.evaluate(context);
+        Object oRight = rhs.evaluate(context);
+        if (oLeft == null && oRight == null) {
+            return new ResultList(Result.TRUE);
+        }
+        if (oLeft == Result.INVALID || oRight == Result.INVALID) {
+            return new ResultList(Result.INVALID);
+        }
+        if (oLeft instanceof AttributeNode.VariableValueList && oRight instanceof AttributeNode.VariableValueList) {
+            if (operator.equals("==")) {
+                return evaluateListsTrue((AttributeNode.VariableValueList)oLeft, (AttributeNode.VariableValueList)oRight);
+            } else if (operator.equals("!=")) {
+                return evaluateListsFalse((AttributeNode.VariableValueList)oLeft, (AttributeNode.VariableValueList)oRight);
+            } else {
+                return new ResultList(Result.INVALID);
+            }
+        } else if (oLeft instanceof AttributeNode.VariableValueList) {
+            return evaluateListAndSingle((AttributeNode.VariableValueList)oLeft, oRight);
+        } else if (oRight instanceof AttributeNode.VariableValueList) {
+            return evaluateListAndSingle((AttributeNode.VariableValueList)oRight, oLeft);
+        }
+        return new ResultList(evaluateBool(oLeft, oRight));
+    }
+
+    public ResultList evaluateListsTrue(AttributeNode.VariableValueList lhs, AttributeNode.VariableValueList rhs) {
+        if (lhs.size() != rhs.size()) {
+            return new ResultList(Result.FALSE);
+        }
+
+        for (int i = 0; i < lhs.size(); i++) {
+            if (!lhs.get(i).getVariables().equals(rhs.get(i).getVariables())) {
+                return new ResultList(Result.FALSE);
+            }
+
+            if (evaluateEquals(lhs.get(i).getValue(), rhs.get(i).getValue()) == Result.FALSE) {
+                return new ResultList(Result.FALSE);
+            }
+        }
+
+        return new ResultList(Result.TRUE);
+    }
+
+    public ResultList evaluateListsFalse(AttributeNode.VariableValueList lhs, AttributeNode.VariableValueList rhs) {
+        ResultList lst = evaluateListsTrue(lhs, rhs);
+        if (lst.toResult() == Result.TRUE) {
+            return new ResultList(Result.FALSE);
+        } else if (lst.toResult() == Result.FALSE) {
+            return new ResultList(Result.TRUE);
+        } else {
+            return lst;
+        }
+    }
+
+    public ResultList evaluateListAndSingle(AttributeNode.VariableValueList lhs, Object rhs) {
+        if (rhs == null && lhs == null) {
+            return new ResultList(Result.TRUE);
+        }
+
+        if (rhs == null || lhs == null) {
+            return new ResultList(Result.FALSE);
+        }
+
+        ResultList retVal = new ResultList();
+        for (int i = 0; i < lhs.size(); i++) {
+        	Result result = evaluateBool(lhs.get(i).getValue(), rhs);
+        	retVal.add((FieldPathIteratorHandler.VariableMap)lhs.get(i).getVariables().clone(), result);
+        }
+
+        return retVal;
+    }
+
+    /**
+     * Evaluate this expression on two operands, given that they are not invalid.
+     *
+     * @param lhs Left hand side of operation.
+     * @param rhs Right hand side of operation.
+     * @return The evaluation result.
+     */
+    private Result evaluateBool(Object lhs, Object rhs) {
+        if (operator.equals("==")) {
+            return evaluateEquals(lhs, rhs);
+        } else if (operator.equals("!=")) {
+            return Result.invert(evaluateEquals(lhs, rhs));
+        } else if (operator.equals("<") || operator.equals("<=") ||
+                   operator.equals(">") || operator.equals(">=")) {
+            return evaluateNumber(lhs, rhs);
+        } else if (operator.equals("=~") || operator.equals("=")) {
+            return evaluateString(lhs, rhs);
+        }
+        throw new IllegalStateException("Comparison operator '" + operator + "' is not supported.");
+    }
+
+    /**
+     * Compare two operands for equality.
+     *
+     * @param lhs Left hand side of operation.
+     * @param rhs Right hand side of operation.
+     * @return Wether or not the two operands are equal.
+     */
+    private Result evaluateEquals(Object lhs, Object rhs) {
+        if (lhs == null || rhs == null) {
+            return Result.toResult(lhs == rhs);
+        }
+
+        double a = getAsNumber(lhs);
+        double b = getAsNumber(rhs);
+        if (Double.isNaN(a) || Double.isNaN(b)) {
+        	return Result.toResult(lhs.toString().equals(rhs.toString()));
+        }
+        return Result.toResult(a == b); // Ugh, comparing doubles? Should be converted to long value perhaps...
+    }
+
+    private double getAsNumber(Object value) {
+        if (value instanceof Number) {
+            return ((Number)value).doubleValue();
+        } else if (value instanceof NumericFieldValue) {
+            return getAsNumber(((NumericFieldValue)value).getNumber());
+        } else {
+            return Double.NaN; //new IllegalStateException("Term '" + value + "' (" + value.getClass() + ") does not evaluate to a number.");
+        }
+    }
+
+    /**
+     * Evalutes the value of this term over a document, given that both operands must be numbers.
+     *
+     * @param lhs Left hand side of operation.
+     * @param rhs Right hand side of operation.
+     * @return The evaluation result.
+     */
+    private Result evaluateNumber(Object lhs, Object rhs) {
+    	double a = getAsNumber(lhs);
+    	double b = getAsNumber(rhs);
+    	if (Double.isNaN(a) || Double.isNaN(b)) {
+    		return Result.INVALID;
+    	}
+        if (operator.equals("<")) {
+            return Result.toResult(a < b);
+        } else if (operator.equals("<=")) {
+            return Result.toResult(a <= b);
+        } else if (operator.equals(">")) {
+            return Result.toResult(a > b);
+        } else {
+            return Result.toResult(a >= b);
+        }
+    }
+
+    /**
+     * Evalutes the value of this term over a document, given that both operands must be strings.
+     *
+     * @param lhs Left hand side of operation.
+     * @param rhs Right hand side of operation.
+     * @return The evaluation result.
+     */
+    private Result evaluateString(Object lhs, Object rhs) {
+        String left = "" + lhs; // Allows null objects to evaluate to string.
+        String right = "" + rhs;
+        if (operator.equals("=~")) {
+            return Result.toResult(Pattern.compile(right).matcher(left).find());
+        } else {
+            return Result.toResult(Pattern.compile(globToRegex(right)).matcher(left).find());
+        }
+    }
+
+    /**
+     * Converts a glob pattern to a corresponding regular expression string.
+     *
+     * @param glob The glob pattern.
+     * @return The regex string.
+     */
+    private String globToRegex(String glob) {
+        StringBuilder ret = new StringBuilder();
+        ret.append("^");
+        for (int i = 0; i < glob.length(); i++) {
+            ret.append(globToRegex(glob.charAt(i)));
+        }
+        ret.append("$");
+
+        return ret.toString();
+    }
+
+    /**
+     * Converts a single character in a glob expression to the corresponding regular expression string.
+     *
+     * @param glob The glob character.
+     * @return The regex string.
+     */
+    private String globToRegex(char glob) {
+        switch (glob) {
+            case'*':
+                return ".*";
+            case'?':
+                return ".";
+            case'^':
+            case'$':
+            case'|':
+            case'{':
+            case'}':
+            case'(':
+            case')':
+            case'[':
+            case']':
+            case'\\':
+            case'+':
+            case'.':
+                return "\\" + glob;
+            default:
+                return "" + glob;
+        }
+    }
+
+    public void accept(Visitor visitor) {
+        visitor.visit(this);
+    }
+
+    // Inherit doc from Object.
+    @Override
+    public String toString() {
+        return lhs + " " + operator + " " + rhs;
+    }
+}
diff --git a/document/src/main/java/com/yahoo/document/select/rule/DocumentNode.java b/document/src/main/java/com/yahoo/document/select/rule/DocumentNode.java
index c071e6674aa..242413c8d3e 100644
--- a/document/src/main/java/com/yahoo/document/select/rule/DocumentNode.java
+++ b/document/src/main/java/com/yahoo/document/select/rule/DocumentNode.java
@@ -1,65 +1,65 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.document.select.rule;

-

-import com.yahoo.document.*;

-import com.yahoo.document.select.BucketSet;

-import com.yahoo.document.select.Context;

-import com.yahoo.document.select.OrderingSpecification;

-import com.yahoo.document.select.Visitor;

-

-/**

- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>

- */

-public class DocumentNode implements ExpressionNode {

-

-    private String type;

-

-    public DocumentNode(String type) {

-        this.type = type;

-    }

-

-    public String getType() {

-        return type;

-    }

-

-    public DocumentNode setType(String type) {

-        this.type = type;

-        return this;

-    }

-

-    @Override

-    public BucketSet getBucketSet(BucketIdFactory factory) {

-        return null;

-    }

-

-    @Override

-    public Object evaluate(Context context) {

-        return evaluate(context.getDocumentOperation());

-    }

-

-    public Object evaluate(DocumentOperation op) {

-        DocumentType doct;

-        if (op instanceof DocumentPut) {

-            doct = ((DocumentPut)op).getDocument().getDataType();

-        } else if (op instanceof DocumentUpdate) {

-            doct = ((DocumentUpdate)op).getDocumentType();

-        } else {

-            throw new IllegalStateException("Document class '" + op.getClass().getName() + "' is not supported.");

-        }

-        return doct.isA(this.type) ? op : Boolean.FALSE;

-    }

-

-    public void accept(Visitor visitor) {

-        visitor.visit(this);

-    }

-

-    @Override

-    public String toString() {

-        return type;

-    }

-

-    @Override

-    public OrderingSpecification getOrdering(int order) {

-        return null;

-    }

-}

+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.document.select.rule;
+
+import com.yahoo.document.*;
+import com.yahoo.document.select.BucketSet;
+import com.yahoo.document.select.Context;
+import com.yahoo.document.select.OrderingSpecification;
+import com.yahoo.document.select.Visitor;
+
+/**
+ * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ */
+public class DocumentNode implements ExpressionNode {
+
+    private String type;
+
+    public DocumentNode(String type) {
+        this.type = type;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public DocumentNode setType(String type) {
+        this.type = type;
+        return this;
+    }
+
+    @Override
+    public BucketSet getBucketSet(BucketIdFactory factory) {
+        return null;
+    }
+
+    @Override
+    public Object evaluate(Context context) {
+        return evaluate(context.getDocumentOperation());
+    }
+
+    public Object evaluate(DocumentOperation op) {
+        DocumentType doct;
+        if (op instanceof DocumentPut) {
+            doct = ((DocumentPut)op).getDocument().getDataType();
+        } else if (op instanceof DocumentUpdate) {
+            doct = ((DocumentUpdate)op).getDocumentType();
+        } else {
+            throw new IllegalStateException("Document class '" + op.getClass().getName() + "' is not supported.");
+        }
+        return doct.isA(this.type) ? op : Boolean.FALSE;
+    }
+
+    public void accept(Visitor visitor) {
+        visitor.visit(this);
+    }
+
+    @Override
+    public String toString() {
+        return type;
+    }
+
+    @Override
+    public OrderingSpecification getOrdering(int order) {
+        return null;
+    }
+}
diff --git a/document/src/main/java/com/yahoo/document/select/rule/EmbracedNode.java b/document/src/main/java/com/yahoo/document/select/rule/EmbracedNode.java
index 13b20695cab..234013ce604 100644
--- a/document/src/main/java/com/yahoo/document/select/rule/EmbracedNode.java
+++ b/document/src/main/java/com/yahoo/document/select/rule/EmbracedNode.java
@@ -1,51 +1,51 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.

-package com.yahoo.document.select.rule;

-

-import com.yahoo.document.BucketIdFactory;

-import com.yahoo.document.select.BucketSet;

-import com.yahoo.document.select.Context;

-import com.yahoo.document.select.OrderingSpecification;

-import com.yahoo.document.select.Visitor;

-

-/**

- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>

- */

-public class EmbracedNode implements ExpressionNode {

-

-    private ExpressionNode node;

-

-    public EmbracedNode(ExpressionNode node) {

-        this.node = node;

-    }

-

-    public ExpressionNode getNode() {

-        return node;

-    }

-

-    public EmbracedNode setNode(ExpressionNode node) {

-        this.node = node;

-        return this;

-    }

-

-    // Inherit doc from ExpressionNode.

-    public BucketSet getBucketSet(BucketIdFactory factory) {

-        return node.getBucketSet(factory);

-    }

-

-    public Object evaluate(Context context) {

-        return node.evaluate(context);

-    }

-

-    @Override

-    public String toString() {

-        return "(" + node + ")";

-    }

-

-    public void accept(Visitor visitor) {

-        visitor.visit(this);

-    }

-

-    public OrderingSpecification getOrdering(int order) {

-        return null;

-    }

-}

+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.document.select.rule;
+
+import com.yahoo.document.BucketIdFactory;
+import com.yahoo.document.select.BucketSet;
+import com.yahoo.document.select.Context;
+import com.yahoo.document.select.OrderingSpecification;
+import com.yahoo.document.select.Visitor;
+
+/**
+ * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ */
+public class EmbracedNode implements ExpressionNode {
+
+    private ExpressionNode node;
+
+    public EmbracedNode(ExpressionNode node) {
+        this.node = node;
+    }
+
+    public ExpressionNode getNode() {
+        return node;
+    }
+
+    public EmbracedNode setNode(ExpressionNode node) {
+        this.node = node;
+        return this;
+    }
+
+    // Inherit doc from ExpressionNode.
+    public BucketSet getBucketSet(BucketIdFactory factory) {
+        return node.getBucketSet(factory);
+    }
+
+    public Object evaluate(Context context) {
+        return node.evaluate(context);
+    }
+
+    @Override
+    public String toString() {
+        return "(" + node + ")";
+    }
+
+    public void accept(Visitor visitor) {
+        visitor.visit(this);
+    }
+
+    public OrderingSpecification getOrdering(int order) {
+        return null;
+    }
+}
diff --git a/document/src/main/java/com/yahoo/document/select/rule/ExpressionNode.java b/document/src/main/java/com/yahoo/document/select/rule/ExpressionNode.java
index ba51ec840d4..71500415bb3 100644
--- a/document/src/main/java/com/yahoo/document/select/rule/ExpressionNode.java
+++ b/document/src/main/java/com/yahoo/document/select/rule/ExpressionNode.java
@@ -1,48 +1,48 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.document.select.rule;

-

-import com.yahoo.document.BucketIdFactory;

-import com.yahoo.document.select.BucketSet;

-import com.yahoo.document.select.Context;

-import com.yahoo.document.select.OrderingSpecification;

-import com.yahoo.document.select.Visitor;

-

-/**

- * This is the interface of all expression nodes. It declares the methods requires by all expression nodes to maintain

- * a working document selector language.

- *

- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>

- */

-public interface ExpressionNode {

-

-    /**

-     * Evaluate the content of this node based on document object, and return that value.

-     *

-     * @param doc The document to evaluate over.

-     * @return The value of this.

-     */

-    public Object evaluate(Context doc);

-

-    /**

-     * Returns the set of bucket ids covered by this node.

-     *

-     * @param factory The factory used by the current application.

-     */

-    public BucketSet getBucketSet(BucketIdFactory factory);

-

-    /**

-     * If this document selection implies a specific ordering (using the orderdoc scheme),

-     * return that specification.  

-     *

-     * @param order The order in which we are looking to traverse the ordering (ASCENDING or DESCENDING)

-     */

-    public OrderingSpecification getOrdering(int order);

-

-    /**

-     * Perform visitation of this node.

-     *

-     * @param visitor The visitor that wishes to visit the node.

-     */

-    public void accept(Visitor visitor);

-

-}

+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.document.select.rule;
+
+import com.yahoo.document.BucketIdFactory;
+import com.yahoo.document.select.BucketSet;
+import com.yahoo.document.select.Context;
+import com.yahoo.document.select.OrderingSpecification;
+import com.yahoo.document.select.Visitor;
+
+/**
+ * This is the interface of all expression nodes. It declares the methods requires by all expression nodes to maintain
+ * a working document selector language.
+ *
+ * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ */
+public interface ExpressionNode {
+
+    /**
+     * Evaluate the content of this node based on document object, and return that value.
+     *
+     * @param doc The document to evaluate over.
+     * @return The value of this.
+     */
+    public Object evaluate(Context doc);
+
+    /**
+     * Returns the set of bucket ids covered by this node.
+     *
+     * @param factory The factory used by the current application.
+     */
+    public BucketSet getBucketSet(BucketIdFactory factory);
+
+    /**
+     * If this document selection implies a specific ordering (using the orderdoc scheme),
+     * return that specification.  
+     *
+     * @param order The order in which we are looking to traverse the ordering (ASCENDING or DESCENDING)
+     */
+    public OrderingSpecification getOrdering(int order);
+
+    /**
+     * Perform visitation of this node.
+     *
+     * @param visitor The visitor that wishes to visit the node.
+     */
+    public void accept(Visitor visitor);
+
+}
diff --git a/document/src/main/java/com/yahoo/document/select/rule/IdNode.java b/document/src/main/java/com/yahoo/document/select/rule/IdNode.java
index f12ecbb752b..d1c6aacd03c 100644
--- a/document/src/main/java/com/yahoo/document/select/rule/IdNode.java
+++ b/document/src/main/java/com/yahoo/document/select/rule/IdNode.java
@@ -1,108 +1,108 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.document.select.rule;

-

-import com.yahoo.document.DocumentId;

-import com.yahoo.document.BucketIdFactory;

-import com.yahoo.document.select.*;

-import com.yahoo.document.idstring.*;

-

-/**

- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>

- */

-public class IdNode implements ExpressionNode {

-

-    private String field;

-    private short widthBits = -1;

-    private short divisionBits = -1;

-

-    public IdNode() {

-        // empty

-    }

-

-    public String getField() {

-        return field;

-    }

-

-    public IdNode setField(String field) {

-        this.field = field;

-        return this;

-    }

-

-    public IdNode setWidthBits(short widthBits) {

-        this.widthBits = widthBits;

-        return this;

-    }

-

-    public IdNode setDivisionBits(short divisionBits) {

-        this.divisionBits = divisionBits;

-        return this;

-    }

-

-    public short getWidthBits() {

-        return widthBits;

-    }

-

-    public short getDivisionBits() {

-        return divisionBits;

-    }

-

-    // Inherit doc from ExpressionNode.

-    public BucketSet getBucketSet(BucketIdFactory factory) {

-        return null;

-    }

-

-    public OrderingSpecification getOrdering(int ordering) {

-        return null;

-    }

-

-    // Inherit doc from ExpressionNode.

-    public Object evaluate(Context context) {

-        DocumentId id = context.getDocumentOperation().getId();

-        if (id == null) {

-            throw new IllegalStateException("Document has no identifier.");

-        }

-        if (field == null) {

-            return id.toString();

-        } else if (field.equalsIgnoreCase("scheme")) {

-            return id.getScheme().getType().toString();

-        } else if (field.equalsIgnoreCase("namespace")) {

-            return id.getScheme().getNamespace();

-        } else if (field.equalsIgnoreCase("specific")) {

-            return id.getScheme().getNamespaceSpecific();

-        } else if (field.equalsIgnoreCase("group")) {

-            if (id.getScheme().hasGroup()) {

-                return id.getScheme().getGroup();

-            }

-            throw new IllegalStateException("Group identifier is null."); 

-        } else if (field.equalsIgnoreCase("user")) {

-            if (id.getScheme().hasNumber()) {

-                return id.getScheme().getNumber();

-            }

-            throw new IllegalStateException("User identifier is null.");

-        } else if (field.equalsIgnoreCase("type")) {

-            if (id.getScheme().hasDocType()) {

-                return id.getScheme().getDocType();

-            }

-            throw new IllegalStateException("Document id doesn't have doc type.");

-        } else if (field.equalsIgnoreCase("order")) {

-            if (id.getScheme() instanceof OrderDocIdString) {

-                OrderDocIdString ods = (OrderDocIdString)id.getScheme();

-                if (ods.getWidthBits() == widthBits && ods.getDivisionBits() == divisionBits) {

-                    return ods.getOrdering();

-                }

-            }

-        } else{

-            throw new IllegalStateException("Identifier field '" + field + "' is not supported.");

-        }

-        return null;

-    }

-

-    public void accept(Visitor visitor) {

-        visitor.visit(this);

-    }

-

-    @Override

-    public String toString() {

-        return "id" + (field != null ? "." + field : "") + (widthBits != -1 ? "(" + widthBits + "," + divisionBits + ")" : "");

-    }

-}

+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.document.select.rule;
+
+import com.yahoo.document.DocumentId;
+import com.yahoo.document.BucketIdFactory;
+import com.yahoo.document.select.*;
+import com.yahoo.document.idstring.*;
+
+/**
+ * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ */
+public class IdNode implements ExpressionNode {
+
+    private String field;
+    private short widthBits = -1;
+    private short divisionBits = -1;
+
+    public IdNode() {
+        // empty
+    }
+
+    public String getField() {
+        return field;
+    }
+
+    public IdNode setField(String field) {
+        this.field = field;
+        return this;
+    }
+
+    public IdNode setWidthBits(short widthBits) {
+        this.widthBits = widthBits;
+        return this;
+    }
+
+    public IdNode setDivisionBits(short divisionBits) {
+        this.divisionBits = divisionBits;
+        return this;
+    }
+
+    public short getWidthBits() {
+        return widthBits;
+    }
+
+    public short getDivisionBits() {
+        return divisionBits;
+    }
+
+    // Inherit doc from ExpressionNode.
+    public BucketSet getBucketSet(BucketIdFactory factory) {
+        return null;
+    }
+
+    public OrderingSpecification getOrdering(int ordering) {
+        return null;
+    }
+
+    // Inherit doc from ExpressionNode.
+    public Object evaluate(Context context) {
+        DocumentId id = context.getDocumentOperation().getId();
+        if (id == null) {
+            throw new IllegalStateException("Document has no identifier.");
+        }
+        if (field == null) {
+            return id.toString();
+        } else if (field.equalsIgnoreCase("scheme")) {
+            return id.getScheme().getType().toString();
+        } else if (field.equalsIgnoreCase("namespace")) {
+            return id.getScheme().getNamespace();
+        } else if (field.equalsIgnoreCase("specific")) {
+            return id.getScheme().getNamespaceSpecific();
+        } else if (field.equalsIgnoreCase("group")) {
+            if (id.getScheme().hasGroup()) {
+                return id.getScheme().getGroup();
+            }
+            throw new IllegalStateException("Group identifier is null."); 
+        } else if (field.equalsIgnoreCase("user")) {
+            if (id.getScheme().hasNumber()) {
+                return id.getScheme().getNumber();
+            }
+            throw new IllegalStateException("User identifier is null.");
+        } else if (field.equalsIgnoreCase("type")) {
+            if (id.getScheme().hasDocType()) {
+                return id.getScheme().getDocType();
+            }
+            throw new IllegalStateException("Document id doesn't have doc type.");
+        } else if (field.equalsIgnoreCase("order")) {
+            if (id.getScheme() instanceof OrderDocIdString) {
+                OrderDocIdString ods = (OrderDocIdString)id.getScheme();
+                if (ods.getWidthBits() == widthBits && ods.getDivisionBits() == divisionBits) {
+                    return ods.getOrdering();
+                }
+            }
+        } else{
+            throw new IllegalStateException("Identifier field '" + field + "' is not supported.");
+        }
+        return null;
+    }
+
+    public void accept(Visitor visitor) {
+        visitor.visit(this);
+    }
+
+    @Override
+    public String toString() {
+        return "id" + (field != null ? "." + field : "") + (widthBits != -1 ? "(" + widthBits + "," + divisionBits + ")" : "");
+    }
+}
diff --git a/document/src/main/java/com/yahoo/document/select/rule/LiteralNode.java b/document/src/main/java/com/yahoo/document/select/rule/LiteralNode.java
index ae0d640d471..ec186cc59d7 100644
--- a/document/src/main/java/com/yahoo/document/select/rule/LiteralNode.java
+++ b/document/src/main/java/com/yahoo/document/select/rule/LiteralNode.java
@@ -1,61 +1,61 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.document.select.rule;

-

-import com.yahoo.document.BucketIdFactory;

-import com.yahoo.document.select.BucketSet;

-import com.yahoo.document.select.Context;

-import com.yahoo.document.select.OrderingSpecification;

-import com.yahoo.document.select.Visitor;

-import com.yahoo.document.select.parser.SelectParserUtils;

-

-/**

- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>

- */

-public class LiteralNode implements ExpressionNode {

-

-    private Object value;

-

-    public LiteralNode(Object value) {

-        this.value = value;

-    }

-

-    public Object getValue() {

-        return value;

-    }

-

-    public LiteralNode setValue(Object value) {

-        this.value = value;

-        return this;

-    }

-

-    @Override

-    public BucketSet getBucketSet(BucketIdFactory factory) {

-        return null;

-    }

-

-    @Override

-    public Object evaluate(Context context) {

-        return value;

-    }

-

-    @Override

-    public void accept(Visitor visitor) {

-        visitor.visit(this);

-    }

-

-    @Override

-    public String toString() {

-        if (value == null) {

-            return "null";

-        } else if (value instanceof String) {

-            return SelectParserUtils.quote((String)value, '"');

-        } else {

-            return value.toString();

-        }

-    }

-

-    @Override

-    public OrderingSpecification getOrdering(int order) {

-        return null;

-    }

-}

+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.document.select.rule;
+
+import com.yahoo.document.BucketIdFactory;
+import com.yahoo.document.select.BucketSet;
+import com.yahoo.document.select.Context;
+import com.yahoo.document.select.OrderingSpecification;
+import com.yahoo.document.select.Visitor;
+import com.yahoo.document.select.parser.SelectParserUtils;
+
+/**
+ * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ */
+public class LiteralNode implements ExpressionNode {
+
+    private Object value;
+
+    public LiteralNode(Object value) {
+        this.value = value;
+    }
+
+    public Object getValue() {
+        return value;
+    }
+
+    public LiteralNode setValue(Object value) {
+        this.value = value;
+        return this;
+    }
+
+    @Override
+    public BucketSet getBucketSet(BucketIdFactory factory) {
+        return null;
+    }
+
+    @Override
+    public Object evaluate(Context context) {
+        return value;
+    }
+
+    @Override
+    public void accept(Visitor visitor) {
+        visitor.visit(this);
+    }
+
+    @Override
+    public String toString() {
+        if (value == null) {
+            return "null";
+        } else if (value instanceof String) {
+            return SelectParserUtils.quote((String)value, '"');
+        } else {
+            return value.toString();
+        }
+    }
+
+    @Override
+    public OrderingSpecification getOrdering(int order) {
+        return null;
+    }
+}
diff --git a/document/src/main/java/com/yahoo/document/select/rule/LogicNode.java b/document/src/main/java/com/yahoo/document/select/rule/LogicNode.java
index 145c655fae2..6489ca13b17 100644
--- a/document/src/main/java/com/yahoo/document/select/rule/LogicNode.java
+++ b/document/src/main/java/com/yahoo/document/select/rule/LogicNode.java
@@ -1,316 +1,316 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.document.select.rule;

-

-import com.yahoo.document.BucketIdFactory;

-import com.yahoo.document.select.BucketSet;

-import com.yahoo.document.select.Context;

-import com.yahoo.document.select.OrderingSpecification;

-import com.yahoo.document.select.ResultList;

-import com.yahoo.document.select.Visitor;

-

-import java.util.ArrayList;

-import java.util.List;

-import java.util.Stack;

-

-/**

- * This class defines a logical expression of nodes. This implementation uses a stack to evaluate its content as to

- * avoid deep recursions when building the parse tree.

- *

- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>

- */

-public class LogicNode implements ExpressionNode {

-

-    // A no-op value is defined for completeness.

-    public static final int NOP = 0;

-

-    // The OR operator has lower precedence than AND.

-    public static final int OR = 1;

-

-    // The AND operator has the highest precedence.

-    public static final int AND = 2;

-

-    // The items contained in this.

-    private final List<NodeItem> items = new ArrayList<NodeItem>();

-

-    /**

-     * Construct an empty logic expression.

-     */

-    public LogicNode() {

-        // empty

-    }

-

-    public List<NodeItem> getItems() {

-        return items;

-    }

-    

-    /**

-     * Adds an (operator, node) pair to this expression.

-     *

-     * @param operator The operator that combines the previous with the node given.

-     * @param node The node to add to this.

-     * @return This, to allow chaining.

-     */

-    public LogicNode add(String operator, ExpressionNode node) {

-        items.add(new LogicNode.NodeItem(stringToOperator(operator), node));

-        return this;

-    }

-

-    // Inherit doc from ExpressionNode.

-    public BucketSet getBucketSet(BucketIdFactory factory) {

-        Stack<BucketItem> buf = new Stack<>();

-        for (NodeItem item : items) {

-            if (!buf.isEmpty()) {

-                while (buf.peek().operator > item.operator) {

-                    combineBuckets(buf);

-                }

-            }

-            buf.push(new BucketItem(item.operator, item.node.getBucketSet(factory)));

-        }

-        while (buf.size() > 1) {

-            combineBuckets(buf);

-        }

-        return buf.pop().buckets;

-    }

-

-    public OrderingSpecification getOrdering(int order) {

-        Stack<OrderingItem> buf = new Stack<>();

-        for (NodeItem item : items) {

-            if (!buf.isEmpty()) {

-                while (buf.peek().operator > item.operator) {

-                    pickOrdering(buf);

-                }

-            }

-            buf.push(new OrderingItem(item.operator, item.node.getOrdering(order)));

-        }

-        while (buf.size() > 1) {

-            pickOrdering(buf);

-        }

-        return buf.pop().ordering;

-    }

-

-    private OrderingSpecification pickOrdering(OrderingSpecification a, OrderingSpecification b, boolean isAnd) {

-        if (a.getWidthBits() == b.getWidthBits() && a.getDivisionBits() == b.getDivisionBits() && a.getOrder() == b.getOrder()) {

-            if ((a.getOrder() == OrderingSpecification.ASCENDING && isAnd) ||

-                (a.getOrder() == OrderingSpecification.DESCENDING && !isAnd)) {

-                return new OrderingSpecification(a.getOrder(), Math.max(a.getOrderingStart(), b.getOrderingStart()), b.getWidthBits(), a.getDivisionBits());

-            } else {

-                return new OrderingSpecification(a.getOrder(), Math.min(a.getOrderingStart(), b.getOrderingStart()), b.getWidthBits(), a.getDivisionBits());

-            }

-        }

-        return null;

-    }

-

-    private void pickOrdering(Stack<OrderingItem> buf) {

-        OrderingItem rhs = buf.pop();

-        OrderingItem lhs = buf.pop();

-        switch (rhs.operator) {

-        case AND:

-            if (lhs.ordering == null) {

-                lhs.ordering = rhs.ordering;

-            } else if (rhs.ordering == null) {

-                // empty

-            } else {

-                lhs.ordering = pickOrdering(lhs.ordering, rhs.ordering, true);

-            }

-            break;

-        case OR:

-            if (lhs.ordering != null && rhs.ordering != null) {

-                lhs.ordering = pickOrdering(lhs.ordering, rhs.ordering, false);

-            } else {

-                lhs.ordering = null;

-            }

-            break;

-        default:

-            lhs.ordering = null;

-        }

-        buf.push(lhs);

-    }

-

-    /**

-     * Combines the top two items of the given stack using the operator of the second.

-     *

-     * @param buf The stack of bucket items.

-     */

-    private void combineBuckets(Stack<BucketItem> buf) {

-        BucketItem rhs = buf.pop();

-        BucketItem lhs = buf.pop();

-        switch (rhs.operator) {

-            case AND:

-                if (lhs.buckets == null) {

-                    lhs.buckets = rhs.buckets;

-                } else if (rhs.buckets == null) {

-                    // empty

-                } else {

-                    lhs.buckets = lhs.buckets.intersection(rhs.buckets);

-                }

-                break;

-            case OR:

-                if (lhs.buckets == null) {

-                    // empty

-                } else if (rhs.buckets == null) {

-                    lhs.buckets = null;

-                } else {

-                    lhs.buckets = lhs.buckets.union(rhs.buckets);

-                }

-                break;

-            default:

-                throw new IllegalStateException("Arithmetic operator " + rhs.operator + " not supported.");

-        }

-        buf.push(lhs);

-    }

-

-    // Inherit doc from ExpressionNode.

-    @Override

-    public Object evaluate(Context context) {

-        Stack<ValueItem> buf = new Stack<>();

-        for (NodeItem item : items) {

-            if ( ! buf.isEmpty()) {

-                while (buf.peek().operator > item.operator) {

-                    combineValues(buf);

-                }

-            }

-            

-            buf.push(new ValueItem(item.operator, ResultList.toResultList(item.node.evaluate(context))));

-        }

-        while (buf.size() > 1) {

-            combineValues(buf);

-        }

-        return buf.pop().value;

-    }

-

-    /**

-     * Combines the top two items of the given stack using the operator of the second.

-     *

-     * @param buf The stack of values.

-     */

-    private void combineValues(Stack<ValueItem> buf) {

-        ValueItem rhs = buf.pop();

-        ValueItem lhs = buf.pop();

-

-        switch (rhs.operator) {

-            case AND:

-                buf.push(new ValueItem(lhs.operator, lhs.value.combineAND(rhs.value)));

-                break;

-            case OR:

-                buf.push(new ValueItem(lhs.operator, lhs.value.combineOR(rhs.value)));

-                break;

-            default:

-                throw new IllegalStateException("Arithmetic operator " + rhs.operator + " not supported.");

-        }

-    }

-

-    public void accept(Visitor visitor) {

-        visitor.visit(this);

-    }

-

-    // Inherit doc from Object.

-    @Override

-    public String toString() {

-        StringBuilder ret = new StringBuilder();

-        for (LogicNode.NodeItem item : items) {

-            if (item.operator != NOP) {

-                ret.append(" ").append(operatorToString(item.operator)).append(" ");

-            }

-            ret.append(item.node);

-        }

-        return ret.toString();

-    }

-

-    /**

-     * Converts the given operator index to a string representation.

-     *

-     * @param operator The operator index to convert.

-     * @return The string representation.

-     */

-    public String operatorToString(int operator) {

-        switch (operator) {

-            case NOP:

-                return null;

-            case OR:

-                return "or";

-            case AND:

-                return "and";

-            default:

-                throw new IllegalStateException("Logical operator " + operator + " not supported.");

-        }

-    }

-

-    /**

-     * Converts the given operator string to a corresponding operator index. This is necessary to perform a stack

-     * traversal of logic expression.

-     *

-     * @param operator The operator to convert.

-     * @return The corresponding index.

-     */

-    private int stringToOperator(String operator) {

-        if (operator == null) {

-            return NOP;

-        } else if (operator.equalsIgnoreCase("or")) {

-            return OR;

-        } else if (operator.equalsIgnoreCase("and")) {

-            return AND;

-        } else {

-            throw new IllegalStateException("Logical operator '" + operator + "' not supported.");

-        }

-    }

-

-    /**

-     * Private class to store results in a stack.

-     */

-    private final class ValueItem {

-        private int operator;

-        private ResultList value;

-

-        public ValueItem(int operator, ResultList value) {

-            this.operator = operator;

-            this.value = value;

-        }

-    }

-

-    /**

-     * Private class to store bucket sets in a stack.

-     */

-    private final class BucketItem {

-        private int operator;

-        private BucketSet buckets;

-

-        public BucketItem(int operator, BucketSet buckets) {

-            this.operator = operator;

-            this.buckets = buckets;

-        }

-    }

-

-    /**

-     * Private class to store ordering expressions in a stack.

-     */

-    private final class OrderingItem {

-        private int operator;

-        private OrderingSpecification ordering;

-

-        public OrderingItem(int operator, OrderingSpecification orderSpec) {

-            this.operator = operator;

-            this.ordering = orderSpec;

-        }

-    }

-

-    /**

-     * Private class to store expression nodes in a stack.

-     */

-    public final class NodeItem {

-        private int operator;

-        private ExpressionNode node;

-

-        public NodeItem(int operator, ExpressionNode node) {

-            this.operator = operator;

-            this.node = node;

-        }

-

-        public int getOperator() {

-            return operator;

-        }

-

-        public ExpressionNode getNode() {

-            return node;

-        }

-    }

-}

+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.document.select.rule;
+
+import com.yahoo.document.BucketIdFactory;
+import com.yahoo.document.select.BucketSet;
+import com.yahoo.document.select.Context;
+import com.yahoo.document.select.OrderingSpecification;
+import com.yahoo.document.select.ResultList;
+import com.yahoo.document.select.Visitor;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Stack;
+
+/**
+ * This class defines a logical expression of nodes. This implementation uses a stack to evaluate its content as to
+ * avoid deep recursions when building the parse tree.
+ *
+ * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ */
+public class LogicNode implements ExpressionNode {
+
+    // A no-op value is defined for completeness.
+    public static final int NOP = 0;
+
+    // The OR operator has lower precedence than AND.
+    public static final int OR = 1;
+
+    // The AND operator has the highest precedence.
+    public static final int AND = 2;
+
+    // The items contained in this.
+    private final List<NodeItem> items = new ArrayList<NodeItem>();
+
+    /**
+     * Construct an empty logic expression.
+     */
+    public LogicNode() {
+        // empty
+    }
+
+    public List<NodeItem> getItems() {
+        return items;
+    }
+    
+    /**
+     * Adds an (operator, node) pair to this expression.
+     *
+     * @param operator The operator that combines the previous with the node given.
+     * @param node The node to add to this.
+     * @return This, to allow chaining.
+     */
+    public LogicNode add(String operator, ExpressionNode node) {
+        items.add(new LogicNode.NodeItem(stringToOperator(operator), node));
+        return this;
+    }
+
+    // Inherit doc from ExpressionNode.
+    public BucketSet getBucketSet(BucketIdFactory factory) {
+        Stack<BucketItem> buf = new Stack<>();
+        for (NodeItem item : items) {
+            if (!buf.isEmpty()) {
+                while (buf.peek().operator > item.operator) {
+                    combineBuckets(buf);
+                }
+            }
+            buf.push(new BucketItem(item.operator, item.node.getBucketSet(factory)));
+        }
+        while (buf.size() > 1) {
+            combineBuckets(buf);
+        }
+        return buf.pop().buckets;
+    }
+
+    public OrderingSpecification getOrdering(int order) {
+        Stack<OrderingItem> buf = new Stack<>();
+        for (NodeItem item : items) {
+            if (!buf.isEmpty()) {
+                while (buf.peek().operator > item.operator) {
+                    pickOrdering(buf);
+                }
+            }
+            buf.push(new OrderingItem(item.operator, item.node.getOrdering(order)));
+        }
+        while (buf.size() > 1) {
+            pickOrdering(buf);
+        }
+        return buf.pop().ordering;
+    }
+
+    private OrderingSpecification pickOrdering(OrderingSpecification a, OrderingSpecification b, boolean isAnd) {
+        if (a.getWidthBits() == b.getWidthBits() && a.getDivisionBits() == b.getDivisionBits() && a.getOrder() == b.getOrder()) {
+            if ((a.getOrder() == OrderingSpecification.ASCENDING && isAnd) ||
+                (a.getOrder() == OrderingSpecification.DESCENDING && !isAnd)) {
+                return new OrderingSpecification(a.getOrder(), Math.max(a.getOrderingStart(), b.getOrderingStart()), b.getWidthBits(), a.getDivisionBits());
+            } else {
+                return new OrderingSpecification(a.getOrder(), Math.min(a.getOrderingStart(), b.getOrderingStart()), b.getWidthBits(), a.getDivisionBits());
+            }
+        }
+        return null;
+    }
+
+    private void pickOrdering(Stack<OrderingItem> buf) {
+        OrderingItem rhs = buf.pop();
+        OrderingItem lhs = buf.pop();
+        switch (rhs.operator) {
+        case AND:
+            if (lhs.ordering == null) {
+                lhs.ordering = rhs.ordering;
+            } else if (rhs.ordering == null) {
+                // empty
+            } else {
+                lhs.ordering = pickOrdering(lhs.ordering, rhs.ordering, true);
+            }
+            break;
+        case OR:
+            if (lhs.ordering != null && rhs.ordering != null) {
+                lhs.ordering = pickOrdering(lhs.ordering, rhs.ordering, false);
+            } else {
+                lhs.ordering = null;
+            }
+            break;
+        default:
+            lhs.ordering = null;
+        }
+        buf.push(lhs);
+    }
+
+    /**
+     * Combines the top two items of the given stack using the operator of the second.
+     *
+     * @param buf The stack of bucket items.
+     */
+    private void combineBuckets(Stack<BucketItem> buf) {
+        BucketItem rhs = buf.pop();
+        BucketItem lhs = buf.pop();
+        switch (rhs.operator) {
+            case AND:
+                if (lhs.buckets == null) {
+                    lhs.buckets = rhs.buckets;
+                } else if (rhs.buckets == null) {
+                    // empty
+                } else {
+                    lhs.buckets = lhs.buckets.intersection(rhs.buckets);
+                }
+                break;
+            case OR:
+                if (lhs.buckets == null) {
+                    // empty
+                } else if (rhs.buckets == null) {
+                    lhs.buckets = null;
+                } else {
+                    lhs.buckets = lhs.buckets.union(rhs.buckets);
+                }
+                break;
+            default:
+                throw new IllegalStateException("Arithmetic operator " + rhs.operator + " not supported.");
+        }
+        buf.push(lhs);
+    }
+
+    // Inherit doc from ExpressionNode.
+    @Override
+    public Object evaluate(Context context) {
+        Stack<ValueItem> buf = new Stack<>();
+        for (NodeItem item : items) {
+            if ( ! buf.isEmpty()) {
+                while (buf.peek().operator > item.operator) {
+                    combineValues(buf);
+                }
+            }
+            
+            buf.push(new ValueItem(item.operator, ResultList.toResultList(item.node.evaluate(context))));
+        }
+        while (buf.size() > 1) {
+            combineValues(buf);
+        }
+        return buf.pop().value;
+    }
+
+    /**
+     * Combines the top two items of the given stack using the operator of the second.
+     *
+     * @param buf The stack of values.
+     */
+    private void combineValues(Stack<ValueItem> buf) {
+        ValueItem rhs = buf.pop();
+        ValueItem lhs = buf.pop();
+
+        switch (rhs.operator) {
+            case AND:
+                buf.push(new ValueItem(lhs.operator, lhs.value.combineAND(rhs.value)));
+                break;
+            case OR:
+                buf.push(new ValueItem(lhs.operator, lhs.value.combineOR(rhs.value)));
+                break;
+            default:
+                throw new IllegalStateException("Arithmetic operator " + rhs.operator + " not supported.");
+        }
+    }
+
+    public void accept(Visitor visitor) {
+        visitor.visit(this);
+    }
+
+    // Inherit doc from Object.
+    @Override
+    public String toString() {
+        StringBuilder ret = new StringBuilder();
+        for (LogicNode.NodeItem item : items) {
+            if (item.operator != NOP) {
+                ret.append(" ").append(operatorToString(item.operator)).append(" ");
+            }
+            ret.append(item.node);
+        }
+        return ret.toString();
+    }
+
+    /**
+     * Converts the given operator index to a string representation.
+     *
+     * @param operator The operator index to convert.
+     * @return The string representation.
+     */
+    public String operatorToString(int operator) {
+        switch (operator) {
+            case NOP:
+                return null;
+            case OR:
+                return "or";
+            case AND:
+                return "and";
+            default:
+                throw new IllegalStateException("Logical operator " + operator + " not supported.");
+        }
+    }
+
+    /**
+     * Converts the given operator string to a corresponding operator index. This is necessary to perform a stack
+     * traversal of logic expression.
+     *
+     * @param operator The operator to convert.
+     * @return The corresponding index.
+     */
+    private int stringToOperator(String operator) {
+        if (operator == null) {
+            return NOP;
+        } else if (operator.equalsIgnoreCase("or")) {
+            return OR;
+        } else if (operator.equalsIgnoreCase("and")) {
+            return AND;
+        } else {
+            throw new IllegalStateException("Logical operator '" + operator + "' not supported.");
+        }
+    }
+
+    /**
+     * Private class to store results in a stack.
+     */
+    private final class ValueItem {
+        private int operator;
+        private ResultList value;
+
+        public ValueItem(int operator, ResultList value) {
+            this.operator = operator;
+            this.value = value;
+        }
+    }
+
+    /**
+     * Private class to store bucket sets in a stack.
+     */
+    private final class BucketItem {
+        private int operator;
+        private BucketSet buckets;
+
+        public BucketItem(int operator, BucketSet buckets) {
+            this.operator = operator;
+            this.buckets = buckets;
+        }
+    }
+
+    /**
+     * Private class to store ordering expressions in a stack.
+     */
+    private final class OrderingItem {
+        private int operator;
+        private OrderingSpecification ordering;
+
+        public OrderingItem(int operator, OrderingSpecification orderSpec) {
+            this.operator = operator;
+            this.ordering = orderSpec;
+        }
+    }
+
+    /**
+     * Private class to store expression nodes in a stack.
+     */
+    public final class NodeItem {
+        private int operator;
+        private ExpressionNode node;
+
+        public NodeItem(int operator, ExpressionNode node) {
+            this.operator = operator;
+            this.node = node;
+        }
+
+        public int getOperator() {
+            return operator;
+        }
+
+        public ExpressionNode getNode() {
+            return node;
+        }
+    }
+}
diff --git a/document/src/main/java/com/yahoo/document/select/rule/NegationNode.java b/document/src/main/java/com/yahoo/document/select/rule/NegationNode.java
index 2b85bc3eee6..63660814bbe 100644
--- a/document/src/main/java/com/yahoo/document/select/rule/NegationNode.java
+++ b/document/src/main/java/com/yahoo/document/select/rule/NegationNode.java
@@ -1,53 +1,53 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.document.select.rule;

-

-import com.yahoo.document.BucketIdFactory;

-import com.yahoo.document.select.BucketSet;

-import com.yahoo.document.select.Context;

-import com.yahoo.document.select.OrderingSpecification;

-import com.yahoo.document.select.Result;

-import com.yahoo.document.select.Visitor;

-

-/**

- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>

- */

-public class NegationNode implements ExpressionNode {

-

-    private ExpressionNode node;

-

-    public NegationNode(ExpressionNode node) {

-        this.node = node;

-    }

-

-    public ExpressionNode getNode() {

-        return node;

-    }

-

-    public NegationNode setNode(ExpressionNode node) {

-        this.node = node;

-        return this;

-    }

-

-    // Inherit doc from ExpressionNode.

-    public BucketSet getBucketSet(BucketIdFactory factory) {

-        return null;

-    }

-

-    // Inherit doc from ExpressionNode.

-    public Object evaluate(Context context) {

-        return Result.invert(Result.toResult(node.evaluate(context)));

-    }

-

-    public void accept(Visitor visitor) {

-        visitor.visit(this);

-    }

-

-    @Override

-    public String toString() {

-        return "not " + node;

-    }

-

-    public OrderingSpecification getOrdering(int order) {

-        return null;

-    }

-}

+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.document.select.rule;
+
+import com.yahoo.document.BucketIdFactory;
+import com.yahoo.document.select.BucketSet;
+import com.yahoo.document.select.Context;
+import com.yahoo.document.select.OrderingSpecification;
+import com.yahoo.document.select.Result;
+import com.yahoo.document.select.Visitor;
+
+/**
+ * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ */
+public class NegationNode implements ExpressionNode {
+
+    private ExpressionNode node;
+
+    public NegationNode(ExpressionNode node) {
+        this.node = node;
+    }
+
+    public ExpressionNode getNode() {
+        return node;
+    }
+
+    public NegationNode setNode(ExpressionNode node) {
+        this.node = node;
+        return this;
+    }
+
+    // Inherit doc from ExpressionNode.
+    public BucketSet getBucketSet(BucketIdFactory factory) {
+        return null;
+    }
+
+    // Inherit doc from ExpressionNode.
+    public Object evaluate(Context context) {
+        return Result.invert(Result.toResult(node.evaluate(context)));
+    }
+
+    public void accept(Visitor visitor) {
+        visitor.visit(this);
+    }
+
+    @Override
+    public String toString() {
+        return "not " + node;
+    }
+
+    public OrderingSpecification getOrdering(int order) {
+        return null;
+    }
+}
diff --git a/document/src/main/java/com/yahoo/document/select/rule/NowNode.java b/document/src/main/java/com/yahoo/document/select/rule/NowNode.java
index 600dbe536e4..d0ae3d363d1 100644
--- a/document/src/main/java/com/yahoo/document/select/rule/NowNode.java
+++ b/document/src/main/java/com/yahoo/document/select/rule/NowNode.java
@@ -1,34 +1,34 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.document.select.rule;

-import com.yahoo.document.BucketIdFactory;

-import com.yahoo.document.select.*;

-

-/**

- * @author <a href="mailto:lulf@yahoo-inc.com">Ulf Lilleengen</a>

- */

-public class NowNode implements ExpressionNode {

-

-    // Inherit doc from ExpressionNode.

-    public BucketSet getBucketSet(BucketIdFactory factory) {

-        return null;

-    }

-

-    // Inherit doc from ExpressionNode.

-    public Object evaluate(Context context) {

-        Object ret = System.currentTimeMillis() / 1000;  

-        return ret;

-    }

-

-    @Override

-    public String toString() {

-        return "now()";

-    }

-

-    public OrderingSpecification getOrdering(int order) {

-        return null;

-    }

-

-    public void accept(Visitor visitor) {

-        visitor.visit(this);

-    }

-}

+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.document.select.rule;
+import com.yahoo.document.BucketIdFactory;
+import com.yahoo.document.select.*;
+
+/**
+ * @author <a href="mailto:lulf@yahoo-inc.com">Ulf Lilleengen</a>
+ */
+public class NowNode implements ExpressionNode {
+
+    // Inherit doc from ExpressionNode.
+    public BucketSet getBucketSet(BucketIdFactory factory) {
+        return null;
+    }
+
+    // Inherit doc from ExpressionNode.
+    public Object evaluate(Context context) {
+        Object ret = System.currentTimeMillis() / 1000;  
+        return ret;
+    }
+
+    @Override
+    public String toString() {
+        return "now()";
+    }
+
+    public OrderingSpecification getOrdering(int order) {
+        return null;
+    }
+
+    public void accept(Visitor visitor) {
+        visitor.visit(this);
+    }
+}
diff --git a/document/src/main/java/com/yahoo/document/select/rule/SearchColumnNode.java b/document/src/main/java/com/yahoo/document/select/rule/SearchColumnNode.java
index c63197ae3a4..90cd790539a 100644
--- a/document/src/main/java/com/yahoo/document/select/rule/SearchColumnNode.java
+++ b/document/src/main/java/com/yahoo/document/select/rule/SearchColumnNode.java
@@ -1,56 +1,56 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.document.select.rule;

-

-import com.yahoo.document.BucketDistribution;

-import com.yahoo.document.BucketIdFactory;

-import com.yahoo.document.select.*;

-

-/**

- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>

- */

-public class SearchColumnNode implements ExpressionNode {

-

-    private int field;

-    private BucketIdFactory factory = new BucketIdFactory(); // why is this not an abstract class?

-    private BucketDistribution distribution;

-

-    public SearchColumnNode() {

-        setField(0);

-    }

-

-    public int getField() {

-        return field;

-    }

-

-    public SearchColumnNode setField(int field) {

-        distribution = new BucketDistribution(this.field = field, 16);

-        return this;

-    }

-

-    public BucketDistribution getDistribution() {

-        return distribution;

-    }

-

-    // Inherit doc from ExpressionNode.

-    public BucketSet getBucketSet(BucketIdFactory factory) {

-        return null;

-    }

-

-    // Inherit doc from ExpressionNode.

-    public Object evaluate(Context context) {

-        return distribution.getColumn(factory.getBucketId(context.getDocumentOperation().getId()));

-    }

-

-    public void accept(Visitor visitor) {

-        visitor.visit(this);

-    }

-

-    @Override

-    public String toString() {

-        return "searchcolumn." + field;

-    }

-

-    public OrderingSpecification getOrdering(int order) {

-        return null;

-    }

-}

+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.document.select.rule;
+
+import com.yahoo.document.BucketDistribution;
+import com.yahoo.document.BucketIdFactory;
+import com.yahoo.document.select.*;
+
+/**
+ * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ */
+public class SearchColumnNode implements ExpressionNode {
+
+    private int field;
+    private BucketIdFactory factory = new BucketIdFactory(); // why is this not an abstract class?
+    private BucketDistribution distribution;
+
+    public SearchColumnNode() {
+        setField(0);
+    }
+
+    public int getField() {
+        return field;
+    }
+
+    public SearchColumnNode setField(int field) {
+        distribution = new BucketDistribution(this.field = field, 16);
+        return this;
+    }
+
+    public BucketDistribution getDistribution() {
+        return distribution;
+    }
+
+    // Inherit doc from ExpressionNode.
+    public BucketSet getBucketSet(BucketIdFactory factory) {
+        return null;
+    }
+
+    // Inherit doc from ExpressionNode.
+    public Object evaluate(Context context) {
+        return distribution.getColumn(factory.getBucketId(context.getDocumentOperation().getId()));
+    }
+
+    public void accept(Visitor visitor) {
+        visitor.visit(this);
+    }
+
+    @Override
+    public String toString() {
+        return "searchcolumn." + field;
+    }
+
+    public OrderingSpecification getOrdering(int order) {
+        return null;
+    }
+}
diff --git a/document/src/main/java/com/yahoo/document/select/rule/VariableNode.java b/document/src/main/java/com/yahoo/document/select/rule/VariableNode.java
index 77c462674db..524674322cf 100644
--- a/document/src/main/java/com/yahoo/document/select/rule/VariableNode.java
+++ b/document/src/main/java/com/yahoo/document/select/rule/VariableNode.java
@@ -1,58 +1,58 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.document.select.rule;

-

-import com.yahoo.document.BucketIdFactory;

-import com.yahoo.document.select.BucketSet;

-import com.yahoo.document.select.Context;

-import com.yahoo.document.select.OrderingSpecification;

-import com.yahoo.document.select.Visitor;

-

-/**

- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>

- */

-public class VariableNode implements ExpressionNode {

-

-    private String value;

-

-    public VariableNode(String value) {

-        this.value = value;

-    }

-

-    public Object getValue() {

-        return value;

-    }

-

-    public VariableNode setValue(String value) {

-        this.value = value;

-        return this;

-    }

-

-    @Override

-    public BucketSet getBucketSet(BucketIdFactory factory) {

-        return null;

-    }

-

-    @Override

-    public Object evaluate(Context context) {

-        Object o = context.getVariables().get(value);

-        if (o == null) {

-            throw new IllegalArgumentException("Variable " + value + " was not set in the variable list");

-        }

-        return o;

-    }

-

-    @Override

-    public void accept(Visitor visitor) {

-        visitor.visit(this);

-    }

-

-    @Override

-    public String toString() {

-        return "$" + value;

-    }

-

-    @Override

-    public OrderingSpecification getOrdering(int order) {

-        return null;

-    }

-}

+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.document.select.rule;
+
+import com.yahoo.document.BucketIdFactory;
+import com.yahoo.document.select.BucketSet;
+import com.yahoo.document.select.Context;
+import com.yahoo.document.select.OrderingSpecification;
+import com.yahoo.document.select.Visitor;
+
+/**
+ * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ */
+public class VariableNode implements ExpressionNode {
+
+    private String value;
+
+    public VariableNode(String value) {
+        this.value = value;
+    }
+
+    public Object getValue() {
+        return value;
+    }
+
+    public VariableNode setValue(String value) {
+        this.value = value;
+        return this;
+    }
+
+    @Override
+    public BucketSet getBucketSet(BucketIdFactory factory) {
+        return null;
+    }
+
+    @Override
+    public Object evaluate(Context context) {
+        Object o = context.getVariables().get(value);
+        if (o == null) {
+            throw new IllegalArgumentException("Variable " + value + " was not set in the variable list");
+        }
+        return o;
+    }
+
+    @Override
+    public void accept(Visitor visitor) {
+        visitor.visit(this);
+    }
+
+    @Override
+    public String toString() {
+        return "$" + value;
+    }
+
+    @Override
+    public OrderingSpecification getOrdering(int order) {
+        return null;
+    }
+}
diff --git a/document/src/main/java/com/yahoo/document/select/rule/package-info.java b/document/src/main/java/com/yahoo/document/select/rule/package-info.java
index b5268393037..0b80dd5f25d 100644
--- a/document/src/main/java/com/yahoo/document/select/rule/package-info.java
+++ b/document/src/main/java/com/yahoo/document/select/rule/package-info.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 @ExportPackage
 @PublicApi
 package com.yahoo.document.select.rule;
diff --git a/document/src/main/java/com/yahoo/document/select/simple/IdSpecParser.java b/document/src/main/java/com/yahoo/document/select/simple/IdSpecParser.java
index 79411894664..f792c4b8c0f 100644
--- a/document/src/main/java/com/yahoo/document/select/simple/IdSpecParser.java
+++ b/document/src/main/java/com/yahoo/document/select/simple/IdSpecParser.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.select.simple;
 
 import com.yahoo.document.select.rule.IdNode;
diff --git a/document/src/main/java/com/yahoo/document/select/simple/IntegerParser.java b/document/src/main/java/com/yahoo/document/select/simple/IntegerParser.java
index 3d0ae1ae2a8..142f8ad3fd4 100644
--- a/document/src/main/java/com/yahoo/document/select/simple/IntegerParser.java
+++ b/document/src/main/java/com/yahoo/document/select/simple/IntegerParser.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.select.simple;
 
 import com.yahoo.document.select.rule.LiteralNode;
diff --git a/document/src/main/java/com/yahoo/document/select/simple/OperatorParser.java b/document/src/main/java/com/yahoo/document/select/simple/OperatorParser.java
index a1ddee75ff2..ad69a47c6ae 100644
--- a/document/src/main/java/com/yahoo/document/select/simple/OperatorParser.java
+++ b/document/src/main/java/com/yahoo/document/select/simple/OperatorParser.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.select.simple;
 
 /**
diff --git a/document/src/main/java/com/yahoo/document/select/simple/Parser.java b/document/src/main/java/com/yahoo/document/select/simple/Parser.java
index fa2e5d2910b..53cde8bcabb 100644
--- a/document/src/main/java/com/yahoo/document/select/simple/Parser.java
+++ b/document/src/main/java/com/yahoo/document/select/simple/Parser.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.select.simple;
 
 /**
diff --git a/document/src/main/java/com/yahoo/document/select/simple/SelectionParser.java b/document/src/main/java/com/yahoo/document/select/simple/SelectionParser.java
index dd76202cfb2..0614731265b 100644
--- a/document/src/main/java/com/yahoo/document/select/simple/SelectionParser.java
+++ b/document/src/main/java/com/yahoo/document/select/simple/SelectionParser.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.select.simple;
 
 import com.yahoo.document.select.rule.ComparisonNode;
diff --git a/document/src/main/java/com/yahoo/document/select/simple/StringParser.java b/document/src/main/java/com/yahoo/document/select/simple/StringParser.java
index 42047a63e5a..d43c57aee03 100644
--- a/document/src/main/java/com/yahoo/document/select/simple/StringParser.java
+++ b/document/src/main/java/com/yahoo/document/select/simple/StringParser.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.select.simple;
 
 import com.yahoo.document.select.rule.LiteralNode;
diff --git a/document/src/main/java/com/yahoo/document/select/simple/package-info.java b/document/src/main/java/com/yahoo/document/select/simple/package-info.java
index 58d4cc3428b..e6885d54fd4 100644
--- a/document/src/main/java/com/yahoo/document/select/simple/package-info.java
+++ b/document/src/main/java/com/yahoo/document/select/simple/package-info.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 @ExportPackage
 @PublicApi
 package com.yahoo.document.select.simple;
diff --git a/document/src/main/java/com/yahoo/document/serialization/AnnotationReader.java b/document/src/main/java/com/yahoo/document/serialization/AnnotationReader.java
index 92b042249d2..851cf56a33a 100644
--- a/document/src/main/java/com/yahoo/document/serialization/AnnotationReader.java
+++ b/document/src/main/java/com/yahoo/document/serialization/AnnotationReader.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.serialization;
 
 import com.yahoo.document.annotation.Annotation;
diff --git a/document/src/main/java/com/yahoo/document/serialization/AnnotationWriter.java b/document/src/main/java/com/yahoo/document/serialization/AnnotationWriter.java
index 061798e91b8..ef83687c1e7 100644
--- a/document/src/main/java/com/yahoo/document/serialization/AnnotationWriter.java
+++ b/document/src/main/java/com/yahoo/document/serialization/AnnotationWriter.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.serialization;
 
 import com.yahoo.document.annotation.Annotation;
diff --git a/document/src/main/java/com/yahoo/document/serialization/DeserializationException.java b/document/src/main/java/com/yahoo/document/serialization/DeserializationException.java
index a189290fb13..7b03fb460e0 100644
--- a/document/src/main/java/com/yahoo/document/serialization/DeserializationException.java
+++ b/document/src/main/java/com/yahoo/document/serialization/DeserializationException.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.serialization;
 
 /**
diff --git a/document/src/main/java/com/yahoo/document/serialization/DocumentDeserializer.java b/document/src/main/java/com/yahoo/document/serialization/DocumentDeserializer.java
index e4c1a3293b1..582a6b0bd92 100644
--- a/document/src/main/java/com/yahoo/document/serialization/DocumentDeserializer.java
+++ b/document/src/main/java/com/yahoo/document/serialization/DocumentDeserializer.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.serialization;
 
 import com.yahoo.io.GrowableByteBuffer;
diff --git a/document/src/main/java/com/yahoo/document/serialization/DocumentDeserializerFactory.java b/document/src/main/java/com/yahoo/document/serialization/DocumentDeserializerFactory.java
index b32d7bc6369..072f11f5f22 100644
--- a/document/src/main/java/com/yahoo/document/serialization/DocumentDeserializerFactory.java
+++ b/document/src/main/java/com/yahoo/document/serialization/DocumentDeserializerFactory.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.serialization;
 
 import com.yahoo.document.DocumentTypeManager;
diff --git a/document/src/main/java/com/yahoo/document/serialization/DocumentReader.java b/document/src/main/java/com/yahoo/document/serialization/DocumentReader.java
index 5f1b227790b..9bfe1573e18 100644
--- a/document/src/main/java/com/yahoo/document/serialization/DocumentReader.java
+++ b/document/src/main/java/com/yahoo/document/serialization/DocumentReader.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.serialization;
 
 import com.yahoo.document.Document;
diff --git a/document/src/main/java/com/yahoo/document/serialization/DocumentSerializer.java b/document/src/main/java/com/yahoo/document/serialization/DocumentSerializer.java
index c1d53430bdc..76eea0d6850 100644
--- a/document/src/main/java/com/yahoo/document/serialization/DocumentSerializer.java
+++ b/document/src/main/java/com/yahoo/document/serialization/DocumentSerializer.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.serialization;
 
 import com.yahoo.io.GrowableByteBuffer;
diff --git a/document/src/main/java/com/yahoo/document/serialization/DocumentSerializerFactory.java b/document/src/main/java/com/yahoo/document/serialization/DocumentSerializerFactory.java
index 827a42c4f81..7ff58855c34 100644
--- a/document/src/main/java/com/yahoo/document/serialization/DocumentSerializerFactory.java
+++ b/document/src/main/java/com/yahoo/document/serialization/DocumentSerializerFactory.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.serialization;
 
 import com.yahoo.io.GrowableByteBuffer;
diff --git a/document/src/main/java/com/yahoo/document/serialization/DocumentUpdateFlags.java b/document/src/main/java/com/yahoo/document/serialization/DocumentUpdateFlags.java
index d6dd1ad35ac..e057437626d 100644
--- a/document/src/main/java/com/yahoo/document/serialization/DocumentUpdateFlags.java
+++ b/document/src/main/java/com/yahoo/document/serialization/DocumentUpdateFlags.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.serialization;
 
 /**
@@ -35,4 +35,4 @@ public class DocumentUpdateFlags {
         int mask = ~(~0 << 28);
         return combined & mask;
     }
-}
\ No newline at end of file
+}
diff --git a/document/src/main/java/com/yahoo/document/serialization/DocumentUpdateReader.java b/document/src/main/java/com/yahoo/document/serialization/DocumentUpdateReader.java
index 4e31af08d00..576fed5e771 100644
--- a/document/src/main/java/com/yahoo/document/serialization/DocumentUpdateReader.java
+++ b/document/src/main/java/com/yahoo/document/serialization/DocumentUpdateReader.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.serialization;
 
 import com.yahoo.document.*;
diff --git a/document/src/main/java/com/yahoo/document/serialization/DocumentUpdateWriter.java b/document/src/main/java/com/yahoo/document/serialization/DocumentUpdateWriter.java
index 725de8935f5..582df19ff9c 100644
--- a/document/src/main/java/com/yahoo/document/serialization/DocumentUpdateWriter.java
+++ b/document/src/main/java/com/yahoo/document/serialization/DocumentUpdateWriter.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.serialization;
 
 import com.yahoo.document.DataType;
diff --git a/document/src/main/java/com/yahoo/document/serialization/DocumentWriter.java b/document/src/main/java/com/yahoo/document/serialization/DocumentWriter.java
index aba9c97cf67..a315635a1bd 100644
--- a/document/src/main/java/com/yahoo/document/serialization/DocumentWriter.java
+++ b/document/src/main/java/com/yahoo/document/serialization/DocumentWriter.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.serialization;
 
 import com.yahoo.document.Document;
diff --git a/document/src/main/java/com/yahoo/document/serialization/FieldReader.java b/document/src/main/java/com/yahoo/document/serialization/FieldReader.java
index 25b6addcfed..11fc0c314af 100644
--- a/document/src/main/java/com/yahoo/document/serialization/FieldReader.java
+++ b/document/src/main/java/com/yahoo/document/serialization/FieldReader.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 /**
  *
  */
diff --git a/document/src/main/java/com/yahoo/document/serialization/FieldWriter.java b/document/src/main/java/com/yahoo/document/serialization/FieldWriter.java
index 20897f10a67..243d25c3950 100644
--- a/document/src/main/java/com/yahoo/document/serialization/FieldWriter.java
+++ b/document/src/main/java/com/yahoo/document/serialization/FieldWriter.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.serialization;
 
 import com.yahoo.document.Document;
diff --git a/document/src/main/java/com/yahoo/document/serialization/SerializationException.java b/document/src/main/java/com/yahoo/document/serialization/SerializationException.java
index 44dd9d2ccf8..4b9cdc7d428 100644
--- a/document/src/main/java/com/yahoo/document/serialization/SerializationException.java
+++ b/document/src/main/java/com/yahoo/document/serialization/SerializationException.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.serialization;
 
 /**
diff --git a/document/src/main/java/com/yahoo/document/serialization/SpanNodeReader.java b/document/src/main/java/com/yahoo/document/serialization/SpanNodeReader.java
index 652758e8e38..d5485be95fe 100644
--- a/document/src/main/java/com/yahoo/document/serialization/SpanNodeReader.java
+++ b/document/src/main/java/com/yahoo/document/serialization/SpanNodeReader.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.serialization;
 
 import com.yahoo.document.annotation.AlternateSpanList;
diff --git a/document/src/main/java/com/yahoo/document/serialization/SpanNodeWriter.java b/document/src/main/java/com/yahoo/document/serialization/SpanNodeWriter.java
index 8712c792f99..f52b49db08e 100644
--- a/document/src/main/java/com/yahoo/document/serialization/SpanNodeWriter.java
+++ b/document/src/main/java/com/yahoo/document/serialization/SpanNodeWriter.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.serialization;
 
 import com.yahoo.document.annotation.AlternateSpanList;
diff --git a/document/src/main/java/com/yahoo/document/serialization/SpanTreeReader.java b/document/src/main/java/com/yahoo/document/serialization/SpanTreeReader.java
index ca670f527b5..664f9824580 100644
--- a/document/src/main/java/com/yahoo/document/serialization/SpanTreeReader.java
+++ b/document/src/main/java/com/yahoo/document/serialization/SpanTreeReader.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.serialization;
 
 import com.yahoo.document.annotation.SpanTree;
diff --git a/document/src/main/java/com/yahoo/document/serialization/SpanTreeWriter.java b/document/src/main/java/com/yahoo/document/serialization/SpanTreeWriter.java
index 629a21f149e..dba4ea000b7 100644
--- a/document/src/main/java/com/yahoo/document/serialization/SpanTreeWriter.java
+++ b/document/src/main/java/com/yahoo/document/serialization/SpanTreeWriter.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.serialization;
 
 import com.yahoo.document.annotation.SpanTree;
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 ed1f40e750b..ff0e11bcdeb 100644
--- a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializer42.java
+++ b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializer42.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.serialization;
 
 import com.yahoo.collections.Tuple2;
diff --git a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializerHead.java b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializerHead.java
index fdee3ae506e..7bdc6fd5355 100644
--- a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializerHead.java
+++ b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializerHead.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.serialization;
 
 import com.yahoo.document.DocumentId;
diff --git a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializer42.java b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializer42.java
index 6095d4a1545..33e4831185b 100644
--- a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializer42.java
+++ b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializer42.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.serialization;
 
 import com.yahoo.compress.Compressor;
diff --git a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializerHead.java b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializerHead.java
index 33b58ee2005..9629ed94f47 100644
--- a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializerHead.java
+++ b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializerHead.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.serialization;
 
 import com.yahoo.document.DocumentUpdate;
diff --git a/document/src/main/java/com/yahoo/document/serialization/XmlDocumentWriter.java b/document/src/main/java/com/yahoo/document/serialization/XmlDocumentWriter.java
index 16899fa68a4..768ec879ce1 100644
--- a/document/src/main/java/com/yahoo/document/serialization/XmlDocumentWriter.java
+++ b/document/src/main/java/com/yahoo/document/serialization/XmlDocumentWriter.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.serialization;
 
 import com.yahoo.document.Document;
diff --git a/document/src/main/java/com/yahoo/document/serialization/XmlSerializationHelper.java b/document/src/main/java/com/yahoo/document/serialization/XmlSerializationHelper.java
index d7362095cf3..f2f7cc88d00 100644
--- a/document/src/main/java/com/yahoo/document/serialization/XmlSerializationHelper.java
+++ b/document/src/main/java/com/yahoo/document/serialization/XmlSerializationHelper.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.serialization;
 
 import com.yahoo.document.Document;
diff --git a/document/src/main/java/com/yahoo/document/serialization/XmlStream.java b/document/src/main/java/com/yahoo/document/serialization/XmlStream.java
index f0c8451cd2a..eb5e64400d3 100644
--- a/document/src/main/java/com/yahoo/document/serialization/XmlStream.java
+++ b/document/src/main/java/com/yahoo/document/serialization/XmlStream.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.serialization;
 
 import com.yahoo.text.XML;
diff --git a/document/src/main/java/com/yahoo/document/serialization/package-info.java b/document/src/main/java/com/yahoo/document/serialization/package-info.java
index 711990c5d9a..05da1d3b2ab 100644
--- a/document/src/main/java/com/yahoo/document/serialization/package-info.java
+++ b/document/src/main/java/com/yahoo/document/serialization/package-info.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 @ExportPackage
 @PublicApi
 package com.yahoo.document.serialization;
diff --git a/document/src/main/java/com/yahoo/document/update/AddValueUpdate.java b/document/src/main/java/com/yahoo/document/update/AddValueUpdate.java
index bae921a7ab7..93661eb3451 100644
--- a/document/src/main/java/com/yahoo/document/update/AddValueUpdate.java
+++ b/document/src/main/java/com/yahoo/document/update/AddValueUpdate.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.update;
 
 import com.yahoo.document.CollectionDataType;
diff --git a/document/src/main/java/com/yahoo/document/update/ArithmeticValueUpdate.java b/document/src/main/java/com/yahoo/document/update/ArithmeticValueUpdate.java
index c4e677cab66..2f1fa5ad70a 100644
--- a/document/src/main/java/com/yahoo/document/update/ArithmeticValueUpdate.java
+++ b/document/src/main/java/com/yahoo/document/update/ArithmeticValueUpdate.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.update;
 
 import com.yahoo.document.DataType;
diff --git a/document/src/main/java/com/yahoo/document/update/AssignValueUpdate.java b/document/src/main/java/com/yahoo/document/update/AssignValueUpdate.java
index f1157d272e2..9165d6b5ea3 100644
--- a/document/src/main/java/com/yahoo/document/update/AssignValueUpdate.java
+++ b/document/src/main/java/com/yahoo/document/update/AssignValueUpdate.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.update;
 
 import com.yahoo.document.DataType;
diff --git a/document/src/main/java/com/yahoo/document/update/ClearValueUpdate.java b/document/src/main/java/com/yahoo/document/update/ClearValueUpdate.java
index a9a0ad271ef..b7efc95f16d 100644
--- a/document/src/main/java/com/yahoo/document/update/ClearValueUpdate.java
+++ b/document/src/main/java/com/yahoo/document/update/ClearValueUpdate.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.update;
 
 import com.yahoo.document.DataType;
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 c4250a33f28..163bda5b623 100644
--- a/document/src/main/java/com/yahoo/document/update/FieldUpdate.java
+++ b/document/src/main/java/com/yahoo/document/update/FieldUpdate.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.update;
 
 import com.yahoo.document.DataType;
diff --git a/document/src/main/java/com/yahoo/document/update/MapValueUpdate.java b/document/src/main/java/com/yahoo/document/update/MapValueUpdate.java
index de2fe1987a9..0a56e69b1e4 100644
--- a/document/src/main/java/com/yahoo/document/update/MapValueUpdate.java
+++ b/document/src/main/java/com/yahoo/document/update/MapValueUpdate.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.update;
 
 import com.yahoo.document.ArrayDataType;
diff --git a/document/src/main/java/com/yahoo/document/update/RemoveValueUpdate.java b/document/src/main/java/com/yahoo/document/update/RemoveValueUpdate.java
index e83d19803b1..e4b704fdcdd 100644
--- a/document/src/main/java/com/yahoo/document/update/RemoveValueUpdate.java
+++ b/document/src/main/java/com/yahoo/document/update/RemoveValueUpdate.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.update;
 
 import com.yahoo.document.CollectionDataType;
diff --git a/document/src/main/java/com/yahoo/document/update/ValueUpdate.java b/document/src/main/java/com/yahoo/document/update/ValueUpdate.java
index 5c6f5b22dbe..301f619fbd9 100644
--- a/document/src/main/java/com/yahoo/document/update/ValueUpdate.java
+++ b/document/src/main/java/com/yahoo/document/update/ValueUpdate.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.update;
 
 import com.yahoo.document.DataType;
diff --git a/document/src/main/java/com/yahoo/document/update/package-info.java b/document/src/main/java/com/yahoo/document/update/package-info.java
index 3699dec32ef..ef8545b1be6 100644
--- a/document/src/main/java/com/yahoo/document/update/package-info.java
+++ b/document/src/main/java/com/yahoo/document/update/package-info.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 @ExportPackage
 @PublicApi
 package com.yahoo.document.update;
diff --git a/document/src/main/java/com/yahoo/vespaxmlparser/FeedReader.java b/document/src/main/java/com/yahoo/vespaxmlparser/FeedReader.java
index e97bd43d9bf..28028f1d7de 100644
--- a/document/src/main/java/com/yahoo/vespaxmlparser/FeedReader.java
+++ b/document/src/main/java/com/yahoo/vespaxmlparser/FeedReader.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespaxmlparser;
 
 import com.yahoo.vespaxmlparser.VespaXMLFeedReader.Operation;
@@ -18,4 +18,4 @@ public interface FeedReader {
      */
     public abstract void read(Operation operation) throws Exception;
 
-}
\ No newline at end of file
+}
diff --git a/document/src/main/java/com/yahoo/vespaxmlparser/VespaXMLDocumentReader.java b/document/src/main/java/com/yahoo/vespaxmlparser/VespaXMLDocumentReader.java
index a5ea5983e29..c1a8cc05c0c 100644
--- a/document/src/main/java/com/yahoo/vespaxmlparser/VespaXMLDocumentReader.java
+++ b/document/src/main/java/com/yahoo/vespaxmlparser/VespaXMLDocumentReader.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespaxmlparser;
 
 import com.yahoo.document.Document;
diff --git a/document/src/main/java/com/yahoo/vespaxmlparser/VespaXMLFeedReader.java b/document/src/main/java/com/yahoo/vespaxmlparser/VespaXMLFeedReader.java
index 0c8b9b22961..49652b53da8 100644
--- a/document/src/main/java/com/yahoo/vespaxmlparser/VespaXMLFeedReader.java
+++ b/document/src/main/java/com/yahoo/vespaxmlparser/VespaXMLFeedReader.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespaxmlparser;
 
 import com.yahoo.document.Document;
diff --git a/document/src/main/java/com/yahoo/vespaxmlparser/VespaXMLFieldReader.java b/document/src/main/java/com/yahoo/vespaxmlparser/VespaXMLFieldReader.java
index 1fdab19b1cb..bfe15c8c45b 100644
--- a/document/src/main/java/com/yahoo/vespaxmlparser/VespaXMLFieldReader.java
+++ b/document/src/main/java/com/yahoo/vespaxmlparser/VespaXMLFieldReader.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespaxmlparser;
 
 import com.yahoo.document.DataType;
diff --git a/document/src/main/java/com/yahoo/vespaxmlparser/VespaXMLReader.java b/document/src/main/java/com/yahoo/vespaxmlparser/VespaXMLReader.java
index 10c3676a965..09af5dc6242 100644
--- a/document/src/main/java/com/yahoo/vespaxmlparser/VespaXMLReader.java
+++ b/document/src/main/java/com/yahoo/vespaxmlparser/VespaXMLReader.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespaxmlparser;
 
 import com.yahoo.document.DocumentTypeManager;
diff --git a/document/src/main/java/com/yahoo/vespaxmlparser/VespaXMLUpdateReader.java b/document/src/main/java/com/yahoo/vespaxmlparser/VespaXMLUpdateReader.java
index a4d334848d5..8c941dee58b 100644
--- a/document/src/main/java/com/yahoo/vespaxmlparser/VespaXMLUpdateReader.java
+++ b/document/src/main/java/com/yahoo/vespaxmlparser/VespaXMLUpdateReader.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespaxmlparser;
 
 import com.yahoo.document.*;
diff --git a/document/src/main/java/com/yahoo/vespaxmlparser/package-info.java b/document/src/main/java/com/yahoo/vespaxmlparser/package-info.java
index 6083408be29..ba33b6a83ad 100644
--- a/document/src/main/java/com/yahoo/vespaxmlparser/package-info.java
+++ b/document/src/main/java/com/yahoo/vespaxmlparser/package-info.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 // TODO: Remove this package on Vespa 7
 @ExportPackage
 package com.yahoo.vespaxmlparser;