SpringCloud/spring-cloud-openfeign
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

only invoke RestClient.initWithNiwsConfig once

Browse Source 
fixes gh-324
This commit is contained in:
Spencer Gibb
2015-04-30 12:56:38 -06:00
parent 5166994f7c
commit c3f5678854
2 changed files with 63 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/RibbonClientConfiguration.java
View File

@@ -123,10 +123,11 @@ public class RibbonClientConfiguration {
return new RibbonLoadBalancerContext(loadBalancer, config);
}
private static class OverrideRestClient extends RestClient {
static class OverrideRestClient extends RestClient {
private OverrideRestClient(IClientConfig ncc) {
super(ncc);
protected OverrideRestClient(IClientConfig ncc) {
super();
initWithNiwsConfig(ncc);
}
@Override

59
spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientConfigurationTests.java Normal file
View File

@@ -0,0 +1,59 @@
/*
* Copyright 2013-2015 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.cloud.netflix.ribbon;
import static org.hamcrest.Matchers.*;
import static org.junit.Assert.assertThat;
import com.netflix.client.config.CommonClientConfigKey;
import com.netflix.client.config.DefaultClientConfigImpl;
import com.netflix.client.config.IClientConfig;
import org.junit.Test;
/**
* @author Spencer Gibb
*/
public class RibbonClientConfigurationTests {
@Test
public void restClientInitCalledOnce() {
CountingConfig config = new CountingConfig();
config.setProperty(CommonClientConfigKey.ConnectTimeout, "1");
config.setProperty(CommonClientConfigKey.ReadTimeout, "1");
config.setProperty(CommonClientConfigKey.MaxHttpConnectionsPerHost, "1");
config.setClientName("testClient");
new TestRestClient(config);
assertThat(config.count, is(equalTo(1)));
}
static class CountingConfig extends DefaultClientConfigImpl {
int count = 0;
}
static class TestRestClient extends RibbonClientConfiguration.OverrideRestClient {
private TestRestClient(IClientConfig ncc) {
super(ncc);
}
@Override
public void initWithNiwsConfig(IClientConfig clientConfig) {
((CountingConfig) clientConfig).count++;
super.initWithNiwsConfig(clientConfig);
}
}
}