diff options
author | Geir Storli <geirst@oath.com> | 2018-08-29 15:14:27 +0200 |
---|---|---|
committer | Geir Storli <geirst@oath.com> | 2018-08-29 15:14:27 +0200 |
commit | 49fde9abcf86600bcbfedc46f6fd4ec0740ec41a (patch) | |
tree | 0316c414b99eb702200a97177e4269eb004c2219 | |
parent | ae38db15dee838d8e6dcf9eaeabf08690a53af0e (diff) |
Improve function name.
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/StructFieldAttributeChangeValidator.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/StructFieldAttributeChangeValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/StructFieldAttributeChangeValidator.java index 341861e3c7e..4dfeb808e31 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/StructFieldAttributeChangeValidator.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/search/StructFieldAttributeChangeValidator.java @@ -98,7 +98,7 @@ public class StructFieldAttributeChangeValidator { } if (isArrayOfStructType(dataType())) { StructDataType nestedType = (StructDataType)((ArrayDataType)dataType()).getNestedType(); - if (hasLastFieldNameInStructType(fieldNames, nestedType)) { + if (structTypeContainsLastFieldNameComponent(nestedType, fieldNames)) { return true; } } else if (isMapOfStructType(dataType())) { @@ -107,7 +107,7 @@ public class StructFieldAttributeChangeValidator { String subFieldName = fieldNames.nextToken(); if (subFieldName.equals("key") && !fieldNames.hasMoreTokens()) { return true; - } else if (subFieldName.equals("value") && hasLastFieldNameInStructType(fieldNames, valueType)) { + } else if (subFieldName.equals("value") && structTypeContainsLastFieldNameComponent(valueType, fieldNames)) { return true; } } else if (isMapOfPrimitiveType(dataType())) { @@ -153,7 +153,7 @@ public class StructFieldAttributeChangeValidator { return (type instanceof StructDataType); } - private static boolean hasLastFieldNameInStructType(StringTokenizer fieldNames, StructDataType structType) { + private static boolean structTypeContainsLastFieldNameComponent(StructDataType structType, StringTokenizer fieldNames) { return structType.getField(fieldNames.nextToken()) != null && !fieldNames.hasMoreTokens(); } } |