Updated swagger to split implementation and client (Azure#22989)

* Updated swagger

* Checkpoint

* Fixed a bunch of autorest options

* Fixed all tests with generated client; updated recordings

* Cleaned up use of map on simple methods

* Missed an implementation type

Author: LarryOsterman

eng/code-quality-reports/src/main/resources/checkstyle/checkstyle-suppressions.xml

@@ -551,10 +551,10 @@ the main ServiceBusClientBuilder. -->
             files="com.azure.search.documents.SearchIndexingBufferedSender"/>
 
   <!-- Suppress checks on AutoRest generated Attestation service code -->
-  <suppress checks="(MissingJavadocMethod|EnforceFinalFields)"
-            files=".*[/\\]azure[/\\]security[/\\]attestation[/\\]AttestationClientBuilder.java"/>
+  <suppress checks="ThrowFromClientLogger"
+            files="com.azure.security.attestation.models.JsonWebKey.java"/>
   <suppress checks="WhitespaceAround|ThrowFromClientLogger"
-            files="com.azure.security.attestation.models.*\.java"/>
+            files="com.azure.security.attestation.implementation.models.*\.java"/>
 
   <suppress checks="com.azure.tools.checkstyle.checks.GoodLoggingCheck"
             files="com.azure.core.test.AzureTestWatcher.java"/>

eng/code-quality-reports/src/main/resources/spotbugs/spotbugs-exclude.xml

@@ -2459,8 +2459,14 @@
 
   <!-- Machine generated classes for MAA service generate spotBugs errors -->
   <Match>
-    <Class name="~com.azure.security.attestation.models\.[\w]+"/>
-    <Bug pattern="PZLA_PREFER_ZERO_LENGTH_ARRAYS"/>
+    <Or>
+      <Class name="~com.azure.security.attestation.implementation.models.*"/>
+      <Class name="~com.azure.security.attestation.models.*+"/>
+    </Or>
+    <Or>
+      <Bug pattern="PZLA_PREFER_ZERO_LENGTH_ARRAYS"/>
+      <Bug pattern="UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR"/>
+    </Or>
   </Match>
 
   <!-- Generated implementation of Anomaly Detector is using an inline class -->

sdk/attestation/azure-security-attestation/src/main/java/com/azure/security/attestation/AttestationAsyncClient.java

@@ -13,11 +13,12 @@
 import com.azure.security.attestation.models.AttestSgxEnclaveRequest;
 import com.azure.security.attestation.models.AttestationResponse;
 import com.azure.security.attestation.models.CloudErrorException;
-import com.azure.security.attestation.models.TpmAttestationRequest;
-import com.azure.security.attestation.models.TpmAttestationResponse;
 import reactor.core.publisher.Mono;
 
-/** Initializes a new instance of the asynchronous AttestationClient type. */
+import java.nio.charset.StandardCharsets;
+import java.util.Objects;
+
+/** Initializes a new instance of the asynchronous AzureAttestationRestClient type. */
 @ServiceClient(builder = AttestationClientBuilder.class, isAsync = true)
 public final class AttestationAsyncClient {
     private final AttestationsImpl serviceClient;
@@ -43,7 +44,8 @@ public final class AttestationAsyncClient {
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono<Response<AttestationResponse>> attestOpenEnclaveWithResponse(AttestOpenEnclaveRequest request) {
-        return this.serviceClient.attestOpenEnclaveWithResponseAsync(request);
+        return this.serviceClient.attestOpenEnclaveWithResponseAsync(request.toGenerated())
+            .map(response -> Utilities.generateResponseFromModelType(response, AttestationResponse.fromGenerated(response.getValue())));
     }
 
     /**
@@ -58,7 +60,8 @@ public Mono<Response<AttestationResponse>> attestOpenEnclaveWithResponse(AttestO
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono<AttestationResponse> attestOpenEnclave(AttestOpenEnclaveRequest request) {
-        return this.serviceClient.attestOpenEnclaveAsync(request);
+        return serviceClient.attestOpenEnclaveAsync(request.toGenerated())
+            .map(AttestationResponse::fromGenerated);
     }
 
     /**
@@ -73,7 +76,8 @@ public Mono<AttestationResponse> attestOpenEnclave(AttestOpenEnclaveRequest requ
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono<Response<AttestationResponse>> attestSgxEnclaveWithResponse(AttestSgxEnclaveRequest request) {
-        return this.serviceClient.attestSgxEnclaveWithResponseAsync(request);
+        return this.serviceClient.attestSgxEnclaveWithResponseAsync(request.toGenerated())
+            .map(response ->  Utilities.generateResponseFromModelType(response, AttestationResponse.fromGenerated(response.getValue())));
     }
 
     /**
@@ -88,7 +92,8 @@ public Mono<Response<AttestationResponse>> attestSgxEnclaveWithResponse(AttestSg
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono<AttestationResponse> attestSgxEnclave(AttestSgxEnclaveRequest request) {
-        return this.serviceClient.attestSgxEnclaveAsync(request);
+        return this.serviceClient.attestSgxEnclaveAsync(request.toGenerated())
+            .map(AttestationResponse::fromGenerated);
     }
 
     /**
@@ -102,8 +107,9 @@ public Mono<AttestationResponse> attestSgxEnclave(AttestSgxEnclaveRequest reques
      * @return attestation response for Trusted Platform Module (TPM) attestation.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<Response<TpmAttestationResponse>> attestTpmWithResponse(TpmAttestationRequest request) {
-        return this.serviceClient.attestTpmWithResponseAsync(request);
+    public Mono<Response<String>> attestTpmWithResponse(String request) {
+        return this.serviceClient.attestTpmWithResponseAsync(new com.azure.security.attestation.implementation.models.TpmAttestationRequest().setData(request.getBytes(StandardCharsets.UTF_8)))
+            .map(response -> Utilities.generateResponseFromModelType(response, new String(Objects.requireNonNull(response.getValue().getData()), StandardCharsets.UTF_8)));
     }
 
     /**
@@ -117,7 +123,8 @@ public Mono<Response<TpmAttestationResponse>> attestTpmWithResponse(TpmAttestati
      * @return attestation response for Trusted Platform Module (TPM) attestation.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<TpmAttestationResponse> attestTpm(TpmAttestationRequest request) {
-        return this.serviceClient.attestTpmAsync(request);
+    public Mono<String> attestTpm(String request) {
+        return this.serviceClient.attestTpmAsync(new com.azure.security.attestation.implementation.models.TpmAttestationRequest().setData(request.getBytes(StandardCharsets.UTF_8)))
+            .map(response -> new String(response.getData(), StandardCharsets.UTF_8));
     }
 }

sdk/attestation/azure-security-attestation/src/main/java/com/azure/security/attestation/AttestationClient.java

@@ -10,14 +10,17 @@
 import com.azure.core.http.rest.Response;
 import com.azure.core.util.Context;
 import com.azure.security.attestation.implementation.AttestationsImpl;
+import com.azure.security.attestation.implementation.models.TpmAttestationRequest;
+import com.azure.security.attestation.implementation.models.TpmAttestationResponse;
 import com.azure.security.attestation.models.AttestOpenEnclaveRequest;
 import com.azure.security.attestation.models.AttestSgxEnclaveRequest;
 import com.azure.security.attestation.models.AttestationResponse;
 import com.azure.security.attestation.models.CloudErrorException;
-import com.azure.security.attestation.models.TpmAttestationRequest;
-import com.azure.security.attestation.models.TpmAttestationResponse;
 
-/** Initializes a new instance of the synchronous AttestationClient type. */
+import java.nio.charset.StandardCharsets;
+import java.util.Objects;
+
+/** Initializes a new instance of the synchronous AzureAttestationRestClient type. */
 @ServiceClient(builder = AttestationClientBuilder.class)
 public final class AttestationClient {
     private final AttestationsImpl serviceClient;
@@ -43,7 +46,7 @@ public final class AttestationClient {
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public AttestationResponse attestOpenEnclave(AttestOpenEnclaveRequest request) {
-        return this.serviceClient.attestOpenEnclave(request);
+        return AttestationResponse.fromGenerated(this.serviceClient.attestOpenEnclave(request.toGenerated()));
     }
 
     /**
@@ -60,7 +63,8 @@ public AttestationResponse attestOpenEnclave(AttestOpenEnclaveRequest request) {
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response<AttestationResponse> attestOpenEnclaveWithResponse(
             AttestOpenEnclaveRequest request, Context context) {
-        return this.serviceClient.attestOpenEnclaveWithResponse(request, context);
+        Response<com.azure.security.attestation.implementation.models.AttestationResponse> response = this.serviceClient.attestOpenEnclaveWithResponse(request.toGenerated(), context);
+        return Utilities.generateResponseFromModelType(response, AttestationResponse.fromGenerated(response.getValue()));
     }
 
     /**
@@ -75,7 +79,7 @@ public Response<AttestationResponse> attestOpenEnclaveWithResponse(
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public AttestationResponse attestSgxEnclave(AttestSgxEnclaveRequest request) {
-        return this.serviceClient.attestSgxEnclave(request);
+        return AttestationResponse.fromGenerated(serviceClient.attestSgxEnclave(request.toGenerated()));
     }
 
     /**
@@ -92,7 +96,8 @@ public AttestationResponse attestSgxEnclave(AttestSgxEnclaveRequest request) {
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response<AttestationResponse> attestSgxEnclaveWithResponse(
             AttestSgxEnclaveRequest request, Context context) {
-        return this.serviceClient.attestSgxEnclaveWithResponse(request, context);
+        Response<com.azure.security.attestation.implementation.models.AttestationResponse> response = this.serviceClient.attestSgxEnclaveWithResponse(request.toGenerated(), context);
+        return Utilities.generateResponseFromModelType(response, AttestationResponse.fromGenerated(response.getValue()));
     }
 
     /**
@@ -106,8 +111,10 @@ public Response<AttestationResponse> attestSgxEnclaveWithResponse(
      * @return attestation response for Trusted Platform Module (TPM) attestation.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public TpmAttestationResponse attestTpm(TpmAttestationRequest request) {
-        return this.serviceClient.attestTpm(request);
+    public String attestTpm(String request) {
+        return new String(Objects.requireNonNull(this.serviceClient.attestTpm(
+            new TpmAttestationRequest()
+                .setData(request.getBytes(StandardCharsets.UTF_8))).getData()), StandardCharsets.UTF_8);
     }
 
     /**
@@ -122,7 +129,9 @@ public TpmAttestationResponse attestTpm(TpmAttestationRequest request) {
      * @return attestation response for Trusted Platform Module (TPM) attestation.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<TpmAttestationResponse> attestTpmWithResponse(TpmAttestationRequest request, Context context) {
-        return this.serviceClient.attestTpmWithResponse(request, context);
+    public Response<String> attestTpmWithResponse(String request, Context context) {
+
+        Response<TpmAttestationResponse> response = this.serviceClient.attestTpmWithResponse(new TpmAttestationRequest().setData(request.getBytes(StandardCharsets.UTF_8)), context);
+        return Utilities.generateResponseFromModelType(response, new String(Objects.requireNonNull(response.getValue().getData()), StandardCharsets.UTF_8));
     }
 }

sdk/attestation/azure-security-attestation/src/main/java/com/azure/security/attestation/AttestationClientBuilder.java

@@ -18,11 +18,14 @@
 import com.azure.core.util.Configuration;
 import com.azure.core.util.serializer.JacksonAdapter;
 import com.azure.core.util.serializer.SerializerAdapter;
+import com.azure.security.attestation.implementation.AttestationClientImplBuilder;
 import com.azure.security.attestation.implementation.AttestationClientImpl;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 /** A builder for creating a new instance of the AttestationClient type. */
 @ServiceClientBuilder(
@@ -45,6 +48,9 @@ public final class AttestationClientBuilder {
 
     private final Map<String, String> properties = new HashMap<>();
 
+    /**
+     * Creates a new instance of the AttestationClientBuilder class.
+     */
     public AttestationClientBuilder() {
         this.pipelinePolicies = new ArrayList<>();
     }
@@ -53,23 +59,23 @@ public AttestationClientBuilder() {
      * The attestation instance base URI, for example
      * https://mytenant.attest.azure.net.
      */
-    private String instanceUrl;
+    private String endpoint;
 
     /**
-     * Sets The attestation instance base URI, for example https://mytenant.attest.azure.net.
+     * Sets The attestation endpoint URI, for example https://mytenant.attest.azure.net.
      *
-     * @param instanceUrl the instanceUrl value.
+     * @param endpoint The endpoint to connect to.
      * @return the AttestationClientBuilder.
      */
-    public AttestationClientBuilder instanceUrl(String instanceUrl) {
-        this.instanceUrl = instanceUrl;
+    public AttestationClientBuilder endpoint(String endpoint) {
+        this.endpoint = endpoint;
         return this;
     }
 
     /*
      * The HTTP pipeline to send requests through
      */
-    private HttpPipeline pipeline;
+    private HttpPipeline httpPipeline;
 
     /**
      * Sets The HTTP pipeline to send requests through.
@@ -78,7 +84,7 @@ public AttestationClientBuilder instanceUrl(String instanceUrl) {
      * @return the AttestationClientBuilder.
      */
     public AttestationClientBuilder pipeline(HttpPipeline pipeline) {
-        this.pipeline = pipeline;
+        this.httpPipeline = pipeline;
         return this;
     }
 
@@ -167,7 +173,7 @@ public AttestationClientBuilder retryPolicy(RetryPolicy retryPolicy) {
     /*
      * The list of Http pipeline policies to add.
      */
-    private List<HttpPipelinePolicy> pipelinePolicies;
+    private final List<HttpPipelinePolicy> pipelinePolicies;
 
     /**
      * Adds a custom Http pipeline policy.
@@ -186,14 +192,22 @@ public AttestationClientBuilder addPolicy(HttpPipelinePolicy customPolicy) {
      * @return an instance of AttestationClientImpl.
      */
     private AttestationClientImpl buildInnerClient() {
-        if (pipeline == null) {
-            this.pipeline = createHttpPipeline();
+        Objects.requireNonNull(endpoint);
+
+        HttpPipeline pipeline;
+        if (httpPipeline != null) {
+            pipeline = httpPipeline;
+        } else {
+            pipeline = createHttpPipeline();
         }
         if (serializerAdapter == null) {
             this.serializerAdapter = JacksonAdapter.createDefaultSerializerAdapter();
         }
-        AttestationClientImpl client = new AttestationClientImpl(pipeline, serializerAdapter, instanceUrl);
-        return client;
+        AttestationClientImplBuilder client = new AttestationClientImplBuilder()
+            .pipeline(pipeline)
+            .instanceUrl(endpoint)
+            .serializerAdapter(serializerAdapter);
+        return client.buildClient();
     }
 
     private HttpPipeline createHttpPipeline() {
@@ -213,12 +227,10 @@ private HttpPipeline createHttpPipeline() {
         policies.addAll(this.pipelinePolicies);
         HttpPolicyProviders.addAfterRetryPolicies(policies);
         policies.add(new HttpLoggingPolicy(httpLogOptions));
-        HttpPipeline httpPipeline =
-                new HttpPipelineBuilder()
-                        .policies(policies.toArray(new HttpPipelinePolicy[0]))
-                        .httpClient(httpClient)
-                        .build();
-        return httpPipeline;
+        return new HttpPipelineBuilder()
+                .policies(policies.toArray(new HttpPipelinePolicy[0]))
+                .httpClient(httpClient)
+                .build();
     }
 
     /**

sdk/attestation/azure-security-attestation/src/main/java/com/azure/security/attestation/PolicyAsyncClient.java

@@ -14,7 +14,7 @@
 import com.azure.security.attestation.models.PolicyResponse;
 import reactor.core.publisher.Mono;
 
-/** Initializes a new instance of the asynchronous AttestationClient type. */
+/** Initializes a new instance of the asynchronous AzureAttestationRestClient type. */
 @ServiceClient(builder = AttestationClientBuilder.class, isAsync = true)
 public final class PolicyAsyncClient {
     private final PoliciesImpl serviceClient;
@@ -39,7 +39,8 @@ public final class PolicyAsyncClient {
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono<Response<PolicyResponse>> getWithResponse(AttestationType attestationType) {
-        return this.serviceClient.getWithResponseAsync(attestationType);
+        return this.serviceClient.getWithResponseAsync(attestationType)
+            .map(response -> Utilities.generateResponseFromModelType(response, PolicyResponse.fromGenerated(response.getValue())));
     }
 
     /**
@@ -53,7 +54,9 @@ public Mono<Response<PolicyResponse>> getWithResponse(AttestationType attestatio
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono<PolicyResponse> get(AttestationType attestationType) {
-        return this.serviceClient.getAsync(attestationType);
+        return serviceClient.getAsync(attestationType)
+            .map(PolicyResponse::fromGenerated);
+
     }
 
     /**
@@ -69,7 +72,8 @@ public Mono<PolicyResponse> get(AttestationType attestationType) {
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono<Response<PolicyResponse>> setWithResponse(
             AttestationType attestationType, String newAttestationPolicy) {
-        return this.serviceClient.setWithResponseAsync(attestationType, newAttestationPolicy);
+        return serviceClient.setWithResponseAsync(attestationType, newAttestationPolicy)
+            .map(response -> Utilities.generateResponseFromModelType(response, PolicyResponse.fromGenerated(response.getValue())));
     }
 
     /**
@@ -84,7 +88,8 @@ public Mono<Response<PolicyResponse>> setWithResponse(
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono<PolicyResponse> set(AttestationType attestationType, String newAttestationPolicy) {
-        return this.serviceClient.setAsync(attestationType, newAttestationPolicy);
+        return this.serviceClient.setAsync(attestationType, newAttestationPolicy)
+            .map(PolicyResponse::fromGenerated);
     }
 
     /**
@@ -99,7 +104,8 @@ public Mono<PolicyResponse> set(AttestationType attestationType, String newAttes
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono<Response<PolicyResponse>> resetWithResponse(AttestationType attestationType, String policyJws) {
-        return this.serviceClient.resetWithResponseAsync(attestationType, policyJws);
+        return this.serviceClient.resetWithResponseAsync(attestationType, policyJws)
+            .map(response -> Utilities.generateResponseFromModelType(response, PolicyResponse.fromGenerated(response.getValue())));
     }
 
     /**
@@ -114,6 +120,7 @@ public Mono<Response<PolicyResponse>> resetWithResponse(AttestationType attestat
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono<PolicyResponse> reset(AttestationType attestationType, String policyJws) {
-        return this.serviceClient.resetAsync(attestationType, policyJws);
+        return this.serviceClient.resetAsync(attestationType, policyJws)
+            .map(PolicyResponse::fromGenerated);
     }
 }