Merge pull request apolloconfig#645 from nobodyiam/admin-service-address-locator

lepdou · web-flow · commit a1ac97b4a4e1 · 2017-06-20T13:30:21.000+08:00
use RestTemplateFactory to create rest template
diff --git a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/component/AdminServiceAddressLocator.java b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/component/AdminServiceAddressLocator.java
@@ -32,7 +32,6 @@
 @Component
 public class AdminServiceAddressLocator {
 
-  private static final int DEFAULT_TIMEOUT_MS = 1000;
   private static final long NORMAL_REFRESH_INTERVAL = 5 * 60 * 1000;
   private static final long OFFLINE_REFRESH_INTERVAL = 10 * 1000;
   private static final int RETRY_TIMES = 3;
@@ -48,24 +47,15 @@ public class AdminServiceAddressLocator {
   private HttpMessageConverters httpMessageConverters;
   @Autowired
   private PortalSettings portalSettings;
+  @Autowired
+  private RestTemplateFactory restTemplateFactory;
 
   @PostConstruct
   public void init() {
     allEnvs = portalSettings.getAllEnvs();
 
     //init restTemplate
-    restTemplate = new RestTemplate(httpMessageConverters.getConverters());
-    if (restTemplate.getRequestFactory() instanceof SimpleClientHttpRequestFactory) {
-      SimpleClientHttpRequestFactory rf =
-          (SimpleClientHttpRequestFactory) restTemplate.getRequestFactory();
-      rf.setReadTimeout(DEFAULT_TIMEOUT_MS);
-      rf.setConnectTimeout(DEFAULT_TIMEOUT_MS);
-    } else if (restTemplate.getRequestFactory() instanceof HttpComponentsClientHttpRequestFactory) {
-      HttpComponentsClientHttpRequestFactory rf =
-          (HttpComponentsClientHttpRequestFactory) restTemplate.getRequestFactory();
-      rf.setReadTimeout(DEFAULT_TIMEOUT_MS);
-      rf.setConnectTimeout(DEFAULT_TIMEOUT_MS);
-    }
+    restTemplate = restTemplateFactory.getObject();
 
     refreshServiceAddressService =
         Executors.newScheduledThreadPool(1, ApolloThreadFactory.create("ServiceLocator", false));
