Remove unused methods and default implementations

15 files changed, 12 insertions, 34 deletions

diff --git a/config-model-api/src/main/java/com/yahoo/config/application/api/UnparsedConfigDefinition.java b/config-model-api/src/main/java/com/yahoo/config/application/api/UnparsedConfigDefinition.java
index 36a44583ec9..ea3b1632571 100644
--- a/config-model-api/src/main/java/com/yahoo/config/application/api/UnparsedConfigDefinition.java
+++ b/config-model-api/src/main/java/com/yahoo/config/application/api/UnparsedConfigDefinition.java
@@ -6,8 +6,7 @@ import com.yahoo.vespa.config.ConfigDefinition;
 /**
  * A config definition that has not been parsed.
  * 
- * @author lulf
- * @since 5.20
+ * @author Ulf Lilleengen
 */
 public interface UnparsedConfigDefinition {
 
diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/ConfigChangeAction.java b/config-model-api/src/main/java/com/yahoo/config/model/api/ConfigChangeAction.java
index 6580e315ef5..e453aaf5bdb 100644
--- a/config-model-api/src/main/java/com/yahoo/config/model/api/ConfigChangeAction.java
+++ b/config-model-api/src/main/java/com/yahoo/config/model/api/ConfigChangeAction.java
@@ -8,7 +8,6 @@ import java.util.List;
  * between the current active model and the next model to prepare.
  *
  * @author geirst
- * @since 5.40
  */
 public interface ConfigChangeAction {
 
diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/ConfigChangeRefeedAction.java b/config-model-api/src/main/java/com/yahoo/config/model/api/ConfigChangeRefeedAction.java
index f99086b6633..1f3cb1ef83d 100644
--- a/config-model-api/src/main/java/com/yahoo/config/model/api/ConfigChangeRefeedAction.java
+++ b/config-model-api/src/main/java/com/yahoo/config/model/api/ConfigChangeRefeedAction.java
@@ -5,7 +5,6 @@ package com.yahoo.config.model.api;
  * Represents an action to re-feed a document type in order to handle a config change.
  *
  * @author geirst
- * @since 5.43
  */
 public interface ConfigChangeRefeedAction extends ConfigChangeAction {
 
diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/ConfigChangeRestartAction.java b/config-model-api/src/main/java/com/yahoo/config/model/api/ConfigChangeRestartAction.java
index 2f15caac1e8..f178180b6e0 100644
--- a/config-model-api/src/main/java/com/yahoo/config/model/api/ConfigChangeRestartAction.java
+++ b/config-model-api/src/main/java/com/yahoo/config/model/api/ConfigChangeRestartAction.java
@@ -5,7 +5,6 @@ package com.yahoo.config.model.api;
  * Represents an action to restart services in order to handle a config change.
  *
  * @author geirst
- * @since 5.43
  */
 public interface ConfigChangeRestartAction extends ConfigChangeAction {
 
diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/ConfigDefinitionRepo.java b/config-model-api/src/main/java/com/yahoo/config/model/api/ConfigDefinitionRepo.java
index d2b8dc75d22..676dad9656e 100644
--- a/config-model-api/src/main/java/com/yahoo/config/model/api/ConfigDefinitionRepo.java
+++ b/config-model-api/src/main/java/com/yahoo/config/model/api/ConfigDefinitionRepo.java
@@ -21,7 +21,6 @@ public interface ConfigDefinitionRepo {
     /**
      * Gets a config definition from repo or null if not found
      */
-    // TODO: Remove default implementation when 6.246 is the oldest version in use
-    default ConfigDefinition get(ConfigDefinitionKey key) { return null; }
+    ConfigDefinition get(ConfigDefinitionKey key);
 
 }
diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/ConfigDefinitionStore.java b/config-model-api/src/main/java/com/yahoo/config/model/api/ConfigDefinitionStore.java
index de041232a71..10c9e42e553 100644
--- a/config-model-api/src/main/java/com/yahoo/config/model/api/ConfigDefinitionStore.java
+++ b/config-model-api/src/main/java/com/yahoo/config/model/api/ConfigDefinitionStore.java
@@ -5,8 +5,7 @@ import com.yahoo.vespa.config.ConfigDefinition;
 import com.yahoo.vespa.config.ConfigDefinitionKey;
 
 /**
- * @author lulf
- * @since 5.1
+ * @author Ulf Lilleengen
  */
 public interface ConfigDefinitionStore {
     ConfigDefinition getConfigDefinition(ConfigDefinitionKey defKey);
diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/ConfigModelPlugin.java b/config-model-api/src/main/java/com/yahoo/config/model/api/ConfigModelPlugin.java
index fa97016d2ba..b3862dd77d1 100644
--- a/config-model-api/src/main/java/com/yahoo/config/model/api/ConfigModelPlugin.java
+++ b/config-model-api/src/main/java/com/yahoo/config/model/api/ConfigModelPlugin.java
@@ -4,7 +4,7 @@ package com.yahoo.config.model.api;
 /**
  * Interface of config model plugins.
  *
- * @author lulf
+ * @author Ulf Lilleengen
  */
 public interface ConfigModelPlugin {
 }
diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/FileDistribution.java b/config-model-api/src/main/java/com/yahoo/config/model/api/FileDistribution.java
index 9b457f49bd2..4a3034b9cea 100644
--- a/config-model-api/src/main/java/com/yahoo/config/model/api/FileDistribution.java
+++ b/config-model-api/src/main/java/com/yahoo/config/model/api/FileDistribution.java
@@ -2,7 +2,6 @@
 package com.yahoo.config.model.api;
 
 import com.yahoo.config.FileReference;
-import com.yahoo.vespa.defaults.Defaults;
 
 import java.io.File;
 import java.util.Set;
@@ -23,18 +22,6 @@ public interface FileDistribution {
      */
     void startDownload(String hostName, int port, Set<FileReference> fileReferences);
 
-    // TODO: Remove when 6.244 is oldest version in use
-    @Deprecated
-    static String getDefaultFileDBRoot() {
-        return Defaults.getDefaults().underVespaHome("var/db/vespa/filedistribution");
-    }
-
-    // TODO: Remove when 6.244 is oldest version in use
-    @Deprecated
-    static File getDefaultFileDBPath() {
-        return new File(getDefaultFileDBRoot());
-    }
-
     File getFileReferencesDir();
 
 }
diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/HostInfo.java b/config-model-api/src/main/java/com/yahoo/config/model/api/HostInfo.java
index 589aee50d7c..3cbc165f2b9 100644
--- a/config-model-api/src/main/java/com/yahoo/config/model/api/HostInfo.java
+++ b/config-model-api/src/main/java/com/yahoo/config/model/api/HostInfo.java
@@ -6,7 +6,7 @@ import java.util.Collection;
 /*
  * Contains information about a host and what services are running on it.
  *
- * @author lulf
+ * @author Ulf Lilleengen
  */
 public class HostInfo {
 
diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/HostProvisioner.java b/config-model-api/src/main/java/com/yahoo/config/model/api/HostProvisioner.java
index 4738249b420..bf58000dd36 100644
--- a/config-model-api/src/main/java/com/yahoo/config/model/api/HostProvisioner.java
+++ b/config-model-api/src/main/java/com/yahoo/config/model/api/HostProvisioner.java
@@ -4,7 +4,6 @@ package com.yahoo.config.model.api;
 import com.yahoo.config.provision.*;
 
 import java.util.List;
-import java.util.logging.Level;
 
 /**
  * Interface towards the host provisioner used to build a {@link Model}. The difference between this provisioner
diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelCreateResult.java b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelCreateResult.java
index 237ec24800d..8cc99d1f308 100644
--- a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelCreateResult.java
+++ b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelCreateResult.java
@@ -7,7 +7,6 @@ import java.util.List;
  * The result after creating and validating a Model.
  *
  * @author geirst
- * @since 5.39
  */
 public class ModelCreateResult {
 
diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelState.java b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelState.java
index c6ac913ad14..9142a8cc1c3 100644
--- a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelState.java
+++ b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelState.java
@@ -2,7 +2,7 @@
 package com.yahoo.config.model.api;
 
 /**
- * @author lulf
+ * @author Ulf Lilleengen
  */
 public interface ModelState {
 
diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/ServiceInfo.java b/config-model-api/src/main/java/com/yahoo/config/model/api/ServiceInfo.java
index 1099b0423ac..15cc4c6c917 100644
--- a/config-model-api/src/main/java/com/yahoo/config/model/api/ServiceInfo.java
+++ b/config-model-api/src/main/java/com/yahoo/config/model/api/ServiceInfo.java
@@ -9,8 +9,7 @@ import java.util.Collection;
 /**
  * Contains information about a service.
  *
- * @author lulf
- * @since 5.37
+ * @author Ulf Lilleengen
  */
 public class ServiceInfo {
     private final String serviceName;
diff --git a/config-model-api/src/test/java/com/yahoo/config/application/api/ApplicationFileTest.java b/config-model-api/src/test/java/com/yahoo/config/application/api/ApplicationFileTest.java
index 34b0b051851..b7ae6d9dcdf 100644
--- a/config-model-api/src/test/java/com/yahoo/config/application/api/ApplicationFileTest.java
+++ b/config-model-api/src/test/java/com/yahoo/config/application/api/ApplicationFileTest.java
@@ -1,7 +1,6 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.config.application.api;
 
-import com.yahoo.config.application.api.ApplicationFile;
 import com.yahoo.io.IOUtils;
 import com.yahoo.path.Path;
 import com.yahoo.vespa.config.util.ConfigUtils;
@@ -14,8 +13,7 @@ import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.*;
 
 /**
- * @author lulf
- * @since 5.1
+ * @author Ulf Lilleengen
  */
 public abstract class ApplicationFileTest {
     protected void writeAppTo(File destFolder) throws IOException {
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/TestConfigDefinitionRepo.java b/configserver/src/test/java/com/yahoo/vespa/config/server/TestConfigDefinitionRepo.java
index 1ec4d20000f..d472f64d228 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/TestConfigDefinitionRepo.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/TestConfigDefinitionRepo.java
@@ -11,8 +11,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 /**
- * @author lulf
- * @since 5.
+ * @author Ulf Lilleengen
  */
 public class TestConfigDefinitionRepo implements ConfigDefinitionRepo {
     private final Map<ConfigDefinitionKey, ConfigDefinition> repo = new LinkedHashMap<>();
@@ -27,4 +26,7 @@ public class TestConfigDefinitionRepo implements ConfigDefinitionRepo {
     public Map<ConfigDefinitionKey, ConfigDefinition> getConfigDefinitions() {
         return repo;
     }
+
+    @Override
+    public ConfigDefinition get(ConfigDefinitionKey key) { return null; }
 }