Remove unused methods

vespa-engine · Jan 23, 2025 · 3145c83 · 3145c83
1 parent 028ed29
commit 3145c83
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 10 deletions.
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/Environment.java b/config-provisioning/src/main/java/com/yahoo/config/provision/Environment.java
@@ -34,10 +34,6 @@ public enum Environment {
     /** Returns whether this environment is production (prod) */
     public boolean isProduction() { return this == prod; }
 
-    /** Returns whether this environment can exist in multiple regions. @deprecated they all are */
-    @Deprecated // TODO: Remove after June 2023
-    public boolean isMultiRegion() { return true; }
-
     /** Returns the prod environment. This is useful for non-hosted properties where we just need any consistent value */
     public static Environment defaultEnvironment() { return prod; }
 

diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/Flavor.java b/config-provisioning/src/main/java/com/yahoo/config/provision/Flavor.java
@@ -111,18 +111,13 @@ public Flavor with(NodeResources resources) {
 
     public Type getType() { return type; }
 
-    /** Convenience, returns getType() == Type.DOCKER_CONTAINER */
-    // TODO: Remove after December 2022
-    public boolean isDocker() { return type == Type.DOCKER_CONTAINER; }
-
     @Override
     public int hashCode() { return Objects.hash(name, flavorOverrides); }
 
     @Override
     public boolean equals(Object o) {
         if (o == this) return true;
-        if ( ! (o instanceof Flavor)) return false;
-        Flavor other = (Flavor)o;
+        if ( ! (o instanceof Flavor other)) return false;
         if (configured)
             return Objects.equals(this.name, other.name) &&
                     Objects.equals(this.flavorOverrides, other.flavorOverrides);