diff options
author | Harald Musum <musum@yahoo-inc.com> | 2016-12-06 13:58:20 +0100 |
---|---|---|
committer | Harald Musum <musum@yahoo-inc.com> | 2016-12-06 13:58:20 +0100 |
commit | 0f8e4be41b2ae3448c3d7e6d205dc79b30252ee6 (patch) | |
tree | d347332f676fa1f3445f1876f13f8d91c72321ad /configserver | |
parent | d4dfb76f9ebfd7cb6350c9adee1b294bea598dcf (diff) |
Don't use optional in builder
Diffstat (limited to 'configserver')
-rw-r--r-- | configserver/src/test/java/com/yahoo/vespa/config/server/TestComponentRegistry.java | 4 | ||||
-rw-r--r-- | configserver/src/test/java/com/yahoo/vespa/config/server/session/RemoteSessionTest.java | 12 |
2 files changed, 9 insertions, 7 deletions
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/TestComponentRegistry.java b/configserver/src/test/java/com/yahoo/vespa/config/server/TestComponentRegistry.java index 4dc0729577c..5772f46b6b9 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/TestComponentRegistry.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/TestComponentRegistry.java @@ -116,8 +116,8 @@ public class TestComponentRegistry implements GlobalComponentRegistry { return this; } - public Builder permanentApplicationPackage(Optional<PermanentApplicationPackage> permanentApplicationPackage) { - this.permanentApplicationPackage = permanentApplicationPackage; + public Builder permanentApplicationPackage(PermanentApplicationPackage permanentApplicationPackage) { + this.permanentApplicationPackage = Optional.ofNullable(permanentApplicationPackage); return this; } diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/session/RemoteSessionTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/session/RemoteSessionTest.java index 87cd23f4362..9ddb7831cea 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/session/RemoteSessionTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/session/RemoteSessionTest.java @@ -229,12 +229,14 @@ public class RemoteSessionTest { private RemoteSession createSession(long sessionId, SessionZooKeeperClient zkc, List<ModelFactory> modelFactories, Optional<PermanentApplicationPackage> permanentApplicationPackage) { zkc.writeStatus(Session.Status.NEW); zkc.writeApplicationId(new ApplicationId.Builder().applicationName("foo").instanceName("bim").build()); + TestComponentRegistry.Builder registryBuilder = new TestComponentRegistry.Builder() + .curator(curator) + .modelFactoryRegistry(new ModelFactoryRegistry(modelFactories)); + if (permanentApplicationPackage.isPresent()) + registryBuilder.permanentApplicationPackage(permanentApplicationPackage.get()).build(); + return new RemoteSession(TenantName.from("default"), sessionId, - new TestComponentRegistry.Builder() - .curator(curator) - .modelFactoryRegistry(new ModelFactoryRegistry(modelFactories)) - .permanentApplicationPackage(permanentApplicationPackage) - .build(), + registryBuilder.build(), zkc); } |