Remove duplicate code in Session constructors

3 files changed, 9 insertions, 7 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationMapper.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationMapper.java
index 5ce9ebca69d..c0158b55422 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationMapper.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationMapper.java
@@ -57,7 +57,7 @@ public final class ApplicationMapper {
 
     /** Returns whether this registry has an application for the given application id */
     public boolean hasApplication(ApplicationId applicationId, Instant now) {
-        return hasApplicationForVersion(applicationId, Optional.<Version>empty(), now);
+        return hasApplicationForVersion(applicationId, Optional.empty(), now);
     }
 
     /** Returns whether this registry has an application for the given application id and vespa version */
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java
index d87a37829de..fe22c537a01 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java
@@ -420,4 +420,5 @@ public class TenantApplications implements RequestHandler, HostValidator<Applica
     }
 
     public TenantFileSystemDirs getTenantFileSystemDirs() { return tenantFileSystemDirs; }
+
 }
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/Session.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/Session.java
index 0fc85b5e51a..d401669b8d6 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/Session.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/Session.java
@@ -34,21 +34,22 @@ public abstract class Session implements Comparable<Session>  {
     protected final Optional<ApplicationPackage> applicationPackage;
 
     protected Session(TenantName tenant, long sessionId, SessionZooKeeperClient sessionZooKeeperClient) {
-        this.tenant = tenant;
-        this.sessionId = sessionId;
-        this.sessionZooKeeperClient = sessionZooKeeperClient;
-        this.applicationPackage = Optional.empty();
+        this(tenant, sessionId, sessionZooKeeperClient, Optional.empty());
     }
 
     protected Session(TenantName tenant, long sessionId, SessionZooKeeperClient sessionZooKeeperClient,
                       ApplicationPackage applicationPackage) {
+        this(tenant, sessionId, sessionZooKeeperClient, Optional.of(applicationPackage));
+    }
+
+    private Session(TenantName tenant, long sessionId, SessionZooKeeperClient sessionZooKeeperClient,
+                      Optional<ApplicationPackage> applicationPackage) {
         this.tenant = tenant;
         this.sessionId = sessionId;
         this.sessionZooKeeperClient = sessionZooKeeperClient;
-        this.applicationPackage = Optional.of(applicationPackage);
+        this.applicationPackage = applicationPackage;
     }
 
-
     public final long getSessionId() {
         return sessionId;
     }