Merge branch 'master' into hakonhall/define-enable-logserver-flag

4 files changed, 5 insertions, 83 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 6b49ea0c172..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");
     }
@@ -262,31 +246,11 @@ public interface ApplicationPackage {
         throw new UnsupportedOperationException("This application package cannot write its metadata");
     }
 
-    /**
-     * Returns the single host allocation info of this, or an empty map if no allocation is available
-     *
-     * @deprecated please use #getAllocatedHosts
-     */
-    // TODO: Remove on Vespa 7
-    @Deprecated
-    default Map<com.yahoo.config.provision.Version, AllocatedHosts> getProvisionInfoMap() {
-        return Collections.emptyMap();
-    }
-
     /** Returns the host allocation info of this, or empty if no allocation is available */
     default Optional<AllocatedHosts> getAllocatedHosts() {
         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/application/api/xml/DeploymentSpecXmlReader.java b/config-model-api/src/main/java/com/yahoo/config/application/api/xml/DeploymentSpecXmlReader.java
index 084779d2147..e70e8449922 100644
--- a/config-model-api/src/main/java/com/yahoo/config/application/api/xml/DeploymentSpecXmlReader.java
+++ b/config-model-api/src/main/java/com/yahoo/config/application/api/xml/DeploymentSpecXmlReader.java
@@ -219,13 +219,10 @@ public class DeploymentSpecXmlReader {
     private List<DeploymentSpec.ChangeBlocker> readChangeBlockers(Element root) {
         List<DeploymentSpec.ChangeBlocker> changeBlockers = new ArrayList<>();
         for (Element tag : XML.getChildren(root)) {
-            // TODO: Remove block-upgrade on Vespa 7
-            if ( ! blockChangeTag.equals(tag.getTagName()) && !"block-upgrade".equals(tag.getTagName())) continue;
+            if ( ! blockChangeTag.equals(tag.getTagName())) continue;
 
-            boolean blockVersions = tag.getTagName().equals("block-upgrade") || //  TODO: Remove condition on Vespa 7
-                                    trueOrMissing(tag.getAttribute("version"));
-            boolean blockRevisions = trueOrMissing(tag.getAttribute("revision"))
-                                     && !tag.getTagName().equals("block-upgrade"); //  TODO: Remove condition on Vespa 7
+            boolean blockVersions = trueOrMissing(tag.getAttribute("version"));
+            boolean blockRevisions = trueOrMissing(tag.getAttribute("revision"));
 
             String daySpec = tag.getAttribute("days");
             String hourSpec = tag.getAttribute("hours");
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
diff --git a/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecTest.java b/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecTest.java
index b40feb3081a..4156439834b 100644
--- a/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecTest.java
+++ b/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecTest.java
@@ -296,38 +296,6 @@ public class DeploymentSpecTest {
         }
     }
 
-    @Test
-    public void deploymentSpecWithBlockUpgrade() {
-        StringReader r = new StringReader(
-                "<deployment>\n" +
-                "  <block-upgrade days='mon,tue' hours='15-16'/>\n" +
-                // version=false is ignored for block-upgrade
-                "  <block-upgrade version='false' days='sat' hours='10' time-zone='CET'/>\n" +
-                "  <prod>\n" +
-                "    <region active='true'>us-west-1</region>\n" +
-                "  </prod>\n" +
-                "</deployment>"
-        );
-        DeploymentSpec spec = DeploymentSpec.fromXml(r);
-        assertEquals(2, spec.changeBlocker().size());
-        assertTrue(spec.changeBlocker().get(0).blocksVersions());
-        assertFalse(spec.changeBlocker().get(0).blocksRevisions());
-        assertEquals(ZoneId.of("UTC"), spec.changeBlocker().get(0).window().zone());
-
-        assertTrue(spec.changeBlocker().get(1).blocksVersions());
-        assertFalse(spec.changeBlocker().get(1).blocksRevisions());
-        assertEquals(ZoneId.of("CET"), spec.changeBlocker().get(1).window().zone());
-
-        assertTrue(spec.canUpgradeAt(Instant.parse("2017-09-18T14:15:30.00Z")));
-        assertFalse(spec.canUpgradeAt(Instant.parse("2017-09-18T15:15:30.00Z")));
-        assertFalse(spec.canUpgradeAt(Instant.parse("2017-09-18T16:15:30.00Z")));
-        assertTrue(spec.canUpgradeAt(Instant.parse("2017-09-18T17:15:30.00Z")));
-
-        assertTrue(spec.canUpgradeAt(Instant.parse("2017-09-23T09:15:30.00Z")));
-        assertFalse(spec.canUpgradeAt(Instant.parse("2017-09-23T08:15:30.00Z"))); // 10 in CET
-        assertTrue(spec.canUpgradeAt(Instant.parse("2017-09-23T10:15:30.00Z")));
-    }
-
     @Test(expected = IllegalArgumentException.class)
     public void deploymentSpecWithIllegallyOrderedDeploymentSpec1() {
         StringReader r = new StringReader(