Merge pull request #3382 from vespa-engine/bratseth/support-error-removal

Bratseth/support error removal

6 files changed, 11 insertions, 13 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java
index 8a11479223e..e38be55290f 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java
@@ -30,7 +30,7 @@ import java.util.logging.Logger;
  * Deployments are created by a {@link ApplicationRepository}.
  * Instances of this are not multithread safe.
  *
- * @author lulf
+ * @author Ulf Lilleengen
  * @author bratseth
  */
 public class Deployment implements com.yahoo.config.provision.Deployment {
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/HttpConfigRequest.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/HttpConfigRequest.java
index 3fc7f43e4af..6ba788aced3 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/HttpConfigRequest.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/HttpConfigRequest.java
@@ -27,10 +27,10 @@ import com.yahoo.vespa.config.util.ConfigUtils;
 /**
  * A request to get config, bound to tenant and app id. Used by both v1 and v2 of the config REST API.
  *
- * @author lulf
- * @since 5.1
+ * @author Ulf Lilleengen
  */
 public class HttpConfigRequest implements GetConfigRequest, TenantRequest {
+
     private static final String HTTP_PROPERTY_NOCACHE = "noCache";
     private final ConfigKey<?> key;
     private final ApplicationId appId;
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ModelsBuilder.java b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ModelsBuilder.java
index 6a4ab40d843..6bd21e9cfb6 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ModelsBuilder.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ModelsBuilder.java
@@ -112,11 +112,11 @@ public abstract class ModelsBuilder<MODELRESULT extends ModelResult> {
         Version latest = findLatest(versions);
         // load latest application version
         MODELRESULT latestModelVersion = buildModelVersion(modelFactoryRegistry.getFactory(latest), 
-                                                                 applicationPackage, 
-                                                                 applicationId, 
-                                                                 wantedNodeVespaVersion, 
-                                                                 allocatedHosts.asOptional(),
-                                                                 now);
+                                                           applicationPackage, 
+                                                           applicationId, 
+                                                           wantedNodeVespaVersion, 
+                                                           allocatedHosts.asOptional(),
+                                                           now);
         allocatedHosts.set(latestModelVersion.getModel().allocatedHosts()); // Update with additional clusters allocated
         
         if (latestModelVersion.getModel().skipOldConfigModels(now))
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 d70ed584c3d..cbcfb865acf 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
@@ -18,8 +18,7 @@ import java.util.Set;
 /**
  * Parameters for prepare. Immutable.
  *
- * @author lulf
- * @since 5.1.24
+ * @author Ulf Lilleengen
  */
 public final class PrepareParams {
 
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java
index 09fc83e225d..8f056898374 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java
@@ -172,7 +172,7 @@ public class SessionZooKeeperClient {
     }
 
     public Version readVespaVersion() {
-        if ( ! configCurator.exists(versionPath())) return Vtag.currentVersion;
+        if ( ! configCurator.exists(versionPath())) return Vtag.currentVersion; // TODO: This should not be possible any more - verify and remove
         return new Version(configCurator.getData(versionPath()));
     }
 
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ConfigCurator.java b/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ConfigCurator.java
index c09fe5ae4bb..c7a79556397 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ConfigCurator.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ConfigCurator.java
@@ -35,9 +35,8 @@ import java.util.concurrent.atomic.AtomicInteger;
  * Some methods have retries and/or reconnect. This is necessary because ZK will throw on certain scenarios,
  * even though it will recover from it itself, @see http://wiki.apache.org/hadoop/ZooKeeper/ErrorHandling
  *
- * @author vegardh
+ * @author Vegard Havdal
  * @author bratseth
- * @since 5.0
  */
 public class ConfigCurator {