diff options
| author | Bjørn Christian Seime <bjorncs@oath.com> | 2017-11-21 12:49:29 +0100 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@oath.com> | 2017-11-21 13:25:26 +0100 |
| commit | a5e9e72054f596110f5fbff7970139af853b2610 (patch) | |
| tree | f61195c41b145ed81549fa42b3a8d67bbb07e2c9 /orchestrator/src/main | |
| parent | 437dfe2db270af3ce8c4da1975ce335bb625f557 (diff) | |
Set scheme parameter for all us of jaxrs client
Diffstat (limited to 'orchestrator/src/main')
2 files changed, 5 insertions, 2 deletions
diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/controller/RetryingClusterControllerClientFactory.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/controller/RetryingClusterControllerClientFactory.java index e0f5b0ecf4f..c7aae6ea93d 100644 --- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/controller/RetryingClusterControllerClientFactory.java +++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/controller/RetryingClusterControllerClientFactory.java @@ -20,6 +20,7 @@ public class RetryingClusterControllerClientFactory implements ClusterController // TODO: Figure this port out dynamically. public static final int HARDCODED_CLUSTERCONTROLLER_PORT = 19050; public static final String CLUSTERCONTROLLER_API_PATH = "/"; + public static final String CLUSTERCONTROLLER_SCHEME = "http"; private static final int CLUSTER_CONTROLLER_CONNECT_TIMEOUT_MS = 1000; private static final int CLUSTER_CONTROLLER_READ_TIMEOUT_MS = 1000; @@ -39,7 +40,7 @@ public class RetryingClusterControllerClientFactory implements ClusterController String clusterName) { Set<HostName> clusterControllerSet = clusterControllers.stream().collect(Collectors.toSet()); JaxRsStrategy<ClusterControllerJaxRsApi> jaxRsApi - = new JaxRsStrategyFactory(clusterControllerSet, HARDCODED_CLUSTERCONTROLLER_PORT, jaxRsClientFactory) + = new JaxRsStrategyFactory(clusterControllerSet, HARDCODED_CLUSTERCONTROLLER_PORT, jaxRsClientFactory, CLUSTERCONTROLLER_SCHEME) .apiWithRetries(ClusterControllerJaxRsApi.class, CLUSTERCONTROLLER_API_PATH); return new ClusterControllerClientImpl(jaxRsApi, clusterName); } diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/controller/SingleInstanceClusterControllerClientFactory.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/controller/SingleInstanceClusterControllerClientFactory.java index ca757adfea3..7459f0a6b11 100644 --- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/controller/SingleInstanceClusterControllerClientFactory.java +++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/controller/SingleInstanceClusterControllerClientFactory.java @@ -16,6 +16,7 @@ import java.util.logging.Logger; public class SingleInstanceClusterControllerClientFactory implements ClusterControllerClientFactory { public static final int CLUSTERCONTROLLER_HARDCODED_PORT = 19050; + public static final String CLUSTERCONTROLLER_HARDCODED_SCHEME = "http"; public static final String CLUSTERCONTROLLER_API_PATH = "/"; private static final Logger log = Logger.getLogger(SingleInstanceClusterControllerClientFactory.class.getName()); @@ -44,7 +45,8 @@ public class SingleInstanceClusterControllerClientFactory implements ClusterCont port, jaxRsClientFactory, ClusterControllerJaxRsApi.class, - CLUSTERCONTROLLER_API_PATH); + CLUSTERCONTROLLER_API_PATH, + CLUSTERCONTROLLER_HARDCODED_SCHEME); return new ClusterControllerClientImpl(strategy, clusterName); } |