Merge pull request #31190 from vespa-engine/balder/no-need-to-implement-typed-key

Balder/no need to implement typed key

3 files changed, 9 insertions, 27 deletions

diff --git a/config-model/src/main/java/com/yahoo/schema/document/SDField.java b/config-model/src/main/java/com/yahoo/schema/document/SDField.java
index f165141b16e..2483fa47667 100644
--- a/config-model/src/main/java/com/yahoo/schema/document/SDField.java
+++ b/config-model/src/main/java/com/yahoo/schema/document/SDField.java
@@ -46,7 +46,7 @@ import java.util.TreeMap;
  *
  * @author bratseth
  */
-public class SDField extends Field implements TypedKey, ImmutableSDField {
+public class SDField extends Field implements ImmutableSDField {
 
     /** Use this field for modifying index-structure, even if it doesn't have any indexing code */
     private boolean indexStructureField = false;
@@ -315,7 +315,7 @@ public class SDField extends Field implements TypedKey, ImmutableSDField {
                     supplyStructField.accept(field.getName(), field.getDataType());
                 }
             }
-            if ((subType == null) && (structFields.size() > 0)) {
+            if ((subType == null) && (!structFields.isEmpty())) {
                 throw new IllegalArgumentException("Cannot find matching (repo=" + sdoc + ") for subfields in "
                                                    + this + " [" + getDataType() + getDataType().getClass() +
                                                    "] with " + structFields.size() + " struct fields");
@@ -627,7 +627,7 @@ public class SDField extends Field implements TypedKey, ImmutableSDField {
 
     public Attribute addAttribute(Attribute attribute) {
         String name = attribute.getName();
-        if (name == null || "".equals(name)) {
+        if (name == null || name.isEmpty()) {
             name = getName();
             attribute.setName(name);
         }
diff --git a/config-model/src/main/java/com/yahoo/schema/document/TypedKey.java b/config-model/src/main/java/com/yahoo/schema/document/TypedKey.java
deleted file mode 100644
index 652d21d7f7d..00000000000
--- a/config-model/src/main/java/com/yahoo/schema/document/TypedKey.java
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.schema.document;
-
-import com.yahoo.document.DataType;
-
-/**
- * Common interface for various typed key (or field definitions).
- * Used by code which wants to use common algorithms for dealing with typed keys, like the logical mapping
- *
- * @author bratseth
- */
-public interface TypedKey {
-
-    String getName();
-
-    void setDataType(DataType type);
-
-    DataType getDataType();
-
-}
diff --git a/config-model/src/main/java/com/yahoo/vespa/documentmodel/SummaryField.java b/config-model/src/main/java/com/yahoo/vespa/documentmodel/SummaryField.java
index d50d5e36134..785b45d8def 100644
--- a/config-model/src/main/java/com/yahoo/vespa/documentmodel/SummaryField.java
+++ b/config-model/src/main/java/com/yahoo/vespa/documentmodel/SummaryField.java
@@ -3,10 +3,12 @@ package com.yahoo.vespa.documentmodel;
 
 import com.yahoo.document.DataType;
 import com.yahoo.document.Field;
-import com.yahoo.schema.document.TypedKey;
 
 import java.io.Serializable;
-import java.util.*;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 import static com.yahoo.text.Lowercase.toLowerCase;
@@ -16,7 +18,7 @@ import static com.yahoo.text.Lowercase.toLowerCase;
  *
  * @author bratseth
  */
-public class SummaryField extends Field implements Cloneable, TypedKey {
+public class SummaryField extends Field implements Cloneable {
 
     /** A source (field name). */
     public static class Source implements Serializable {
@@ -62,7 +64,7 @@ public class SummaryField extends Field implements Cloneable, TypedKey {
      */
     private Set<Source> sources = new java.util.LinkedHashSet<>();
 
-    private Set<String> destinations  =new java.util.LinkedHashSet<>();
+    private Set<String> destinations  = new java.util.LinkedHashSet<>();
 
     /** True if this field was defined implicitly */
     private boolean implicit = false;