Non-functional changes only

5 files changed, 20 insertions, 16 deletions

diff --git a/config/src/main/java/com/yahoo/vespa/config/ConfigPayload.java b/config/src/main/java/com/yahoo/vespa/config/ConfigPayload.java
index f4858843574..2f3a4bd2172 100644
--- a/config/src/main/java/com/yahoo/vespa/config/ConfigPayload.java
+++ b/config/src/main/java/com/yahoo/vespa/config/ConfigPayload.java
@@ -22,6 +22,7 @@ import java.io.OutputStream;
  * @author Ulf Lilleengen
  */
 public class ConfigPayload {
+
     private final Slime slime;
 
     public ConfigPayload(Slime slime) {
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/Application.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/Application.java
index 51213b173dd..2e73a02c75b 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/Application.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/Application.java
@@ -37,7 +37,9 @@ import java.util.Set;
 public class Application implements ModelResult {
 
     private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(Application.class.getName());
-    private final long appGeneration; // The config generation for this application
+
+    /** The config generation for this application. */
+    private final long applicationGeneration;
     private final boolean internalRedeploy;
     private final Version vespaVersion;
     private final Model model;
@@ -45,12 +47,12 @@ public class Application implements ModelResult {
     private final MetricUpdater metricUpdater;
     private final ApplicationId app;
 
-    public Application(Model model, ServerCache cache, long appGeneration, boolean internalRedeploy,
+    public Application(Model model, ServerCache cache, long applicationGeneration, boolean internalRedeploy,
                        Version vespaVersion, MetricUpdater metricUpdater, ApplicationId app) {
         Objects.requireNonNull(model, "The model cannot be null");
         this.model = model;
         this.cache = cache;
-        this.appGeneration = appGeneration;
+        this.applicationGeneration = applicationGeneration;
         this.internalRedeploy = internalRedeploy;
         this.vespaVersion = vespaVersion;
         this.metricUpdater = metricUpdater;
@@ -62,7 +64,7 @@ public class Application implements ModelResult {
      *
      * @return the config generation
      */
-    public Long getApplicationGeneration() { return appGeneration; }
+    public Long getApplicationGeneration() { return applicationGeneration; }
 
     /** Returns the application model, never null */
     @Override
@@ -72,13 +74,13 @@ public class Application implements ModelResult {
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("application '").append(app.application().value()).append("', ");
-        sb.append("generation ").append(appGeneration).append(", ");
+        sb.append("generation ").append(applicationGeneration).append(", ");
         sb.append("vespa version ").append(vespaVersion);
         return sb.toString();
     }
 
     public ApplicationInfo toApplicationInfo() {
-        return new ApplicationInfo(app, appGeneration, model);
+        return new ApplicationInfo(app, applicationGeneration, model);
     }
 
     public ServerCache getCache() {
@@ -134,7 +136,7 @@ public class Application implements ModelResult {
             throw new ConfigurationRuntimeException("Unable to resolve config " + configKey);
         }
 
-        ConfigResponse configResponse = responseFactory.createResponse(payload, appGeneration, internalRedeploy);
+        ConfigResponse configResponse = responseFactory.createResponse(payload, applicationGeneration, internalRedeploy);
         metricUpdater.incrementProcTime(System.currentTimeMillis() - start);
         if (useCache(req)) {
             cache.put(cacheKey, configResponse, configResponse.getConfigMd5());
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 6d2ef4028c6..7601d90043e 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
@@ -50,7 +50,7 @@ public class ActivatedModelsBuilder extends ModelsBuilder<Application> {
     private static final Logger log = Logger.getLogger(ActivatedModelsBuilder.class.getName());
 
     private final TenantName tenant;
-    private final long appGeneration;
+    private final long applicationGeneration;
     private final SessionZooKeeperClient zkClient;
     private final PermanentApplicationPackage permanentApplicationPackage;
     private final ConfigDefinitionRepo configDefinitionRepo;
@@ -60,7 +60,7 @@ public class ActivatedModelsBuilder extends ModelsBuilder<Application> {
     private final SecretStore secretStore;
 
     public ActivatedModelsBuilder(TenantName tenant,
-                                  long appGeneration,
+                                  long applicationGeneration,
                                   SessionZooKeeperClient zkClient,
                                   GlobalComponentRegistry globalComponentRegistry) {
         super(globalComponentRegistry.getModelFactoryRegistry(),
@@ -68,7 +68,7 @@ public class ActivatedModelsBuilder extends ModelsBuilder<Application> {
               globalComponentRegistry.getZone(),
               HostProvisionerProvider.from(globalComponentRegistry.getHostProvisioner()));
         this.tenant = tenant;
-        this.appGeneration = appGeneration;
+        this.applicationGeneration = applicationGeneration;
         this.zkClient = zkClient;
         this.permanentApplicationPackage = globalComponentRegistry.getPermanentApplicationPackage();
         this.configDefinitionRepo = globalComponentRegistry.getStaticConfigDefinitionRepo();
@@ -87,7 +87,7 @@ public class ActivatedModelsBuilder extends ModelsBuilder<Application> {
                                             Optional<AllocatedHosts> ignored // Ignored since we have this in the app package for activated models
     ) {
         log.log(Level.FINE, String.format("Loading model version %s for session %s application %s",
-                                          modelFactory.version(), appGeneration, applicationId));
+                                          modelFactory.version(), applicationGeneration, applicationId));
         ModelContext.Properties modelContextProperties = createModelContextProperties(applicationId);
         Provisioned provisioned = new Provisioned();
         ModelContext modelContext = new ModelContextImpl(
@@ -110,7 +110,7 @@ public class ActivatedModelsBuilder extends ModelsBuilder<Application> {
         ServerCache serverCache = new ServerCache(configDefinitionRepo, zkClient.getUserConfigDefinitions());
         return new Application(modelFactory.createModel(modelContext),
                                serverCache,
-                               appGeneration,
+                               applicationGeneration,
                                applicationPackage.getMetaData().isInternalRedeploy(),
                                modelFactory.version(),
                                applicationMetricUpdater,
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/ConfigResponseFactory.java b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/ConfigResponseFactory.java
index 88aa41ca735..415fa764823 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/ConfigResponseFactory.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/ConfigResponseFactory.java
@@ -26,10 +26,11 @@ public interface ConfigResponseFactory {
 
     /**
      * Creates a {@link ConfigResponse} for a given payload and generation.
-     * @param payload          the {@link ConfigPayload} to put in the response.
-     * @param generation       the payload generation.  @return A {@link ConfigResponse} that can be sent to the client.
-     * @param internalRedeploy whether this config generation was produced by an internal redeployment,
+     * @param payload          the {@link ConfigPayload} to put in the response
+     * @param generation       the payload generation
+     * @param internalRedeploy whether this config generation was produced by an internal redeployment
      *                         not a change to the application package
+     * @return a {@link ConfigResponse} that can be sent to the client
      */
     ConfigResponse createResponse(ConfigPayload payload, long generation, boolean internalRedeploy);
 
diff --git a/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/evaluation/EvaluationTestCase.java b/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/evaluation/EvaluationTestCase.java
index 6a9108311b1..f1c421f6c22 100644
--- a/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/evaluation/EvaluationTestCase.java
+++ b/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/evaluation/EvaluationTestCase.java
@@ -22,7 +22,7 @@ import static org.junit.Assert.fail;
  */
 public class EvaluationTestCase {
 
-    private double tolerance = 0.000001;
+    private final double tolerance = 0.000001;
 
     @Test
     public void testEvaluation() {