Remove Jackson usage in Personalizer (#42503)

Author: alzimmermsft

sdk/personalizer/azure-ai-personalizer/assets.json

@@ -2,5 +2,5 @@
   "AssetsRepo": "Azure/azure-sdk-assets",
   "AssetsRepoPrefixPath": "java",
   "TagPrefix": "java/personalizer/azure-ai-personalizer",
-  "Tag": "java/personalizer/azure-ai-personalizer_2583cef92d"
+  "Tag": "java/personalizer/azure-ai-personalizer_8067625503"
 }

sdk/personalizer/azure-ai-personalizer/pom.xml

@@ -36,9 +36,7 @@
     <!-- Configures the Java 9+ run to perform the required module exports, opens, and reads that are necessary for testing but shouldn't be part of the module-info. -->
     <javaModulesSurefireArgLine>
       --add-exports com.azure.core/com.azure.core.implementation.http=ALL-UNNAMED
-      --add-exports com.azure.ai.personalizer/com.azure.ai.personalizer.testmodels=com.fasterxml.jackson.databind
       --add-opens com.azure.ai.personalizer/com.azure.ai.personalizer=ALL-UNNAMED
-      --add-opens com.azure.ai.personalizer/com.azure.ai.personalizer.testmodels=com.fasterxml.jackson.databind
       --add-opens com.azure.ai.personalizer/com.azure.ai.personalizer.testmodels=com.azure.core
     </javaModulesSurefireArgLine>
 

sdk/personalizer/azure-ai-personalizer/src/main/java/com/azure/ai/personalizer/administration/PersonalizerAdministrationAsyncClient.java

@@ -512,23 +512,8 @@ public Mono<Response<BinaryData>> exportModelWithResponse(boolean isSigned) {
      * @return the model file generated by Personalizer service.
      */
     Mono<Response<BinaryData>> exportModelWithResponse(boolean isSigned, Context context) {
-        return service.getModels().getWithResponseAsync(isSigned, context).flatMap(streamResponse -> {
-            return BinaryData.fromFlux(streamResponse.getValue())
-                .flatMap(binaryData -> {
-                    Response<BinaryData> response = new SimpleResponse<>(
-                        streamResponse.getRequest(),
-                        streamResponse.getStatusCode(),
-                        streamResponse.getHeaders(),
-                        binaryData);
-                    return Mono.just(response);
-                }).doFinally(ignored -> {
-                    try {
-                        streamResponse.close();
-                    } catch (Exception e) {
-                        logger.logThrowableAsError(e);
-                    }
-                });
-        }).onErrorMap(Transforms::mapToHttpResponseExceptionIfExists);
+        return service.getModels().getWithResponseAsync(isSigned, context)
+            .onErrorMap(Transforms::mapToHttpResponseExceptionIfExists);
     }
 
     /**

sdk/personalizer/azure-ai-personalizer/src/main/java/com/azure/ai/personalizer/administration/models/EvaluationsCreateHeaders.java

@@ -5,31 +5,32 @@
 package com.azure.ai.personalizer.administration.models;
 
 import com.azure.core.annotation.Fluent;
+import com.azure.core.http.HttpHeaderName;
 import com.azure.core.http.HttpHeaders;
-import com.fasterxml.jackson.annotation.JsonProperty;
 
-/** The EvaluationsCreateHeaders model. */
+/**
+ * The EvaluationsCreateHeaders model.
+ */
 @Fluent
 public final class EvaluationsCreateHeaders {
     /*
      * The Location property.
      */
-    @JsonProperty(value = "Location")
     private String location;
 
     // HttpHeaders containing the raw property values.
     /**
      * Creates an instance of EvaluationsCreateHeaders class.
-     *
+     * 
      * @param rawHeaders The raw HttpHeaders that will be used to create the property values.
      */
     public EvaluationsCreateHeaders(HttpHeaders rawHeaders) {
-        this.location = rawHeaders.getValue("Location");
+        this.location = rawHeaders.getValue(HttpHeaderName.LOCATION);
     }
 
     /**
      * Get the location property: The Location property.
-     *
+     * 
      * @return the location value.
      */
     public String getLocation() {
@@ -38,7 +39,7 @@ public String getLocation() {
 
     /**
      * Set the location property: The Location property.
-     *
+     * 
      * @param location the location value to set.
      * @return the EvaluationsCreateHeaders object itself.
      */

sdk/personalizer/azure-ai-personalizer/src/main/java/com/azure/ai/personalizer/administration/models/PersonalizerDateRange.java

@@ -5,39 +5,111 @@
 package com.azure.ai.personalizer.administration.models;
 
 import com.azure.core.annotation.Immutable;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import com.azure.core.util.CoreUtils;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
 import java.time.OffsetDateTime;
 
-/** A date range starting at From and ending at To. */
+/**
+ * A date range starting at From and ending at To.
+ */
 @Immutable
-public class PersonalizerDateRange {
+public class PersonalizerDateRange implements JsonSerializable<PersonalizerDateRange> {
     /*
      * Start date for the range.
      */
-    @JsonProperty(value = "from", access = JsonProperty.Access.WRITE_ONLY)
     private OffsetDateTime from;
 
     /*
      * End date for the range.
      */
-    @JsonProperty(value = "to", access = JsonProperty.Access.WRITE_ONLY)
     private OffsetDateTime to;
 
+    /**
+     * Creates an instance of PersonalizerDateRange class.
+     */
+    public PersonalizerDateRange() {
+    }
+
     /**
      * Get the from property: Start date for the range.
-     *
+     * 
      * @return the from value.
      */
     public OffsetDateTime getFrom() {
         return this.from;
     }
 
+    /**
+     * Set the from property: Start date for the range.
+     * 
+     * @param from the from value to set.
+     * @return the PersonalizerDateRange object itself.
+     */
+    PersonalizerDateRange setFrom(OffsetDateTime from) {
+        this.from = from;
+        return this;
+    }
+
     /**
      * Get the to property: End date for the range.
-     *
+     * 
      * @return the to value.
      */
     public OffsetDateTime getTo() {
         return this.to;
     }
+
+    /**
+     * Set the to property: End date for the range.
+     * 
+     * @param to the to value to set.
+     * @return the PersonalizerDateRange object itself.
+     */
+    PersonalizerDateRange setTo(OffsetDateTime to) {
+        this.to = to;
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of PersonalizerDateRange from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of PersonalizerDateRange if the JsonReader was pointing to an instance of it, or null if it
+     * was pointing to JSON null.
+     * @throws IOException If an error occurs while reading the PersonalizerDateRange.
+     */
+    public static PersonalizerDateRange fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            PersonalizerDateRange deserializedPersonalizerDateRange = new PersonalizerDateRange();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("from".equals(fieldName)) {
+                    deserializedPersonalizerDateRange.from = reader
+                        .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString()));
+                } else if ("to".equals(fieldName)) {
+                    deserializedPersonalizerDateRange.to = reader
+                        .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString()));
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedPersonalizerDateRange;
+        });
+    }
 }

sdk/personalizer/azure-ai-personalizer/src/main/java/com/azure/ai/personalizer/administration/models/PersonalizerEvaluation.java

@@ -1,85 +1,88 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) AutoRest Code Generator.
-
 package com.azure.ai.personalizer.administration.models;
 
 import com.azure.ai.personalizer.models.EvaluationJobStatus;
 import com.azure.ai.personalizer.models.EvaluationType;
 import com.azure.core.annotation.Fluent;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import com.azure.core.util.CoreUtils;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
 import java.time.OffsetDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.List;
 
-/** A counterfactual evaluation. */
+/**
+ * A counterfactual evaluation.
+ */
 @Fluent
-public final class PersonalizerEvaluation {
+public final class PersonalizerEvaluation implements JsonSerializable<PersonalizerEvaluation> {
+
     /*
      * The ID of the evaluation.
      */
-    @JsonProperty(value = "id", access = JsonProperty.Access.WRITE_ONLY)
     private String id;
 
     /*
      * The name of the evaluation.
      */
-    @JsonProperty(value = "name", access = JsonProperty.Access.WRITE_ONLY)
     private String name;
 
     /*
      * The start time of the evaluation.
      */
-    @JsonProperty(value = "startTime", access = JsonProperty.Access.WRITE_ONLY)
     private OffsetDateTime startTime;
 
     /*
      * The end time of the evaluation.
      */
-    @JsonProperty(value = "endTime", access = JsonProperty.Access.WRITE_ONLY)
     private OffsetDateTime endTime;
 
     /*
      * The ID of the job processing the evaluation.
      */
-    @JsonProperty(value = "jobId", access = JsonProperty.Access.WRITE_ONLY)
     private String jobId;
 
     /*
      * The status of the job processing the evaluation.
      */
-    @JsonProperty(value = "status", access = JsonProperty.Access.WRITE_ONLY)
     private EvaluationJobStatus status;
 
     /*
      * The results of the evaluation.
      */
-    @JsonProperty(value = "policyResults")
     private List<PersonalizerPolicyResult> policyResults;
 
     /*
      * Feature Importance.
      */
-    @JsonProperty(value = "featureImportance")
     private List<List<String>> featureImportance;
 
     /*
      * Evaluation type (manual or through Automatic Optimization).
      */
-    @JsonProperty(value = "evaluationType")
     private EvaluationType evaluationType;
 
     /*
      * Thr optimal policy.
      */
-    @JsonProperty(value = "optimalPolicy")
     private String optimalPolicy;
 
     /*
      * Creation time.
      */
-    @JsonProperty(value = "creationTime")
     private OffsetDateTime creationTime;
 
+    /**
+     * Creates an instance of PersonalizerEvaluation class.
+     */
+    public PersonalizerEvaluation() {
+    }
+
     /**
      * Get the id property: The ID of the evaluation.
      *
@@ -233,4 +236,72 @@ PersonalizerEvaluation setCreationTime(OffsetDateTime creationTime) {
         this.creationTime = creationTime;
         return this;
     }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeArrayField("policyResults", this.policyResults, (writer, element) -> writer.writeJson(element));
+        jsonWriter.writeArrayField("featureImportance", this.featureImportance,
+            (writer, element) -> writer.writeArray(element, (writer1, element1) -> writer1.writeString(element1)));
+        jsonWriter.writeStringField("evaluationType",
+            this.evaluationType == null ? null : this.evaluationType.toString());
+        jsonWriter.writeStringField("optimalPolicy", this.optimalPolicy);
+        jsonWriter.writeStringField("creationTime",
+            this.creationTime == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.creationTime));
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of PersonalizerEvaluation from the JsonReader.
+     *
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of PersonalizerEvaluation if the JsonReader was pointing to an instance of it, or null if it
+     * was pointing to JSON null.
+     * @throws IOException If an error occurs while reading the PersonalizerEvaluation.
+     */
+    public static PersonalizerEvaluation fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            PersonalizerEvaluation deserializedPersonalizerEvaluation = new PersonalizerEvaluation();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+                if ("id".equals(fieldName)) {
+                    deserializedPersonalizerEvaluation.id = reader.getString();
+                } else if ("name".equals(fieldName)) {
+                    deserializedPersonalizerEvaluation.name = reader.getString();
+                } else if ("startTime".equals(fieldName)) {
+                    deserializedPersonalizerEvaluation.startTime = reader
+                        .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString()));
+                } else if ("endTime".equals(fieldName)) {
+                    deserializedPersonalizerEvaluation.endTime = reader
+                        .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString()));
+                } else if ("jobId".equals(fieldName)) {
+                    deserializedPersonalizerEvaluation.jobId = reader.getString();
+                } else if ("status".equals(fieldName)) {
+                    deserializedPersonalizerEvaluation.status = EvaluationJobStatus.fromString(reader.getString());
+                } else if ("policyResults".equals(fieldName)) {
+                    List<PersonalizerPolicyResult> policyResults
+                        = reader.readArray(reader1 -> PersonalizerPolicyResult.fromJson(reader1));
+                    deserializedPersonalizerEvaluation.policyResults = policyResults;
+                } else if ("featureImportance".equals(fieldName)) {
+                    List<List<String>> featureImportance
+                        = reader.readArray(reader1 -> reader1.readArray(reader2 -> reader2.getString()));
+                    deserializedPersonalizerEvaluation.featureImportance = featureImportance;
+                } else if ("evaluationType".equals(fieldName)) {
+                    deserializedPersonalizerEvaluation.evaluationType = EvaluationType.fromString(reader.getString());
+                } else if ("optimalPolicy".equals(fieldName)) {
+                    deserializedPersonalizerEvaluation.optimalPolicy = reader.getString();
+                } else if ("creationTime".equals(fieldName)) {
+                    deserializedPersonalizerEvaluation.creationTime = reader
+                        .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString()));
+                } else {
+                    reader.skipChildren();
+                }
+            }
+            return deserializedPersonalizerEvaluation;
+        });
+    }
 }