Fix Uri for host substitution when the path is / (Azure#45314)

Author: samvaity

sdk/clientcore/annotation-processor-test/src/main/java/io/clientcore/annotation/processor/test/HostPathEdgeCase3ServiceImpl.java

@@ -0,0 +1,65 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+package io.clientcore.annotation.processor.test;
+
+import io.clientcore.core.http.models.HttpHeaderName;
+import io.clientcore.core.http.models.HttpMethod;
+import io.clientcore.core.http.models.HttpRequest;
+import io.clientcore.core.http.models.RequestContext;
+import io.clientcore.core.http.models.Response;
+import io.clientcore.core.http.pipeline.HttpPipeline;
+import io.clientcore.core.implementation.utils.UriEscapers;
+import io.clientcore.core.models.binarydata.BinaryData;
+import io.clientcore.annotation.processor.test.implementation.HostPathEdgeCase3Service;
+import io.clientcore.core.instrumentation.logging.ClientLogger;
+import io.clientcore.core.serialization.json.JsonSerializer;
+import io.clientcore.core.serialization.xml.XmlSerializer;
+import io.clientcore.core.http.models.HttpResponseException;
+
+/**
+ * Initializes a new instance of the HostPathEdgeCase3ServiceImpl type.
+ */
+public class HostPathEdgeCase3ServiceImpl implements HostPathEdgeCase3Service {
+
+    private static final ClientLogger LOGGER = new ClientLogger(HostPathEdgeCase3Service.class);
+
+    private final HttpPipeline httpPipeline;
+
+    private final JsonSerializer jsonSerializer;
+
+    private final XmlSerializer xmlSerializer;
+
+    private HostPathEdgeCase3ServiceImpl(HttpPipeline httpPipeline) {
+        this.httpPipeline = httpPipeline;
+        this.jsonSerializer = JsonSerializer.getInstance();
+        this.xmlSerializer = XmlSerializer.getInstance();
+    }
+
+    /**
+     * Creates an instance of HostPathEdgeCase3Service that is capable of sending requests to the service.
+     * @param httpPipeline The HTTP pipeline to use for sending requests.
+     * @return An instance of `HostPathEdgeCase3Service`;
+     */
+    public static HostPathEdgeCase3Service getNewInstance(HttpPipeline httpPipeline) {
+        return new HostPathEdgeCase3ServiceImpl(httpPipeline);
+    }
+
+    @SuppressWarnings("cast")
+    @Override
+    public Response<Void> noOperationParams(String endpoint, String apiVersion, RequestContext requestContext) {
+        // Create the HttpRequest.
+        HttpRequest httpRequest = new HttpRequest().setMethod(HttpMethod.GET).setUri(endpoint + "/server/path/multiple/" + apiVersion + "/");
+        httpRequest.setContext(requestContext);
+        httpRequest.getContext().getRequestCallback().accept(httpRequest);
+        // Send the request through the httpPipeline
+        try (Response<BinaryData> networkResponse = this.httpPipeline.send(httpRequest)) {
+            int responseCode = networkResponse.getStatusCode();
+            boolean expectedResponse = responseCode == 204;
+            if (!expectedResponse) {
+                String errorMessage = networkResponse.getValue().toString();
+                throw new HttpResponseException(errorMessage, networkResponse, null);
+            }
+            return new Response<>(networkResponse.getRequest(), responseCode, networkResponse.getHeaders(), null);
+        }
+    }
+}

sdk/clientcore/annotation-processor-test/src/main/java/io/clientcore/annotation/processor/test/implementation/HostPathEdgeCase3Service.java

@@ -0,0 +1,54 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+package io.clientcore.annotation.processor.test.implementation;
+
+import io.clientcore.core.annotations.ServiceInterface;
+import io.clientcore.core.http.annotations.HostParam;
+import io.clientcore.core.http.annotations.HttpRequestInformation;
+import io.clientcore.core.http.annotations.UnexpectedResponseExceptionDetail;
+import io.clientcore.core.http.models.HttpMethod;
+import io.clientcore.core.http.models.RequestContext;
+import io.clientcore.core.http.models.Response;
+import io.clientcore.core.http.pipeline.HttpPipeline;
+import java.lang.reflect.InvocationTargetException;
+
+/**
+ * Tests that there isn't a variable name conflict if the parameterized host segment is called {@code endpoint}.
+ */
+@ServiceInterface(name = "HostPathEdgeCase3", host = "{endpoint}/server/path/multiple/{apiVersion}")
+public interface HostPathEdgeCase3Service {
+    /**
+     * Creates a new instance of {@link HostPathEdgeCase3Service}.
+     *
+     * @param pipeline The HTTP pipeline to use.
+     * @return A new instance of HostEdgeCase2.
+     */
+    static HostPathEdgeCase3Service getNewInstance(HttpPipeline pipeline) {
+        if (pipeline == null) {
+            throw new IllegalArgumentException("pipeline cannot be null");
+        }
+        try {
+            Class<?> clazz = Class
+                .forName("io.clientcore.annotation.processor.test.HostPathEdgeCase3ServiceImpl");
+            return (HostPathEdgeCase3Service) clazz.getMethod("getNewInstance", HttpPipeline.class)
+                .invoke(null, pipeline);
+        } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException
+            | InvocationTargetException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+
+    /**
+     * Performs a no operation.
+     * @param endpoint The endpoint to connect to.
+     * @param apiVersion The API version to use.
+     * @param requestContext The request context to use.
+     * @return A response with no content.
+     */
+    @HttpRequestInformation(method = HttpMethod.GET, path = "/", expectedStatusCodes = { 204 })
+    @UnexpectedResponseExceptionDetail
+    Response<Void> noOperationParams(@HostParam("endpoint") String endpoint,
+        @HostParam("apiVersion") String apiVersion, RequestContext requestContext);
+
+}

sdk/clientcore/annotation-processor/src/main/java/io/clientcore/annotation/processor/AnnotationProcessor.java

@@ -24,7 +24,6 @@
 import io.clientcore.core.implementation.utils.UriEscapers;
 import io.clientcore.core.models.binarydata.BinaryData;
 import io.clientcore.core.utils.CoreUtils;
-
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
@@ -222,20 +221,23 @@ private HttpRequestContext createHttpRequestContext(ExecutableElement requestMet
 
     private String getHost(HttpRequestContext method) {
         String path = method.getPath();
-        // Set the path after host, concatenating the path segment in the host.
-        if (path != null && !path.isEmpty() && !"/".equals(path)) {
-            String hostPath = method.getHost();
-            if (hostPath == null || hostPath.isEmpty() || "/".equals(hostPath) || path.contains("://")) {
+        String hostPath = method.getHost();
+
+        // If hostPath is set (from @ServiceInterface), always use it as the base.
+        if (hostPath != null && !hostPath.isEmpty() && !"/".equals(hostPath)) {
+            if (path == null || path.isEmpty() || "/".equals(path)) {
+                // Path is "/" or empty, so append "/" to the host
+                method.setPath(hostPath + "/");
+            } else if (path.contains("://")) {
+                // Path is a full URL, use as is
                 method.setPath(path);
+            } else if (path.startsWith("/")) {
+                method.setPath(hostPath + path);
             } else {
-                if (path.startsWith("/")) {
-                    method.setPath(hostPath + path);
-                } else {
-                    method.setPath(hostPath + "/" + path);
-                }
+                method.setPath(hostPath + "/" + path);
             }
         }
-
+        // else: hostPath is empty, use the path as is
         return PathBuilder.buildPath(method.getPath(), method);
     }
 }

sdk/clientcore/annotation-processor/src/main/java/io/clientcore/annotation/processor/templating/JavaParserTemplateProcessor.java

@@ -45,11 +45,6 @@
 import io.clientcore.core.utils.CoreUtils;
 import io.clientcore.core.utils.GeneratedCodeUtils;
 import io.clientcore.core.utils.UriBuilder;
-
-import javax.annotation.processing.ProcessingEnvironment;
-import javax.lang.model.type.TypeKind;
-import javax.lang.model.type.TypeMirror;
-import javax.tools.Diagnostic;
 import java.io.IOException;
 import java.io.Writer;
 import java.lang.reflect.Field;
@@ -63,6 +58,10 @@
 import java.util.Optional;
 import java.util.TreeMap;
 import java.util.stream.Collectors;
+import javax.annotation.processing.ProcessingEnvironment;
+import javax.lang.model.type.TypeKind;
+import javax.lang.model.type.TypeMirror;
+import javax.tools.Diagnostic;
 
 import static io.clientcore.annotation.processor.utils.ResponseHandler.generateResponseHandling;
 
@@ -363,7 +362,6 @@ void setHttpRequestUri(BlockStmt body, Expression createHttpRequest, HttpRequest
         } else {
             urlStatement = method.getHost();
         }
-
         // If the method doesn't have query parameters to set, inline the call to HttpRequest.setUri and return.
         if (method.getQueryParams().isEmpty()) {
             // The 'createHttpRequest' expression is the scope for the method call expression being added.