diff options
author | Jon Bratseth <bratseth@oath.com> | 2018-06-19 10:46:30 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@oath.com> | 2018-06-19 10:46:30 +0200 |
commit | 3eae0d34a00570add245e39830452acded0c0238 (patch) | |
tree | 3d0a883074c7706ac1928ba9035496a6b7f6e747 | |
parent | 0f4b4c99881aed25e9c9b946c74c4be80ee242ab (diff) |
Nonfunctional changes only
10 files changed, 17 insertions, 11 deletions
diff --git a/config-model/src/main/java/com/yahoo/config/model/ConfigModelInstanceFactory.java b/config-model/src/main/java/com/yahoo/config/model/ConfigModelInstanceFactory.java index 83aca36b8b1..af7f5776f74 100644 --- a/config-model/src/main/java/com/yahoo/config/model/ConfigModelInstanceFactory.java +++ b/config-model/src/main/java/com/yahoo/config/model/ConfigModelInstanceFactory.java @@ -4,8 +4,7 @@ package com.yahoo.config.model; /** * Interface for factories of config models. * - * @author lulf - * @since 5.1 + * @author Ulf Lilleengen */ public interface ConfigModelInstanceFactory<MODEL extends ConfigModel> { diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java index 93e434c3b87..821162353d6 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java @@ -198,6 +198,7 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye * was not present for this id (meaning it either is not active or active on another * node in the config server cluster) */ + @Override public Optional<com.yahoo.config.provision.Deployment> deployFromLocalActive(ApplicationId application) { return deployFromLocalActive(application, Duration.ofSeconds(configserverConfig.zookeeper().barrierTimeout()).plus(Duration.ofSeconds(5))); } @@ -410,7 +411,7 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye public void validateThatRemoteSessionIsPrepared(Tenant tenant, long sessionId) { RemoteSession session = getRemoteSession(tenant, sessionId); - if (!Session.Status.PREPARE.equals(session.getStatus())) + if ( ! Session.Status.PREPARE.equals(session.getStatus())) throw new IllegalStateException("Session not prepared: " + sessionId); } diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/ReloadListener.java b/configserver/src/main/java/com/yahoo/vespa/config/server/ReloadListener.java index 59783bf1af5..773a4862033 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/ReloadListener.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/ReloadListener.java @@ -12,10 +12,10 @@ import java.util.Collection; * reloaded. It only exists because the RpcServer cannot distinguish between a * successful reload of a new application and a reload of the same application. * - * @author lulf - * @since 5.1 + * @author Ulf Lilleengen */ public interface ReloadListener { + /** * Signal the listener that hosts used by by a particular tenant. * @@ -47,4 +47,5 @@ public interface ReloadListener { * Must be thread-safe. */ void applicationRemoved(ApplicationId applicationId); + } diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRequestHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRequestHandler.java index f4c0a9fd47a..8d7023fef5b 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRequestHandler.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRequestHandler.java @@ -85,6 +85,7 @@ public class TenantRequestHandler implements RequestHandler, ReloadHandler, Host /** * Activates the config of the given app. Notifies listeners + * * @param applicationSet the {@link ApplicationSet} to be reloaded */ public void reloadConfig(ApplicationSet applicationSet) { diff --git a/container-search/src/main/java/com/yahoo/prelude/query/WeakAndItem.java b/container-search/src/main/java/com/yahoo/prelude/query/WeakAndItem.java index 708c48f0954..902fefae9be 100644 --- a/container-search/src/main/java/com/yahoo/prelude/query/WeakAndItem.java +++ b/container-search/src/main/java/com/yahoo/prelude/query/WeakAndItem.java @@ -35,6 +35,7 @@ public final class WeakAndItem extends NonReducibleCompositeItem { /** * Make a WAND item with no children. You can mention a common index or you can mention it on each child. + * * @param index The index it shall search. * @param N the target for minimum number of hits to produce; * a backend will not suppress any hits in the operator @@ -94,6 +95,7 @@ public final class WeakAndItem extends NonReducibleCompositeItem { * This threshold is currently only used if the WeakAndItem is searching a RISE index field. * The score threshold then specifies the minimum dot product score a match needs to be part of the result set. * Default value is 0. + * * @param scoreThreshold the score threshold. */ public void setScoreThreshold(int scoreThreshold) { diff --git a/linguistics/src/main/java/com/yahoo/language/simple/SimpleDetector.java b/linguistics/src/main/java/com/yahoo/language/simple/SimpleDetector.java index 24ac0091e72..c75536dac83 100644 --- a/linguistics/src/main/java/com/yahoo/language/simple/SimpleDetector.java +++ b/linguistics/src/main/java/com/yahoo/language/simple/SimpleDetector.java @@ -10,7 +10,7 @@ import com.yahoo.text.Utf8; import java.nio.ByteBuffer; /** - * <p>Includes functionality for determining the langCode from a sample or from the encoding. Currently only Chinese, + * Includes functionality for determining the langCode from a sample or from the encoding. Currently only Chinese, * Japanese and Korean are supported. There are two ways to guess a String's langCode, by encoding and by character * set. If the encoding is available this is a very good indication of the langCode. If the encoding is not available, * then the actual characters in the string can be used to make an educated guess at the String's langCode. Recall a @@ -18,7 +18,7 @@ import java.nio.ByteBuffer; * Unfortunately, its not 100% fool-proof. From what I've been able to determine, Korean characters do not overlap with * Japanese or Chinese characters, so their presence is a good indication of Korean. If a string contains phonetic * japanese, this is a good indication of Japanese. However, Japanese and Chinese characters occupy many of the same - * character blocks, so if there are no definitive signs of Japanese then it is assumed that the String is Chinese.</p> + * character blocks, so if there are no definitive signs of Japanese then it is assumed that the String is Chinese. * * @author Rich Pito */ diff --git a/linguistics/src/main/java/com/yahoo/language/simple/SimpleToken.java b/linguistics/src/main/java/com/yahoo/language/simple/SimpleToken.java index 20c41d657e1..122b9b6dff6 100644 --- a/linguistics/src/main/java/com/yahoo/language/simple/SimpleToken.java +++ b/linguistics/src/main/java/com/yahoo/language/simple/SimpleToken.java @@ -9,7 +9,7 @@ import java.util.ArrayList; import java.util.List; /** - * @author <a href="mailto:mathiasm@yahoo-inc.com">Mathias Mølster Lidal</a> + * @author Mathias Mølster Lidal */ public class SimpleToken implements Token { diff --git a/linguistics/src/main/java/com/yahoo/language/simple/SimpleTransformer.java b/linguistics/src/main/java/com/yahoo/language/simple/SimpleTransformer.java index fce3344bfad..f0227a73946 100644 --- a/linguistics/src/main/java/com/yahoo/language/simple/SimpleTransformer.java +++ b/linguistics/src/main/java/com/yahoo/language/simple/SimpleTransformer.java @@ -11,7 +11,7 @@ import java.util.regex.Pattern; * Converts all accented characters into their de-accented counterparts followed by their combining diacritics, then * strips off the diacritics using a regex. * - * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> + * @author Simon Thoresen */ public class SimpleTransformer implements Transformer { diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java index 5024296b0a7..1383a0a8cf3 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java @@ -661,4 +661,5 @@ public class NodeRepository extends AbstractComponent { private Mutex lock(Node node) { return node.allocation().isPresent() ? lock(node.allocation().get().owner()) : lockUnallocated(); } + } diff --git a/zkfacade/src/main/java/com/yahoo/vespa/curator/Lock.java b/zkfacade/src/main/java/com/yahoo/vespa/curator/Lock.java index 1ab5558e2b9..d71660a990f 100644 --- a/zkfacade/src/main/java/com/yahoo/vespa/curator/Lock.java +++ b/zkfacade/src/main/java/com/yahoo/vespa/curator/Lock.java @@ -42,8 +42,9 @@ public class Lock implements Mutex { throw new RuntimeException("Exception acquiring lock '" + lockPath + "'", e); } - if (! acquired) throw new UncheckedTimeoutException("Timed out after waiting " + timeout.toString() + - " to acquire lock '" + lockPath + "'"); + if (! acquired) + throw new UncheckedTimeoutException("Timed out after waiting " + timeout + + " to acquire lock '" + lockPath + "'"); } @Override |