Remove deprecated duplicate Version class

2 files changed, 2 insertions, 34 deletions

diff --git a/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationPackage.java b/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationPackage.java
index 06da1eccf27..06f8034453d 100644
--- a/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationPackage.java
+++ b/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationPackage.java
@@ -185,17 +185,7 @@ public interface ApplicationPackage {
     Optional<Reader> getDeployment();
     Optional<Reader> getValidationOverrides();
 
-    /** @deprecated do not override or call. Use the other Version class */
-    @Deprecated
-    default List<ComponentInfo> getComponentsInfo(com.yahoo.config.provision.Version vespaVersion) {
-        return getComponentsInfo(vespaVersion.toVersion());
-    }
-
-    // TODO: Remove the default implementation after December 2018
-    @SuppressWarnings("deprecation")
-    default List<ComponentInfo> getComponentsInfo(Version vespaVersion) {
-        return getComponentsInfo(com.yahoo.config.provision.Version.from(vespaVersion));
-    }
+    List<ComponentInfo> getComponentsInfo(Version vespaVersion);
 
     /**
      * Reads a ranking expression from file to a string and returns it.
@@ -248,12 +238,6 @@ public interface ApplicationPackage {
         throw new UnsupportedOperationException("This application package cannot validate XML");
     }
 
-    /** @deprecated do not override or call. Use the other Version class */
-    @Deprecated
-    default void validateXML(Optional<com.yahoo.config.provision.Version> vespaVersion) throws IOException {
-        validateXMLFor(vespaVersion.map(com.yahoo.config.provision.Version::toVersion));
-    }
-
     default void validateXMLFor(Optional<Version> vespaVersion) throws IOException {
         throw new UnsupportedOperationException("This application package cannot validate XML");
     }
@@ -267,15 +251,6 @@ public interface ApplicationPackage {
         return Optional.empty();
     }
 
-    /** @deprecated do not override or call. Use getFileRegistries */
-    @Deprecated
-    default Map<com.yahoo.config.provision.Version, FileRegistry> getFileRegistryMap() {
-        return getFileRegistries().entrySet()
-                                  .stream()
-                                  .collect(Collectors.toMap(e -> com.yahoo.config.provision.Version.from(e.getKey()),
-                                                            e -> e.getValue()));
-    }
-
     default Map<Version, FileRegistry> getFileRegistries() {
         return Collections.emptyMap();
     }
diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelFactory.java b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelFactory.java
index 23782162725..0c4e5087d62 100644
--- a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelFactory.java
+++ b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelFactory.java
@@ -13,14 +13,7 @@ public interface ModelFactory {
      *
      * @return the version of a {@link Model} instance that this factory can create.
      */
-    @SuppressWarnings("deprecation")
-    default Version version() { // TODO: Remove this default implementationm after December 2018
-        return getVersion().toVersion();
-    }
-
-    /** @deprecated use and override version(). TODO: Remove this method after December 2018 */
-    @Deprecated
-    default com.yahoo.config.provision.Version getVersion() { return com.yahoo.config.provision.Version.from(version()); }
+    Version version();
 
     /**
      * Creates an instance of a {@link Model}. The resulting instance will be used to serve config. No model