diff options
author | Harald Musum <musum@oath.com> | 2017-11-07 10:53:58 +0100 |
---|---|---|
committer | Harald Musum <musum@oath.com> | 2017-11-07 10:53:58 +0100 |
commit | 3844115235cf56c977aa580a3cd56f81ebfcc520 (patch) | |
tree | 11607e9a45284e34d9fae3536b5d3c02ef418330 /config | |
parent | 5e9a9227722eec66390b2670359a41b4703b343a (diff) |
Implement downloading of file references, not functional yet
Diffstat (limited to 'config')
4 files changed, 20 insertions, 11 deletions
diff --git a/config/src/main/java/com/yahoo/config/subscription/impl/MockConnection.java b/config/src/main/java/com/yahoo/config/subscription/impl/MockConnection.java index 3509a960740..bd9a49c2fe2 100644 --- a/config/src/main/java/com/yahoo/config/subscription/impl/MockConnection.java +++ b/config/src/main/java/com/yahoo/config/subscription/impl/MockConnection.java @@ -53,6 +53,12 @@ public class MockConnection implements ConnectionPool, com.yahoo.vespa.config.Co } @Override + public void invokeSync(Request request, double jrtTimeout) { + numberOfRequests++; + lastRequest = request; + } + + @Override public void setError(int errorCode) { numberOfFailovers++; } @@ -68,9 +74,7 @@ public class MockConnection implements ConnectionPool, com.yahoo.vespa.config.Co } @Override - public void close() { - - } + public void close() {} @Override public void setError(Connection connection, int errorCode) { @@ -109,7 +113,6 @@ public class MockConnection implements ConnectionPool, com.yahoo.vespa.config.Co } } - public interface ResponseHandler extends Runnable { RequestWaiter requestWaiter(); diff --git a/config/src/main/java/com/yahoo/vespa/config/Connection.java b/config/src/main/java/com/yahoo/vespa/config/Connection.java index 3d487198450..e39175a3a78 100644 --- a/config/src/main/java/com/yahoo/vespa/config/Connection.java +++ b/config/src/main/java/com/yahoo/vespa/config/Connection.java @@ -11,6 +11,8 @@ public interface Connection { void invokeAsync(Request request, double jrtTimeout, RequestWaiter requestWaiter); + void invokeSync(Request request, double jrtTimeout); + void setError(int errorCode); void setSuccess(); diff --git a/config/src/main/java/com/yahoo/vespa/config/JRTConnection.java b/config/src/main/java/com/yahoo/vespa/config/JRTConnection.java index 96dd6f62244..01da823b87b 100644 --- a/config/src/main/java/com/yahoo/vespa/config/JRTConnection.java +++ b/config/src/main/java/com/yahoo/vespa/config/JRTConnection.java @@ -13,6 +13,7 @@ import java.util.logging.Logger; * @author <a href="mailto:gunnarga@yahoo-inc.com">Gunnar Gauslaa Bergem</a> */ public class JRTConnection implements Connection { + public final static Logger logger = Logger.getLogger(JRTConnection.class.getPackage().getName()); private final String address; private final Supervisor supervisor; @@ -30,17 +31,20 @@ public class JRTConnection implements Connection { yyyyMMddz.setTimeZone(TimeZone.getTimeZone("GMT")); } + + public JRTConnection(String address, Supervisor supervisor) { + this.address = address; + this.supervisor = supervisor; + } + @Override public void invokeAsync(Request request, double jrtTimeout, RequestWaiter requestWaiter) { getTarget().invokeAsync(request, jrtTimeout, requestWaiter); } - public final static Logger logger = Logger.getLogger(JRTConnection.class.getPackage().getName()); - - - public JRTConnection(String address, Supervisor supervisor) { - this.address = address; - this.supervisor = supervisor; + @Override + public void invokeSync(Request request, double jrtTimeout) { + getTarget().invokeSync(request, jrtTimeout); } public String getAddress() { diff --git a/config/src/main/java/com/yahoo/vespa/config/JRTConnectionPool.java b/config/src/main/java/com/yahoo/vespa/config/JRTConnectionPool.java index b27f83851b4..bb8f7e9f9ce 100644 --- a/config/src/main/java/com/yahoo/vespa/config/JRTConnectionPool.java +++ b/config/src/main/java/com/yahoo/vespa/config/JRTConnectionPool.java @@ -21,7 +21,7 @@ import java.util.logging.Logger; * The current connection is available with {@link #getCurrent()}. * When calling {@link #setError(Connection, int)}, {#link #setNewCurrentConnection} will always be called. * - * @author <a href="mailto:gunnarga@yahoo-inc.com">Gunnar Gauslaa Bergem</a> + * @author Gunnar Gauslaa Bergem * @author hmusum */ public class JRTConnectionPool implements ConnectionPool { |