Merge pull request #2031 from doernbrackandre/fix_whitespaces_in_retryable_status_codes_list

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/RibbonLoadBalancedRetryPolicy.java

@@ -18,17 +18,17 @@
 
 package org.springframework.cloud.netflix.ribbon;
 
-import java.util.ArrayList;
-import java.util.List;
+import com.netflix.client.config.CommonClientConfigKey;
+import com.netflix.client.config.IClientConfig;
+import com.netflix.client.config.IClientConfigKey;
 import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryContext;
 import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryPolicy;
 import org.springframework.cloud.client.loadbalancer.ServiceInstanceChooser;
-import org.springframework.core.env.Environment;
 import org.springframework.http.HttpMethod;
 import org.springframework.util.StringUtils;
-import com.netflix.client.config.CommonClientConfigKey;
-import com.netflix.client.config.IClientConfig;
-import com.netflix.client.config.IClientConfigKey;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * {@link LoadBalancedRetryPolicy} for Ribbon clients.
@@ -60,7 +60,7 @@ public class RibbonLoadBalancedRetryPolicy implements LoadBalancedRetryPolicy {
         for(String code : retryableStatusCodesArray) {
             if(!StringUtils.isEmpty(code)) {
                 try {
-                    retryableStatusCodes.add(Integer.valueOf(code));
+                    retryableStatusCodes.add(Integer.valueOf(code.trim()));
                 } catch (NumberFormatException e) {
                     //TODO log
                 }

spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonLoadBalancedRetryPolicyFactoryTest.java

@@ -201,7 +201,7 @@ public class RibbonLoadBalancedRetryPolicyFactoryTest {
     }
 
     @Test
-    public void testRetryableStatusCodest() throws Exception {
+    public void testRetryableStatusCodes() throws Exception {
         int sameServer = 3;
         int nextServer = 3;
         RibbonServer server = getRibbonServer();
@@ -210,7 +210,7 @@ public class RibbonLoadBalancedRetryPolicyFactoryTest {
         doReturn(nextServer).when(config).get(eq(CommonClientConfigKey.MaxAutoRetriesNextServer), anyInt());
         doReturn(false).when(config).get(eq(CommonClientConfigKey.OkToRetryOnAllOperations), eq(false));
         doReturn(config).when(clientFactory).getClientConfig(eq(server.getServiceId()));
-        doReturn("404,502,foo, ,").when(config).getPropertyAsString(eq(RibbonLoadBalancedRetryPolicy.RETRYABLE_STATUS_CODES),eq(""));
+        doReturn("404, 418,502,foo, ,").when(config).getPropertyAsString(eq(RibbonLoadBalancedRetryPolicy.RETRYABLE_STATUS_CODES),eq(""));
         clientFactory.getLoadBalancerContext(server.getServiceId()).setRetryHandler(new DefaultLoadBalancerRetryHandler(config));
         RibbonLoadBalancerClient client = getRibbonLoadBalancerClient(server);
         RibbonLoadBalancedRetryPolicyFactory factory = new RibbonLoadBalancedRetryPolicyFactory(clientFactory);
@@ -219,6 +219,7 @@ public class RibbonLoadBalancedRetryPolicyFactoryTest {
         doReturn(HttpMethod.GET).when(request).getMethod();
         assertThat(policy.retryableStatusCode(400), is(false));
         assertThat(policy.retryableStatusCode(404), is(true));
+        assertThat(policy.retryableStatusCode(418), is(true));
         assertThat(policy.retryableStatusCode(502), is(true));
     }