diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/config/AtlasDbRuntimeConfig.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/config/AtlasDbRuntimeConfig.java index 795488575d9..792073986e8 100644 --- a/atlasdb-config/src/main/java/com/palantir/atlasdb/config/AtlasDbRuntimeConfig.java +++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/config/AtlasDbRuntimeConfig.java @@ -66,7 +66,6 @@ public long getTimestampCacheSize() { * This value is ignored if the install config does not specify usage of TimeLock. * We do not currently support live reloading from a leader block or using embedded services to using TimeLock. */ - public abstract Optional timelockRuntime(); public static ImmutableAtlasDbRuntimeConfig defaultRuntimeConfig() { diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/config/TimeLockClientConfigs.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/config/TimeLockClientConfigs.java index f6784558520..083b2688cf0 100644 --- a/atlasdb-config/src/main/java/com/palantir/atlasdb/config/TimeLockClientConfigs.java +++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/config/TimeLockClientConfigs.java @@ -27,5 +27,4 @@ public static TimeLockClientConfig copyWithClient(TimeLockClientConfig config, S .client(namespace) .build(); } - } diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/http/AtlasDbHttpClients.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/http/AtlasDbHttpClients.java index b12c1e14ae1..6315e77ee33 100644 --- a/atlasdb-config/src/main/java/com/palantir/atlasdb/http/AtlasDbHttpClients.java +++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/http/AtlasDbHttpClients.java @@ -156,7 +156,7 @@ public static T createProxyWithFailover( String userAgent) { return AtlasDbMetrics.instrument( type, - AtlasDbFeignTargetFactory.createProxyWithFailover( + AtlasDbFeignTargetFactory.createLiveReloadingProxyWithFailover( serverListConfigSupplier, sslSocketFactoryCreator, proxySelectorCreator, type, userAgent), MetricRegistry.name(type)); } diff --git a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/AtlasDbFeignTargetFactory.java b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/AtlasDbFeignTargetFactory.java index 9af3c785534..eb27e006e45 100644 --- a/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/AtlasDbFeignTargetFactory.java +++ b/atlasdb-feign/src/main/java/com/palantir/atlasdb/http/AtlasDbFeignTargetFactory.java @@ -123,7 +123,7 @@ public static T createProxyWithFailover( userAgent); } - public static T createProxyWithFailover( + public static T createLiveReloadingProxyWithFailover( Supplier serverListConfigSupplier, Function sslSocketFactoryCreator, Function proxySelectorCreator,