Merge pull request #5843 from vespa-engine/hmusum/remove-duplicated-method

Remove duplicated method

4 files changed, 3 insertions, 10 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 99c95670208..ab825f14b68 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
@@ -484,7 +484,7 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye
         }
     }
 
-    private Slime createDeployLog() {
+    public Slime createDeployLog() {
         Slime deployLog = new Slime();
         deployLog.setObject();
         return deployLog;
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionHandler.java
index f6547288702..f03173736c0 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionHandler.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionHandler.java
@@ -76,13 +76,6 @@ public class SessionHandler extends HttpHandler {
         return new DeployHandlerLogger(deployLog.get().setArray("log"), verbose, app);
     }
 
-    // TODO: Refactor to use the one in ApplicationRepository and remove
-    protected Slime createDeployLog() {
-        Slime deployLog = new Slime();
-        deployLog.setObject();
-        return deployLog;
-    }
-
     protected static boolean shouldIgnoreLockFailure(HttpRequest request) {
         return request.getBooleanProperty("force");
     }
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionCreateHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionCreateHandler.java
index caf95f9f503..74c85829ef2 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionCreateHandler.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionCreateHandler.java
@@ -50,7 +50,7 @@ public class SessionCreateHandler extends SessionHandler {
 
     @Override
     protected HttpResponse handlePOST(HttpRequest request) {
-        Slime deployLog = createDeployLog();
+        Slime deployLog = applicationRepository.createDeployLog();
         final TenantName tenantName = Utils.getTenantNameFromSessionRequest(request);
         Utils.checkThatTenantExists(tenantRepository, tenantName);
         TimeoutBudget timeoutBudget = SessionHandler.getTimeoutBudget(request, zookeeperBarrierTimeout);
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandler.java
index 8a3ad96c078..2251c94a8e0 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandler.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandler.java
@@ -52,7 +52,7 @@ public class SessionPrepareHandler extends SessionHandler {
         long sessionId = getSessionIdV2(request);
         applicationRepository.validateThatRemoteSessionIsNotActive(tenant, sessionId);
         applicationRepository.validateThatRemoteSessionIsPrepared(tenant, sessionId);
-        return new SessionPrepareResponse(createDeployLog(), tenant.getName(), request, sessionId);
+        return new SessionPrepareResponse(applicationRepository.createDeployLog(), tenant.getName(), request, sessionId);
     }
 
     @Override