summaryrefslogtreecommitdiffstats
path: root/configserver
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@verizonmedia.com>2019-10-11 10:05:04 +0200
committerJon Bratseth <bratseth@verizonmedia.com>2019-10-11 10:05:04 +0200
commit0862204e36bc4e47be69480c63bb2980bda88e7a (patch)
tree17bda39f30a19a5bac8fb53a2d654ffcba2b74a6 /configserver
parentb682654c786a94dc7dd564f4bc1047e1ed06500c (diff)
Nonfunctional changes only
Diffstat (limited to 'configserver')
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/session/PrepareParams.java9
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java3
2 files changed, 5 insertions, 7 deletions
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 5bf70c55f9e..a21e12a5d42 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
@@ -49,8 +49,9 @@ public final class PrepareParams {
private final Optional<String> tlsSecretsKeyName;
private PrepareParams(ApplicationId applicationId, TimeoutBudget timeoutBudget, boolean ignoreValidationErrors,
- boolean dryRun, boolean verbose, boolean isBootstrap, Optional<Version> vespaVersion, Set<Rotation> rotations,
- List<ContainerEndpoint> containerEndpoints, Optional<String> tlsSecretsKeyName) {
+ boolean dryRun, boolean verbose, boolean isBootstrap, Optional<Version> vespaVersion,
+ Set<Rotation> rotations, List<ContainerEndpoint> containerEndpoints,
+ Optional<String> tlsSecretsKeyName) {
this.timeoutBudget = timeoutBudget;
this.applicationId = applicationId;
this.ignoreValidationErrors = ignoreValidationErrors;
@@ -140,8 +141,8 @@ public final class PrepareParams {
if (serialized == null) return this;
Slime slime = SlimeUtils.jsonToSlime(serialized);
containerEndpoints = ContainerEndpointSerializer.endpointListFromSlime(slime);
- return this;
- }
+ return this;
+ }
public Builder tlsSecretsKeyName(String tlsSecretsKeyName) {
this.tlsSecretsKeyName = Optional.ofNullable(tlsSecretsKeyName)
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 3ec74a4c3eb..872936f7f34 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
@@ -72,7 +72,6 @@ public class SessionPreparer {
private final ConfigDefinitionRepo configDefinitionRepo;
private final Curator curator;
private final Zone zone;
- private final FlagSource flagSource;
private final SecretStore secretStore;
@Inject
@@ -84,7 +83,6 @@ public class SessionPreparer {
ConfigDefinitionRepo configDefinitionRepo,
Curator curator,
Zone zone,
- FlagSource flagSource,
SecretStore secretStore) {
this.modelFactoryRegistry = modelFactoryRegistry;
this.fileDistributionFactory = fileDistributionFactory;
@@ -94,7 +92,6 @@ public class SessionPreparer {
this.configDefinitionRepo = configDefinitionRepo;
this.curator = curator;
this.zone = zone;
- this.flagSource = flagSource;
this.secretStore = secretStore;
}