Remove WrapsFieldKey.java

Author: labkey-tchad

src/org/labkey/test/components/ui/grids/FieldReferenceManager.java

@@ -3,7 +3,6 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.labkey.test.params.FieldKey;
-import org.labkey.test.params.WrapsFieldKey;
 import org.labkey.test.util.CachingSupplier;
 import org.labkey.test.util.selenium.WebElementUtils;
 import org.openqa.selenium.NoSuchElementException;
@@ -53,9 +52,9 @@ public FieldReference getColumnHeader(int index)
     {
         List<Supplier<FieldReference>> options;
 
-        if (fieldIdentifier instanceof WrapsFieldKey fk)
+        if (fieldIdentifier instanceof FieldKey fk)
         {
-            options = List.of(() -> findColumnHeaderByFieldKey(fk.getFieldKey())); // We know it is a FieldKey
+            options = List.of(() -> findColumnHeaderByFieldKey(fk)); // We know it is a FieldKey
         }
         else
         {

src/org/labkey/test/params/FieldInfo.java

@@ -7,7 +7,7 @@
  * Immutable alternative to 'FieldDefinition'
  * Use this for shared global field information
  */
-public class FieldInfo implements WrapsFieldKey
+public class FieldInfo
 {
     private final FieldKey _fieldKey;
     private final String _label;
@@ -57,7 +57,6 @@ public String getLabel()
         return Objects.requireNonNullElseGet(getRawLabel(), () -> FieldDefinition.labelFromName(_fieldKey.getName()));
     }
 
-    @Override
     public FieldKey getFieldKey()
     {
         return _fieldKey;

src/org/labkey/test/params/FieldKey.java

@@ -9,7 +9,7 @@
 import java.util.Iterator;
 import java.util.List;
 
-public class FieldKey implements CharSequence, WrapsFieldKey
+public class FieldKey implements CharSequence
 {
     public static final FieldKey EMPTY = new FieldKey(""); // Useful as a sort of FieldKey builder starting point
     public static final FieldKey SOURCES_FK = new FieldKey("DataInputs");
@@ -61,9 +61,9 @@ public static FieldKey fromParts(String... parts)
      */
     public static FieldKey fromFieldKey(CharSequence fieldKey)
     {
-        if (fieldKey instanceof WrapsFieldKey fk)
+        if (fieldKey instanceof FieldKey fk)
         {
-            return fk.getFieldKey();
+            return fk;
         }
         else
         {
@@ -78,8 +78,8 @@ public static FieldKey fromFieldKey(CharSequence fieldKey)
      */
     public static FieldKey fromName(CharSequence nameOrFieldKey)
     {
-        if (nameOrFieldKey instanceof WrapsFieldKey fk)
-            return fk.getFieldKey();
+        if (nameOrFieldKey instanceof FieldKey fk)
+            return fk;
         else
             return fromParts(nameOrFieldKey.toString());
     }
@@ -144,12 +144,6 @@ public String[] getNameArray()
         return Arrays.stream(_fieldKey.split(SEPARATOR)).map(FieldKey::decodePart).toArray(String[]::new);
     }
 
-    @Override
-    public FieldKey getFieldKey()
-    {
-        return this;
-    }
-
     @Override
     public @NotNull String toString()
     {