remove now-unused requiresConsecutivePorts

5 files changed, 0 insertions, 32 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/AbstractService.java b/config-model/src/main/java/com/yahoo/vespa/model/AbstractService.java
index 20ae438a6e0..72c475fb091 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/AbstractService.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/AbstractService.java
@@ -196,16 +196,6 @@ public abstract class AbstractService extends AbstractConfigProducer<AbstractCon
     }
 
     /**
-     * Override if the services does not require consecutive port numbers. I.e. if any ports
-     * in addition to the baseport should be allocated from Vespa's default port range.
-     *
-     * @return true by default
-     */
-    public boolean requiresConsecutivePorts() {
-        return true;
-    }
-
-    /**
      * Gets the ports metainfo object. The service implementation
      * must populate this object in the constructor.
      */
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/NetworkPortRequestor.java b/config-model/src/main/java/com/yahoo/vespa/model/NetworkPortRequestor.java
index 10a236e42c6..845b925aaf0 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/NetworkPortRequestor.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/NetworkPortRequestor.java
@@ -46,14 +46,6 @@ public interface NetworkPortRequestor {
     default boolean requiresWantedPort() { return false; }
 
     /**
-     * Override if the services does not require consecutive port numbers. I.e. if any ports
-     * in addition to the baseport should be allocated from Vespa's default port range.
-     *
-     * @return true by default
-     */
-    default boolean requiresConsecutivePorts() { return true; }
-
-    /**
      * Return names for each port requested.
      * The size of the returned array must be equal to getPortCount().
      */
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/Slobrok.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/Slobrok.java
index da157798767..c4e76f5ccf1 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/Slobrok.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/Slobrok.java
@@ -35,11 +35,6 @@ public class Slobrok extends AbstractService implements StateserverConfig.Produc
     }
 
     @Override
-    public boolean requiresConsecutivePorts() {
-        return false;
-    }
-
-    @Override
     public int getWantedPort() {
         if (getId() == 1) {
             return BASEPORT;
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainer.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainer.java
index 73ec43ae8fc..3218389438d 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainer.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainer.java
@@ -90,11 +90,6 @@ public class MetricsProxyContainer extends Container implements
 
     // Must have predictable ports for both http and rpc.
     @Override
-    public boolean requiresConsecutivePorts() {
-        return true;
-    }
-
-    @Override
     public void allocatePorts(int start, PortAllocBridge from) {
         if (start == 0) start = BASEPORT;
         from.wantPort(start++, "http");
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java b/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java
index 0a405292118..5919c0426fe 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java
@@ -224,10 +224,6 @@ public abstract class Container extends AbstractService implements
         return requireSpecificPorts && (getHttp() == null);
     }
 
-    public boolean requiresConsecutivePorts() {
-        return false;
-    }
-
     /**
      * @return the number of ports needed by the Container
      */