diff --git a/.chronus/changes/java-generate-clientcore-http-operations.md b/.chronus/changes/java-generate-clientcore-http-operations.md
new file mode 100644
index 00000000000..9a39058bf21
--- /dev/null
+++ b/.chronus/changes/java-generate-clientcore-http-operations.md
@@ -0,0 +1,7 @@
+---
+changeKind: feature
+packages:
+ - "@typespec/http-client-java"
+---
+
+Generate HTTP operations directly for the `generic` and `azurev2` Java clients, so newly generated SDKs no longer require the ClientCore annotation processor.
diff --git a/packages/http-client-java/generator/README.md b/packages/http-client-java/generator/README.md
index a48f0837409..ca280d4f244 100644
--- a/packages/http-client-java/generator/README.md
+++ b/packages/http-client-java/generator/README.md
@@ -2,6 +2,9 @@
The **Microsoft Java client generator** tool generates client libraries for accessing RESTful web services.
+The `generic` and `azurev2` flavors generate HTTP operations directly and no longer require the ClientCore annotation
+processor. The `use-rest-proxy: true` option retains the HTTP annotations for ClientCore's runtime `RestProxy`.
+
## Table of Contents
- [Prerequisites](#prerequisites)
diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/pom.xml b/packages/http-client-java/generator/http-client-generator-clientcore-test/pom.xml
index f1941780c33..6572a6bf4b5 100644
--- a/packages/http-client-java/generator/http-client-generator-clientcore-test/pom.xml
+++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/pom.xml
@@ -75,52 +75,4 @@
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
- 3.15.0
-
-
- run-annotation-processing
- generate-sources
-
- compile
-
-
- 1.8
- 1.8
- 8
- only
- ${project.build.directory}/generated-sources/
-
-
- io.clientcore
- annotation-processor
- 1.0.0-beta.4
-
-
-
- io.clientcore.annotation.processor.AnnotationProcessor
-
-
- -Xlint:-options
-
-
- module-info.java
-
-
-
-
-
-
- io.clientcore
- annotation-processor
- 1.0.0-beta.4
-
-
-
-
-
diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/authentication/apikey/implementation/ApiKeyClientImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/authentication/apikey/implementation/ApiKeyClientImpl.java
index 372a57b8f03..3d87f3c9607 100644
--- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/authentication/apikey/implementation/ApiKeyClientImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/authentication/apikey/implementation/ApiKeyClientImpl.java
@@ -1,19 +1,21 @@
package authentication.apikey.implementation;
-import authentication.apikey.InvalidAuth;
import io.clientcore.core.annotations.ReturnType;
-import io.clientcore.core.annotations.ServiceInterface;
import io.clientcore.core.annotations.ServiceMethod;
-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.HttpRequest;
import io.clientcore.core.http.models.HttpResponseException;
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.instrumentation.Instrumentation;
-import java.lang.reflect.InvocationTargetException;
+import io.clientcore.core.instrumentation.logging.ClientLogger;
+import io.clientcore.core.models.binarydata.BinaryData;
+import io.clientcore.core.serialization.json.JsonSerializer;
+import io.clientcore.core.serialization.xml.XmlSerializer;
+import io.clientcore.core.utils.CoreUtils;
+import io.clientcore.core.utils.GeneratedCodeUtils;
+import java.util.Map;
/**
* Initializes a new instance of the ApiKeyClient type.
@@ -81,36 +83,67 @@ public ApiKeyClientImpl(HttpPipeline httpPipeline, Instrumentation instrumentati
}
/**
- * The interface defining all the services for ApiKeyClient to be used by the proxy service to perform REST calls.
+ * The HTTP operations for ApiKeyClient.
*/
- @ServiceInterface(name = "ApiKeyClient", host = "{endpoint}")
public interface ApiKeyClientService {
static ApiKeyClientService getNewInstance(HttpPipeline pipeline) {
- try {
- Class> clazz = Class.forName("authentication.apikey.implementation.ApiKeyClientServiceImpl");
- return (ApiKeyClientService) clazz.getMethod("getNewInstance", HttpPipeline.class)
- .invoke(null, pipeline);
- } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException
- | InvocationTargetException e) {
- throw new RuntimeException(e);
- }
+ return new ApiKeyClientServiceImpl(pipeline);
+ }
+
+ Response valid(String endpoint, RequestContext requestContext);
+
+ Response invalid(String endpoint, RequestContext requestContext);
+ }
+
+ private static final class ApiKeyClientServiceImpl implements ApiKeyClientService {
+ private static final ClientLogger HTTP_LOG = new ClientLogger(ApiKeyClientService.class);
+
+ private final HttpPipeline httpPipeline;
+ private final JsonSerializer jsonSerializer = JsonSerializer.getInstance();
+
+ private final XmlSerializer xmlSerializer = XmlSerializer.getInstance();
+
+ private ApiKeyClientServiceImpl(HttpPipeline httpPipeline) {
+ this.httpPipeline = httpPipeline;
}
- @HttpRequestInformation(
- method = HttpMethod.GET,
- path = "/authentication/api-key/valid",
- expectedStatusCodes = { 204 })
- @UnexpectedResponseExceptionDetail
- Response valid(@HostParam("endpoint") String endpoint, RequestContext requestContext);
-
- @HttpRequestInformation(
- method = HttpMethod.GET,
- path = "/authentication/api-key/invalid",
- expectedStatusCodes = { 204 })
- @UnexpectedResponseExceptionDetail(statusCode = { 403 }, exceptionBodyClass = InvalidAuth.class)
- @UnexpectedResponseExceptionDetail
- Response invalid(@HostParam("endpoint") String endpoint, RequestContext requestContext);
+ @Override
+ public Response valid(String endpoint, RequestContext requestContext) {
+ HttpRequest httpRequest
+ = new HttpRequest().setMethod(HttpMethod.GET).setUri(endpoint + "/authentication/api-key/valid");
+ httpRequest.setContext(requestContext);
+ httpRequest.getContext().getRequestCallback().accept(httpRequest);
+ try (Response networkResponse = this.httpPipeline.send(httpRequest)) {
+ int responseCode = networkResponse.getStatusCode();
+ boolean expectedResponse = responseCode == 204;
+ if (!expectedResponse) {
+ GeneratedCodeUtils.handleUnexpectedResponse(responseCode, networkResponse, this.jsonSerializer,
+ this.xmlSerializer, null, null, HTTP_LOG);
+ }
+ return new Response<>(networkResponse.getRequest(), responseCode, networkResponse.getHeaders(), null);
+ }
+ }
+
+ @Override
+ public Response invalid(String endpoint, RequestContext requestContext) {
+ HttpRequest httpRequest
+ = new HttpRequest().setMethod(HttpMethod.GET).setUri(endpoint + "/authentication/api-key/invalid");
+ httpRequest.setContext(requestContext);
+ httpRequest.getContext().getRequestCallback().accept(httpRequest);
+ try (Response networkResponse = this.httpPipeline.send(httpRequest)) {
+ int responseCode = networkResponse.getStatusCode();
+ boolean expectedResponse = responseCode == 204;
+ if (!expectedResponse) {
+ GeneratedCodeUtils.handleUnexpectedResponse(responseCode, networkResponse, this.jsonSerializer,
+ this.xmlSerializer, null,
+ Map.ofEntries(
+ Map.entry(403, CoreUtils.createParameterizedType(authentication.apikey.InvalidAuth.class))),
+ HTTP_LOG);
+ }
+ return new Response<>(networkResponse.getRequest(), responseCode, networkResponse.getHeaders(), null);
+ }
+ }
}
/**
diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/authentication/http/custom/implementation/CustomClientImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/authentication/http/custom/implementation/CustomClientImpl.java
index 9eaf9738200..9c08c4f71e5 100644
--- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/authentication/http/custom/implementation/CustomClientImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/authentication/http/custom/implementation/CustomClientImpl.java
@@ -1,19 +1,21 @@
package authentication.http.custom.implementation;
-import authentication.http.custom.InvalidAuth;
import io.clientcore.core.annotations.ReturnType;
-import io.clientcore.core.annotations.ServiceInterface;
import io.clientcore.core.annotations.ServiceMethod;
-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.HttpRequest;
import io.clientcore.core.http.models.HttpResponseException;
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.instrumentation.Instrumentation;
-import java.lang.reflect.InvocationTargetException;
+import io.clientcore.core.instrumentation.logging.ClientLogger;
+import io.clientcore.core.models.binarydata.BinaryData;
+import io.clientcore.core.serialization.json.JsonSerializer;
+import io.clientcore.core.serialization.xml.XmlSerializer;
+import io.clientcore.core.utils.CoreUtils;
+import io.clientcore.core.utils.GeneratedCodeUtils;
+import java.util.Map;
/**
* Initializes a new instance of the CustomClient type.
@@ -81,36 +83,67 @@ public CustomClientImpl(HttpPipeline httpPipeline, Instrumentation instrumentati
}
/**
- * The interface defining all the services for CustomClient to be used by the proxy service to perform REST calls.
+ * The HTTP operations for CustomClient.
*/
- @ServiceInterface(name = "CustomClient", host = "{endpoint}")
public interface CustomClientService {
static CustomClientService getNewInstance(HttpPipeline pipeline) {
- try {
- Class> clazz = Class.forName("authentication.http.custom.implementation.CustomClientServiceImpl");
- return (CustomClientService) clazz.getMethod("getNewInstance", HttpPipeline.class)
- .invoke(null, pipeline);
- } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException
- | InvocationTargetException e) {
- throw new RuntimeException(e);
- }
+ return new CustomClientServiceImpl(pipeline);
+ }
+
+ Response valid(String endpoint, RequestContext requestContext);
+
+ Response invalid(String endpoint, RequestContext requestContext);
+ }
+
+ private static final class CustomClientServiceImpl implements CustomClientService {
+ private static final ClientLogger HTTP_LOG = new ClientLogger(CustomClientService.class);
+
+ private final HttpPipeline httpPipeline;
+ private final JsonSerializer jsonSerializer = JsonSerializer.getInstance();
+
+ private final XmlSerializer xmlSerializer = XmlSerializer.getInstance();
+
+ private CustomClientServiceImpl(HttpPipeline httpPipeline) {
+ this.httpPipeline = httpPipeline;
}
- @HttpRequestInformation(
- method = HttpMethod.GET,
- path = "/authentication/http/custom/valid",
- expectedStatusCodes = { 204 })
- @UnexpectedResponseExceptionDetail
- Response valid(@HostParam("endpoint") String endpoint, RequestContext requestContext);
-
- @HttpRequestInformation(
- method = HttpMethod.GET,
- path = "/authentication/http/custom/invalid",
- expectedStatusCodes = { 204 })
- @UnexpectedResponseExceptionDetail(statusCode = { 403 }, exceptionBodyClass = InvalidAuth.class)
- @UnexpectedResponseExceptionDetail
- Response invalid(@HostParam("endpoint") String endpoint, RequestContext requestContext);
+ @Override
+ public Response valid(String endpoint, RequestContext requestContext) {
+ HttpRequest httpRequest
+ = new HttpRequest().setMethod(HttpMethod.GET).setUri(endpoint + "/authentication/http/custom/valid");
+ httpRequest.setContext(requestContext);
+ httpRequest.getContext().getRequestCallback().accept(httpRequest);
+ try (Response networkResponse = this.httpPipeline.send(httpRequest)) {
+ int responseCode = networkResponse.getStatusCode();
+ boolean expectedResponse = responseCode == 204;
+ if (!expectedResponse) {
+ GeneratedCodeUtils.handleUnexpectedResponse(responseCode, networkResponse, this.jsonSerializer,
+ this.xmlSerializer, null, null, HTTP_LOG);
+ }
+ return new Response<>(networkResponse.getRequest(), responseCode, networkResponse.getHeaders(), null);
+ }
+ }
+
+ @Override
+ public Response invalid(String endpoint, RequestContext requestContext) {
+ HttpRequest httpRequest
+ = new HttpRequest().setMethod(HttpMethod.GET).setUri(endpoint + "/authentication/http/custom/invalid");
+ httpRequest.setContext(requestContext);
+ httpRequest.getContext().getRequestCallback().accept(httpRequest);
+ try (Response networkResponse = this.httpPipeline.send(httpRequest)) {
+ int responseCode = networkResponse.getStatusCode();
+ boolean expectedResponse = responseCode == 204;
+ if (!expectedResponse) {
+ GeneratedCodeUtils.handleUnexpectedResponse(responseCode, networkResponse, this.jsonSerializer,
+ this.xmlSerializer, null,
+ Map.ofEntries(Map.entry(403,
+ CoreUtils.createParameterizedType(authentication.http.custom.InvalidAuth.class))),
+ HTTP_LOG);
+ }
+ return new Response<>(networkResponse.getRequest(), responseCode, networkResponse.getHeaders(), null);
+ }
+ }
}
/**
diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/authentication/noauth/union/implementation/UnionClientImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/authentication/noauth/union/implementation/UnionClientImpl.java
index 548ad00e46c..658209787f7 100644
--- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/authentication/noauth/union/implementation/UnionClientImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/authentication/noauth/union/implementation/UnionClientImpl.java
@@ -1,18 +1,19 @@
package authentication.noauth.union.implementation;
import io.clientcore.core.annotations.ReturnType;
-import io.clientcore.core.annotations.ServiceInterface;
import io.clientcore.core.annotations.ServiceMethod;
-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.HttpRequest;
import io.clientcore.core.http.models.HttpResponseException;
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.instrumentation.Instrumentation;
-import java.lang.reflect.InvocationTargetException;
+import io.clientcore.core.instrumentation.logging.ClientLogger;
+import io.clientcore.core.models.binarydata.BinaryData;
+import io.clientcore.core.serialization.json.JsonSerializer;
+import io.clientcore.core.serialization.xml.XmlSerializer;
+import io.clientcore.core.utils.GeneratedCodeUtils;
/**
* Initializes a new instance of the UnionClient type.
@@ -80,35 +81,64 @@ public UnionClientImpl(HttpPipeline httpPipeline, Instrumentation instrumentatio
}
/**
- * The interface defining all the services for UnionClient to be used by the proxy service to perform REST calls.
+ * The HTTP operations for UnionClient.
*/
- @ServiceInterface(name = "UnionClient", host = "{endpoint}")
public interface UnionClientService {
static UnionClientService getNewInstance(HttpPipeline pipeline) {
- try {
- Class> clazz = Class.forName("authentication.noauth.union.implementation.UnionClientServiceImpl");
- return (UnionClientService) clazz.getMethod("getNewInstance", HttpPipeline.class)
- .invoke(null, pipeline);
- } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException
- | InvocationTargetException e) {
- throw new RuntimeException(e);
- }
+ return new UnionClientServiceImpl(pipeline);
+ }
+
+ Response validNoAuth(String endpoint, RequestContext requestContext);
+
+ Response validToken(String endpoint, RequestContext requestContext);
+ }
+
+ private static final class UnionClientServiceImpl implements UnionClientService {
+ private static final ClientLogger HTTP_LOG = new ClientLogger(UnionClientService.class);
+
+ private final HttpPipeline httpPipeline;
+ private final JsonSerializer jsonSerializer = JsonSerializer.getInstance();
+
+ private final XmlSerializer xmlSerializer = XmlSerializer.getInstance();
+
+ private UnionClientServiceImpl(HttpPipeline httpPipeline) {
+ this.httpPipeline = httpPipeline;
}
- @HttpRequestInformation(
- method = HttpMethod.GET,
- path = "/authentication/noauth/union/valid",
- expectedStatusCodes = { 204 })
- @UnexpectedResponseExceptionDetail
- Response validNoAuth(@HostParam("endpoint") String endpoint, RequestContext requestContext);
-
- @HttpRequestInformation(
- method = HttpMethod.GET,
- path = "/authentication/noauth/union/validtoken",
- expectedStatusCodes = { 204 })
- @UnexpectedResponseExceptionDetail
- Response validToken(@HostParam("endpoint") String endpoint, RequestContext requestContext);
+ @Override
+ public Response validNoAuth(String endpoint, RequestContext requestContext) {
+ HttpRequest httpRequest
+ = new HttpRequest().setMethod(HttpMethod.GET).setUri(endpoint + "/authentication/noauth/union/valid");
+ httpRequest.setContext(requestContext);
+ httpRequest.getContext().getRequestCallback().accept(httpRequest);
+ try (Response networkResponse = this.httpPipeline.send(httpRequest)) {
+ int responseCode = networkResponse.getStatusCode();
+ boolean expectedResponse = responseCode == 204;
+ if (!expectedResponse) {
+ GeneratedCodeUtils.handleUnexpectedResponse(responseCode, networkResponse, this.jsonSerializer,
+ this.xmlSerializer, null, null, HTTP_LOG);
+ }
+ return new Response<>(networkResponse.getRequest(), responseCode, networkResponse.getHeaders(), null);
+ }
+ }
+
+ @Override
+ public Response validToken(String endpoint, RequestContext requestContext) {
+ HttpRequest httpRequest = new HttpRequest().setMethod(HttpMethod.GET)
+ .setUri(endpoint + "/authentication/noauth/union/validtoken");
+ httpRequest.setContext(requestContext);
+ httpRequest.getContext().getRequestCallback().accept(httpRequest);
+ try (Response networkResponse = this.httpPipeline.send(httpRequest)) {
+ int responseCode = networkResponse.getStatusCode();
+ boolean expectedResponse = responseCode == 204;
+ if (!expectedResponse) {
+ GeneratedCodeUtils.handleUnexpectedResponse(responseCode, networkResponse, this.jsonSerializer,
+ this.xmlSerializer, null, null, HTTP_LOG);
+ }
+ return new Response<>(networkResponse.getRequest(), responseCode, networkResponse.getHeaders(), null);
+ }
+ }
}
/**
diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/authentication/oauth2/implementation/OAuth2ClientImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/authentication/oauth2/implementation/OAuth2ClientImpl.java
index e8c55050490..3c4251ce678 100644
--- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/authentication/oauth2/implementation/OAuth2ClientImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/authentication/oauth2/implementation/OAuth2ClientImpl.java
@@ -1,19 +1,21 @@
package authentication.oauth2.implementation;
-import authentication.oauth2.InvalidAuth;
import io.clientcore.core.annotations.ReturnType;
-import io.clientcore.core.annotations.ServiceInterface;
import io.clientcore.core.annotations.ServiceMethod;
-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.HttpRequest;
import io.clientcore.core.http.models.HttpResponseException;
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.instrumentation.Instrumentation;
-import java.lang.reflect.InvocationTargetException;
+import io.clientcore.core.instrumentation.logging.ClientLogger;
+import io.clientcore.core.models.binarydata.BinaryData;
+import io.clientcore.core.serialization.json.JsonSerializer;
+import io.clientcore.core.serialization.xml.XmlSerializer;
+import io.clientcore.core.utils.CoreUtils;
+import io.clientcore.core.utils.GeneratedCodeUtils;
+import java.util.Map;
/**
* Initializes a new instance of the OAuth2Client type.
@@ -81,36 +83,67 @@ public OAuth2ClientImpl(HttpPipeline httpPipeline, Instrumentation instrumentati
}
/**
- * The interface defining all the services for OAuth2Client to be used by the proxy service to perform REST calls.
+ * The HTTP operations for OAuth2Client.
*/
- @ServiceInterface(name = "OAuth2Client", host = "{endpoint}")
public interface OAuth2ClientService {
static OAuth2ClientService getNewInstance(HttpPipeline pipeline) {
- try {
- Class> clazz = Class.forName("authentication.oauth2.implementation.OAuth2ClientServiceImpl");
- return (OAuth2ClientService) clazz.getMethod("getNewInstance", HttpPipeline.class)
- .invoke(null, pipeline);
- } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException
- | InvocationTargetException e) {
- throw new RuntimeException(e);
- }
+ return new OAuth2ClientServiceImpl(pipeline);
+ }
+
+ Response valid(String endpoint, RequestContext requestContext);
+
+ Response invalid(String endpoint, RequestContext requestContext);
+ }
+
+ private static final class OAuth2ClientServiceImpl implements OAuth2ClientService {
+ private static final ClientLogger HTTP_LOG = new ClientLogger(OAuth2ClientService.class);
+
+ private final HttpPipeline httpPipeline;
+ private final JsonSerializer jsonSerializer = JsonSerializer.getInstance();
+
+ private final XmlSerializer xmlSerializer = XmlSerializer.getInstance();
+
+ private OAuth2ClientServiceImpl(HttpPipeline httpPipeline) {
+ this.httpPipeline = httpPipeline;
}
- @HttpRequestInformation(
- method = HttpMethod.GET,
- path = "/authentication/oauth2/valid",
- expectedStatusCodes = { 204 })
- @UnexpectedResponseExceptionDetail
- Response valid(@HostParam("endpoint") String endpoint, RequestContext requestContext);
-
- @HttpRequestInformation(
- method = HttpMethod.GET,
- path = "/authentication/oauth2/invalid",
- expectedStatusCodes = { 204 })
- @UnexpectedResponseExceptionDetail(statusCode = { 403 }, exceptionBodyClass = InvalidAuth.class)
- @UnexpectedResponseExceptionDetail
- Response invalid(@HostParam("endpoint") String endpoint, RequestContext requestContext);
+ @Override
+ public Response valid(String endpoint, RequestContext requestContext) {
+ HttpRequest httpRequest
+ = new HttpRequest().setMethod(HttpMethod.GET).setUri(endpoint + "/authentication/oauth2/valid");
+ httpRequest.setContext(requestContext);
+ httpRequest.getContext().getRequestCallback().accept(httpRequest);
+ try (Response networkResponse = this.httpPipeline.send(httpRequest)) {
+ int responseCode = networkResponse.getStatusCode();
+ boolean expectedResponse = responseCode == 204;
+ if (!expectedResponse) {
+ GeneratedCodeUtils.handleUnexpectedResponse(responseCode, networkResponse, this.jsonSerializer,
+ this.xmlSerializer, null, null, HTTP_LOG);
+ }
+ return new Response<>(networkResponse.getRequest(), responseCode, networkResponse.getHeaders(), null);
+ }
+ }
+
+ @Override
+ public Response invalid(String endpoint, RequestContext requestContext) {
+ HttpRequest httpRequest
+ = new HttpRequest().setMethod(HttpMethod.GET).setUri(endpoint + "/authentication/oauth2/invalid");
+ httpRequest.setContext(requestContext);
+ httpRequest.getContext().getRequestCallback().accept(httpRequest);
+ try (Response networkResponse = this.httpPipeline.send(httpRequest)) {
+ int responseCode = networkResponse.getStatusCode();
+ boolean expectedResponse = responseCode == 204;
+ if (!expectedResponse) {
+ GeneratedCodeUtils.handleUnexpectedResponse(responseCode, networkResponse, this.jsonSerializer,
+ this.xmlSerializer, null,
+ Map.ofEntries(
+ Map.entry(403, CoreUtils.createParameterizedType(authentication.oauth2.InvalidAuth.class))),
+ HTTP_LOG);
+ }
+ return new Response<>(networkResponse.getRequest(), responseCode, networkResponse.getHeaders(), null);
+ }
+ }
}
/**
diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/authentication/union/implementation/UnionClientImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/authentication/union/implementation/UnionClientImpl.java
index e1bea9c2211..076a2356df9 100644
--- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/authentication/union/implementation/UnionClientImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/authentication/union/implementation/UnionClientImpl.java
@@ -1,18 +1,19 @@
package authentication.union.implementation;
import io.clientcore.core.annotations.ReturnType;
-import io.clientcore.core.annotations.ServiceInterface;
import io.clientcore.core.annotations.ServiceMethod;
-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.HttpRequest;
import io.clientcore.core.http.models.HttpResponseException;
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.instrumentation.Instrumentation;
-import java.lang.reflect.InvocationTargetException;
+import io.clientcore.core.instrumentation.logging.ClientLogger;
+import io.clientcore.core.models.binarydata.BinaryData;
+import io.clientcore.core.serialization.json.JsonSerializer;
+import io.clientcore.core.serialization.xml.XmlSerializer;
+import io.clientcore.core.utils.GeneratedCodeUtils;
/**
* Initializes a new instance of the UnionClient type.
@@ -80,35 +81,64 @@ public UnionClientImpl(HttpPipeline httpPipeline, Instrumentation instrumentatio
}
/**
- * The interface defining all the services for UnionClient to be used by the proxy service to perform REST calls.
+ * The HTTP operations for UnionClient.
*/
- @ServiceInterface(name = "UnionClient", host = "{endpoint}")
public interface UnionClientService {
static UnionClientService getNewInstance(HttpPipeline pipeline) {
- try {
- Class> clazz = Class.forName("authentication.union.implementation.UnionClientServiceImpl");
- return (UnionClientService) clazz.getMethod("getNewInstance", HttpPipeline.class)
- .invoke(null, pipeline);
- } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException
- | InvocationTargetException e) {
- throw new RuntimeException(e);
- }
+ return new UnionClientServiceImpl(pipeline);
+ }
+
+ Response validKey(String endpoint, RequestContext requestContext);
+
+ Response validToken(String endpoint, RequestContext requestContext);
+ }
+
+ private static final class UnionClientServiceImpl implements UnionClientService {
+ private static final ClientLogger HTTP_LOG = new ClientLogger(UnionClientService.class);
+
+ private final HttpPipeline httpPipeline;
+ private final JsonSerializer jsonSerializer = JsonSerializer.getInstance();
+
+ private final XmlSerializer xmlSerializer = XmlSerializer.getInstance();
+
+ private UnionClientServiceImpl(HttpPipeline httpPipeline) {
+ this.httpPipeline = httpPipeline;
}
- @HttpRequestInformation(
- method = HttpMethod.GET,
- path = "/authentication/union/validkey",
- expectedStatusCodes = { 204 })
- @UnexpectedResponseExceptionDetail
- Response validKey(@HostParam("endpoint") String endpoint, RequestContext requestContext);
-
- @HttpRequestInformation(
- method = HttpMethod.GET,
- path = "/authentication/union/validtoken",
- expectedStatusCodes = { 204 })
- @UnexpectedResponseExceptionDetail
- Response validToken(@HostParam("endpoint") String endpoint, RequestContext requestContext);
+ @Override
+ public Response validKey(String endpoint, RequestContext requestContext) {
+ HttpRequest httpRequest
+ = new HttpRequest().setMethod(HttpMethod.GET).setUri(endpoint + "/authentication/union/validkey");
+ httpRequest.setContext(requestContext);
+ httpRequest.getContext().getRequestCallback().accept(httpRequest);
+ try (Response networkResponse = this.httpPipeline.send(httpRequest)) {
+ int responseCode = networkResponse.getStatusCode();
+ boolean expectedResponse = responseCode == 204;
+ if (!expectedResponse) {
+ GeneratedCodeUtils.handleUnexpectedResponse(responseCode, networkResponse, this.jsonSerializer,
+ this.xmlSerializer, null, null, HTTP_LOG);
+ }
+ return new Response<>(networkResponse.getRequest(), responseCode, networkResponse.getHeaders(), null);
+ }
+ }
+
+ @Override
+ public Response validToken(String endpoint, RequestContext requestContext) {
+ HttpRequest httpRequest
+ = new HttpRequest().setMethod(HttpMethod.GET).setUri(endpoint + "/authentication/union/validtoken");
+ httpRequest.setContext(requestContext);
+ httpRequest.getContext().getRequestCallback().accept(httpRequest);
+ try (Response networkResponse = this.httpPipeline.send(httpRequest)) {
+ int responseCode = networkResponse.getStatusCode();
+ boolean expectedResponse = responseCode == 204;
+ if (!expectedResponse) {
+ GeneratedCodeUtils.handleUnexpectedResponse(responseCode, networkResponse, this.jsonSerializer,
+ this.xmlSerializer, null, null, HTTP_LOG);
+ }
+ return new Response<>(networkResponse.getRequest(), responseCode, networkResponse.getHeaders(), null);
+ }
+ }
}
/**
diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/documentation/implementation/ListsImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/documentation/implementation/ListsImpl.java
index f23f2bb60ad..f1836fbf046 100644
--- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/documentation/implementation/ListsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/documentation/implementation/ListsImpl.java
@@ -3,20 +3,22 @@
import documentation.lists.BulletPointsModel;
import documentation.lists.implementation.BulletPointsModelRequest;
import io.clientcore.core.annotations.ReturnType;
-import io.clientcore.core.annotations.ServiceInterface;
import io.clientcore.core.annotations.ServiceMethod;
-import io.clientcore.core.http.annotations.BodyParam;
-import io.clientcore.core.http.annotations.HeaderParam;
-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.HttpHeaderName;
import io.clientcore.core.http.models.HttpMethod;
+import io.clientcore.core.http.models.HttpRequest;
import io.clientcore.core.http.models.HttpResponseException;
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.instrumentation.Instrumentation;
-import java.lang.reflect.InvocationTargetException;
+import io.clientcore.core.instrumentation.logging.ClientLogger;
+import io.clientcore.core.models.binarydata.BinaryData;
+import io.clientcore.core.serialization.SerializationFormat;
+import io.clientcore.core.serialization.json.JsonSerializer;
+import io.clientcore.core.serialization.xml.XmlSerializer;
+import io.clientcore.core.utils.CoreUtils;
+import io.clientcore.core.utils.GeneratedCodeUtils;
/**
* An instance of this class provides access to all the operations defined in Lists.
@@ -49,45 +51,92 @@ public final class ListsImpl {
}
/**
- * The interface defining all the services for DocumentationClientLists to be used by the proxy service to perform
- * REST calls.
+ * The HTTP operations for DocumentationClientLists.
*/
- @ServiceInterface(name = "DocumentationClientLists", host = "{endpoint}")
public interface ListsService {
static ListsService getNewInstance(HttpPipeline pipeline) {
- try {
- Class> clazz = Class.forName("documentation.implementation.ListsServiceImpl");
- return (ListsService) clazz.getMethod("getNewInstance", HttpPipeline.class).invoke(null, pipeline);
- } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException
- | InvocationTargetException e) {
- throw new RuntimeException(e);
+ return new ListsServiceImpl(pipeline);
+ }
+
+ Response bulletPointsOp(String endpoint, RequestContext requestContext);
+
+ Response bulletPointsModel(String endpoint, String contentType,
+ BulletPointsModelRequest bulletPointsModelRequest, RequestContext requestContext);
+
+ Response numbered(String endpoint, RequestContext requestContext);
+ }
+
+ private static final class ListsServiceImpl implements ListsService {
+ private static final ClientLogger HTTP_LOG = new ClientLogger(ListsService.class);
+
+ private final HttpPipeline httpPipeline;
+
+ private final JsonSerializer jsonSerializer = JsonSerializer.getInstance();
+
+ private final XmlSerializer xmlSerializer = XmlSerializer.getInstance();
+
+ private ListsServiceImpl(HttpPipeline httpPipeline) {
+ this.httpPipeline = httpPipeline;
+ }
+
+ @Override
+ public Response bulletPointsOp(String endpoint, RequestContext requestContext) {
+ HttpRequest httpRequest = new HttpRequest().setMethod(HttpMethod.GET)
+ .setUri(endpoint + "/documentation/lists/bullet-points/op");
+ httpRequest.setContext(requestContext);
+ httpRequest.getContext().getRequestCallback().accept(httpRequest);
+ try (Response networkResponse = this.httpPipeline.send(httpRequest)) {
+ int responseCode = networkResponse.getStatusCode();
+ boolean expectedResponse = responseCode == 204;
+ if (!expectedResponse) {
+ GeneratedCodeUtils.handleUnexpectedResponse(responseCode, networkResponse, this.jsonSerializer,
+ this.xmlSerializer, null, null, HTTP_LOG);
+ }
+ return new Response<>(networkResponse.getRequest(), responseCode, networkResponse.getHeaders(), null);
}
+ }
+ @Override
+ public Response bulletPointsModel(String endpoint, String contentType,
+ BulletPointsModelRequest bulletPointsModelRequest, RequestContext requestContext) {
+ HttpRequest httpRequest = new HttpRequest().setMethod(HttpMethod.POST)
+ .setUri(endpoint + "/documentation/lists/bullet-points/model");
+ if (bulletPointsModelRequest != null) {
+ httpRequest.getHeaders().set(HttpHeaderName.CONTENT_TYPE, contentType);
+ SerializationFormat requestFormat
+ = CoreUtils.serializationFormatFromContentType(httpRequest.getHeaders());
+ httpRequest.setBody(BinaryData.fromObject(bulletPointsModelRequest,
+ this.xmlSerializer.supportsFormat(requestFormat) ? this.xmlSerializer : this.jsonSerializer));
+ }
+ httpRequest.setContext(requestContext);
+ httpRequest.getContext().getRequestCallback().accept(httpRequest);
+ try (Response networkResponse = this.httpPipeline.send(httpRequest)) {
+ int responseCode = networkResponse.getStatusCode();
+ boolean expectedResponse = responseCode == 200;
+ if (!expectedResponse) {
+ GeneratedCodeUtils.handleUnexpectedResponse(responseCode, networkResponse, this.jsonSerializer,
+ this.xmlSerializer, null, null, HTTP_LOG);
+ }
+ return new Response<>(networkResponse.getRequest(), responseCode, networkResponse.getHeaders(), null);
+ }
}
- @HttpRequestInformation(
- method = HttpMethod.GET,
- path = "/documentation/lists/bullet-points/op",
- expectedStatusCodes = { 204 })
- @UnexpectedResponseExceptionDetail
- Response bulletPointsOp(@HostParam("endpoint") String endpoint, RequestContext requestContext);
-
- @HttpRequestInformation(
- method = HttpMethod.POST,
- path = "/documentation/lists/bullet-points/model",
- expectedStatusCodes = { 200 })
- @UnexpectedResponseExceptionDetail
- Response bulletPointsModel(@HostParam("endpoint") String endpoint,
- @HeaderParam("Content-Type") String contentType,
- @BodyParam("application/json") BulletPointsModelRequest bulletPointsModelRequest,
- RequestContext requestContext);
-
- @HttpRequestInformation(
- method = HttpMethod.GET,
- path = "/documentation/lists/numbered",
- expectedStatusCodes = { 204 })
- @UnexpectedResponseExceptionDetail
- Response numbered(@HostParam("endpoint") String endpoint, RequestContext requestContext);
+ @Override
+ public Response numbered(String endpoint, RequestContext requestContext) {
+ HttpRequest httpRequest
+ = new HttpRequest().setMethod(HttpMethod.GET).setUri(endpoint + "/documentation/lists/numbered");
+ httpRequest.setContext(requestContext);
+ httpRequest.getContext().getRequestCallback().accept(httpRequest);
+ try (Response networkResponse = this.httpPipeline.send(httpRequest)) {
+ int responseCode = networkResponse.getStatusCode();
+ boolean expectedResponse = responseCode == 204;
+ if (!expectedResponse) {
+ GeneratedCodeUtils.handleUnexpectedResponse(responseCode, networkResponse, this.jsonSerializer,
+ this.xmlSerializer, null, null, HTTP_LOG);
+ }
+ return new Response<>(networkResponse.getRequest(), responseCode, networkResponse.getHeaders(), null);
+ }
+ }
}
/**
diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/documentation/implementation/TextFormattingsImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/documentation/implementation/TextFormattingsImpl.java
index 3b3076f04f9..a52f9bad1ab 100644
--- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/documentation/implementation/TextFormattingsImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/documentation/implementation/TextFormattingsImpl.java
@@ -1,18 +1,19 @@
package documentation.implementation;
import io.clientcore.core.annotations.ReturnType;
-import io.clientcore.core.annotations.ServiceInterface;
import io.clientcore.core.annotations.ServiceMethod;
-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.HttpRequest;
import io.clientcore.core.http.models.HttpResponseException;
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.instrumentation.Instrumentation;
-import java.lang.reflect.InvocationTargetException;
+import io.clientcore.core.instrumentation.logging.ClientLogger;
+import io.clientcore.core.models.binarydata.BinaryData;
+import io.clientcore.core.serialization.json.JsonSerializer;
+import io.clientcore.core.serialization.xml.XmlSerializer;
+import io.clientcore.core.utils.GeneratedCodeUtils;
/**
* An instance of this class provides access to all the operations defined in TextFormattings.
@@ -45,43 +46,83 @@ public final class TextFormattingsImpl {
}
/**
- * The interface defining all the services for DocumentationClientTextFormattings to be used by the proxy service to
- * perform REST calls.
+ * The HTTP operations for DocumentationClientTextFormattings.
*/
- @ServiceInterface(name = "DocumentationClientTextFormattings", host = "{endpoint}")
public interface TextFormattingsService {
static TextFormattingsService getNewInstance(HttpPipeline pipeline) {
- try {
- Class> clazz = Class.forName("documentation.implementation.TextFormattingsServiceImpl");
- return (TextFormattingsService) clazz.getMethod("getNewInstance", HttpPipeline.class)
- .invoke(null, pipeline);
- } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException
- | InvocationTargetException e) {
- throw new RuntimeException(e);
+ return new TextFormattingsServiceImpl(pipeline);
+ }
+
+ Response boldText(String endpoint, RequestContext requestContext);
+
+ Response italicText(String endpoint, RequestContext requestContext);
+
+ Response combinedFormatting(String endpoint, RequestContext requestContext);
+ }
+
+ private static final class TextFormattingsServiceImpl implements TextFormattingsService {
+ private static final ClientLogger HTTP_LOG = new ClientLogger(TextFormattingsService.class);
+
+ private final HttpPipeline httpPipeline;
+
+ private final JsonSerializer jsonSerializer = JsonSerializer.getInstance();
+
+ private final XmlSerializer xmlSerializer = XmlSerializer.getInstance();
+
+ private TextFormattingsServiceImpl(HttpPipeline httpPipeline) {
+ this.httpPipeline = httpPipeline;
+ }
+
+ @Override
+ public Response boldText(String endpoint, RequestContext requestContext) {
+ HttpRequest httpRequest
+ = new HttpRequest().setMethod(HttpMethod.GET).setUri(endpoint + "/documentation/text-formatting/bold");
+ httpRequest.setContext(requestContext);
+ httpRequest.getContext().getRequestCallback().accept(httpRequest);
+ try (Response networkResponse = this.httpPipeline.send(httpRequest)) {
+ int responseCode = networkResponse.getStatusCode();
+ boolean expectedResponse = responseCode == 204;
+ if (!expectedResponse) {
+ GeneratedCodeUtils.handleUnexpectedResponse(responseCode, networkResponse, this.jsonSerializer,
+ this.xmlSerializer, null, null, HTTP_LOG);
+ }
+ return new Response<>(networkResponse.getRequest(), responseCode, networkResponse.getHeaders(), null);
}
+ }
+ @Override
+ public Response italicText(String endpoint, RequestContext requestContext) {
+ HttpRequest httpRequest = new HttpRequest().setMethod(HttpMethod.GET)
+ .setUri(endpoint + "/documentation/text-formatting/italic");
+ httpRequest.setContext(requestContext);
+ httpRequest.getContext().getRequestCallback().accept(httpRequest);
+ try (Response networkResponse = this.httpPipeline.send(httpRequest)) {
+ int responseCode = networkResponse.getStatusCode();
+ boolean expectedResponse = responseCode == 204;
+ if (!expectedResponse) {
+ GeneratedCodeUtils.handleUnexpectedResponse(responseCode, networkResponse, this.jsonSerializer,
+ this.xmlSerializer, null, null, HTTP_LOG);
+ }
+ return new Response<>(networkResponse.getRequest(), responseCode, networkResponse.getHeaders(), null);
+ }
}
- @HttpRequestInformation(
- method = HttpMethod.GET,
- path = "/documentation/text-formatting/bold",
- expectedStatusCodes = { 204 })
- @UnexpectedResponseExceptionDetail
- Response boldText(@HostParam("endpoint") String endpoint, RequestContext requestContext);
-
- @HttpRequestInformation(
- method = HttpMethod.GET,
- path = "/documentation/text-formatting/italic",
- expectedStatusCodes = { 204 })
- @UnexpectedResponseExceptionDetail
- Response italicText(@HostParam("endpoint") String endpoint, RequestContext requestContext);
-
- @HttpRequestInformation(
- method = HttpMethod.GET,
- path = "/documentation/text-formatting/combined",
- expectedStatusCodes = { 204 })
- @UnexpectedResponseExceptionDetail
- Response combinedFormatting(@HostParam("endpoint") String endpoint, RequestContext requestContext);
+ @Override
+ public Response combinedFormatting(String endpoint, RequestContext requestContext) {
+ HttpRequest httpRequest = new HttpRequest().setMethod(HttpMethod.GET)
+ .setUri(endpoint + "/documentation/text-formatting/combined");
+ httpRequest.setContext(requestContext);
+ httpRequest.getContext().getRequestCallback().accept(httpRequest);
+ try (Response networkResponse = this.httpPipeline.send(httpRequest)) {
+ int responseCode = networkResponse.getStatusCode();
+ boolean expectedResponse = responseCode == 204;
+ if (!expectedResponse) {
+ GeneratedCodeUtils.handleUnexpectedResponse(responseCode, networkResponse, this.jsonSerializer,
+ this.xmlSerializer, null, null, HTTP_LOG);
+ }
+ return new Response<>(networkResponse.getRequest(), responseCode, networkResponse.getHeaders(), null);
+ }
+ }
}
/**
diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/array/implementation/PropertiesImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/array/implementation/PropertiesImpl.java
index c7c1dfdecd5..dfaba413024 100644
--- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/array/implementation/PropertiesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/array/implementation/PropertiesImpl.java
@@ -13,20 +13,23 @@
import encode.array.SpaceDelimitedEnumArrayProperty;
import encode.array.SpaceDelimitedExtensibleEnumArrayProperty;
import io.clientcore.core.annotations.ReturnType;
-import io.clientcore.core.annotations.ServiceInterface;
import io.clientcore.core.annotations.ServiceMethod;
-import io.clientcore.core.http.annotations.BodyParam;
-import io.clientcore.core.http.annotations.HeaderParam;
-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.HttpHeaderName;
import io.clientcore.core.http.models.HttpMethod;
+import io.clientcore.core.http.models.HttpRequest;
import io.clientcore.core.http.models.HttpResponseException;
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.instrumentation.Instrumentation;
-import java.lang.reflect.InvocationTargetException;
+import io.clientcore.core.instrumentation.logging.ClientLogger;
+import io.clientcore.core.models.binarydata.BinaryData;
+import io.clientcore.core.serialization.SerializationFormat;
+import io.clientcore.core.serialization.json.JsonSerializer;
+import io.clientcore.core.serialization.xml.XmlSerializer;
+import io.clientcore.core.utils.CoreUtils;
+import io.clientcore.core.utils.GeneratedCodeUtils;
+import java.lang.reflect.ParameterizedType;
/**
* An instance of this class provides access to all the operations defined in Properties.
@@ -59,139 +62,445 @@ public final class PropertiesImpl {
}
/**
- * The interface defining all the services for ArrayClientProperties to be used by the proxy service to perform REST
- * calls.
+ * The HTTP operations for ArrayClientProperties.
*/
- @ServiceInterface(name = "ArrayClientProperties", host = "{endpoint}")
public interface PropertiesService {
static PropertiesService getNewInstance(HttpPipeline pipeline) {
- try {
- Class> clazz = Class.forName("encode.array.implementation.PropertiesServiceImpl");
- return (PropertiesService) clazz.getMethod("getNewInstance", HttpPipeline.class).invoke(null, pipeline);
- } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException
- | InvocationTargetException e) {
- throw new RuntimeException(e);
- }
-
+ return new PropertiesServiceImpl(pipeline);
}
- @HttpRequestInformation(
- method = HttpMethod.POST,
- path = "/encode/array/property/comma-delimited",
- expectedStatusCodes = { 200 })
- @UnexpectedResponseExceptionDetail
- Response commaDelimited(@HostParam("endpoint") String endpoint,
- @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
- @BodyParam("application/json") CommaDelimitedArrayProperty body, RequestContext requestContext);
-
- @HttpRequestInformation(
- method = HttpMethod.POST,
- path = "/encode/array/property/space-delimited",
- expectedStatusCodes = { 200 })
- @UnexpectedResponseExceptionDetail
- Response spaceDelimited(@HostParam("endpoint") String endpoint,
- @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
- @BodyParam("application/json") SpaceDelimitedArrayProperty body, RequestContext requestContext);
-
- @HttpRequestInformation(
- method = HttpMethod.POST,
- path = "/encode/array/property/pipe-delimited",
- expectedStatusCodes = { 200 })
- @UnexpectedResponseExceptionDetail
- Response pipeDelimited(@HostParam("endpoint") String endpoint,
- @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
- @BodyParam("application/json") PipeDelimitedArrayProperty body, RequestContext requestContext);
-
- @HttpRequestInformation(
- method = HttpMethod.POST,
- path = "/encode/array/property/newline-delimited",
- expectedStatusCodes = { 200 })
- @UnexpectedResponseExceptionDetail
- Response newlineDelimited(@HostParam("endpoint") String endpoint,
- @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
- @BodyParam("application/json") NewlineDelimitedArrayProperty body, RequestContext requestContext);
-
- @HttpRequestInformation(
- method = HttpMethod.POST,
- path = "/encode/array/property/enum/comma-delimited",
- expectedStatusCodes = { 200 })
- @UnexpectedResponseExceptionDetail
- Response enumCommaDelimited(@HostParam("endpoint") String endpoint,
- @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
- @BodyParam("application/json") CommaDelimitedEnumArrayProperty body, RequestContext requestContext);
-
- @HttpRequestInformation(
- method = HttpMethod.POST,
- path = "/encode/array/property/enum/space-delimited",
- expectedStatusCodes = { 200 })
- @UnexpectedResponseExceptionDetail
- Response enumSpaceDelimited(@HostParam("endpoint") String endpoint,
- @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
- @BodyParam("application/json") SpaceDelimitedEnumArrayProperty body, RequestContext requestContext);
-
- @HttpRequestInformation(
- method = HttpMethod.POST,
- path = "/encode/array/property/enum/pipe-delimited",
- expectedStatusCodes = { 200 })
- @UnexpectedResponseExceptionDetail
- Response enumPipeDelimited(@HostParam("endpoint") String endpoint,
- @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
- @BodyParam("application/json") PipeDelimitedEnumArrayProperty body, RequestContext requestContext);
-
- @HttpRequestInformation(
- method = HttpMethod.POST,
- path = "/encode/array/property/enum/newline-delimited",
- expectedStatusCodes = { 200 })
- @UnexpectedResponseExceptionDetail
- Response enumNewlineDelimited(@HostParam("endpoint") String endpoint,
- @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
- @BodyParam("application/json") NewlineDelimitedEnumArrayProperty body, RequestContext requestContext);
-
- @HttpRequestInformation(
- method = HttpMethod.POST,
- path = "/encode/array/property/extensible-enum/comma-delimited",
- expectedStatusCodes = { 200 })
- @UnexpectedResponseExceptionDetail
- Response extensibleEnumCommaDelimited(
- @HostParam("endpoint") String endpoint, @HeaderParam("Content-Type") String contentType,
- @HeaderParam("Accept") String accept,
- @BodyParam("application/json") CommaDelimitedExtensibleEnumArrayProperty body,
+ Response commaDelimited(String endpoint, String contentType, String accept,
+ CommaDelimitedArrayProperty body, RequestContext requestContext);
+
+ Response spaceDelimited(String endpoint, String contentType, String accept,
+ SpaceDelimitedArrayProperty body, RequestContext requestContext);
+
+ Response pipeDelimited(String endpoint, String contentType, String accept,
+ PipeDelimitedArrayProperty body, RequestContext requestContext);
+
+ Response newlineDelimited(String endpoint, String contentType, String accept,
+ NewlineDelimitedArrayProperty body, RequestContext requestContext);
+
+ Response enumCommaDelimited(String endpoint, String contentType, String accept,
+ CommaDelimitedEnumArrayProperty body, RequestContext requestContext);
+
+ Response enumSpaceDelimited(String endpoint, String contentType, String accept,
+ SpaceDelimitedEnumArrayProperty body, RequestContext requestContext);
+
+ Response enumPipeDelimited(String endpoint, String contentType, String accept,
+ PipeDelimitedEnumArrayProperty body, RequestContext requestContext);
+
+ Response enumNewlineDelimited(String endpoint, String contentType,
+ String accept, NewlineDelimitedEnumArrayProperty body, RequestContext requestContext);
+
+ Response extensibleEnumCommaDelimited(String endpoint,
+ String contentType, String accept, CommaDelimitedExtensibleEnumArrayProperty body,
RequestContext requestContext);
- @HttpRequestInformation(
- method = HttpMethod.POST,
- path = "/encode/array/property/extensible-enum/space-delimited",
- expectedStatusCodes = { 200 })
- @UnexpectedResponseExceptionDetail
- Response extensibleEnumSpaceDelimited(
- @HostParam("endpoint") String endpoint, @HeaderParam("Content-Type") String contentType,
- @HeaderParam("Accept") String accept,
- @BodyParam("application/json") SpaceDelimitedExtensibleEnumArrayProperty body,
+ Response extensibleEnumSpaceDelimited(String endpoint,
+ String contentType, String accept, SpaceDelimitedExtensibleEnumArrayProperty body,
RequestContext requestContext);
- @HttpRequestInformation(
- method = HttpMethod.POST,
- path = "/encode/array/property/extensible-enum/pipe-delimited",
- expectedStatusCodes = { 200 })
- @UnexpectedResponseExceptionDetail
- Response extensibleEnumPipeDelimited(
- @HostParam("endpoint") String endpoint, @HeaderParam("Content-Type") String contentType,
- @HeaderParam("Accept") String accept,
- @BodyParam("application/json") PipeDelimitedExtensibleEnumArrayProperty body,
+ Response extensibleEnumPipeDelimited(String endpoint,
+ String contentType, String accept, PipeDelimitedExtensibleEnumArrayProperty body,
RequestContext requestContext);
- @HttpRequestInformation(
- method = HttpMethod.POST,
- path = "/encode/array/property/extensible-enum/newline-delimited",
- expectedStatusCodes = { 200 })
- @UnexpectedResponseExceptionDetail
- Response extensibleEnumNewlineDelimited(
- @HostParam("endpoint") String endpoint, @HeaderParam("Content-Type") String contentType,
- @HeaderParam("Accept") String accept,
- @BodyParam("application/json") NewlineDelimitedExtensibleEnumArrayProperty body,
+ Response extensibleEnumNewlineDelimited(String endpoint,
+ String contentType, String accept, NewlineDelimitedExtensibleEnumArrayProperty body,
RequestContext requestContext);
}
+ private static final class PropertiesServiceImpl implements PropertiesService {
+ private static final ClientLogger HTTP_LOG = new ClientLogger(PropertiesService.class);
+
+ private final HttpPipeline httpPipeline;
+
+ private final JsonSerializer jsonSerializer = JsonSerializer.getInstance();
+
+ private final XmlSerializer xmlSerializer = XmlSerializer.getInstance();
+
+ private PropertiesServiceImpl(HttpPipeline httpPipeline) {
+ this.httpPipeline = httpPipeline;
+ }
+
+ @Override
+ public Response commaDelimited(String endpoint, String contentType, String accept,
+ CommaDelimitedArrayProperty body, RequestContext requestContext) {
+ HttpRequest httpRequest = new HttpRequest().setMethod(HttpMethod.POST)
+ .setUri(endpoint + "/encode/array/property/comma-delimited");
+ if (accept != null) {
+ httpRequest.getHeaders().add(HttpHeaderName.fromString("Accept"), accept);
+ }
+ if (body != null) {
+ httpRequest.getHeaders().set(HttpHeaderName.CONTENT_TYPE, contentType);
+ SerializationFormat requestFormat
+ = CoreUtils.serializationFormatFromContentType(httpRequest.getHeaders());
+ httpRequest.setBody(BinaryData.fromObject(body,
+ this.xmlSerializer.supportsFormat(requestFormat) ? this.xmlSerializer : this.jsonSerializer));
+ }
+ httpRequest.setContext(requestContext);
+ httpRequest.getContext().getRequestCallback().accept(httpRequest);
+ Response networkResponse = this.httpPipeline.send(httpRequest);
+ int responseCode = networkResponse.getStatusCode();
+ boolean expectedResponse = responseCode == 200;
+ if (!expectedResponse) {
+ GeneratedCodeUtils.handleUnexpectedResponse(responseCode, networkResponse, this.jsonSerializer,
+ this.xmlSerializer, null, null, HTTP_LOG);
+ }
+ return new Response<>(networkResponse.getRequest(), responseCode, networkResponse.getHeaders(),
+ this.decodeResponse(networkResponse.getValue(),
+ CoreUtils.createParameterizedType(Response.class, CommaDelimitedArrayProperty.class),
+ CoreUtils.serializationFormatFromContentType(networkResponse.getHeaders())));
+ }
+
+ @Override
+ public Response spaceDelimited(String endpoint, String contentType, String accept,
+ SpaceDelimitedArrayProperty body, RequestContext requestContext) {
+ HttpRequest httpRequest = new HttpRequest().setMethod(HttpMethod.POST)
+ .setUri(endpoint + "/encode/array/property/space-delimited");
+ if (accept != null) {
+ httpRequest.getHeaders().add(HttpHeaderName.fromString("Accept"), accept);
+ }
+ if (body != null) {
+ httpRequest.getHeaders().set(HttpHeaderName.CONTENT_TYPE, contentType);
+ SerializationFormat requestFormat
+ = CoreUtils.serializationFormatFromContentType(httpRequest.getHeaders());
+ httpRequest.setBody(BinaryData.fromObject(body,
+ this.xmlSerializer.supportsFormat(requestFormat) ? this.xmlSerializer : this.jsonSerializer));
+ }
+ httpRequest.setContext(requestContext);
+ httpRequest.getContext().getRequestCallback().accept(httpRequest);
+ Response networkResponse = this.httpPipeline.send(httpRequest);
+ int responseCode = networkResponse.getStatusCode();
+ boolean expectedResponse = responseCode == 200;
+ if (!expectedResponse) {
+ GeneratedCodeUtils.handleUnexpectedResponse(responseCode, networkResponse, this.jsonSerializer,
+ this.xmlSerializer, null, null, HTTP_LOG);
+ }
+ return new Response<>(networkResponse.getRequest(), responseCode, networkResponse.getHeaders(),
+ this.decodeResponse(networkResponse.getValue(),
+ CoreUtils.createParameterizedType(Response.class, SpaceDelimitedArrayProperty.class),
+ CoreUtils.serializationFormatFromContentType(networkResponse.getHeaders())));
+ }
+
+ @Override
+ public Response pipeDelimited(String endpoint, String contentType, String accept,
+ PipeDelimitedArrayProperty body, RequestContext requestContext) {
+ HttpRequest httpRequest = new HttpRequest().setMethod(HttpMethod.POST)
+ .setUri(endpoint + "/encode/array/property/pipe-delimited");
+ if (accept != null) {
+ httpRequest.getHeaders().add(HttpHeaderName.fromString("Accept"), accept);
+ }
+ if (body != null) {
+ httpRequest.getHeaders().set(HttpHeaderName.CONTENT_TYPE, contentType);
+ SerializationFormat requestFormat
+ = CoreUtils.serializationFormatFromContentType(httpRequest.getHeaders());
+ httpRequest.setBody(BinaryData.fromObject(body,
+ this.xmlSerializer.supportsFormat(requestFormat) ? this.xmlSerializer : this.jsonSerializer));
+ }
+ httpRequest.setContext(requestContext);
+ httpRequest.getContext().getRequestCallback().accept(httpRequest);
+ Response networkResponse = this.httpPipeline.send(httpRequest);
+ int responseCode = networkResponse.getStatusCode();
+ boolean expectedResponse = responseCode == 200;
+ if (!expectedResponse) {
+ GeneratedCodeUtils.handleUnexpectedResponse(responseCode, networkResponse, this.jsonSerializer,
+ this.xmlSerializer, null, null, HTTP_LOG);
+ }
+ return new Response<>(networkResponse.getRequest(), responseCode, networkResponse.getHeaders(),
+ this.decodeResponse(networkResponse.getValue(),
+ CoreUtils.createParameterizedType(Response.class, PipeDelimitedArrayProperty.class),
+ CoreUtils.serializationFormatFromContentType(networkResponse.getHeaders())));
+ }
+
+ @Override
+ public Response newlineDelimited(String endpoint, String contentType,
+ String accept, NewlineDelimitedArrayProperty body, RequestContext requestContext) {
+ HttpRequest httpRequest = new HttpRequest().setMethod(HttpMethod.POST)
+ .setUri(endpoint + "/encode/array/property/newline-delimited");
+ if (accept != null) {
+ httpRequest.getHeaders().add(HttpHeaderName.fromString("Accept"), accept);
+ }
+ if (body != null) {
+ httpRequest.getHeaders().set(HttpHeaderName.CONTENT_TYPE, contentType);
+ SerializationFormat requestFormat
+ = CoreUtils.serializationFormatFromContentType(httpRequest.getHeaders());
+ httpRequest.setBody(BinaryData.fromObject(body,
+ this.xmlSerializer.supportsFormat(requestFormat) ? this.xmlSerializer : this.jsonSerializer));
+ }
+ httpRequest.setContext(requestContext);
+ httpRequest.getContext().getRequestCallback().accept(httpRequest);
+ Response networkResponse = this.httpPipeline.send(httpRequest);
+ int responseCode = networkResponse.getStatusCode();
+ boolean expectedResponse = responseCode == 200;
+ if (!expectedResponse) {
+ GeneratedCodeUtils.handleUnexpectedResponse(responseCode, networkResponse, this.jsonSerializer,
+ this.xmlSerializer, null, null, HTTP_LOG);
+ }
+ return new Response<>(networkResponse.getRequest(), responseCode, networkResponse.getHeaders(),
+ this.decodeResponse(networkResponse.getValue(),
+ CoreUtils.createParameterizedType(Response.class, NewlineDelimitedArrayProperty.class),
+ CoreUtils.serializationFormatFromContentType(networkResponse.getHeaders())));
+ }
+
+ @Override
+ public Response enumCommaDelimited(String endpoint, String contentType,
+ String accept, CommaDelimitedEnumArrayProperty body, RequestContext requestContext) {
+ HttpRequest httpRequest = new HttpRequest().setMethod(HttpMethod.POST)
+ .setUri(endpoint + "/encode/array/property/enum/comma-delimited");
+ if (accept != null) {
+ httpRequest.getHeaders().add(HttpHeaderName.fromString("Accept"), accept);
+ }
+ if (body != null) {
+ httpRequest.getHeaders().set(HttpHeaderName.CONTENT_TYPE, contentType);
+ SerializationFormat requestFormat
+ = CoreUtils.serializationFormatFromContentType(httpRequest.getHeaders());
+ httpRequest.setBody(BinaryData.fromObject(body,
+ this.xmlSerializer.supportsFormat(requestFormat) ? this.xmlSerializer : this.jsonSerializer));
+ }
+ httpRequest.setContext(requestContext);
+ httpRequest.getContext().getRequestCallback().accept(httpRequest);
+ Response networkResponse = this.httpPipeline.send(httpRequest);
+ int responseCode = networkResponse.getStatusCode();
+ boolean expectedResponse = responseCode == 200;
+ if (!expectedResponse) {
+ GeneratedCodeUtils.handleUnexpectedResponse(responseCode, networkResponse, this.jsonSerializer,
+ this.xmlSerializer, null, null, HTTP_LOG);
+ }
+ return new Response<>(networkResponse.getRequest(), responseCode, networkResponse.getHeaders(),
+ this.decodeResponse(networkResponse.getValue(),
+ CoreUtils.createParameterizedType(Response.class, CommaDelimitedEnumArrayProperty.class),
+ CoreUtils.serializationFormatFromContentType(networkResponse.getHeaders())));
+ }
+
+ @Override
+ public Response enumSpaceDelimited(String endpoint, String contentType,
+ String accept, SpaceDelimitedEnumArrayProperty body, RequestContext requestContext) {
+ HttpRequest httpRequest = new HttpRequest().setMethod(HttpMethod.POST)
+ .setUri(endpoint + "/encode/array/property/enum/space-delimited");
+ if (accept != null) {
+ httpRequest.getHeaders().add(HttpHeaderName.fromString("Accept"), accept);
+ }
+ if (body != null) {
+ httpRequest.getHeaders().set(HttpHeaderName.CONTENT_TYPE, contentType);
+ SerializationFormat requestFormat
+ = CoreUtils.serializationFormatFromContentType(httpRequest.getHeaders());
+ httpRequest.setBody(BinaryData.fromObject(body,
+ this.xmlSerializer.supportsFormat(requestFormat) ? this.xmlSerializer : this.jsonSerializer));
+ }
+ httpRequest.setContext(requestContext);
+ httpRequest.getContext().getRequestCallback().accept(httpRequest);
+ Response networkResponse = this.httpPipeline.send(httpRequest);
+ int responseCode = networkResponse.getStatusCode();
+ boolean expectedResponse = responseCode == 200;
+ if (!expectedResponse) {
+ GeneratedCodeUtils.handleUnexpectedResponse(responseCode, networkResponse, this.jsonSerializer,
+ this.xmlSerializer, null, null, HTTP_LOG);
+ }
+ return new Response<>(networkResponse.getRequest(), responseCode, networkResponse.getHeaders(),
+ this.decodeResponse(networkResponse.getValue(),
+ CoreUtils.createParameterizedType(Response.class, SpaceDelimitedEnumArrayProperty.class),
+ CoreUtils.serializationFormatFromContentType(networkResponse.getHeaders())));
+ }
+
+ @Override
+ public Response enumPipeDelimited(String endpoint, String contentType,
+ String accept, PipeDelimitedEnumArrayProperty body, RequestContext requestContext) {
+ HttpRequest httpRequest = new HttpRequest().setMethod(HttpMethod.POST)
+ .setUri(endpoint + "/encode/array/property/enum/pipe-delimited");
+ if (accept != null) {
+ httpRequest.getHeaders().add(HttpHeaderName.fromString("Accept"), accept);
+ }
+ if (body != null) {
+ httpRequest.getHeaders().set(HttpHeaderName.CONTENT_TYPE, contentType);
+ SerializationFormat requestFormat
+ = CoreUtils.serializationFormatFromContentType(httpRequest.getHeaders());
+ httpRequest.setBody(BinaryData.fromObject(body,
+ this.xmlSerializer.supportsFormat(requestFormat) ? this.xmlSerializer : this.jsonSerializer));
+ }
+ httpRequest.setContext(requestContext);
+ httpRequest.getContext().getRequestCallback().accept(httpRequest);
+ Response networkResponse = this.httpPipeline.send(httpRequest);
+ int responseCode = networkResponse.getStatusCode();
+ boolean expectedResponse = responseCode == 200;
+ if (!expectedResponse) {
+ GeneratedCodeUtils.handleUnexpectedResponse(responseCode, networkResponse, this.jsonSerializer,
+ this.xmlSerializer, null, null, HTTP_LOG);
+ }
+ return new Response<>(networkResponse.getRequest(), responseCode, networkResponse.getHeaders(),
+ this.decodeResponse(networkResponse.getValue(),
+ CoreUtils.createParameterizedType(Response.class, PipeDelimitedEnumArrayProperty.class),
+ CoreUtils.serializationFormatFromContentType(networkResponse.getHeaders())));
+ }
+
+ @Override
+ public Response enumNewlineDelimited(String endpoint, String contentType,
+ String accept, NewlineDelimitedEnumArrayProperty body, RequestContext requestContext) {
+ HttpRequest httpRequest = new HttpRequest().setMethod(HttpMethod.POST)
+ .setUri(endpoint + "/encode/array/property/enum/newline-delimited");
+ if (accept != null) {
+ httpRequest.getHeaders().add(HttpHeaderName.fromString("Accept"), accept);
+ }
+ if (body != null) {
+ httpRequest.getHeaders().set(HttpHeaderName.CONTENT_TYPE, contentType);
+ SerializationFormat requestFormat
+ = CoreUtils.serializationFormatFromContentType(httpRequest.getHeaders());
+ httpRequest.setBody(BinaryData.fromObject(body,
+ this.xmlSerializer.supportsFormat(requestFormat) ? this.xmlSerializer : this.jsonSerializer));
+ }
+ httpRequest.setContext(requestContext);
+ httpRequest.getContext().getRequestCallback().accept(httpRequest);
+ Response networkResponse = this.httpPipeline.send(httpRequest);
+ int responseCode = networkResponse.getStatusCode();
+ boolean expectedResponse = responseCode == 200;
+ if (!expectedResponse) {
+ GeneratedCodeUtils.handleUnexpectedResponse(responseCode, networkResponse, this.jsonSerializer,
+ this.xmlSerializer, null, null, HTTP_LOG);
+ }
+ return new Response<>(networkResponse.getRequest(), responseCode, networkResponse.getHeaders(),
+ this.decodeResponse(networkResponse.getValue(),
+ CoreUtils.createParameterizedType(Response.class, NewlineDelimitedEnumArrayProperty.class),
+ CoreUtils.serializationFormatFromContentType(networkResponse.getHeaders())));
+ }
+
+ @Override
+ public Response extensibleEnumCommaDelimited(String endpoint,
+ String contentType, String accept, CommaDelimitedExtensibleEnumArrayProperty body,
+ RequestContext requestContext) {
+ HttpRequest httpRequest = new HttpRequest().setMethod(HttpMethod.POST)
+ .setUri(endpoint + "/encode/array/property/extensible-enum/comma-delimited");
+ if (accept != null) {
+ httpRequest.getHeaders().add(HttpHeaderName.fromString("Accept"), accept);
+ }
+ if (body != null) {
+ httpRequest.getHeaders().set(HttpHeaderName.CONTENT_TYPE, contentType);
+ SerializationFormat requestFormat
+ = CoreUtils.serializationFormatFromContentType(httpRequest.getHeaders());
+ httpRequest.setBody(BinaryData.fromObject(body,
+ this.xmlSerializer.supportsFormat(requestFormat) ? this.xmlSerializer : this.jsonSerializer));
+ }
+ httpRequest.setContext(requestContext);
+ httpRequest.getContext().getRequestCallback().accept(httpRequest);
+ Response networkResponse = this.httpPipeline.send(httpRequest);
+ int responseCode = networkResponse.getStatusCode();
+ boolean expectedResponse = responseCode == 200;
+ if (!expectedResponse) {
+ GeneratedCodeUtils.handleUnexpectedResponse(responseCode, networkResponse, this.jsonSerializer,
+ this.xmlSerializer, null, null, HTTP_LOG);
+ }
+ return new Response<>(networkResponse.getRequest(), responseCode, networkResponse.getHeaders(),
+ this.decodeResponse(networkResponse.getValue(),
+ CoreUtils.createParameterizedType(Response.class, CommaDelimitedExtensibleEnumArrayProperty.class),
+ CoreUtils.serializationFormatFromContentType(networkResponse.getHeaders())));
+ }
+
+ @Override
+ public Response extensibleEnumSpaceDelimited(String endpoint,
+ String contentType, String accept, SpaceDelimitedExtensibleEnumArrayProperty body,
+ RequestContext requestContext) {
+ HttpRequest httpRequest = new HttpRequest().setMethod(HttpMethod.POST)
+ .setUri(endpoint + "/encode/array/property/extensible-enum/space-delimited");
+ if (accept != null) {
+ httpRequest.getHeaders().add(HttpHeaderName.fromString("Accept"), accept);
+ }
+ if (body != null) {
+ httpRequest.getHeaders().set(HttpHeaderName.CONTENT_TYPE, contentType);
+ SerializationFormat requestFormat
+ = CoreUtils.serializationFormatFromContentType(httpRequest.getHeaders());
+ httpRequest.setBody(BinaryData.fromObject(body,
+ this.xmlSerializer.supportsFormat(requestFormat) ? this.xmlSerializer : this.jsonSerializer));
+ }
+ httpRequest.setContext(requestContext);
+ httpRequest.getContext().getRequestCallback().accept(httpRequest);
+ Response networkResponse = this.httpPipeline.send(httpRequest);
+ int responseCode = networkResponse.getStatusCode();
+ boolean expectedResponse = responseCode == 200;
+ if (!expectedResponse) {
+ GeneratedCodeUtils.handleUnexpectedResponse(responseCode, networkResponse, this.jsonSerializer,
+ this.xmlSerializer, null, null, HTTP_LOG);
+ }
+ return new Response<>(networkResponse.getRequest(), responseCode, networkResponse.getHeaders(),
+ this.decodeResponse(networkResponse.getValue(),
+ CoreUtils.createParameterizedType(Response.class, SpaceDelimitedExtensibleEnumArrayProperty.class),
+ CoreUtils.serializationFormatFromContentType(networkResponse.getHeaders())));
+ }
+
+ @Override
+ public Response extensibleEnumPipeDelimited(String endpoint,
+ String contentType, String accept, PipeDelimitedExtensibleEnumArrayProperty body,
+ RequestContext requestContext) {
+ HttpRequest httpRequest = new HttpRequest().setMethod(HttpMethod.POST)
+ .setUri(endpoint + "/encode/array/property/extensible-enum/pipe-delimited");
+ if (accept != null) {
+ httpRequest.getHeaders().add(HttpHeaderName.fromString("Accept"), accept);
+ }
+ if (body != null) {
+ httpRequest.getHeaders().set(HttpHeaderName.CONTENT_TYPE, contentType);
+ SerializationFormat requestFormat
+ = CoreUtils.serializationFormatFromContentType(httpRequest.getHeaders());
+ httpRequest.setBody(BinaryData.fromObject(body,
+ this.xmlSerializer.supportsFormat(requestFormat) ? this.xmlSerializer : this.jsonSerializer));
+ }
+ httpRequest.setContext(requestContext);
+ httpRequest.getContext().getRequestCallback().accept(httpRequest);
+ Response networkResponse = this.httpPipeline.send(httpRequest);
+ int responseCode = networkResponse.getStatusCode();
+ boolean expectedResponse = responseCode == 200;
+ if (!expectedResponse) {
+ GeneratedCodeUtils.handleUnexpectedResponse(responseCode, networkResponse, this.jsonSerializer,
+ this.xmlSerializer, null, null, HTTP_LOG);
+ }
+ return new Response<>(networkResponse.getRequest(), responseCode, networkResponse.getHeaders(),
+ this.decodeResponse(networkResponse.getValue(),
+ CoreUtils.createParameterizedType(Response.class, PipeDelimitedExtensibleEnumArrayProperty.class),
+ CoreUtils.serializationFormatFromContentType(networkResponse.getHeaders())));
+ }
+
+ @Override
+ public Response extensibleEnumNewlineDelimited(String endpoint,
+ String contentType, String accept, NewlineDelimitedExtensibleEnumArrayProperty body,
+ RequestContext requestContext) {
+ HttpRequest httpRequest = new HttpRequest().setMethod(HttpMethod.POST)
+ .setUri(endpoint + "/encode/array/property/extensible-enum/newline-delimited");
+ if (accept != null) {
+ httpRequest.getHeaders().add(HttpHeaderName.fromString("Accept"), accept);
+ }
+ if (body != null) {
+ httpRequest.getHeaders().set(HttpHeaderName.CONTENT_TYPE, contentType);
+ SerializationFormat requestFormat
+ = CoreUtils.serializationFormatFromContentType(httpRequest.getHeaders());
+ httpRequest.setBody(BinaryData.fromObject(body,
+ this.xmlSerializer.supportsFormat(requestFormat) ? this.xmlSerializer : this.jsonSerializer));
+ }
+ httpRequest.setContext(requestContext);
+ httpRequest.getContext().getRequestCallback().accept(httpRequest);
+ Response networkResponse = this.httpPipeline.send(httpRequest);
+ int responseCode = networkResponse.getStatusCode();
+ boolean expectedResponse = responseCode == 200;
+ if (!expectedResponse) {
+ GeneratedCodeUtils.handleUnexpectedResponse(responseCode, networkResponse, this.jsonSerializer,
+ this.xmlSerializer, null, null, HTTP_LOG);
+ }
+ return new Response<>(networkResponse.getRequest(), responseCode, networkResponse.getHeaders(),
+ this.decodeResponse(networkResponse.getValue(),
+ CoreUtils.createParameterizedType(Response.class,
+ NewlineDelimitedExtensibleEnumArrayProperty.class),
+ CoreUtils.serializationFormatFromContentType(networkResponse.getHeaders())));
+ }
+
+ private T decodeResponse(BinaryData value, ParameterizedType type, SerializationFormat format) {
+ if (this.jsonSerializer.supportsFormat(format)) {
+ return CoreUtils.decodeNetworkResponse(value, this.jsonSerializer, type);
+ }
+ if (this.xmlSerializer.supportsFormat(format)) {
+ return CoreUtils.decodeNetworkResponse(value, this.xmlSerializer, type);
+ }
+ throw HTTP_LOG.throwableAtError()
+ .addKeyValue("serializationFormat", format.name())
+ .log("None of the provided serializers support the format.", UnsupportedOperationException::new);
+ }
+ }
+
/**
* The commaDelimited operation.
*
diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/booleannamespace/implementation/PropertiesImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/booleannamespace/implementation/PropertiesImpl.java
index b9488a092de..dc3d318735d 100644
--- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/booleannamespace/implementation/PropertiesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/booleannamespace/implementation/PropertiesImpl.java
@@ -2,20 +2,23 @@
import encode.booleannamespace.property.BoolAsStringProperty;
import io.clientcore.core.annotations.ReturnType;
-import io.clientcore.core.annotations.ServiceInterface;
import io.clientcore.core.annotations.ServiceMethod;
-import io.clientcore.core.http.annotations.BodyParam;
-import io.clientcore.core.http.annotations.HeaderParam;
-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.HttpHeaderName;
import io.clientcore.core.http.models.HttpMethod;
+import io.clientcore.core.http.models.HttpRequest;
import io.clientcore.core.http.models.HttpResponseException;
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.instrumentation.Instrumentation;
-import java.lang.reflect.InvocationTargetException;
+import io.clientcore.core.instrumentation.logging.ClientLogger;
+import io.clientcore.core.models.binarydata.BinaryData;
+import io.clientcore.core.serialization.SerializationFormat;
+import io.clientcore.core.serialization.json.JsonSerializer;
+import io.clientcore.core.serialization.xml.XmlSerializer;
+import io.clientcore.core.utils.CoreUtils;
+import io.clientcore.core.utils.GeneratedCodeUtils;
+import java.lang.reflect.ParameterizedType;
/**
* An instance of this class provides access to all the operations defined in Properties.
@@ -48,57 +51,170 @@ public final class PropertiesImpl {
}
/**
- * The interface defining all the services for BooleanClientProperties to be used by the proxy service to perform
- * REST calls.
+ * The HTTP operations for BooleanClientProperties.
*/
- @ServiceInterface(name = "BooleanClientProperties", host = "{endpoint}")
public interface PropertiesService {
static PropertiesService getNewInstance(HttpPipeline pipeline) {
- try {
- Class> clazz = Class.forName("encode.booleannamespace.implementation.PropertiesServiceImpl");
- return (PropertiesService) clazz.getMethod("getNewInstance", HttpPipeline.class).invoke(null, pipeline);
- } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException
- | InvocationTargetException e) {
- throw new RuntimeException(e);
+ return new PropertiesServiceImpl(pipeline);
+ }
+
+ Response trueLower(String endpoint, String contentType, String accept,
+ BoolAsStringProperty value, RequestContext requestContext);
+
+ Response falseLower(String endpoint, String contentType, String accept,
+ BoolAsStringProperty value, RequestContext requestContext);
+
+ Response trueUpper(String endpoint, String contentType, String accept,
+ BoolAsStringProperty value, RequestContext requestContext);
+
+ Response falseMixed(String endpoint, String contentType, String accept,
+ BoolAsStringProperty value, RequestContext requestContext);
+ }
+
+ private static final class PropertiesServiceImpl implements PropertiesService {
+ private static final ClientLogger HTTP_LOG = new ClientLogger(PropertiesService.class);
+
+ private final HttpPipeline httpPipeline;
+
+ private final JsonSerializer jsonSerializer = JsonSerializer.getInstance();
+
+ private final XmlSerializer xmlSerializer = XmlSerializer.getInstance();
+
+ private PropertiesServiceImpl(HttpPipeline httpPipeline) {
+ this.httpPipeline = httpPipeline;
+ }
+
+ @Override
+ public Response trueLower(String endpoint, String contentType, String accept,
+ BoolAsStringProperty value, RequestContext requestContext) {
+ HttpRequest httpRequest
+ = new HttpRequest().setMethod(HttpMethod.POST).setUri(endpoint + "/encode/boolean/property/true-lower");
+ if (accept != null) {
+ httpRequest.getHeaders().add(HttpHeaderName.fromString("Accept"), accept);
+ }
+ if (value != null) {
+ httpRequest.getHeaders().set(HttpHeaderName.CONTENT_TYPE, contentType);
+ SerializationFormat requestFormat
+ = CoreUtils.serializationFormatFromContentType(httpRequest.getHeaders());
+ httpRequest.setBody(BinaryData.fromObject(value,
+ this.xmlSerializer.supportsFormat(requestFormat) ? this.xmlSerializer : this.jsonSerializer));
+ }
+ httpRequest.setContext(requestContext);
+ httpRequest.getContext().getRequestCallback().accept(httpRequest);
+ Response networkResponse = this.httpPipeline.send(httpRequest);
+ int responseCode = networkResponse.getStatusCode();
+ boolean expectedResponse = responseCode == 200;
+ if (!expectedResponse) {
+ GeneratedCodeUtils.handleUnexpectedResponse(responseCode, networkResponse, this.jsonSerializer,
+ this.xmlSerializer, null, null, HTTP_LOG);
+ }
+ return new Response<>(networkResponse.getRequest(), responseCode, networkResponse.getHeaders(),
+ this.decodeResponse(networkResponse.getValue(),
+ CoreUtils.createParameterizedType(Response.class, BoolAsStringProperty.class),
+ CoreUtils.serializationFormatFromContentType(networkResponse.getHeaders())));
+ }
+
+ @Override
+ public Response falseLower(String endpoint, String contentType, String accept,
+ BoolAsStringProperty value, RequestContext requestContext) {
+ HttpRequest httpRequest = new HttpRequest().setMethod(HttpMethod.POST)
+ .setUri(endpoint + "/encode/boolean/property/false-lower");
+ if (accept != null) {
+ httpRequest.getHeaders().add(HttpHeaderName.fromString("Accept"), accept);
+ }
+ if (value != null) {
+ httpRequest.getHeaders().set(HttpHeaderName.CONTENT_TYPE, contentType);
+ SerializationFormat requestFormat
+ = CoreUtils.serializationFormatFromContentType(httpRequest.getHeaders());
+ httpRequest.setBody(BinaryData.fromObject(value,
+ this.xmlSerializer.supportsFormat(requestFormat) ? this.xmlSerializer : this.jsonSerializer));
+ }
+ httpRequest.setContext(requestContext);
+ httpRequest.getContext().getRequestCallback().accept(httpRequest);
+ Response networkResponse = this.httpPipeline.send(httpRequest);
+ int responseCode = networkResponse.getStatusCode();
+ boolean expectedResponse = responseCode == 200;
+ if (!expectedResponse) {
+ GeneratedCodeUtils.handleUnexpectedResponse(responseCode, networkResponse, this.jsonSerializer,
+ this.xmlSerializer, null, null, HTTP_LOG);
+ }
+ return new Response<>(networkResponse.getRequest(), responseCode, networkResponse.getHeaders(),
+ this.decodeResponse(networkResponse.getValue(),
+ CoreUtils.createParameterizedType(Response.class, BoolAsStringProperty.class),
+ CoreUtils.serializationFormatFromContentType(networkResponse.getHeaders())));
+ }
+
+ @Override
+ public Response trueUpper(String endpoint, String contentType, String accept,
+ BoolAsStringProperty value, RequestContext requestContext) {
+ HttpRequest httpRequest
+ = new HttpRequest().setMethod(HttpMethod.POST).setUri(endpoint + "/encode/boolean/property/true-upper");
+ if (accept != null) {
+ httpRequest.getHeaders().add(HttpHeaderName.fromString("Accept"), accept);
+ }
+ if (value != null) {
+ httpRequest.getHeaders().set(HttpHeaderName.CONTENT_TYPE, contentType);
+ SerializationFormat requestFormat
+ = CoreUtils.serializationFormatFromContentType(httpRequest.getHeaders());
+ httpRequest.setBody(BinaryData.fromObject(value,
+ this.xmlSerializer.supportsFormat(requestFormat) ? this.xmlSerializer : this.jsonSerializer));
}
+ httpRequest.setContext(requestContext);
+ httpRequest.getContext().getRequestCallback().accept(httpRequest);
+ Response networkResponse = this.httpPipeline.send(httpRequest);
+ int responseCode = networkResponse.getStatusCode();
+ boolean expectedResponse = responseCode == 200;
+ if (!expectedResponse) {
+ GeneratedCodeUtils.handleUnexpectedResponse(responseCode, networkResponse, this.jsonSerializer,
+ this.xmlSerializer, null, null, HTTP_LOG);
+ }
+ return new Response<>(networkResponse.getRequest(), responseCode, networkResponse.getHeaders(),
+ this.decodeResponse(networkResponse.getValue(),
+ CoreUtils.createParameterizedType(Response.class, BoolAsStringProperty.class),
+ CoreUtils.serializationFormatFromContentType(networkResponse.getHeaders())));
+ }
+ @Override
+ public Response falseMixed(String endpoint, String contentType, String accept,
+ BoolAsStringProperty value, RequestContext requestContext) {
+ HttpRequest httpRequest = new HttpRequest().setMethod(HttpMethod.POST)
+ .setUri(endpoint + "/encode/boolean/property/false-mixed");
+ if (accept != null) {
+ httpRequest.getHeaders().add(HttpHeaderName.fromString("Accept"), accept);
+ }
+ if (value != null) {
+ httpRequest.getHeaders().set(HttpHeaderName.CONTENT_TYPE, contentType);
+ SerializationFormat requestFormat
+ = CoreUtils.serializationFormatFromContentType(httpRequest.getHeaders());
+ httpRequest.setBody(BinaryData.fromObject(value,
+ this.xmlSerializer.supportsFormat(requestFormat) ? this.xmlSerializer : this.jsonSerializer));
+ }
+ httpRequest.setContext(requestContext);
+ httpRequest.getContext().getRequestCallback().accept(httpRequest);
+ Response networkResponse = this.httpPipeline.send(httpRequest);
+ int responseCode = networkResponse.getStatusCode();
+ boolean expectedResponse = responseCode == 200;
+ if (!expectedResponse) {
+ GeneratedCodeUtils.handleUnexpectedResponse(responseCode, networkResponse, this.jsonSerializer,
+ this.xmlSerializer, null, null, HTTP_LOG);
+ }
+ return new Response<>(networkResponse.getRequest(), responseCode, networkResponse.getHeaders(),
+ this.decodeResponse(networkResponse.getValue(),
+ CoreUtils.createParameterizedType(Response.class, BoolAsStringProperty.class),
+ CoreUtils.serializationFormatFromContentType(networkResponse.getHeaders())));
}
- @HttpRequestInformation(
- method = HttpMethod.POST,
- path = "/encode/boolean/property/true-lower",
- expectedStatusCodes = { 200 })
- @UnexpectedResponseExceptionDetail
- Response trueLower(@HostParam("endpoint") String endpoint,
- @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
- @BodyParam("application/json") BoolAsStringProperty value, RequestContext requestContext);
-
- @HttpRequestInformation(
- method = HttpMethod.POST,
- path = "/encode/boolean/property/false-lower",
- expectedStatusCodes = { 200 })
- @UnexpectedResponseExceptionDetail
- Response falseLower(@HostParam("endpoint") String endpoint,
- @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
- @BodyParam("application/json") BoolAsStringProperty value, RequestContext requestContext);
-
- @HttpRequestInformation(
- method = HttpMethod.POST,
- path = "/encode/boolean/property/true-upper",
- expectedStatusCodes = { 200 })
- @UnexpectedResponseExceptionDetail
- Response trueUpper(@HostParam("endpoint") String endpoint,
- @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
- @BodyParam("application/json") BoolAsStringProperty value, RequestContext requestContext);
-
- @HttpRequestInformation(
- method = HttpMethod.POST,
- path = "/encode/boolean/property/false-mixed",
- expectedStatusCodes = { 200 })
- @UnexpectedResponseExceptionDetail
- Response falseMixed(@HostParam("endpoint") String endpoint,
- @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
- @BodyParam("application/json") BoolAsStringProperty value, RequestContext requestContext);
+ private T decodeResponse(BinaryData value, ParameterizedType type, SerializationFormat format) {
+ if (this.jsonSerializer.supportsFormat(format)) {
+ return CoreUtils.decodeNetworkResponse(value, this.jsonSerializer, type);
+ }
+ if (this.xmlSerializer.supportsFormat(format)) {
+ return CoreUtils.decodeNetworkResponse(value, this.xmlSerializer, type);
+ }
+ throw HTTP_LOG.throwableAtError()
+ .addKeyValue("serializationFormat", format.name())
+ .log("None of the provided serializers support the format.", UnsupportedOperationException::new);
+ }
}
/**
diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/bytes/implementation/HeadersImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/bytes/implementation/HeadersImpl.java
index e909dfc993a..32fd7b0c5b9 100644
--- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/bytes/implementation/HeadersImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/bytes/implementation/HeadersImpl.java
@@ -1,21 +1,21 @@
package encode.bytes.implementation;
import io.clientcore.core.annotations.ReturnType;
-import io.clientcore.core.annotations.ServiceInterface;
import io.clientcore.core.annotations.ServiceMethod;
-import io.clientcore.core.http.annotations.HeaderParam;
-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.HttpHeaderName;
import io.clientcore.core.http.models.HttpMethod;
+import io.clientcore.core.http.models.HttpRequest;
import io.clientcore.core.http.models.HttpResponseException;
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.instrumentation.Instrumentation;
+import io.clientcore.core.instrumentation.logging.ClientLogger;
import io.clientcore.core.models.binarydata.BinaryData;
+import io.clientcore.core.serialization.json.JsonSerializer;
+import io.clientcore.core.serialization.xml.XmlSerializer;
import io.clientcore.core.utils.Base64Uri;
-import java.lang.reflect.InvocationTargetException;
+import io.clientcore.core.utils.GeneratedCodeUtils;
import java.util.Base64;
import java.util.List;
import java.util.stream.Collectors;
@@ -51,53 +51,114 @@ public final class HeadersImpl {
}
/**
- * The interface defining all the services for BytesClientHeaders to be used by the proxy service to perform REST
- * calls.
+ * The HTTP operations for BytesClientHeaders.
*/
- @ServiceInterface(name = "BytesClientHeaders", host = "{endpoint}")
public interface HeadersService {
static HeadersService getNewInstance(HttpPipeline pipeline) {
- try {
- Class> clazz = Class.forName("encode.bytes.implementation.HeadersServiceImpl");
- return (HeadersService) clazz.getMethod("getNewInstance", HttpPipeline.class).invoke(null, pipeline);
- } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException
- | InvocationTargetException e) {
- throw new RuntimeException(e);
+ return new HeadersServiceImpl(pipeline);
+ }
+
+ Response defaultMethod(String endpoint, String value, RequestContext requestContext);
+
+ Response base64(String endpoint, String value, RequestContext requestContext);
+
+ Response base64url(String endpoint, Base64Uri value, RequestContext requestContext);
+
+ Response base64urlArray(String endpoint, String value, RequestContext requestContext);
+ }
+
+ private static final class HeadersServiceImpl implements HeadersService {
+ private static final ClientLogger HTTP_LOG = new ClientLogger(HeadersService.class);
+
+ private final HttpPipeline httpPipeline;
+
+ private final JsonSerializer jsonSerializer = JsonSerializer.getInstance();
+
+ private final XmlSerializer xmlSerializer = XmlSerializer.getInstance();
+
+ private HeadersServiceImpl(HttpPipeline httpPipeline) {
+ this.httpPipeline = httpPipeline;
+ }
+
+ @Override
+ public Response defaultMethod(String endpoint, String value, RequestContext requestContext) {
+ HttpRequest httpRequest
+ = new HttpRequest().setMethod(HttpMethod.GET).setUri(endpoint + "/encode/bytes/header/default");
+ if (value != null) {
+ httpRequest.getHeaders().add(HttpHeaderName.fromString("value"), value);
+ }
+ httpRequest.setContext(requestContext);
+ httpRequest.getContext().getRequestCallback().accept(httpRequest);
+ try (Response networkResponse = this.httpPipeline.send(httpRequest)) {
+ int responseCode = networkResponse.getStatusCode();
+ boolean expectedResponse = responseCode == 204;
+ if (!expectedResponse) {
+ GeneratedCodeUtils.handleUnexpectedResponse(responseCode, networkResponse, this.jsonSerializer,
+ this.xmlSerializer, null, null, HTTP_LOG);
+ }
+ return new Response<>(networkResponse.getRequest(), responseCode, networkResponse.getHeaders(), null);
+ }
+ }
+
+ @Override
+ public Response base64(String endpoint, String value, RequestContext requestContext) {
+ HttpRequest httpRequest
+ = new HttpRequest().setMethod(HttpMethod.GET).setUri(endpoint + "/encode/bytes/header/base64");
+ if (value != null) {
+ httpRequest.getHeaders().add(HttpHeaderName.fromString("value"), value);
+ }
+ httpRequest.setContext(requestContext);
+ httpRequest.getContext().getRequestCallback().accept(httpRequest);
+ try (Response networkResponse = this.httpPipeline.send(httpRequest)) {
+ int responseCode = networkResponse.getStatusCode();
+ boolean expectedResponse = responseCode == 204;
+ if (!expectedResponse) {
+ GeneratedCodeUtils.handleUnexpectedResponse(responseCode, networkResponse, this.jsonSerializer,
+ this.xmlSerializer, null, null, HTTP_LOG);
+ }
+ return new Response<>(networkResponse.getRequest(), responseCode, networkResponse.getHeaders(), null);
}
+ }
+ @Override
+ public Response base64url(String endpoint, Base64Uri value, RequestContext requestContext) {
+ HttpRequest httpRequest
+ = new HttpRequest().setMethod(HttpMethod.GET).setUri(endpoint + "/encode/bytes/header/base64url");
+ if (value != null) {
+ httpRequest.getHeaders().add(HttpHeaderName.fromString("value"), String.valueOf(value));
+ }
+ httpRequest.setContext(requestContext);
+ httpRequest.getContext().getRequestCallback().accept(httpRequest);
+ try (Response networkResponse = this.httpPipeline.send(httpRequest)) {
+ int responseCode = networkResponse.getStatusCode();
+ boolean expectedResponse = responseCode == 204;
+ if (!expectedResponse) {
+ GeneratedCodeUtils.handleUnexpectedResponse(responseCode, networkResponse, this.jsonSerializer,
+ this.xmlSerializer, null, null, HTTP_LOG);
+ }
+ return new Response<>(networkResponse.getRequest(), responseCode, networkResponse.getHeaders(), null);
+ }
}
- @HttpRequestInformation(
- method = HttpMethod.GET,
- path = "/encode/bytes/header/default",
- expectedStatusCodes = { 204 })
- @UnexpectedResponseExceptionDetail
- Response defaultMethod(@HostParam("endpoint") String endpoint, @HeaderParam("value") String value,
- RequestContext requestContext);
-
- @HttpRequestInformation(
- method = HttpMethod.GET,
- path = "/encode/bytes/header/base64",
- expectedStatusCodes = { 204 })
- @UnexpectedResponseExceptionDetail
- Response base64(@HostParam("endpoint") String endpoint, @HeaderParam("value") String value,
- RequestContext requestContext);
-
- @HttpRequestInformation(
- method = HttpMethod.GET,
- path = "/encode/bytes/header/base64url",
- expectedStatusCodes = { 204 })
- @UnexpectedResponseExceptionDetail
- Response base64url(@HostParam("endpoint") String endpoint, @HeaderParam("value") Base64Uri value,
- RequestContext requestContext);
-
- @HttpRequestInformation(
- method = HttpMethod.GET,
- path = "/encode/bytes/header/base64url-array",
- expectedStatusCodes = { 204 })
- @UnexpectedResponseExceptionDetail
- Response base64urlArray(@HostParam("endpoint") String endpoint, @HeaderParam("value") String value,
- RequestContext requestContext);
+ @Override
+ public Response base64urlArray(String endpoint, String value, RequestContext requestContext) {
+ HttpRequest httpRequest
+ = new HttpRequest().setMethod(HttpMethod.GET).setUri(endpoint + "/encode/bytes/header/base64url-array");
+ if (value != null) {
+ httpRequest.getHeaders().add(HttpHeaderName.fromString("value"), value);
+ }
+ httpRequest.setContext(requestContext);
+ httpRequest.getContext().getRequestCallback().accept(httpRequest);
+ try (Response networkResponse = this.httpPipeline.send(httpRequest)) {
+ int responseCode = networkResponse.getStatusCode();
+ boolean expectedResponse = responseCode == 204;
+ if (!expectedResponse) {
+ GeneratedCodeUtils.handleUnexpectedResponse(responseCode, networkResponse, this.jsonSerializer,
+ this.xmlSerializer, null, null, HTTP_LOG);
+ }
+ return new Response<>(networkResponse.getRequest(), responseCode, networkResponse.getHeaders(), null);
+ }
+ }
}
/**
diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/bytes/implementation/PropertiesImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/bytes/implementation/PropertiesImpl.java
index 572df90a61f..c9bd07f593f 100644
--- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/bytes/implementation/PropertiesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/bytes/implementation/PropertiesImpl.java
@@ -5,20 +5,23 @@
import encode.bytes.Base64urlBytesProperty;
import encode.bytes.DefaultBytesProperty;
import io.clientcore.core.annotations.ReturnType;
-import io.clientcore.core.annotations.ServiceInterface;
import io.clientcore.core.annotations.ServiceMethod;
-import io.clientcore.core.http.annotations.BodyParam;
-import io.clientcore.core.http.annotations.HeaderParam;
-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.HttpHeaderName;
import io.clientcore.core.http.models.HttpMethod;
+import io.clientcore.core.http.models.HttpRequest;
import io.clientcore.core.http.models.HttpResponseException;
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.instrumentation.Instrumentation;
-import java.lang.reflect.InvocationTargetException;
+import io.clientcore.core.instrumentation.logging.ClientLogger;
+import io.clientcore.core.models.binarydata.BinaryData;
+import io.clientcore.core.serialization.SerializationFormat;
+import io.clientcore.core.serialization.json.JsonSerializer;
+import io.clientcore.core.serialization.xml.XmlSerializer;
+import io.clientcore.core.utils.CoreUtils;
+import io.clientcore.core.utils.GeneratedCodeUtils;
+import java.lang.reflect.ParameterizedType;
/**
* An instance of this class provides access to all the operations defined in Properties.
@@ -51,57 +54,170 @@ public final class PropertiesImpl {
}
/**
- * The interface defining all the services for BytesClientProperties to be used by the proxy service to perform REST
- * calls.
+ * The HTTP operations for BytesClientProperties.
*/
- @ServiceInterface(name = "BytesClientProperties", host = "{endpoint}")
public interface PropertiesService {
static PropertiesService getNewInstance(HttpPipeline pipeline) {
- try {
- Class> clazz = Class.forName("encode.bytes.implementation.PropertiesServiceImpl");
- return (PropertiesService) clazz.getMethod("getNewInstance", HttpPipeline.class).invoke(null, pipeline);
- } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException
- | InvocationTargetException e) {
- throw new RuntimeException(e);
+ return new PropertiesServiceImpl(pipeline);
+ }
+
+ Response defaultMethod(String endpoint, String contentType, String accept,
+ DefaultBytesProperty body, RequestContext requestContext);
+
+ Response base64(String endpoint, String contentType, String accept,
+ Base64BytesProperty body, RequestContext requestContext);
+
+ Response base64url(String endpoint, String contentType, String accept,
+ Base64urlBytesProperty body, RequestContext requestContext);
+
+ Response base64urlArray(String endpoint, String contentType, String accept,
+ Base64urlArrayBytesProperty body, RequestContext requestContext);
+ }
+
+ private static final class PropertiesServiceImpl implements PropertiesService {
+ private static final ClientLogger HTTP_LOG = new ClientLogger(PropertiesService.class);
+
+ private final HttpPipeline httpPipeline;
+
+ private final JsonSerializer jsonSerializer = JsonSerializer.getInstance();
+
+ private final XmlSerializer xmlSerializer = XmlSerializer.getInstance();
+
+ private PropertiesServiceImpl(HttpPipeline httpPipeline) {
+ this.httpPipeline = httpPipeline;
+ }
+
+ @Override
+ public Response defaultMethod(String endpoint, String contentType, String accept,
+ DefaultBytesProperty body, RequestContext requestContext) {
+ HttpRequest httpRequest
+ = new HttpRequest().setMethod(HttpMethod.POST).setUri(endpoint + "/encode/bytes/property/default");
+ if (accept != null) {
+ httpRequest.getHeaders().add(HttpHeaderName.fromString("Accept"), accept);
+ }
+ if (body != null) {
+ httpRequest.getHeaders().set(HttpHeaderName.CONTENT_TYPE, contentType);
+ SerializationFormat requestFormat
+ = CoreUtils.serializationFormatFromContentType(httpRequest.getHeaders());
+ httpRequest.setBody(BinaryData.fromObject(body,
+ this.xmlSerializer.supportsFormat(requestFormat) ? this.xmlSerializer : this.jsonSerializer));
+ }
+ httpRequest.setContext(requestContext);
+ httpRequest.getContext().getRequestCallback().accept(httpRequest);
+ Response networkResponse = this.httpPipeline.send(httpRequest);
+ int responseCode = networkResponse.getStatusCode();
+ boolean expectedResponse = responseCode == 200;
+ if (!expectedResponse) {
+ GeneratedCodeUtils.handleUnexpectedResponse(responseCode, networkResponse, this.jsonSerializer,
+ this.xmlSerializer, null, null, HTTP_LOG);
+ }
+ return new Response<>(networkResponse.getRequest(), responseCode, networkResponse.getHeaders(),
+ this.decodeResponse(networkResponse.getValue(),
+ CoreUtils.createParameterizedType(Response.class, DefaultBytesProperty.class),
+ CoreUtils.serializationFormatFromContentType(networkResponse.getHeaders())));
+ }
+
+ @Override
+ public Response base64(String endpoint, String contentType, String accept,
+ Base64BytesProperty body, RequestContext requestContext) {
+ HttpRequest httpRequest
+ = new HttpRequest().setMethod(HttpMethod.POST).setUri(endpoint + "/encode/bytes/property/base64");
+ if (accept != null) {
+ httpRequest.getHeaders().add(HttpHeaderName.fromString("Accept"), accept);
+ }
+ if (body != null) {
+ httpRequest.getHeaders().set(HttpHeaderName.CONTENT_TYPE, contentType);
+ SerializationFormat requestFormat
+ = CoreUtils.serializationFormatFromContentType(httpRequest.getHeaders());
+ httpRequest.setBody(BinaryData.fromObject(body,
+ this.xmlSerializer.supportsFormat(requestFormat) ? this.xmlSerializer : this.jsonSerializer));
+ }
+ httpRequest.setContext(requestContext);
+ httpRequest.getContext().getRequestCallback().accept(httpRequest);
+ Response networkResponse = this.httpPipeline.send(httpRequest);
+ int responseCode = networkResponse.getStatusCode();
+ boolean expectedResponse = responseCode == 200;
+ if (!expectedResponse) {
+ GeneratedCodeUtils.handleUnexpectedResponse(responseCode, networkResponse, this.jsonSerializer,
+ this.xmlSerializer, null, null, HTTP_LOG);
+ }
+ return new Response<>(networkResponse.getRequest(), responseCode, networkResponse.getHeaders(),
+ this.decodeResponse(networkResponse.getValue(),
+ CoreUtils.createParameterizedType(Response.class, Base64BytesProperty.class),
+ CoreUtils.serializationFormatFromContentType(networkResponse.getHeaders())));
+ }
+
+ @Override
+ public Response base64url(String endpoint, String contentType, String accept,
+ Base64urlBytesProperty body, RequestContext requestContext) {
+ HttpRequest httpRequest
+ = new HttpRequest().setMethod(HttpMethod.POST).setUri(endpoint + "/encode/bytes/property/base64url");
+ if (accept != null) {
+ httpRequest.getHeaders().add(HttpHeaderName.fromString("Accept"), accept);
+ }
+ if (body != null) {
+ httpRequest.getHeaders().set(HttpHeaderName.CONTENT_TYPE, contentType);
+ SerializationFormat requestFormat
+ = CoreUtils.serializationFormatFromContentType(httpRequest.getHeaders());
+ httpRequest.setBody(BinaryData.fromObject(body,
+ this.xmlSerializer.supportsFormat(requestFormat) ? this.xmlSerializer : this.jsonSerializer));
}
+ httpRequest.setContext(requestContext);
+ httpRequest.getContext().getRequestCallback().accept(httpRequest);
+ Response networkResponse = this.httpPipeline.send(httpRequest);
+ int responseCode = networkResponse.getStatusCode();
+ boolean expectedResponse = responseCode == 200;
+ if (!expectedResponse) {
+ GeneratedCodeUtils.handleUnexpectedResponse(responseCode, networkResponse, this.jsonSerializer,
+ this.xmlSerializer, null, null, HTTP_LOG);
+ }
+ return new Response<>(networkResponse.getRequest(), responseCode, networkResponse.getHeaders(),
+ this.decodeResponse(networkResponse.getValue(),
+ CoreUtils.createParameterizedType(Response.class, Base64urlBytesProperty.class),
+ CoreUtils.serializationFormatFromContentType(networkResponse.getHeaders())));
+ }
+ @Override
+ public Response base64urlArray(String endpoint, String contentType, String accept,
+ Base64urlArrayBytesProperty body, RequestContext requestContext) {
+ HttpRequest httpRequest = new HttpRequest().setMethod(HttpMethod.POST)
+ .setUri(endpoint + "/encode/bytes/property/base64url-array");
+ if (accept != null) {
+ httpRequest.getHeaders().add(HttpHeaderName.fromString("Accept"), accept);
+ }
+ if (body != null) {
+ httpRequest.getHeaders().set(HttpHeaderName.CONTENT_TYPE, contentType);
+ SerializationFormat requestFormat
+ = CoreUtils.serializationFormatFromContentType(httpRequest.getHeaders());
+ httpRequest.setBody(BinaryData.fromObject(body,
+ this.xmlSerializer.supportsFormat(requestFormat) ? this.xmlSerializer : this.jsonSerializer));
+ }
+ httpRequest.setContext(requestContext);
+ httpRequest.getContext().getRequestCallback().accept(httpRequest);
+ Response networkResponse = this.httpPipeline.send(httpRequest);
+ int responseCode = networkResponse.getStatusCode();
+ boolean expectedResponse = responseCode == 200;
+ if (!expectedResponse) {
+ GeneratedCodeUtils.handleUnexpectedResponse(responseCode, networkResponse, this.jsonSerializer,
+ this.xmlSerializer, null, null, HTTP_LOG);
+ }
+ return new Response<>(networkResponse.getRequest(), responseCode, networkResponse.getHeaders(),
+ this.decodeResponse(networkResponse.getValue(),
+ CoreUtils.createParameterizedType(Response.class, Base64urlArrayBytesProperty.class),
+ CoreUtils.serializationFormatFromContentType(networkResponse.getHeaders())));
}
- @HttpRequestInformation(
- method = HttpMethod.POST,
- path = "/encode/bytes/property/default",
- expectedStatusCodes = { 200 })
- @UnexpectedResponseExceptionDetail
- Response defaultMethod(@HostParam("endpoint") String endpoint,
- @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
- @BodyParam("application/json") DefaultBytesProperty body, RequestContext requestContext);
-
- @HttpRequestInformation(
- method = HttpMethod.POST,
- path = "/encode/bytes/property/base64",
- expectedStatusCodes = { 200 })
- @UnexpectedResponseExceptionDetail
- Response base64(@HostParam("endpoint") String endpoint,
- @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
- @BodyParam("application/json") Base64BytesProperty body, RequestContext requestContext);
-
- @HttpRequestInformation(
- method = HttpMethod.POST,
- path = "/encode/bytes/property/base64url",
- expectedStatusCodes = { 200 })
- @UnexpectedResponseExceptionDetail
- Response base64url(@HostParam("endpoint") String endpoint,
- @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
- @BodyParam("application/json") Base64urlBytesProperty body, RequestContext requestContext);
-
- @HttpRequestInformation(
- method = HttpMethod.POST,
- path = "/encode/bytes/property/base64url-array",
- expectedStatusCodes = { 200 })
- @UnexpectedResponseExceptionDetail
- Response base64urlArray(@HostParam("endpoint") String endpoint,
- @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
- @BodyParam("application/json") Base64urlArrayBytesProperty body, RequestContext requestContext);
+ private T decodeResponse(BinaryData value, ParameterizedType type, SerializationFormat format) {
+ if (this.jsonSerializer.supportsFormat(format)) {
+ return CoreUtils.decodeNetworkResponse(value, this.jsonSerializer, type);
+ }
+ if (this.xmlSerializer.supportsFormat(format)) {
+ return CoreUtils.decodeNetworkResponse(value, this.xmlSerializer, type);
+ }
+ throw HTTP_LOG.throwableAtError()
+ .addKeyValue("serializationFormat", format.name())
+ .log("None of the provided serializers support the format.", UnsupportedOperationException::new);
+ }
}
/**
diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/bytes/implementation/QueriesImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/bytes/implementation/QueriesImpl.java
index e6580272ff0..b7b47717ed0 100644
--- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/bytes/implementation/QueriesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/bytes/implementation/QueriesImpl.java
@@ -1,21 +1,21 @@
package encode.bytes.implementation;
import io.clientcore.core.annotations.ReturnType;
-import io.clientcore.core.annotations.ServiceInterface;
import io.clientcore.core.annotations.ServiceMethod;
-import io.clientcore.core.http.annotations.HostParam;
-import io.clientcore.core.http.annotations.HttpRequestInformation;
-import io.clientcore.core.http.annotations.QueryParam;
-import io.clientcore.core.http.annotations.UnexpectedResponseExceptionDetail;
import io.clientcore.core.http.models.HttpMethod;
+import io.clientcore.core.http.models.HttpRequest;
import io.clientcore.core.http.models.HttpResponseException;
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.instrumentation.Instrumentation;
+import io.clientcore.core.instrumentation.logging.ClientLogger;
import io.clientcore.core.models.binarydata.BinaryData;
+import io.clientcore.core.serialization.json.JsonSerializer;
+import io.clientcore.core.serialization.xml.XmlSerializer;
import io.clientcore.core.utils.Base64Uri;
-import java.lang.reflect.InvocationTargetException;
+import io.clientcore.core.utils.GeneratedCodeUtils;
+import io.clientcore.core.utils.UriBuilder;
import java.util.Base64;
import java.util.List;
import java.util.stream.Collectors;
@@ -51,53 +51,106 @@ public final class QueriesImpl {
}
/**
- * The interface defining all the services for BytesClientQueries to be used by the proxy service to perform REST
- * calls.
+ * The HTTP operations for BytesClientQueries.
*/
- @ServiceInterface(name = "BytesClientQueries", host = "{endpoint}")
public interface QueriesService {
static QueriesService getNewInstance(HttpPipeline pipeline) {
- try {
- Class> clazz = Class.forName("encode.bytes.implementation.QueriesServiceImpl");
- return (QueriesService) clazz.getMethod("getNewInstance", HttpPipeline.class).invoke(null, pipeline);
- } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException
- | InvocationTargetException e) {
- throw new RuntimeException(e);
+ return new QueriesServiceImpl(pipeline);
+ }
+
+ Response defaultMethod(String endpoint, String value, RequestContext requestContext);
+
+ Response base64(String endpoint, String value, RequestContext requestContext);
+
+ Response base64url(String endpoint, Base64Uri value, RequestContext requestContext);
+
+ Response base64urlArray(String endpoint, String value, RequestContext requestContext);
+ }
+
+ private static final class QueriesServiceImpl implements QueriesService {
+ private static final ClientLogger HTTP_LOG = new ClientLogger(QueriesService.class);
+
+ private final HttpPipeline httpPipeline;
+
+ private final JsonSerializer jsonSerializer = JsonSerializer.getInstance();
+
+ private final XmlSerializer xmlSerializer = XmlSerializer.getInstance();
+
+ private QueriesServiceImpl(HttpPipeline httpPipeline) {
+ this.httpPipeline = httpPipeline;
+ }
+
+ @Override
+ public Response defaultMethod(String endpoint, String value, RequestContext requestContext) {
+ UriBuilder uriBuilder = UriBuilder.parse(endpoint + "/encode/bytes/query/default");
+ GeneratedCodeUtils.addQueryParameter(uriBuilder, "value", true, value, true);
+ HttpRequest httpRequest = new HttpRequest().setMethod(HttpMethod.GET).setUri(uriBuilder.toString());
+ httpRequest.setContext(requestContext);
+ httpRequest.getContext().getRequestCallback().accept(httpRequest);
+ try (Response networkResponse = this.httpPipeline.send(httpRequest)) {
+ int responseCode = networkResponse.getStatusCode();
+ boolean expectedResponse = responseCode == 204;
+ if (!expectedResponse) {
+ GeneratedCodeUtils.handleUnexpectedResponse(responseCode, networkResponse, this.jsonSerializer,
+ this.xmlSerializer, null, null, HTTP_LOG);
+ }
+ return new Response<>(networkResponse.getRequest(), responseCode, networkResponse.getHeaders(), null);
+ }
+ }
+
+ @Override
+ public Response base64(String endpoint, String value, RequestContext requestContext) {
+ UriBuilder uriBuilder = UriBuilder.parse(endpoint + "/encode/bytes/query/base64");
+ GeneratedCodeUtils.addQueryParameter(uriBuilder, "value", true, value, true);
+ HttpRequest httpRequest = new HttpRequest().setMethod(HttpMethod.GET).setUri(uriBuilder.toString());
+ httpRequest.setContext(requestContext);
+ httpRequest.getContext().getRequestCallback().accept(httpRequest);
+ try (Response networkResponse = this.httpPipeline.send(httpRequest)) {
+ int responseCode = networkResponse.getStatusCode();
+ boolean expectedResponse = responseCode == 204;
+ if (!expectedResponse) {
+ GeneratedCodeUtils.handleUnexpectedResponse(responseCode, networkResponse, this.jsonSerializer,
+ this.xmlSerializer, null, null, HTTP_LOG);
+ }
+ return new Response<>(networkResponse.getRequest(), responseCode, networkResponse.getHeaders(), null);
}
+ }
+ @Override
+ public Response base64url(String endpoint, Base64Uri value, RequestContext requestContext) {
+ UriBuilder uriBuilder = UriBuilder.parse(endpoint + "/encode/bytes/query/base64url");
+ GeneratedCodeUtils.addQueryParameter(uriBuilder, "value", true, value, true);
+ HttpRequest httpRequest = new HttpRequest().setMethod(HttpMethod.GET).setUri(uriBuilder.toString());
+ httpRequest.setContext(requestContext);
+ httpRequest.getContext().getRequestCallback().accept(httpRequest);
+ try (Response networkResponse = this.httpPipeline.send(httpRequest)) {
+ int responseCode = networkResponse.getStatusCode();
+ boolean expectedResponse = responseCode == 204;
+ if (!expectedResponse) {
+ GeneratedCodeUtils.handleUnexpectedResponse(responseCode, networkResponse, this.jsonSerializer,
+ this.xmlSerializer, null, null, HTTP_LOG);
+ }
+ return new Response<>(networkResponse.getRequest(), responseCode, networkResponse.getHeaders(), null);
+ }
}
- @HttpRequestInformation(
- method = HttpMethod.GET,
- path = "/encode/bytes/query/default",
- expectedStatusCodes = { 204 })
- @UnexpectedResponseExceptionDetail
- Response defaultMethod(@HostParam("endpoint") String endpoint, @QueryParam("value") String value,
- RequestContext requestContext);
-
- @HttpRequestInformation(
- method = HttpMethod.GET,
- path = "/encode/bytes/query/base64",
- expectedStatusCodes = { 204 })
- @UnexpectedResponseExceptionDetail
- Response base64(@HostParam("endpoint") String endpoint, @QueryParam("value") String value,
- RequestContext requestContext);
-
- @HttpRequestInformation(
- method = HttpMethod.GET,
- path = "/encode/bytes/query/base64url",
- expectedStatusCodes = { 204 })
- @UnexpectedResponseExceptionDetail
- Response base64url(@HostParam("endpoint") String endpoint, @QueryParam("value") Base64Uri value,
- RequestContext requestContext);
-
- @HttpRequestInformation(
- method = HttpMethod.GET,
- path = "/encode/bytes/query/base64url-array",
- expectedStatusCodes = { 204 })
- @UnexpectedResponseExceptionDetail
- Response base64urlArray(@HostParam("endpoint") String endpoint, @QueryParam("value") String value,
- RequestContext requestContext);
+ @Override
+ public Response base64urlArray(String endpoint, String value, RequestContext requestContext) {
+ UriBuilder uriBuilder = UriBuilder.parse(endpoint + "/encode/bytes/query/base64url-array");
+ GeneratedCodeUtils.addQueryParameter(uriBuilder, "value", true, value, true);
+ HttpRequest httpRequest = new HttpRequest().setMethod(HttpMethod.GET).setUri(uriBuilder.toString());
+ httpRequest.setContext(requestContext);
+ httpRequest.getContext().getRequestCallback().accept(httpRequest);
+ try (Response networkResponse = this.httpPipeline.send(httpRequest)) {
+ int responseCode = networkResponse.getStatusCode();
+ boolean expectedResponse = responseCode == 204;
+ if (!expectedResponse) {
+ GeneratedCodeUtils.handleUnexpectedResponse(responseCode, networkResponse, this.jsonSerializer,
+ this.xmlSerializer, null, null, HTTP_LOG);
+ }
+ return new Response<>(networkResponse.getRequest(), responseCode, networkResponse.getHeaders(), null);
+ }
+ }
}
/**
diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/bytes/implementation/RequestBodiesImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/bytes/implementation/RequestBodiesImpl.java
index 7d30a2085c9..482e55d531d 100644
--- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/bytes/implementation/RequestBodiesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/bytes/implementation/RequestBodiesImpl.java
@@ -1,22 +1,23 @@
package encode.bytes.implementation;
import io.clientcore.core.annotations.ReturnType;
-import io.clientcore.core.annotations.ServiceInterface;
import io.clientcore.core.annotations.ServiceMethod;
-import io.clientcore.core.http.annotations.BodyParam;
-import io.clientcore.core.http.annotations.HeaderParam;
-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.HttpHeaderName;
import io.clientcore.core.http.models.HttpMethod;
+import io.clientcore.core.http.models.HttpRequest;
import io.clientcore.core.http.models.HttpResponseException;
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.instrumentation.Instrumentation;
+import io.clientcore.core.instrumentation.logging.ClientLogger;
import io.clientcore.core.models.binarydata.BinaryData;
+import io.clientcore.core.serialization.SerializationFormat;
+import io.clientcore.core.serialization.json.JsonSerializer;
+import io.clientcore.core.serialization.xml.XmlSerializer;
import io.clientcore.core.utils.Base64Uri;
-import java.lang.reflect.InvocationTargetException;
+import io.clientcore.core.utils.CoreUtils;
+import io.clientcore.core.utils.GeneratedCodeUtils;
/**
* An instance of this class provides access to all the operations defined in RequestBodies.
@@ -49,66 +50,163 @@ public final class RequestBodiesImpl {
}
/**
- * The interface defining all the services for BytesClientRequestBodies to be used by the proxy service to perform
- * REST calls.
+ * The HTTP operations for BytesClientRequestBodies.
*/
- @ServiceInterface(name = "BytesClientRequestBodies", host = "{endpoint}")
public interface RequestBodiesService {
static RequestBodiesService getNewInstance(HttpPipeline pipeline) {
- try {
- Class> clazz = Class.forName("encode.bytes.implementation.RequestBodiesServiceImpl");
- return (RequestBodiesService) clazz.getMethod("getNewInstance", HttpPipeline.class)
- .invoke(null, pipeline);
- } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException
- | InvocationTargetException e) {
- throw new RuntimeException(e);
+ return new RequestBodiesServiceImpl(pipeline);
+ }
+
+ Response defaultMethod(String endpoint, String contentType, BinaryData value, long contentLength,
+ RequestContext requestContext);
+
+ Response octetStream(String endpoint, String contentType, BinaryData value, long contentLength,
+ RequestContext requestContext);
+
+ Response customContentType(String endpoint, String contentType, BinaryData value, long contentLength,
+ RequestContext requestContext);
+
+ Response base64(String endpoint, String contentType, byte[] value, RequestContext requestContext);
+
+ Response base64url(String endpoint, String contentType, Base64Uri value, RequestContext requestContext);
+ }
+
+ private static final class RequestBodiesServiceImpl implements RequestBodiesService {
+ private static final ClientLogger HTTP_LOG = new ClientLogger(RequestBodiesService.class);
+
+ private final HttpPipeline httpPipeline;
+
+ private final JsonSerializer jsonSerializer = JsonSerializer.getInstance();
+
+ private final XmlSerializer xmlSerializer = XmlSerializer.getInstance();
+
+ private RequestBodiesServiceImpl(HttpPipeline httpPipeline) {
+ this.httpPipeline = httpPipeline;
+ }
+
+ @Override
+ public Response defaultMethod(String endpoint, String contentType, BinaryData value, long contentLength,
+ RequestContext requestContext) {
+ HttpRequest httpRequest
+ = new HttpRequest().setMethod(HttpMethod.POST).setUri(endpoint + "/encode/bytes/body/request/default");
+ httpRequest.getHeaders().add(HttpHeaderName.fromString("Content-Length"), String.valueOf(contentLength));
+ if (value != null) {
+ httpRequest.getHeaders().set(HttpHeaderName.CONTENT_TYPE, contentType);
+ if (value.getLength() != null) {
+ httpRequest.setBody(value);
+ }
}
+ httpRequest.setContext(requestContext);
+ httpRequest.getContext().getRequestCallback().accept(httpRequest);
+ try (Response networkResponse = this.httpPipeline.send(httpRequest)) {
+ int responseCode = networkResponse.getStatusCode();
+ boolean expectedResponse = responseCode == 204;
+ if (!expectedResponse) {
+ GeneratedCodeUtils.handleUnexpectedResponse(responseCode, networkResponse, this.jsonSerializer,
+ this.xmlSerializer, null, null, HTTP_LOG);
+ }
+ return new Response<>(networkResponse.getRequest(), responseCode, networkResponse.getHeaders(), null);
+ }
+ }
+ @Override
+ public Response octetStream(String endpoint, String contentType, BinaryData value, long contentLength,
+ RequestContext requestContext) {
+ HttpRequest httpRequest = new HttpRequest().setMethod(HttpMethod.POST)
+ .setUri(endpoint + "/encode/bytes/body/request/octet-stream");
+ httpRequest.getHeaders().add(HttpHeaderName.fromString("Content-Length"), String.valueOf(contentLength));
+ if (value != null) {
+ httpRequest.getHeaders().set(HttpHeaderName.CONTENT_TYPE, contentType);
+ if (value.getLength() != null) {
+ httpRequest.setBody(value);
+ }
+ }
+ httpRequest.setContext(requestContext);
+ httpRequest.getContext().getRequestCallback().accept(httpRequest);
+ try (Response networkResponse = this.httpPipeline.send(httpRequest)) {
+ int responseCode = networkResponse.getStatusCode();
+ boolean expectedResponse = responseCode == 204;
+ if (!expectedResponse) {
+ GeneratedCodeUtils.handleUnexpectedResponse(responseCode, networkResponse, this.jsonSerializer,
+ this.xmlSerializer, null, null, HTTP_LOG);
+ }
+ return new Response<>(networkResponse.getRequest(), responseCode, networkResponse.getHeaders(), null);
+ }
}
- @HttpRequestInformation(
- method = HttpMethod.POST,
- path = "/encode/bytes/body/request/default",
- expectedStatusCodes = { 204 })
- @UnexpectedResponseExceptionDetail
- Response defaultMethod(@HostParam("endpoint") String endpoint,
- @HeaderParam("Content-Type") String contentType, @BodyParam("application/octet-stream") BinaryData value,
- @HeaderParam("Content-Length") long contentLength, RequestContext requestContext);
-
- @HttpRequestInformation(
- method = HttpMethod.POST,
- path = "/encode/bytes/body/request/octet-stream",
- expectedStatusCodes = { 204 })
- @UnexpectedResponseExceptionDetail
- Response octetStream(@HostParam("endpoint") String endpoint,
- @HeaderParam("content-type") String contentType, @BodyParam("application/octet-stream") BinaryData value,
- @HeaderParam("Content-Length") long contentLength, RequestContext requestContext);
-
- @HttpRequestInformation(
- method = HttpMethod.POST,
- path = "/encode/bytes/body/request/custom-content-type",
- expectedStatusCodes = { 204 })
- @UnexpectedResponseExceptionDetail
- Response customContentType(@HostParam("endpoint") String endpoint,
- @HeaderParam("content-type") String contentType, @BodyParam("image/png") BinaryData value,
- @HeaderParam("Content-Length") long contentLength, RequestContext requestContext);
-
- @HttpRequestInformation(
- method = HttpMethod.POST,
- path = "/encode/bytes/body/request/base64",
- expectedStatusCodes = { 204 })
- @UnexpectedResponseExceptionDetail
- Response base64(@HostParam("endpoint") String endpoint, @HeaderParam("content-type") String contentType,
- @BodyParam("application/json") byte[] value, RequestContext requestContext);
-
- @HttpRequestInformation(
- method = HttpMethod.POST,
- path = "/encode/bytes/body/request/base64url",
- expectedStatusCodes = { 204 })
- @UnexpectedResponseExceptionDetail
- Response base64url(@HostParam("endpoint") String endpoint,
- @HeaderParam("content-type") String contentType, @BodyParam("application/json") Base64Uri value,
- RequestContext requestContext);
+ @Override
+ public Response customContentType(String endpoint, String contentType, BinaryData value,
+ long contentLength, RequestContext requestContext) {
+ HttpRequest httpRequest = new HttpRequest().setMethod(HttpMethod.POST)
+ .setUri(endpoint + "/encode/bytes/body/request/custom-content-type");
+ httpRequest.getHeaders().add(HttpHeaderName.fromString("Content-Length"), String.valueOf(contentLength));
+ if (value != null) {
+ httpRequest.getHeaders().set(HttpHeaderName.CONTENT_TYPE, contentType);
+ if (value.getLength() != null) {
+ httpRequest.setBody(value);
+ }
+ }
+ httpRequest.setContext(requestContext);
+ httpRequest.getContext().getRequestCallback().accept(httpRequest);
+ try (Response networkResponse = this.httpPipeline.send(httpRequest)) {
+ int responseCode = networkResponse.getStatusCode();
+ boolean expectedResponse = responseCode == 204;
+ if (!expectedResponse) {
+ GeneratedCodeUtils.handleUnexpectedResponse(responseCode, networkResponse, this.jsonSerializer,
+ this.xmlSerializer, null, null, HTTP_LOG);
+ }
+ return new Response<>(networkResponse.getRequest(), responseCode, networkResponse.getHeaders(), null);
+ }
+ }
+
+ @Override
+ public Response base64(String endpoint, String contentType, byte[] value, RequestContext requestContext) {
+ HttpRequest httpRequest
+ = new HttpRequest().setMethod(HttpMethod.POST).setUri(endpoint + "/encode/bytes/body/request/base64");
+ if (value != null) {
+ httpRequest.getHeaders().set(HttpHeaderName.CONTENT_TYPE, contentType);
+ SerializationFormat requestFormat
+ = CoreUtils.serializationFormatFromContentType(httpRequest.getHeaders());
+ httpRequest.setBody(BinaryData.fromObject(value,
+ this.xmlSerializer.supportsFormat(requestFormat) ? this.xmlSerializer : this.jsonSerializer));
+ }
+ httpRequest.setContext(requestContext);
+ httpRequest.getContext().getRequestCallback().accept(httpRequest);
+ try (Response networkResponse = this.httpPipeline.send(httpRequest)) {
+ int responseCode = networkResponse.getStatusCode();
+ boolean expectedResponse = responseCode == 204;
+ if (!expectedResponse) {
+ GeneratedCodeUtils.handleUnexpectedResponse(responseCode, networkResponse, this.jsonSerializer,
+ this.xmlSerializer, null, null, HTTP_LOG);
+ }
+ return new Response<>(networkResponse.getRequest(), responseCode, networkResponse.getHeaders(), null);
+ }
+ }
+
+ @Override
+ public Response base64url(String endpoint, String contentType, Base64Uri value,
+ RequestContext requestContext) {
+ HttpRequest httpRequest = new HttpRequest().setMethod(HttpMethod.POST)
+ .setUri(endpoint + "/encode/bytes/body/request/base64url");
+ if (value != null) {
+ httpRequest.getHeaders().set(HttpHeaderName.CONTENT_TYPE, contentType);
+ SerializationFormat requestFormat
+ = CoreUtils.serializationFormatFromContentType(httpRequest.getHeaders());
+ httpRequest.setBody(BinaryData.fromObject(value,
+ this.xmlSerializer.supportsFormat(requestFormat) ? this.xmlSerializer : this.jsonSerializer));
+ }
+ httpRequest.setContext(requestContext);
+ httpRequest.getContext().getRequestCallback().accept(httpRequest);
+ try (Response networkResponse = this.httpPipeline.send(httpRequest)) {
+ int responseCode = networkResponse.getStatusCode();
+ boolean expectedResponse = responseCode == 204;
+ if (!expectedResponse) {
+ GeneratedCodeUtils.handleUnexpectedResponse(responseCode, networkResponse, this.jsonSerializer,
+ this.xmlSerializer, null, null, HTTP_LOG);
+ }
+ return new Response<>(networkResponse.getRequest(), responseCode, networkResponse.getHeaders(), null);
+ }
+ }
}
/**
diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/bytes/implementation/ResponseBodiesImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/bytes/implementation/ResponseBodiesImpl.java
index ea49f43b2c3..339c4913d19 100644
--- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/bytes/implementation/ResponseBodiesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/bytes/implementation/ResponseBodiesImpl.java
@@ -1,21 +1,21 @@
package encode.bytes.implementation;
import io.clientcore.core.annotations.ReturnType;
-import io.clientcore.core.annotations.ServiceInterface;
import io.clientcore.core.annotations.ServiceMethod;
-import io.clientcore.core.http.annotations.HeaderParam;
-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.HttpHeaderName;
import io.clientcore.core.http.models.HttpMethod;
+import io.clientcore.core.http.models.HttpRequest;
import io.clientcore.core.http.models.HttpResponseException;
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.instrumentation.Instrumentation;
+import io.clientcore.core.instrumentation.logging.ClientLogger;
import io.clientcore.core.models.binarydata.BinaryData;
+import io.clientcore.core.serialization.json.JsonSerializer;
+import io.clientcore.core.serialization.xml.XmlSerializer;
import io.clientcore.core.utils.Base64Uri;
-import java.lang.reflect.InvocationTargetException;
+import io.clientcore.core.utils.GeneratedCodeUtils;
/**
* An instance of this class provides access to all the operations defined in ResponseBodies.
@@ -48,63 +48,137 @@ public final class ResponseBodiesImpl {
}
/**
- * The interface defining all the services for BytesClientResponseBodies to be used by the proxy service to perform
- * REST calls.
+ * The HTTP operations for BytesClientResponseBodies.
*/
- @ServiceInterface(name = "BytesClientResponseBodies", host = "{endpoint}")
public interface ResponseBodiesService {
static ResponseBodiesService getNewInstance(HttpPipeline pipeline) {
- try {
- Class> clazz = Class.forName("encode.bytes.implementation.ResponseBodiesServiceImpl");
- return (ResponseBodiesService) clazz.getMethod("getNewInstance", HttpPipeline.class)
- .invoke(null, pipeline);
- } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException
- | InvocationTargetException e) {
- throw new RuntimeException(e);
+ return new ResponseBodiesServiceImpl(pipeline);
+ }
+
+ Response defaultMethod(String endpoint, String accept, RequestContext requestContext);
+
+ Response octetStream(String endpoint, String accept, RequestContext requestContext);
+
+ Response customContentType(String endpoint, String accept, RequestContext requestContext);
+
+ Response base64(String endpoint, String accept, RequestContext requestContext);
+
+ Response base64url(String endpoint, String accept, RequestContext requestContext);
+ }
+
+ private static final class ResponseBodiesServiceImpl implements ResponseBodiesService {
+ private static final ClientLogger HTTP_LOG = new ClientLogger(ResponseBodiesService.class);
+
+ private final HttpPipeline httpPipeline;
+
+ private final JsonSerializer jsonSerializer = JsonSerializer.getInstance();
+
+ private final XmlSerializer xmlSerializer = XmlSerializer.getInstance();
+
+ private ResponseBodiesServiceImpl(HttpPipeline httpPipeline) {
+ this.httpPipeline = httpPipeline;
+ }
+
+ @Override
+ public Response defaultMethod(String endpoint, String accept, RequestContext requestContext) {
+ HttpRequest httpRequest
+ = new HttpRequest().setMethod(HttpMethod.GET).setUri(endpoint + "/encode/bytes/body/response/default");
+ if (accept != null) {
+ httpRequest.getHeaders().add(HttpHeaderName.fromString("Accept"), accept);
+ }
+ httpRequest.setContext(requestContext);
+ httpRequest.getContext().getRequestCallback().accept(httpRequest);
+ Response networkResponse = this.httpPipeline.send(httpRequest);
+ int responseCode = networkResponse.getStatusCode();
+ boolean expectedResponse = responseCode == 200;
+ if (!expectedResponse) {
+ GeneratedCodeUtils.handleUnexpectedResponse(responseCode, networkResponse, this.jsonSerializer,
+ this.xmlSerializer, null, null, HTTP_LOG);
}
+ return networkResponse;
+ }
+
+ @Override
+ public Response octetStream(String endpoint, String accept, RequestContext requestContext) {
+ HttpRequest httpRequest = new HttpRequest().setMethod(HttpMethod.GET)
+ .setUri(endpoint + "/encode/bytes/body/response/octet-stream");
+ if (accept != null) {
+ httpRequest.getHeaders().add(HttpHeaderName.fromString("Accept"), accept);
+ }
+ httpRequest.setContext(requestContext);
+ httpRequest.getContext().getRequestCallback().accept(httpRequest);
+ Response networkResponse = this.httpPipeline.send(httpRequest);
+ int responseCode = networkResponse.getStatusCode();
+ boolean expectedResponse = responseCode == 200;
+ if (!expectedResponse) {
+ GeneratedCodeUtils.handleUnexpectedResponse(responseCode, networkResponse, this.jsonSerializer,
+ this.xmlSerializer, null, null, HTTP_LOG);
+ }
+ return networkResponse;
+ }
+
+ @Override
+ public Response customContentType(String endpoint, String accept, RequestContext requestContext) {
+ HttpRequest httpRequest = new HttpRequest().setMethod(HttpMethod.GET)
+ .setUri(endpoint + "/encode/bytes/body/response/custom-content-type");
+ if (accept != null) {
+ httpRequest.getHeaders().add(HttpHeaderName.fromString("Accept"), accept);
+ }
+ httpRequest.setContext(requestContext);
+ httpRequest.getContext().getRequestCallback().accept(httpRequest);
+ Response networkResponse = this.httpPipeline.send(httpRequest);
+ int responseCode = networkResponse.getStatusCode();
+ boolean expectedResponse = responseCode == 200;
+ if (!expectedResponse) {
+ GeneratedCodeUtils.handleUnexpectedResponse(responseCode, networkResponse, this.jsonSerializer,
+ this.xmlSerializer, null, null, HTTP_LOG);
+ }
+ return networkResponse;
+ }
+ @Override
+ public Response base64(String endpoint, String accept, RequestContext requestContext) {
+ HttpRequest httpRequest
+ = new HttpRequest().setMethod(HttpMethod.GET).setUri(endpoint + "/encode/bytes/body/response/base64");
+ if (accept != null) {
+ httpRequest.getHeaders().add(HttpHeaderName.fromString("Accept"), accept);
+ }
+ httpRequest.setContext(requestContext);
+ httpRequest.getContext().getRequestCallback().accept(httpRequest);
+ try (Response networkResponse = this.httpPipeline.send(httpRequest)) {
+ int responseCode = networkResponse.getStatusCode();
+ boolean expectedResponse = responseCode == 200;
+ if (!expectedResponse) {
+ GeneratedCodeUtils.handleUnexpectedResponse(responseCode, networkResponse, this.jsonSerializer,
+ this.xmlSerializer, null, null, HTTP_LOG);
+ }
+ BinaryData responseBody = networkResponse.getValue();
+ return new Response<>(networkResponse.getRequest(), responseCode, networkResponse.getHeaders(),
+ responseBody == null ? null : responseBody.toBytes());
+ }
}
- @HttpRequestInformation(
- method = HttpMethod.GET,
- path = "/encode/bytes/body/response/default",
- expectedStatusCodes = { 200 })
- @UnexpectedResponseExceptionDetail
- Response defaultMethod(@HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept,
- RequestContext requestContext);
-
- @HttpRequestInformation(
- method = HttpMethod.GET,
- path = "/encode/bytes/body/response/octet-stream",
- expectedStatusCodes = { 200 })
- @UnexpectedResponseExceptionDetail
- Response octetStream(@HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept,
- RequestContext requestContext);
-
- @HttpRequestInformation(
- method = HttpMethod.GET,
- path = "/encode/bytes/body/response/custom-content-type",
- expectedStatusCodes = { 200 })
- @UnexpectedResponseExceptionDetail
- Response customContentType(@HostParam("endpoint") String endpoint,
- @HeaderParam("Accept") String accept, RequestContext requestContext);
-
- @HttpRequestInformation(
- method = HttpMethod.GET,
- path = "/encode/bytes/body/response/base64",
- expectedStatusCodes = { 200 })
- @UnexpectedResponseExceptionDetail
- Response base64(@HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept,
- RequestContext requestContext);
-
- @HttpRequestInformation(
- method = HttpMethod.GET,
- path = "/encode/bytes/body/response/base64url",
- expectedStatusCodes = { 200 },
- returnValueWireType = Base64Uri.class)
- @UnexpectedResponseExceptionDetail
- Response base64url(@HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept,
- RequestContext requestContext);
+ @Override
+ public Response base64url(String endpoint, String accept, RequestContext requestContext) {
+ HttpRequest httpRequest = new HttpRequest().setMethod(HttpMethod.GET)
+ .setUri(endpoint + "/encode/bytes/body/response/base64url");
+ if (accept != null) {
+ httpRequest.getHeaders().add(HttpHeaderName.fromString("Accept"), accept);
+ }
+ httpRequest.setContext(requestContext);
+ httpRequest.getContext().getRequestCallback().accept(httpRequest);
+ try (Response networkResponse = this.httpPipeline.send(httpRequest)) {
+ int responseCode = networkResponse.getStatusCode();
+ boolean expectedResponse = responseCode == 200;
+ if (!expectedResponse) {
+ GeneratedCodeUtils.handleUnexpectedResponse(responseCode, networkResponse, this.jsonSerializer,
+ this.xmlSerializer, null, null, HTTP_LOG);
+ }
+ BinaryData responseBody = networkResponse.getValue();
+ return new Response<>(networkResponse.getRequest(), responseCode, networkResponse.getHeaders(),
+ responseBody == null ? null : new Base64Uri(responseBody.toBytes()).decodedBytes());
+ }
+ }
}
/**
diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/datetime/implementation/HeadersImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/datetime/implementation/HeadersImpl.java
index 165b6207817..902100a6ff4 100644
--- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/datetime/implementation/HeadersImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/datetime/implementation/HeadersImpl.java
@@ -1,22 +1,23 @@
package encode.datetime.implementation;
import io.clientcore.core.annotations.ReturnType;
-import io.clientcore.core.annotations.ServiceInterface;
import io.clientcore.core.annotations.ServiceMethod;
-import io.clientcore.core.http.annotations.HeaderParam;
-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.HttpHeaderName;
import io.clientcore.core.http.models.HttpMethod;
+import io.clientcore.core.http.models.HttpRequest;
import io.clientcore.core.http.models.HttpResponseException;
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.instrumentation.Instrumentation;
+import io.clientcore.core.instrumentation.logging.ClientLogger;
import io.clientcore.core.models.binarydata.BinaryData;
+import io.clientcore.core.serialization.json.JsonSerializer;
+import io.clientcore.core.serialization.xml.XmlSerializer;
import io.clientcore.core.utils.DateTimeRfc1123;
-import java.lang.reflect.InvocationTargetException;
+import io.clientcore.core.utils.GeneratedCodeUtils;
import java.time.OffsetDateTime;
+import java.time.format.DateTimeFormatter;
import java.util.List;
import java.util.stream.Collectors;
@@ -51,61 +52,135 @@ public final class HeadersImpl {
}
/**
- * The interface defining all the services for DatetimeClientHeaders to be used by the proxy service to perform REST
- * calls.
+ * The HTTP operations for DatetimeClientHeaders.
*/
- @ServiceInterface(name = "DatetimeClientHeaders", host = "{endpoint}")
public interface HeadersService {
static HeadersService getNewInstance(HttpPipeline pipeline) {
- try {
- Class> clazz = Class.forName("encode.datetime.implementation.HeadersServiceImpl");
- return (HeadersService) clazz.getMethod("getNewInstance", HttpPipeline.class).invoke(null, pipeline);
- } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException
- | InvocationTargetException e) {
- throw new RuntimeException(e);
+ return new HeadersServiceImpl(pipeline);
+ }
+
+ Response defaultMethod(String endpoint, DateTimeRfc1123 value, RequestContext requestContext);
+
+ Response rfc3339(String endpoint, OffsetDateTime value, RequestContext requestContext);
+
+ Response rfc7231(String endpoint, DateTimeRfc1123 value, RequestContext requestContext);
+
+ Response unixTimestamp(String endpoint, long value, RequestContext requestContext);
+
+ Response unixTimestampArray(String endpoint, String value, RequestContext requestContext);
+ }
+
+ private static final class HeadersServiceImpl implements HeadersService {
+ private static final ClientLogger HTTP_LOG = new ClientLogger(HeadersService.class);
+
+ private final HttpPipeline httpPipeline;
+
+ private final JsonSerializer jsonSerializer = JsonSerializer.getInstance();
+
+ private final XmlSerializer xmlSerializer = XmlSerializer.getInstance();
+
+ private HeadersServiceImpl(HttpPipeline httpPipeline) {
+ this.httpPipeline = httpPipeline;
+ }
+
+ @Override
+ public Response defaultMethod(String endpoint, DateTimeRfc1123 value, RequestContext requestContext) {
+ HttpRequest httpRequest
+ = new HttpRequest().setMethod(HttpMethod.GET).setUri(endpoint + "/encode/datetime/header/default");
+ if (value != null) {
+ httpRequest.getHeaders().add(HttpHeaderName.fromString("value"), String.valueOf(value));
}
+ httpRequest.setContext(requestContext);
+ httpRequest.getContext().getRequestCallback().accept(httpRequest);
+ try (Response networkResponse = this.httpPipeline.send(httpRequest)) {
+ int responseCode = networkResponse.getStatusCode();
+ boolean expectedResponse = responseCode == 204;
+ if (!expectedResponse) {
+ GeneratedCodeUtils.handleUnexpectedResponse(responseCode, networkResponse, this.jsonSerializer,
+ this.xmlSerializer, null, null, HTTP_LOG);
+ }
+ return new Response<>(networkResponse.getRequest(), responseCode, networkResponse.getHeaders(), null);
+ }
+ }
+
+ @Override
+ public Response rfc3339(String endpoint, OffsetDateTime value, RequestContext requestContext) {
+ HttpRequest httpRequest
+ = new HttpRequest().setMethod(HttpMethod.GET).setUri(endpoint + "/encode/datetime/header/rfc3339");
+ if (value != null) {
+ httpRequest.getHeaders()
+ .add(HttpHeaderName.fromString("value"), value.format(DateTimeFormatter.ISO_INSTANT));
+ }
+ httpRequest.setContext(requestContext);
+ httpRequest.getContext().getRequestCallback().accept(httpRequest);
+ try (Response networkResponse = this.httpPipeline.send(httpRequest)) {
+ int responseCode = networkResponse.getStatusCode();
+ boolean expectedResponse = responseCode == 204;
+ if (!expectedResponse) {
+ GeneratedCodeUtils.handleUnexpectedResponse(responseCode, networkResponse, this.jsonSerializer,
+ this.xmlSerializer, null, null, HTTP_LOG);
+ }
+ return new Response<>(networkResponse.getRequest(), responseCode, networkResponse.getHeaders(), null);
+ }
+ }
+
+ @Override
+ public Response rfc7231(String endpoint, DateTimeRfc1123 value, RequestContext requestContext) {
+ HttpRequest httpRequest
+ = new HttpRequest().setMethod(HttpMethod.GET).setUri(endpoint + "/encode/datetime/header/rfc7231");
+ if (value != null) {
+ httpRequest.getHeaders().add(HttpHeaderName.fromString("value"), String.valueOf(value));
+ }
+ httpRequest.setContext(requestContext);
+ httpRequest.getContext().getRequestCallback().accept(httpRequest);
+ try (Response networkResponse = this.httpPipeline.send(httpRequest)) {
+ int responseCode = networkResponse.getStatusCode();
+ boolean expectedResponse = responseCode == 204;
+ if (!expectedResponse) {
+ GeneratedCodeUtils.handleUnexpectedResponse(responseCode, networkResponse, this.jsonSerializer,
+ this.xmlSerializer, null, null, HTTP_LOG);
+ }
+ return new Response<>(networkResponse.getRequest(), responseCode, networkResponse.getHeaders(), null);
+ }
+ }
+ @Override
+ public Response unixTimestamp(String endpoint, long value, RequestContext requestContext) {
+ HttpRequest httpRequest = new HttpRequest().setMethod(HttpMethod.GET)
+ .setUri(endpoint + "/encode/datetime/header/unix-timestamp");
+ httpRequest.getHeaders().add(HttpHeaderName.fromString("value"), String.valueOf(value));
+ httpRequest.setContext(requestContext);
+ httpRequest.getContext().getRequestCallback().accept(httpRequest);
+ try (Response networkResponse = this.httpPipeline.send(httpRequest)) {
+ int responseCode = networkResponse.getStatusCode();
+ boolean expectedResponse = responseCode == 204;
+ if (!expectedResponse) {
+ GeneratedCodeUtils.handleUnexpectedResponse(responseCode, networkResponse, this.jsonSerializer,
+ this.xmlSerializer, null, null, HTTP_LOG);
+ }
+ return new Response<>(networkResponse.getRequest(), responseCode, networkResponse.getHeaders(), null);
+ }
}
- @HttpRequestInformation(
- method = HttpMethod.GET,
- path = "/encode/datetime/header/default",
- expectedStatusCodes = { 204 })
- @UnexpectedResponseExceptionDetail
- Response defaultMethod(@HostParam("endpoint") String endpoint,
- @HeaderParam("value") DateTimeRfc1123 value, RequestContext requestContext);
-
- @HttpRequestInformation(
- method = HttpMethod.GET,
- path = "/encode/datetime/header/rfc3339",
- expectedStatusCodes = { 204 })
- @UnexpectedResponseExceptionDetail
- Response rfc3339(@HostParam("endpoint") String endpoint, @HeaderParam("value") OffsetDateTime value,
- RequestContext requestContext);
-
- @HttpRequestInformation(
- method = HttpMethod.GET,
- path = "/encode/datetime/header/rfc7231",
- expectedStatusCodes = { 204 })
- @UnexpectedResponseExceptionDetail
- Response rfc7231(@HostParam("endpoint") String endpoint, @HeaderParam("value") DateTimeRfc1123 value,
- RequestContext requestContext);
-
- @HttpRequestInformation(
- method = HttpMethod.GET,
- path = "/encode/datetime/header/unix-timestamp",
- expectedStatusCodes = { 204 })
- @UnexpectedResponseExceptionDetail
- Response unixTimestamp(@HostParam("endpoint") String endpoint, @HeaderParam("value") long value,
- RequestContext requestContext);
-
- @HttpRequestInformation(
- method = HttpMethod.GET,
- path = "/encode/datetime/header/unix-timestamp-array",
- expectedStatusCodes = { 204 })
- @UnexpectedResponseExceptionDetail
- Response unixTimestampArray(@HostParam("endpoint") String endpoint, @HeaderParam("value") String value,
- RequestContext requestContext);
+ @Override
+ public Response unixTimestampArray(String endpoint, String value, RequestContext requestContext) {
+ HttpRequest httpRequest = new HttpRequest().setMethod(HttpMethod.GET)
+ .setUri(endpoint + "/encode/datetime/header/unix-timestamp-array");
+ if (value != null) {
+ httpRequest.getHeaders().add(HttpHeaderName.fromString("value"), value);
+ }
+ httpRequest.setContext(requestContext);
+ httpRequest.getContext().getRequestCallback().accept(httpRequest);
+ try (Response networkResponse = this.httpPipeline.send(httpRequest)) {
+ int responseCode = networkResponse.getStatusCode();
+ boolean expectedResponse = responseCode == 204;
+ if (!expectedResponse) {
+ GeneratedCodeUtils.handleUnexpectedResponse(responseCode, networkResponse, this.jsonSerializer,
+ this.xmlSerializer, null, null, HTTP_LOG);
+ }
+ return new Response<>(networkResponse.getRequest(), responseCode, networkResponse.getHeaders(), null);
+ }
+ }
}
/**
diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/datetime/implementation/PropertiesImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/datetime/implementation/PropertiesImpl.java
index 857c7a174a2..3e73addce62 100644
--- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/datetime/implementation/PropertiesImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/encode/datetime/implementation/PropertiesImpl.java
@@ -6,20 +6,23 @@
import encode.datetime.UnixTimestampArrayDatetimeProperty;
import encode.datetime.UnixTimestampDatetimeProperty;
import io.clientcore.core.annotations.ReturnType;
-import io.clientcore.core.annotations.ServiceInterface;
import io.clientcore.core.annotations.ServiceMethod;
-import io.clientcore.core.http.annotations.BodyParam;
-import io.clientcore.core.http.annotations.HeaderParam;
-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.HttpHeaderName;
import io.clientcore.core.http.models.HttpMethod;
+import io.clientcore.core.http.models.HttpRequest;
import io.clientcore.core.http.models.HttpResponseException;
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.instrumentation.Instrumentation;
-import java.lang.reflect.InvocationTargetException;
+import io.clientcore.core.instrumentation.logging.ClientLogger;
+import io.clientcore.core.models.binarydata.BinaryData;
+import io.clientcore.core.serialization.SerializationFormat;
+import io.clientcore.core.serialization.json.JsonSerializer;
+import io.clientcore.core.serialization.xml.XmlSerializer;
+import io.clientcore.core.utils.CoreUtils;
+import io.clientcore.core.utils.GeneratedCodeUtils;
+import java.lang.reflect.ParameterizedType;
/**
* An instance of this class provides access to all the operations defined in Properties.
@@ -52,66 +55,203 @@ public final class PropertiesImpl {
}
/**
- * The interface defining all the services for DatetimeClientProperties to be used by the proxy service to perform
- * REST calls.
+ * The HTTP operations for DatetimeClientProperties.
*/
- @ServiceInterface(name = "DatetimeClientProperties", host = "{endpoint}")
public interface PropertiesService {
static PropertiesService getNewInstance(HttpPipeline pipeline) {
- try {
- Class> clazz = Class.forName("encode.datetime.implementation.PropertiesServiceImpl");
- return (PropertiesService) clazz.getMethod("getNewInstance", HttpPipeline.class).invoke(null, pipeline);
- } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException
- | InvocationTargetException e) {
- throw new RuntimeException(e);
+ return new PropertiesServiceImpl(pipeline);
+ }
+
+ Response defaultMethod(String endpoint, String contentType, String accept,
+ DefaultDatetimeProperty body, RequestContext requestContext);
+
+ Response rfc3339(String endpoint, String contentType, String accept,
+ Rfc3339DatetimeProperty body, RequestContext requestContext);
+
+ Response rfc7231(String endpoint, String contentType, String accept,
+ Rfc7231DatetimeProperty body, RequestContext requestContext);
+
+ Response unixTimestamp(String endpoint, String contentType, String accept,
+ UnixTimestampDatetimeProperty body, RequestContext requestContext);
+
+ Response unixTimestampArray(String endpoint, String contentType,
+ String accept, UnixTimestampArrayDatetimeProperty body, RequestContext requestContext);
+ }
+
+ private static final class PropertiesServiceImpl implements PropertiesService {
+ private static final ClientLogger HTTP_LOG = new ClientLogger(PropertiesService.class);
+
+ private final HttpPipeline httpPipeline;
+
+ private final JsonSerializer jsonSerializer = JsonSerializer.getInstance();
+
+ private final XmlSerializer xmlSerializer = XmlSerializer.getInstance();
+
+ private PropertiesServiceImpl(HttpPipeline httpPipeline) {
+ this.httpPipeline = httpPipeline;
+ }
+
+ @Override
+ public Response defaultMethod(String endpoint, String contentType, String accept,
+ DefaultDatetimeProperty body, RequestContext requestContext) {
+ HttpRequest httpRequest
+ = new HttpRequest().setMethod(HttpMethod.POST).setUri(endpoint + "/encode/datetime/property/default");
+ if (accept != null) {
+ httpRequest.getHeaders().add(HttpHeaderName.fromString("Accept"), accept);
+ }
+ if (body != null) {
+ httpRequest.getHeaders().set(HttpHeaderName.CONTENT_TYPE, contentType);
+ SerializationFormat requestFormat
+ = CoreUtils.serializationFormatFromContentType(httpRequest.getHeaders());
+ httpRequest.setBody(BinaryData.fromObject(body,
+ this.xmlSerializer.supportsFormat(requestFormat) ? this.xmlSerializer : this.jsonSerializer));
+ }
+ httpRequest.setContext(requestContext);
+ httpRequest.getContext().getRequestCallback().accept(httpRequest);
+ Response networkResponse = this.httpPipeline.send(httpRequest);
+ int responseCode = networkResponse.getStatusCode();
+ boolean expectedResponse = responseCode == 200;
+ if (!expectedResponse) {
+ GeneratedCodeUtils.handleUnexpectedResponse(responseCode, networkResponse, this.jsonSerializer,
+ this.xmlSerializer, null, null, HTTP_LOG);
+ }
+ return new Response<>(networkResponse.getRequest(), responseCode, networkResponse.getHeaders(),
+ this.decodeResponse(networkResponse.getValue(),
+ CoreUtils.createParameterizedType(Response.class, DefaultDatetimeProperty.class),
+ CoreUtils.serializationFormatFromContentType(networkResponse.getHeaders())));
+ }
+
+ @Override
+ public Response rfc3339(String endpoint, String contentType, String accept,
+ Rfc3339DatetimeProperty body, RequestContext requestContext) {
+ HttpRequest httpRequest
+ = new HttpRequest().setMethod(HttpMethod.POST).setUri(endpoint + "/encode/datetime/property/rfc3339");
+ if (accept != null) {
+ httpRequest.getHeaders().add(HttpHeaderName.fromString("Accept"), accept);
}
+ if (body != null) {
+ httpRequest.getHeaders().set(HttpHeaderName.CONTENT_TYPE, contentType);
+ SerializationFormat requestFormat
+ = CoreUtils.serializationFormatFromContentType(httpRequest.getHeaders());
+ httpRequest.setBody(BinaryData.fromObject(body,
+ this.xmlSerializer.supportsFormat(requestFormat) ? this.xmlSerializer : this.jsonSerializer));
+ }
+ httpRequest.setContext(requestContext);
+ httpRequest.getContext().getRequestCallback().accept(httpRequest);
+ Response networkResponse = this.httpPipeline.send(httpRequest);
+ int responseCode = networkResponse.getStatusCode();
+ boolean expectedResponse = responseCode == 200;
+ if (!expectedResponse) {
+ GeneratedCodeUtils.handleUnexpectedResponse(responseCode, networkResponse, this.jsonSerializer,
+ this.xmlSerializer, null, null, HTTP_LOG);
+ }
+ return new Response<>(networkResponse.getRequest(), responseCode, networkResponse.getHeaders(),
+ this.decodeResponse(networkResponse.getValue(),
+ CoreUtils.createParameterizedType(Response.class, Rfc3339DatetimeProperty.class),
+ CoreUtils.serializationFormatFromContentType(networkResponse.getHeaders())));
+ }
+ @Override
+ public Response rfc7231(String endpoint, String contentType, String accept,
+ Rfc7231DatetimeProperty body, RequestContext requestContext) {
+ HttpRequest httpRequest
+ = new HttpRequest().setMethod(HttpMethod.POST).setUri(endpoint + "/encode/datetime/property/rfc7231");
+ if (accept != null) {
+ httpRequest.getHeaders().add(HttpHeaderName.fromString("Accept"), accept);
+ }
+ if (body != null) {
+ httpRequest.getHeaders().set(HttpHeaderName.CONTENT_TYPE, contentType);
+ SerializationFormat requestFormat
+ = CoreUtils.serializationFormatFromContentType(httpRequest.getHeaders());
+ httpRequest.setBody(BinaryData.fromObject(body,
+ this.xmlSerializer.supportsFormat(requestFormat) ? this.xmlSerializer : this.jsonSerializer));
+ }
+ httpRequest.setContext(requestContext);
+ httpRequest.getContext().getRequestCallback().accept(httpRequest);
+ Response networkResponse = this.httpPipeline.send(httpRequest);
+ int responseCode = networkResponse.getStatusCode();
+ boolean expectedResponse = responseCode == 200;
+ if (!expectedResponse) {
+ GeneratedCodeUtils.handleUnexpectedResponse(responseCode, networkResponse, this.jsonSerializer,
+ this.xmlSerializer, null, null, HTTP_LOG);
+ }
+ return new Response<>(networkResponse.getRequest(), responseCode, networkResponse.getHeaders(),
+ this.decodeResponse(networkResponse.getValue(),
+ CoreUtils.createParameterizedType(Response.class, Rfc7231DatetimeProperty.class),
+ CoreUtils.serializationFormatFromContentType(networkResponse.getHeaders())));
}
- @HttpRequestInformation(
- method = HttpMethod.POST,
- path = "/encode/datetime/property/default",
- expectedStatusCodes = { 200 })
- @UnexpectedResponseExceptionDetail
- Response defaultMethod(@HostParam("endpoint") String endpoint,
- @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
- @BodyParam("application/json") DefaultDatetimeProperty body, RequestContext requestContext);
-
- @HttpRequestInformation(
- method = HttpMethod.POST,
- path = "/encode/datetime/property/rfc3339",
- expectedStatusCodes = { 200 })
- @UnexpectedResponseExceptionDetail
- Response rfc3339(@HostParam("endpoint") String endpoint,
- @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
- @BodyParam("application/json") Rfc3339DatetimeProperty body, RequestContext requestContext);
-
- @HttpRequestInformation(
- method = HttpMethod.POST,
- path = "/encode/datetime/property/rfc7231",
- expectedStatusCodes = { 200 })
- @UnexpectedResponseExceptionDetail
- Response rfc7231(@HostParam("endpoint") String endpoint,
- @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
- @BodyParam("application/json") Rfc7231DatetimeProperty body, RequestContext requestContext);
-
- @HttpRequestInformation(
- method = HttpMethod.POST,
- path = "/encode/datetime/property/unix-timestamp",
- expectedStatusCodes = { 200 })
- @UnexpectedResponseExceptionDetail
- Response unixTimestamp(@HostParam("endpoint") String endpoint,
- @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
- @BodyParam("application/json") UnixTimestampDatetimeProperty body, RequestContext requestContext);
-
- @HttpRequestInformation(
- method = HttpMethod.POST,
- path = "/encode/datetime/property/unix-timestamp-array",
- expectedStatusCodes = { 200 })
- @UnexpectedResponseExceptionDetail
- Response