From 2b8a5e1671934ae4749484157d3d1a8acddcacb1 Mon Sep 17 00:00:00 2001
From: Henning Baldersheim <balder@yahoo-inc.com>
Date: Mon, 13 May 2024 15:57:14 +0200
Subject: GC TypedKey

---
 .../main/java/com/yahoo/schema/document/SDField.java |  6 +++---
 .../java/com/yahoo/schema/document/TypedKey.java     | 20 --------------------
 2 files changed, 3 insertions(+), 23 deletions(-)
 delete mode 100644 config-model/src/main/java/com/yahoo/schema/document/TypedKey.java

(limited to 'config-model')

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();
-
-}
-- 
cgit v1.2.3