diff options
author | Harald Musum <musum@verizonmedia.com> | 2020-11-06 09:47:21 +0100 |
---|---|---|
committer | Harald Musum <musum@verizonmedia.com> | 2020-11-06 09:47:21 +0100 |
commit | 6e6882ae2e0a3002ee03a3d9604d504bfa477018 (patch) | |
tree | 0ddf3d156dda507242c10b4216fb1f34addd2793 | |
parent | 28e6edea2034bcb017a0d97296ca21a9e89d195c (diff) |
Fix minor stuff found while reading code, no functional changes
5 files changed, 6 insertions, 9 deletions
diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/ConfigChangeRefeedAction.java b/config-model-api/src/main/java/com/yahoo/config/model/api/ConfigChangeRefeedAction.java index 1f3cb1ef83d..c5a7bd030e2 100644 --- a/config-model-api/src/main/java/com/yahoo/config/model/api/ConfigChangeRefeedAction.java +++ b/config-model-api/src/main/java/com/yahoo/config/model/api/ConfigChangeRefeedAction.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.config.model.api; /** @@ -12,8 +12,7 @@ public interface ConfigChangeRefeedAction extends ConfigChangeAction { default Type getType() { return Type.REFEED; } /** Returns the name identifying this kind of change, used to identify names which should be allowed */ - // Remove this default implementation when model versions earlier than 5.125 are gone - default String name() { return ""; } + String name(); /** Returns the name of the document type that one must re-feed to handle this config change */ String getDocumentType(); diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/VespaRefeedAction.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/VespaRefeedAction.java index b61cd7af151..19c63431c03 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/VespaRefeedAction.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/VespaRefeedAction.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.model.application.validation.change; import com.yahoo.config.model.api.ConfigChangeRefeedAction; diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/configchange/RefeedActions.java b/configserver/src/main/java/com/yahoo/vespa/config/server/configchange/RefeedActions.java index ac5b1ee5047..c20b8527f2e 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/configchange/RefeedActions.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/configchange/RefeedActions.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.config.server.configchange; import com.yahoo.config.model.api.ConfigChangeAction; @@ -11,7 +11,6 @@ import java.util.*; * Represents all actions to re-feed document types in order to handle config changes. * * @author geirst - * @since 5.44 */ public class RefeedActions { diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/configchange/MockRefeedAction.java b/configserver/src/test/java/com/yahoo/vespa/config/server/configchange/MockRefeedAction.java index 904ca10aa1c..11f2a46994c 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/configchange/MockRefeedAction.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/configchange/MockRefeedAction.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.config.server.configchange; import com.yahoo.config.model.api.ConfigChangeRefeedAction; @@ -8,7 +8,6 @@ import java.util.List; /** * @author geirst - * @since 5.44 */ public class MockRefeedAction extends MockConfigChangeAction implements ConfigChangeRefeedAction { diff --git a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDownloader.java b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDownloader.java index 13c089a1093..7e14e94823b 100644 --- a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDownloader.java +++ b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDownloader.java @@ -122,7 +122,7 @@ public class FileReferenceDownloader { log.log(Level.FINE, () -> "Found file reference '" + fileReference + "' available at " + connection.getAddress()); return true; } else { - log.log(logLevel, "File reference '" + fileReference + "' not found for " + connection.getAddress()); + log.log(logLevel, "File reference '" + fileReference + "' not found at " + connection.getAddress()); connectionPool.setNewCurrentConnection(); return false; } |