http-client-java, bump clientcore beta.5 (#6031)

lots of package name changed autorest.java PR Azure/autorest.java#3029
microsoft · Feb 18, 2025 · 59f085d · 59f085d
1 parent 45b0601
commit 59f085d
Show file tree

Hide file tree

Showing 785 changed files with 9,663 additions and 3,423 deletions.
diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/Generate.ps1 b/packages/http-client-java/generator/http-client-generator-clientcore-test/Generate.ps1
@@ -88,12 +88,6 @@ Copy-Item -Path node_modules/@typespec/http-specs/specs -Destination ./ -Recurse
 # remove xml tests, emitter has not supported xml model
 Remove-Item ./specs/payload/xml -Recurse -Force
 
-# Base64Url not in core
-Remove-Item ./specs/encode/bytes -Recurse -Force
-# DateTimeRfc1123 is private in beta.1, should now be public in main
-Remove-Item ./specs/encode/datetime -Recurse -Force
-Remove-Item ./specs/special-headers -Recurse -Force
-
 $job = (Get-ChildItem ./specs -Include "main.tsp","old.tsp" -File -Recurse) | ForEach-Object -Parallel $generateScript -ThrottleLimit $Parallelization -AsJob
 
 $job | Wait-Job -Timeout 1200

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
@@ -23,7 +23,7 @@
     <dependency>
       <groupId>io.clientcore</groupId>
       <artifactId>core</artifactId>
-      <version>1.0.0-beta.3</version>
+      <version>1.0.0-beta.5</version>
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>

diff --git a/...tp-client-generator-clientcore-test/src/main/java/authentication/apikey/ApiKeyClient.java b/...tp-client-generator-clientcore-test/src/main/java/authentication/apikey/ApiKeyClient.java
@@ -3,9 +3,9 @@
 package authentication.apikey;
 
 import authentication.apikey.implementation.ApiKeyClientImpl;
-import io.clientcore.core.annotation.Metadata;
-import io.clientcore.core.annotation.ServiceClient;
-import io.clientcore.core.http.exception.HttpResponseException;
+import io.clientcore.core.annotations.Metadata;
+import io.clientcore.core.annotations.ServiceClient;
+import io.clientcore.core.http.exceptions.HttpResponseException;
 import io.clientcore.core.http.models.RequestOptions;
 import io.clientcore.core.http.models.Response;
 

diff --git a/...nt-generator-clientcore-test/src/main/java/authentication/apikey/ApiKeyClientBuilder.java b/...nt-generator-clientcore-test/src/main/java/authentication/apikey/ApiKeyClientBuilder.java
@@ -3,28 +3,28 @@
 package authentication.apikey;
 
 import authentication.apikey.implementation.ApiKeyClientImpl;
-import io.clientcore.core.annotation.Metadata;
-import io.clientcore.core.annotation.ServiceClientBuilder;
-import io.clientcore.core.credential.KeyCredential;
+import io.clientcore.core.annotations.Metadata;
+import io.clientcore.core.annotations.ServiceClientBuilder;
+import io.clientcore.core.credentials.KeyCredential;
 import io.clientcore.core.http.client.HttpClient;
-import io.clientcore.core.http.models.HttpInstrumentationOptions;
-import io.clientcore.core.http.models.HttpRedirectOptions;
-import io.clientcore.core.http.models.HttpRetryOptions;
 import io.clientcore.core.http.models.ProxyOptions;
+import io.clientcore.core.http.pipeline.HttpInstrumentationOptions;
 import io.clientcore.core.http.pipeline.HttpInstrumentationPolicy;
 import io.clientcore.core.http.pipeline.HttpPipeline;
 import io.clientcore.core.http.pipeline.HttpPipelineBuilder;
 import io.clientcore.core.http.pipeline.HttpPipelinePolicy;
+import io.clientcore.core.http.pipeline.HttpRedirectOptions;
 import io.clientcore.core.http.pipeline.HttpRedirectPolicy;
+import io.clientcore.core.http.pipeline.HttpRetryOptions;
 import io.clientcore.core.http.pipeline.HttpRetryPolicy;
 import io.clientcore.core.http.pipeline.KeyCredentialPolicy;
 import io.clientcore.core.instrumentation.logging.ClientLogger;
-import io.clientcore.core.models.traits.ConfigurationTrait;
-import io.clientcore.core.models.traits.EndpointTrait;
-import io.clientcore.core.models.traits.HttpTrait;
-import io.clientcore.core.models.traits.KeyCredentialTrait;
-import io.clientcore.core.models.traits.ProxyTrait;
-import io.clientcore.core.util.configuration.Configuration;
+import io.clientcore.core.traits.ConfigurationTrait;
+import io.clientcore.core.traits.EndpointTrait;
+import io.clientcore.core.traits.HttpTrait;
+import io.clientcore.core.traits.KeyCredentialTrait;
+import io.clientcore.core.traits.ProxyTrait;
+import io.clientcore.core.utils.configuration.Configuration;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -247,7 +247,7 @@ private HttpPipeline createHttpPipeline() {
             policies.add(new KeyCredentialPolicy("x-ms-api-key", keyCredential, null));
         }
         policies.add(new HttpInstrumentationPolicy(localHttpInstrumentationOptions));
-        httpPipelineBuilder.policies(policies.toArray(new HttpPipelinePolicy[0]));
+        policies.forEach(httpPipelineBuilder::addPolicy);
         return httpPipelineBuilder.build();
     }
 

diff --git a/...ttp-client-generator-clientcore-test/src/main/java/authentication/apikey/InvalidAuth.java b/...ttp-client-generator-clientcore-test/src/main/java/authentication/apikey/InvalidAuth.java
@@ -2,8 +2,8 @@
 
 package authentication.apikey;
 
-import io.clientcore.core.annotation.Metadata;
-import io.clientcore.core.annotation.TypeConditions;
+import io.clientcore.core.annotations.Metadata;
+import io.clientcore.core.annotations.TypeConditions;
 import io.clientcore.core.serialization.json.JsonReader;
 import io.clientcore.core.serialization.json.JsonSerializable;
 import io.clientcore.core.serialization.json.JsonToken;

diff --git a/...-clientcore-test/src/main/java/authentication/apikey/implementation/ApiKeyClientImpl.java b/...-clientcore-test/src/main/java/authentication/apikey/implementation/ApiKeyClientImpl.java
@@ -3,13 +3,13 @@
 package authentication.apikey.implementation;
 
 import authentication.apikey.InvalidAuth;
-import io.clientcore.core.annotation.ServiceInterface;
+import io.clientcore.core.annotations.ServiceInterface;
 import io.clientcore.core.http.RestProxy;
-import io.clientcore.core.http.annotation.HeaderParam;
-import io.clientcore.core.http.annotation.HostParam;
-import io.clientcore.core.http.annotation.HttpRequestInformation;
-import io.clientcore.core.http.annotation.UnexpectedResponseExceptionDetail;
-import io.clientcore.core.http.exception.HttpResponseException;
+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.exceptions.HttpResponseException;
 import io.clientcore.core.http.models.HttpMethod;
 import io.clientcore.core.http.models.RequestOptions;
 import io.clientcore.core.http.models.Response;

diff --git a/...ient-generator-clientcore-test/src/main/java/authentication/http/custom/CustomClient.java b/...ient-generator-clientcore-test/src/main/java/authentication/http/custom/CustomClient.java
@@ -3,9 +3,9 @@
 package authentication.http.custom;
 
 import authentication.http.custom.implementation.CustomClientImpl;
-import io.clientcore.core.annotation.Metadata;
-import io.clientcore.core.annotation.ServiceClient;
-import io.clientcore.core.http.exception.HttpResponseException;
+import io.clientcore.core.annotations.Metadata;
+import io.clientcore.core.annotations.ServiceClient;
+import io.clientcore.core.http.exceptions.HttpResponseException;
 import io.clientcore.core.http.models.RequestOptions;
 import io.clientcore.core.http.models.Response;
 

diff --git a/...nerator-clientcore-test/src/main/java/authentication/http/custom/CustomClientBuilder.java b/...nerator-clientcore-test/src/main/java/authentication/http/custom/CustomClientBuilder.java
@@ -3,28 +3,28 @@
 package authentication.http.custom;
 
 import authentication.http.custom.implementation.CustomClientImpl;
-import io.clientcore.core.annotation.Metadata;
-import io.clientcore.core.annotation.ServiceClientBuilder;
-import io.clientcore.core.credential.KeyCredential;
+import io.clientcore.core.annotations.Metadata;
+import io.clientcore.core.annotations.ServiceClientBuilder;
+import io.clientcore.core.credentials.KeyCredential;
 import io.clientcore.core.http.client.HttpClient;
-import io.clientcore.core.http.models.HttpInstrumentationOptions;
-import io.clientcore.core.http.models.HttpRedirectOptions;
-import io.clientcore.core.http.models.HttpRetryOptions;
 import io.clientcore.core.http.models.ProxyOptions;
+import io.clientcore.core.http.pipeline.HttpInstrumentationOptions;
 import io.clientcore.core.http.pipeline.HttpInstrumentationPolicy;
 import io.clientcore.core.http.pipeline.HttpPipeline;
 import io.clientcore.core.http.pipeline.HttpPipelineBuilder;
 import io.clientcore.core.http.pipeline.HttpPipelinePolicy;
+import io.clientcore.core.http.pipeline.HttpRedirectOptions;
 import io.clientcore.core.http.pipeline.HttpRedirectPolicy;
+import io.clientcore.core.http.pipeline.HttpRetryOptions;
 import io.clientcore.core.http.pipeline.HttpRetryPolicy;
 import io.clientcore.core.http.pipeline.KeyCredentialPolicy;
 import io.clientcore.core.instrumentation.logging.ClientLogger;
-import io.clientcore.core.models.traits.ConfigurationTrait;
-import io.clientcore.core.models.traits.EndpointTrait;
-import io.clientcore.core.models.traits.HttpTrait;
-import io.clientcore.core.models.traits.KeyCredentialTrait;
-import io.clientcore.core.models.traits.ProxyTrait;
-import io.clientcore.core.util.configuration.Configuration;
+import io.clientcore.core.traits.ConfigurationTrait;
+import io.clientcore.core.traits.EndpointTrait;
+import io.clientcore.core.traits.HttpTrait;
+import io.clientcore.core.traits.KeyCredentialTrait;
+import io.clientcore.core.traits.ProxyTrait;
+import io.clientcore.core.utils.configuration.Configuration;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -247,7 +247,7 @@ private HttpPipeline createHttpPipeline() {
             policies.add(new KeyCredentialPolicy("authorization", keyCredential, "SharedAccessKey"));
         }
         policies.add(new HttpInstrumentationPolicy(localHttpInstrumentationOptions));
-        httpPipelineBuilder.policies(policies.toArray(new HttpPipelinePolicy[0]));
+        policies.forEach(httpPipelineBuilder::addPolicy);
         return httpPipelineBuilder.build();
     }
 

diff --git a/...lient-generator-clientcore-test/src/main/java/authentication/http/custom/InvalidAuth.java b/...lient-generator-clientcore-test/src/main/java/authentication/http/custom/InvalidAuth.java
@@ -2,8 +2,8 @@
 
 package authentication.http.custom;
 
-import io.clientcore.core.annotation.Metadata;
-import io.clientcore.core.annotation.TypeConditions;
+import io.clientcore.core.annotations.Metadata;
+import io.clientcore.core.annotations.TypeConditions;
 import io.clientcore.core.serialization.json.JsonReader;
 import io.clientcore.core.serialization.json.JsonSerializable;
 import io.clientcore.core.serialization.json.JsonToken;

diff --git a/...ntcore-test/src/main/java/authentication/http/custom/implementation/CustomClientImpl.java b/...ntcore-test/src/main/java/authentication/http/custom/implementation/CustomClientImpl.java
@@ -3,13 +3,13 @@
 package authentication.http.custom.implementation;
 
 import authentication.http.custom.InvalidAuth;
-import io.clientcore.core.annotation.ServiceInterface;
+import io.clientcore.core.annotations.ServiceInterface;
 import io.clientcore.core.http.RestProxy;
-import io.clientcore.core.http.annotation.HeaderParam;
-import io.clientcore.core.http.annotation.HostParam;
-import io.clientcore.core.http.annotation.HttpRequestInformation;
-import io.clientcore.core.http.annotation.UnexpectedResponseExceptionDetail;
-import io.clientcore.core.http.exception.HttpResponseException;
+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.exceptions.HttpResponseException;
 import io.clientcore.core.http.models.HttpMethod;
 import io.clientcore.core.http.models.RequestOptions;
 import io.clientcore.core.http.models.Response;

diff --git a/...ttp-client-generator-clientcore-test/src/main/java/authentication/oauth2/InvalidAuth.java b/...ttp-client-generator-clientcore-test/src/main/java/authentication/oauth2/InvalidAuth.java
@@ -2,8 +2,8 @@
 
 package authentication.oauth2;
 
-import io.clientcore.core.annotation.Metadata;
-import io.clientcore.core.annotation.TypeConditions;
+import io.clientcore.core.annotations.Metadata;
+import io.clientcore.core.annotations.TypeConditions;
 import io.clientcore.core.serialization.json.JsonReader;
 import io.clientcore.core.serialization.json.JsonSerializable;
 import io.clientcore.core.serialization.json.JsonToken;

diff --git a/...tp-client-generator-clientcore-test/src/main/java/authentication/oauth2/OAuth2Client.java b/...tp-client-generator-clientcore-test/src/main/java/authentication/oauth2/OAuth2Client.java
@@ -3,9 +3,9 @@
 package authentication.oauth2;
 
 import authentication.oauth2.implementation.OAuth2ClientImpl;
-import io.clientcore.core.annotation.Metadata;
-import io.clientcore.core.annotation.ServiceClient;
-import io.clientcore.core.http.exception.HttpResponseException;
+import io.clientcore.core.annotations.Metadata;
+import io.clientcore.core.annotations.ServiceClient;
+import io.clientcore.core.http.exceptions.HttpResponseException;
 import io.clientcore.core.http.models.RequestOptions;
 import io.clientcore.core.http.models.Response;
 

diff --git a/...nt-generator-clientcore-test/src/main/java/authentication/oauth2/OAuth2ClientBuilder.java b/...nt-generator-clientcore-test/src/main/java/authentication/oauth2/OAuth2ClientBuilder.java
@@ -3,28 +3,28 @@
 package authentication.oauth2;
 
 import authentication.oauth2.implementation.OAuth2ClientImpl;
-import io.clientcore.core.annotation.Metadata;
-import io.clientcore.core.annotation.ServiceClientBuilder;
-import io.clientcore.core.credential.KeyCredential;
+import io.clientcore.core.annotations.Metadata;
+import io.clientcore.core.annotations.ServiceClientBuilder;
+import io.clientcore.core.credentials.KeyCredential;
 import io.clientcore.core.http.client.HttpClient;
-import io.clientcore.core.http.models.HttpInstrumentationOptions;
-import io.clientcore.core.http.models.HttpRedirectOptions;
-import io.clientcore.core.http.models.HttpRetryOptions;
 import io.clientcore.core.http.models.ProxyOptions;
+import io.clientcore.core.http.pipeline.HttpInstrumentationOptions;
 import io.clientcore.core.http.pipeline.HttpInstrumentationPolicy;
 import io.clientcore.core.http.pipeline.HttpPipeline;
 import io.clientcore.core.http.pipeline.HttpPipelineBuilder;
 import io.clientcore.core.http.pipeline.HttpPipelinePolicy;
+import io.clientcore.core.http.pipeline.HttpRedirectOptions;
 import io.clientcore.core.http.pipeline.HttpRedirectPolicy;
+import io.clientcore.core.http.pipeline.HttpRetryOptions;
 import io.clientcore.core.http.pipeline.HttpRetryPolicy;
 import io.clientcore.core.http.pipeline.KeyCredentialPolicy;
 import io.clientcore.core.instrumentation.logging.ClientLogger;
-import io.clientcore.core.models.traits.ConfigurationTrait;
-import io.clientcore.core.models.traits.EndpointTrait;
-import io.clientcore.core.models.traits.HttpTrait;
-import io.clientcore.core.models.traits.KeyCredentialTrait;
-import io.clientcore.core.models.traits.ProxyTrait;
-import io.clientcore.core.util.configuration.Configuration;
+import io.clientcore.core.traits.ConfigurationTrait;
+import io.clientcore.core.traits.EndpointTrait;
+import io.clientcore.core.traits.HttpTrait;
+import io.clientcore.core.traits.KeyCredentialTrait;
+import io.clientcore.core.traits.ProxyTrait;
+import io.clientcore.core.utils.configuration.Configuration;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -247,7 +247,7 @@ private HttpPipeline createHttpPipeline() {
             policies.add(new KeyCredentialPolicy("authorization", keyCredential, "Bearer"));
         }
         policies.add(new HttpInstrumentationPolicy(localHttpInstrumentationOptions));
-        httpPipelineBuilder.policies(policies.toArray(new HttpPipelinePolicy[0]));
+        policies.forEach(httpPipelineBuilder::addPolicy);
         return httpPipelineBuilder.build();
     }
 

diff --git a/...-clientcore-test/src/main/java/authentication/oauth2/implementation/OAuth2ClientImpl.java b/...-clientcore-test/src/main/java/authentication/oauth2/implementation/OAuth2ClientImpl.java
@@ -3,13 +3,13 @@
 package authentication.oauth2.implementation;
 
 import authentication.oauth2.InvalidAuth;
-import io.clientcore.core.annotation.ServiceInterface;
+import io.clientcore.core.annotations.ServiceInterface;
 import io.clientcore.core.http.RestProxy;
-import io.clientcore.core.http.annotation.HeaderParam;
-import io.clientcore.core.http.annotation.HostParam;
-import io.clientcore.core.http.annotation.HttpRequestInformation;
-import io.clientcore.core.http.annotation.UnexpectedResponseExceptionDetail;
-import io.clientcore.core.http.exception.HttpResponseException;
+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.exceptions.HttpResponseException;
 import io.clientcore.core.http.models.HttpMethod;
 import io.clientcore.core.http.models.RequestOptions;
 import io.clientcore.core.http.models.Response;

diff --git a/...http-client-generator-clientcore-test/src/main/java/authentication/union/UnionClient.java b/...http-client-generator-clientcore-test/src/main/java/authentication/union/UnionClient.java
@@ -3,9 +3,9 @@
 package authentication.union;
 
 import authentication.union.implementation.UnionClientImpl;
-import io.clientcore.core.annotation.Metadata;
-import io.clientcore.core.annotation.ServiceClient;
-import io.clientcore.core.http.exception.HttpResponseException;
+import io.clientcore.core.annotations.Metadata;
+import io.clientcore.core.annotations.ServiceClient;
+import io.clientcore.core.http.exceptions.HttpResponseException;
 import io.clientcore.core.http.models.RequestOptions;
 import io.clientcore.core.http.models.Response;
 

diff --git a/...ient-generator-clientcore-test/src/main/java/authentication/union/UnionClientBuilder.java b/...ient-generator-clientcore-test/src/main/java/authentication/union/UnionClientBuilder.java
@@ -3,28 +3,28 @@
 package authentication.union;
 
 import authentication.union.implementation.UnionClientImpl;
-import io.clientcore.core.annotation.Metadata;
-import io.clientcore.core.annotation.ServiceClientBuilder;
-import io.clientcore.core.credential.KeyCredential;
+import io.clientcore.core.annotations.Metadata;
+import io.clientcore.core.annotations.ServiceClientBuilder;
+import io.clientcore.core.credentials.KeyCredential;
 import io.clientcore.core.http.client.HttpClient;
-import io.clientcore.core.http.models.HttpInstrumentationOptions;
-import io.clientcore.core.http.models.HttpRedirectOptions;
-import io.clientcore.core.http.models.HttpRetryOptions;
 import io.clientcore.core.http.models.ProxyOptions;
+import io.clientcore.core.http.pipeline.HttpInstrumentationOptions;
 import io.clientcore.core.http.pipeline.HttpInstrumentationPolicy;
 import io.clientcore.core.http.pipeline.HttpPipeline;
 import io.clientcore.core.http.pipeline.HttpPipelineBuilder;
 import io.clientcore.core.http.pipeline.HttpPipelinePolicy;
+import io.clientcore.core.http.pipeline.HttpRedirectOptions;
 import io.clientcore.core.http.pipeline.HttpRedirectPolicy;
+import io.clientcore.core.http.pipeline.HttpRetryOptions;
 import io.clientcore.core.http.pipeline.HttpRetryPolicy;
 import io.clientcore.core.http.pipeline.KeyCredentialPolicy;
 import io.clientcore.core.instrumentation.logging.ClientLogger;
-import io.clientcore.core.models.traits.ConfigurationTrait;
-import io.clientcore.core.models.traits.EndpointTrait;
-import io.clientcore.core.models.traits.HttpTrait;
-import io.clientcore.core.models.traits.KeyCredentialTrait;
-import io.clientcore.core.models.traits.ProxyTrait;
-import io.clientcore.core.util.configuration.Configuration;
+import io.clientcore.core.traits.ConfigurationTrait;
+import io.clientcore.core.traits.EndpointTrait;
+import io.clientcore.core.traits.HttpTrait;
+import io.clientcore.core.traits.KeyCredentialTrait;
+import io.clientcore.core.traits.ProxyTrait;
+import io.clientcore.core.utils.configuration.Configuration;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -246,7 +246,7 @@ private HttpPipeline createHttpPipeline() {
             policies.add(new KeyCredentialPolicy("authorization", keyCredential, "Bearer"));
         }
         policies.add(new HttpInstrumentationPolicy(localHttpInstrumentationOptions));
-        httpPipelineBuilder.policies(policies.toArray(new HttpPipelinePolicy[0]));
+        policies.forEach(httpPipelineBuilder::addPolicy);
         return httpPipelineBuilder.build();
     }
 

diff --git a/...or-clientcore-test/src/main/java/authentication/union/implementation/UnionClientImpl.java b/...or-clientcore-test/src/main/java/authentication/union/implementation/UnionClientImpl.java
@@ -2,12 +2,12 @@
 
 package authentication.union.implementation;
 
-import io.clientcore.core.annotation.ServiceInterface;
+import io.clientcore.core.annotations.ServiceInterface;
 import io.clientcore.core.http.RestProxy;
-import io.clientcore.core.http.annotation.HostParam;
-import io.clientcore.core.http.annotation.HttpRequestInformation;
-import io.clientcore.core.http.annotation.UnexpectedResponseExceptionDetail;
-import io.clientcore.core.http.exception.HttpResponseException;
+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.exceptions.HttpResponseException;
 import io.clientcore.core.http.models.HttpMethod;
 import io.clientcore.core.http.models.RequestOptions;
 import io.clientcore.core.http.models.Response;