Ignore null headers and allow full url paths (#6760)

Azure · Dec 12, 2019 · 0937d8e · 0937d8e
1 parent b90bab4
commit 0937d8e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/sdk/core/azure-core/src/main/java/com/azure/core/http/rest/RestProxy.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/rest/RestProxy.java
@@ -232,7 +232,7 @@ private HttpRequest createHttpRequest(SwaggerMethodParser methodParser, Object[]
             // segment in the host.
             if (path != null && !path.isEmpty() && !path.equals("/")) {
                 String hostPath = urlBuilder.getPath();
-                if (hostPath == null || hostPath.isEmpty() || hostPath.equals("/")) {
+                if (hostPath == null || hostPath.isEmpty() || hostPath.equals("/") || path.contains("://")) {
                     urlBuilder.setPath(path);
                 } else {
                     urlBuilder.setPath(hostPath + "/" + path);

diff --git a/sdk/core/azure-core/src/main/java/com/azure/core/http/rest/SwaggerMethodParser.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/rest/SwaggerMethodParser.java
@@ -340,12 +340,16 @@ public Iterable<HttpHeader> setHeaders(Object[] swaggerMethodArguments) {
                         for (final Map.Entry<String, ?> headerCollectionEntry : headerCollection.entrySet()) {
                             final String headerName = headerCollectionPrefix + headerCollectionEntry.getKey();
                             final String headerValue = serialize(headerCollectionEntry.getValue());
-                            result.put(headerName, headerValue);
+                            if (headerValue != null) {
+                                result.put(headerName, headerValue);
+                            }
                         }
                     } else {
                         final String headerName = headerSubstitution.getUrlParameterName();
                         final String headerValue = serialize(methodArgument);
-                        result.put(headerName, headerValue);
+                        if (headerValue != null) {
+                            result.put(headerName, headerValue);
+                        }
                     }
                 }
             }