Revert "Restore public method"

1 files changed, 4 insertions, 15 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 0e50b39a319..480d4d05451 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
@@ -229,9 +229,9 @@ 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
-     *
+    /** 
+     * 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
@@ -262,19 +262,8 @@ public interface ApplicationPackage {
      *
      * @return A new application package instance pointing to a new location
      */
-    default ApplicationPackage preprocess(ZoneId zone, RuleConfigDeriver ruleConfigDeriver, DeployLogger logger)
-            throws IOException, TransformerException, ParserConfigurationException, SAXException {
+    default ApplicationPackage preprocess(ZoneId zone, RuleConfigDeriver ruleConfigDeriver, DeployLogger logger) throws IOException, TransformerException, ParserConfigurationException, SAXException {
         throw new UnsupportedOperationException("This application package does not support preprocessing");
     }
 
-    /**
-     * @deprecated pass a ZoneId as first parameter instead
-     */
-    // TODO: Remove on Vespa 7
-    @Deprecated
-    default ApplicationPackage preprocess(Zone zone, RuleConfigDeriver ruleConfigDeriver, DeployLogger logger)
-            throws IOException, TransformerException, ParserConfigurationException, SAXException {
-        return preprocess(zone.id(), ruleConfigDeriver, logger);
-    }
-
 }