Non-functional changes: Use records

4 files changed, 4 insertions, 76 deletions

diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/container/Container.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/container/Container.java
index dd725a11364..8374a04e764 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/container/Container.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/container/Container.java
@@ -65,37 +65,11 @@ public class Container extends PartialContainer {
     }
 
     /** The network of a container */
-    public static class Network {
-
-        private final String name;
-        private final String ipv4Address;
-
+    public record Network(String name, String ipv4Address) {
         public Network(String name, String ipv4Address) {
             this.name = Objects.requireNonNull(name);
             this.ipv4Address = Objects.requireNonNull(ipv4Address);
         }
-
-        public String name() {
-            return name;
-        }
-
-        public String ipv4Address() {
-            return ipv4Address;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) return true;
-            if (o == null || getClass() != o.getClass()) return false;
-            Network network = (Network) o;
-            return name.equals(network.name) && ipv4Address.equals(network.ipv4Address);
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(name, ipv4Address);
-        }
-
     }
 
 }
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/container/RegistryCredentials.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/container/RegistryCredentials.java
index 29934e3d1aa..fb2281897ce 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/container/RegistryCredentials.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/container/RegistryCredentials.java
@@ -8,40 +8,15 @@ import java.util.Objects;
  *
  * @author mpolden
  */
-public class RegistryCredentials {
+public record RegistryCredentials(String username, String password) {
 
     public static final RegistryCredentials none = new RegistryCredentials("", "");
 
-    private final String username;
-    private final String password;
-
     public RegistryCredentials(String username, String password) {
         this.username = Objects.requireNonNull(username);
         this.password = Objects.requireNonNull(password);
     }
 
-    public String username() {
-        return username;
-    }
-
-    public String password() {
-        return password;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        RegistryCredentials that = (RegistryCredentials) o;
-        return username.equals(that.username) &&
-               password.equals(that.password);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(username, password);
-    }
-
     @Override
     public String toString() {
         return "registry credentials [username=" + username + ",password=<hidden>]";
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/disk/DiskCleanupRule.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/disk/DiskCleanupRule.java
index ebc47a0038b..3b11f68910c 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/disk/DiskCleanupRule.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/disk/DiskCleanupRule.java
@@ -16,16 +16,5 @@ public interface DiskCleanupRule {
         LOWEST, LOW, MEDIUM, HIGH, HIGHEST
     }
 
-    class PrioritizedFileAttributes {
-        private final FileFinder.FileAttributes fileAttributes;
-        private final Priority priority;
-
-        public PrioritizedFileAttributes(FileFinder.FileAttributes fileAttributes, Priority priority) {
-            this.fileAttributes = fileAttributes;
-            this.priority = priority;
-        }
-
-        public Priority priority() { return priority; }
-        public FileFinder.FileAttributes fileAttributes() { return fileAttributes; }
-    }
+    record PrioritizedFileAttributes(FileFinder.FileAttributes fileAttributes, Priority priority) { }
 }
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/DefaultEnvWriter.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/DefaultEnvWriter.java
index 05b33cad2be..c5a28c26786 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/DefaultEnvWriter.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/DefaultEnvWriter.java
@@ -104,17 +104,7 @@ public class DefaultEnvWriter {
         return newDefaultEnvLines;
     }
 
-    private static class Operation {
-        final String action;
-        final String name;
-        final String value;
-
-        Operation(String action, String name, String value) {
-            this.action = action;
-            this.name = name;
-            this.value = value;
-        }
-
+    private record Operation(String action, String name, String value) {
         String toLine() {
             if (action.equals("unset")) {
                 return "unset " + name;