Merge pull request #1651 from daizhenyu/2.1.x-fix-okhttp-bug

fix the issue that xds routing fails when okhttp2.2.0 is used

Author: Sherlockhan

sermant-plugins/sermant-router/spring-router-plugin/src/main/java/io/sermant/router/spring/interceptor/OkHttpClientInterceptorChainInterceptor.java

@@ -17,7 +17,6 @@
 package io.sermant.router.spring.interceptor;
 
 import com.squareup.okhttp.Headers;
-import com.squareup.okhttp.HttpUrl;
 import com.squareup.okhttp.Request;
 
 import io.sermant.core.common.LoggerFactory;
@@ -31,6 +30,7 @@
 
 import java.io.IOException;
 import java.net.URI;
+import java.net.URL;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
@@ -89,8 +89,15 @@ private Map<String, String> getHeaders(Request request) {
     }
 
     private Request rebuildRequest(Request request, URI uri, ServiceInstance serviceInstance) {
+        URL url = null;
+        try {
+            url = new URL(BaseHttpRouterUtils.rebuildUrlByXdsServiceInstance(uri, serviceInstance));
+        } catch (IOException e) {
+            LOGGER.log(Level.WARNING, "Convert url string to url failed.", e.getMessage());
+            return request;
+        }
         return request.newBuilder()
-                .url(HttpUrl.parse(BaseHttpRouterUtils.rebuildUrlByXdsServiceInstance(uri, serviceInstance)))
+                .url(url)
                 .build();
     }