1 files changed, 13 insertions, 3 deletions
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/ComplexAttributeFieldUtils.java b/config-model/src/main/java/com/yahoo/searchdefinition/document/ComplexAttributeFieldUtils.java
index 89d72756512..a56364a6975 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/document/ComplexAttributeFieldUtils.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/document/ComplexAttributeFieldUtils.java
@@ -1,3 +1,4 @@
+// Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.searchdefinition.document;
 
 import com.yahoo.document.ArrayDataType;
@@ -19,7 +20,10 @@ import com.yahoo.document.StructDataType;
 public class ComplexAttributeFieldUtils {
 
     public static boolean isArrayOfSimpleStruct(ImmutableSDField field) {
-        DataType fieldType = field.getDataType();
+        return isArrayOfSimpleStruct(field.getDataType());
+    }
+
+    public static boolean isArrayOfSimpleStruct(DataType fieldType) {
         if (fieldType instanceof ArrayDataType) {
             ArrayDataType arrayType = (ArrayDataType)fieldType;
             return isSimpleStruct(arrayType.getNestedType());
@@ -29,7 +33,10 @@ public class ComplexAttributeFieldUtils {
     }
 
     public static boolean isMapOfSimpleStruct(ImmutableSDField field) {
-        DataType fieldType = field.getDataType();
+        return isMapOfSimpleStruct(field.getDataType());
+    }
+
+    public static boolean isMapOfSimpleStruct(DataType fieldType) {
         if (fieldType instanceof MapDataType) {
             MapDataType mapType = (MapDataType)fieldType;
             return isPrimitiveType(mapType.getKeyType()) &&
@@ -40,7 +47,10 @@ public class ComplexAttributeFieldUtils {
     }
 
     public static boolean isMapOfPrimitiveType(ImmutableSDField field) {
-        DataType fieldType = field.getDataType();
+        return isMapOfPrimitiveType(field.getDataType());
+    }
+
+    public static boolean isMapOfPrimitiveType(DataType fieldType) {
         if (fieldType instanceof MapDataType) {
             MapDataType mapType = (MapDataType)fieldType;
             return isPrimitiveType(mapType.getKeyType()) &&