diff options
6 files changed, 19 insertions, 20 deletions
diff --git a/configdefinitions/src/vespa/configserver.def b/configdefinitions/src/vespa/configserver.def index f541aac4edd..19c55941988 100644 --- a/configdefinitions/src/vespa/configserver.def +++ b/configdefinitions/src/vespa/configserver.def @@ -3,7 +3,10 @@ namespace=cloud.config rpcport int default=19070 httpport int default=19071 numthreads int default=16 + +# TODO: This seems to be only used by the the status API? If so this is unnecessary duplication and potentially lying: Remove zookeepercfg string default="conf/zookeeper/zookeeper.cfg" + zookeeperserver[].hostname string zookeeperserver[].port int default=2181 # in seconds diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/Timer.java b/jdisc_core/src/main/java/com/yahoo/jdisc/Timer.java index dfe821ca0e6..c94ebc1ab93 100644 --- a/jdisc_core/src/main/java/com/yahoo/jdisc/Timer.java +++ b/jdisc_core/src/main/java/com/yahoo/jdisc/Timer.java @@ -9,7 +9,7 @@ import com.yahoo.jdisc.core.SystemTimer; * instance of this class into any component that needs to access time, instead of using * <code>System.currentTimeMillis()</code>.</p> * - * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> + * @author Simon Thoresen */ @ImplementedBy(SystemTimer.class) public interface Timer { @@ -25,5 +25,6 @@ public interface Timer { * @return The difference, measured in milliseconds, between the current time and midnight, January 1, 1970 UTC. * @see java.util.Date */ - public long currentTimeMillis(); + long currentTimeMillis(); + } diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/HttpHeaders.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/HttpHeaders.java index d5cdde300f0..039966133e8 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/HttpHeaders.java +++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/HttpHeaders.java @@ -2,7 +2,7 @@ package com.yahoo.jdisc.http; /** - * @author <a href="mailto:anirudha@yahoo-inc.com">Anirudha Khanna</a> + * @author Anirudha Khanna */ @SuppressWarnings("UnusedDeclaration") public class HttpHeaders { diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpRequestFactory.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpRequestFactory.java index d355836e205..8fc1bb26603 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpRequestFactory.java +++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpRequestFactory.java @@ -12,11 +12,11 @@ import java.net.URI; import java.util.Enumeration; /** - * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen Hult</a> + * @author Simon Thoresen Hult */ class HttpRequestFactory { - public static HttpRequest newJDiscRequest(final CurrentContainer container, - final HttpServletRequest servletRequest) { + + public static HttpRequest newJDiscRequest(CurrentContainer container, HttpServletRequest servletRequest) { return HttpRequest.newServerRequest( container, getUri(servletRequest), @@ -34,22 +34,18 @@ class HttpRequestFactory { } } - public static void copyHeaders(final HttpServletRequest from, - final HttpRequest to) { - for (final Enumeration<String> it = from.getHeaderNames(); it.hasMoreElements(); ) { - final String key = it.nextElement(); - for (final Enumeration<String> value = from.getHeaders(key); value.hasMoreElements(); ) { + public static void copyHeaders(HttpServletRequest from, HttpRequest to) { + for (Enumeration<String> it = from.getHeaderNames(); it.hasMoreElements(); ) { + String key = it.nextElement(); + for (Enumeration<String> value = from.getHeaders(key); value.hasMoreElements(); ) { to.headers().add(key, value.nextElement()); } } } private static String extraQuote(String queryString) { - // TODO this is just a stopgap measure, we need some sort of sane URI builder, do we have one? - String washed = null; - if (queryString == null) { - return null; - } + // TODO: Use an URI builder + if (queryString == null) return null; int toAndIncluding = -1; for (int i = 0; i < queryString.length(); ++i) { @@ -59,6 +55,7 @@ class HttpRequestFactory { toAndIncluding = i; } + String washed; if (toAndIncluding != (queryString.length() - 1)) { StringBuilder w = new StringBuilder(queryString.substring(0, toAndIncluding + 1)); for (int i = toAndIncluding + 1; i < queryString.length(); ++i) { @@ -91,8 +88,6 @@ class HttpRequestFactory { default: return null; } - } - } diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorMutex.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorMutex.java index 76ea6da276d..f5131236ba3 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorMutex.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorMutex.java @@ -35,7 +35,7 @@ public class CuratorMutex implements Mutex { } if (! acquired) throw new UncheckedTimeoutException("Timed out after waiting " + timeout.toString() + - " to acquire lock + '" + lockPath + "'"); + " to acquire lock + '" + lockPath + "'"); } @Override diff --git a/vespajlib/src/main/java/com/yahoo/transaction/Mutex.java b/vespajlib/src/main/java/com/yahoo/transaction/Mutex.java index 991e1473be8..f258aa2961e 100644 --- a/vespajlib/src/main/java/com/yahoo/transaction/Mutex.java +++ b/vespajlib/src/main/java/com/yahoo/transaction/Mutex.java @@ -8,6 +8,6 @@ package com.yahoo.transaction; */ public interface Mutex extends AutoCloseable { - public void close(); + void close(); } |