diff options
author | Harald Musum <musum@oath.com> | 2018-07-02 18:43:19 +0200 |
---|---|---|
committer | Harald Musum <musum@oath.com> | 2018-07-02 18:43:19 +0200 |
commit | 534f8dca33d33ab41eb40d73528569f83c9012f4 (patch) | |
tree | 831ee09d736a1f209cfab29e74d6c9a80d4b7050 /configserver | |
parent | 9387b79d50d0a41ac7ed8493d46341dda5f926d7 (diff) |
Remove unnecessary Optional
Diffstat (limited to 'configserver')
2 files changed, 5 insertions, 6 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/PermanentApplicationPackage.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/PermanentApplicationPackage.java index 868e68d9c73..b64aa1c771c 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/PermanentApplicationPackage.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/PermanentApplicationPackage.java @@ -14,8 +14,7 @@ import java.util.logging.Logger; /** * A global permanent application package containing configuration info that is always used during deploy. * - * @author lulf - * @since 5.15 + * @author Ulf Lilleengen */ public class PermanentApplicationPackage { @@ -24,7 +23,7 @@ public class PermanentApplicationPackage { public PermanentApplicationPackage(ConfigserverConfig config) { File app = new File(getDefaults().underVespaHome(config.applicationDirectory())); - applicationPackage = Optional.<ApplicationPackage>ofNullable(app.exists() ? FilesApplicationPackage.fromFile(app) : null); + applicationPackage = Optional.ofNullable(app.exists() ? FilesApplicationPackage.fromFile(app) : null); if (applicationPackage.isPresent()) { log.log(LogLevel.DEBUG, "Detected permanent application package in '" + getDefaults().underVespaHome(config.applicationDirectory()) + diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ActivatedModelsBuilder.java b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ActivatedModelsBuilder.java index 6b872fc4601..314b6d78ae3 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ActivatedModelsBuilder.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ActivatedModelsBuilder.java @@ -45,7 +45,7 @@ public class ActivatedModelsBuilder extends ModelsBuilder<Application> { private final TenantName tenant; private final long appGeneration; private final SessionZooKeeperClient zkClient; - private final Optional<PermanentApplicationPackage> permanentApplicationPackage; + private final PermanentApplicationPackage permanentApplicationPackage; private final ConfigserverConfig configserverConfig; private final ConfigDefinitionRepo configDefinitionRepo; private final Metrics metrics; @@ -59,7 +59,7 @@ public class ActivatedModelsBuilder extends ModelsBuilder<Application> { this.tenant = tenant; this.appGeneration = appGeneration; this.zkClient = zkClient; - this.permanentApplicationPackage = Optional.of(globalComponentRegistry.getPermanentApplicationPackage()); + this.permanentApplicationPackage = globalComponentRegistry.getPermanentApplicationPackage(); this.configserverConfig = globalComponentRegistry.getConfigserverConfig(); this.configDefinitionRepo = globalComponentRegistry.getConfigDefinitionRepo(); this.metrics = globalComponentRegistry.getMetrics(); @@ -79,7 +79,7 @@ public class ActivatedModelsBuilder extends ModelsBuilder<Application> { ModelContext modelContext = new ModelContextImpl( applicationPackage, Optional.empty(), - permanentApplicationPackage.get().applicationPackage(), + permanentApplicationPackage.applicationPackage(), logger, configDefinitionRepo, getForVersionOrLatest(applicationPackage.getFileRegistryMap(), modelFactory.getVersion()).orElse(new MockFileRegistry()), |