Remove expired compatibility code

4 files changed, 14 insertions, 19 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
index ab974090ee3..17e6db08068 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
@@ -284,17 +284,11 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye
         return currentActiveApplicationSet;
     }
 
-    public ConfigChangeActions prepare(Tenant tenant,
-                                       long sessionId,
-                                       DeployLogger logger,
-                                       PrepareParams params) {
+    public ConfigChangeActions prepare(Tenant tenant, long sessionId, DeployLogger logger, PrepareParams params) {
         LocalSession session = getLocalSession(tenant, sessionId);
         ApplicationId appId = params.getApplicationId();
         Optional<ApplicationSet> currentActiveApplicationSet = getCurrentActiveApplicationSet(tenant, appId);
-        return session.prepare(logger,
-                               params,
-                               currentActiveApplicationSet,
-                               tenant.getPath());
+        return session.prepare(logger, params, currentActiveApplicationSet, tenant.getPath());
     }
 
     private List<ApplicationId> listApplicationIds(Tenant tenant) {
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java
index c27efb2caa2..81e52e0e129 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java
@@ -98,7 +98,7 @@ public class Deployment implements com.yahoo.config.provision.Deployment {
         if (prepared) return;
         TimeoutBudget timeoutBudget = new TimeoutBudget(clock, timeout);
         session.prepare(logger,
-                        /** Assumes that session has already set application id, see {@link com.yahoo.vespa.config.server.session.SessionFactoryImpl}. */
+                        /** Assumes that session has already set application id and version, see {@link com.yahoo.vespa.config.server.session.SessionFactoryImpl}. */
                         new PrepareParams.Builder().applicationId(session.getApplicationId())
                                                    .timeoutBudget(timeoutBudget)
                                                    .ignoreValidationErrors( ! validate)
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/PrepareParams.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/PrepareParams.java
index 3890001518a..0b742b09cdd 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/PrepareParams.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/PrepareParams.java
@@ -48,6 +48,7 @@ public final class PrepareParams {
     }
 
     public static class Builder {
+
         private boolean ignoreValidationErrors = false;
         private boolean dryRun = false;
         private ApplicationId applicationId = ApplicationId.defaultId();
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java
index 96c0f912fd4..fd18a2de997 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java
@@ -87,18 +87,18 @@ public class SessionPreparer {
      */
     public ConfigChangeActions prepare(SessionContext context, DeployLogger logger, PrepareParams params,
                                        Optional<ApplicationSet> currentActiveApplicationSet, Path tenantPath) {
-        Preparation prep = new Preparation(context, logger, params, currentActiveApplicationSet, tenantPath);
-        prep.preprocess();
+        Preparation preparation = new Preparation(context, logger, params, currentActiveApplicationSet, tenantPath);
+        preparation.preprocess();
         try {
-            prep.buildModels();
-            prep.makeResult();
-            if (!params.isDryRun()) {
-                prep.writeStateZK();
-                prep.writeRotZK();
-                prep.distribute();
-                prep.reloadDeployFileDistributor();
+            preparation.buildModels();
+            preparation.makeResult();
+            if ( ! params.isDryRun()) {
+                preparation.writeStateZK();
+                preparation.writeRotZK();
+                preparation.distribute();
+                preparation.reloadDeployFileDistributor();
             }
-            return prep.result();
+            return preparation.result();
         } catch (OutOfCapacityException e) {
             throw e;
         } catch (IllegalArgumentException e) {