Remove Jackson usage in Attestation, Models Repository, Quantum Jobs, and Video Analyzer Edge (#42537)

Remove Jackson usage in Attestation, Models Repository, Quantum Jobs, and Video Analyzer Edge

Author: alzimmermsft

sdk/attestation/azure-security-attestation/pom.xml

@@ -37,7 +37,6 @@
     <javaModulesSurefireArgLine>
       --add-opens com.azure.security.attestation/com.azure.security.attestation=ALL-UNNAMED
       --add-opens com.azure.security.attestation/com.azure.security.attestation.models=ALL-UNNAMED
-      --add-opens com.azure.security.attestation/com.azure.security.attestation.models=com.fasterxml.jackson.databind
     </javaModulesSurefireArgLine>
     <spotless.skip>false</spotless.skip>
   </properties>

sdk/attestation/azure-security-attestation/src/test/java/com/azure/security/attestation/models/TestObject.java

@@ -3,15 +3,28 @@
 
 package com.azure.security.attestation.models;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
+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.Instant;
 import java.time.OffsetDateTime;
 import java.time.ZoneOffset;
+import java.util.List;
 
-final class TestObject {
-    @JsonProperty(value = "alg")
+public final class TestObject implements JsonSerializable<TestObject> {
     private String alg;
+    private int integer;
+    private long expiration;
+    private long issuedOn;
+    private long notBefore;
+    private int[] integerArray;
+    String issuer;
+
+    TestObject() {
+    }
 
     public TestObject setAlg(String v) {
         alg = v;
@@ -22,9 +35,6 @@ public String getAlg() {
         return alg;
     }
 
-    @JsonProperty(value = "int")
-    private int integer;
-
     public TestObject setInteger(int v) {
         integer = v;
         return this;
@@ -34,9 +44,6 @@ public int getInteger() {
         return integer;
     }
 
-    @JsonProperty(value = "exp")
-    private long expiration;
-
     public TestObject setExpiresOn(OffsetDateTime expirationTime) {
         this.expiration = expirationTime.toEpochSecond();
         return this;
@@ -46,9 +53,6 @@ public OffsetDateTime getExpiresOn() {
         return OffsetDateTime.ofInstant(Instant.EPOCH.plusSeconds(expiration), ZoneOffset.UTC);
     }
 
-    @JsonProperty(value = "iat")
-    private long issuedOn;
-
     public TestObject setIssuedOn(OffsetDateTime issuedOn) {
         this.issuedOn = issuedOn.toEpochSecond();
         return this;
@@ -58,9 +62,6 @@ public OffsetDateTime getIssuedOn() {
         return OffsetDateTime.ofInstant(Instant.EPOCH.plusSeconds(issuedOn), ZoneOffset.UTC);
     }
 
-    @JsonProperty(value = "nbf")
-    private long notBefore;
-
     public TestObject setNotBefore(OffsetDateTime notBefore) {
         this.notBefore = notBefore.toEpochSecond();
         return this;
@@ -70,9 +71,6 @@ public OffsetDateTime getNotBefore() {
         return OffsetDateTime.ofInstant(Instant.EPOCH.plusSeconds(notBefore), ZoneOffset.UTC);
     }
 
-    @JsonProperty(value = "intArray")
-    private int[] integerArray;
-
     public TestObject setIntegerArray(int[] v) {
         integerArray = v.clone();
         return this;
@@ -82,9 +80,6 @@ public int[] getIntegerArray() {
         return integerArray;
     }
 
-    @JsonProperty(value = "iss")
-    String issuer;
-
     public TestObject setIssuer(String iss) {
         issuer = iss;
         return this;
@@ -94,7 +89,63 @@ public String getIssuer() {
         return issuer;
     }
 
-    TestObject() {
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject()
+            .writeStringField("alg", alg)
+            .writeIntField("int", integer)
+            .writeLongField("exp", expiration)
+            .writeLongField("iat", issuedOn)
+            .writeLongField("nbf", notBefore);
+
+        if (integerArray != null) {
+            jsonWriter.writeStartArray("intArray");
+
+            for (int value : integerArray) {
+                jsonWriter.writeInt(value);
+            }
+
+            jsonWriter.writeEndArray();
+        }
+
+        return jsonWriter.writeStringField("iss", issuer).writeEndObject();
+    }
 
+    public static TestObject fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            TestObject testObject = new TestObject();
+
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("alg".equals(fieldName)) {
+                    testObject.alg = reader.getString();
+                } else if ("int".equals(fieldName)) {
+                    testObject.integer = reader.getInt();
+                } else if ("exp".equals(fieldName)) {
+                    testObject.expiration = reader.getLong();
+                } else if ("iat".equals(fieldName)) {
+                    testObject.issuedOn = reader.getLong();
+                } else if ("nbf".equals(fieldName)) {
+                    testObject.notBefore = reader.getLong();
+                } else if ("intArray".equals(fieldName)) {
+                    List<Integer> intList = reader.readArray(JsonReader::getInt);
+                    if (intList != null) {
+                        testObject.integerArray = new int[intList.size()];
+                        for (int i = 0; i < testObject.integerArray.length; i++) {
+                            testObject.integerArray[i] = intList.get(i);
+                        }
+
+                    }
+                } else if ("iss".equals(fieldName)) {
+                    testObject.issuer = reader.getString();
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return testObject;
+        });
     }
 }

sdk/modelsrepository/azure-iot-modelsrepository/pom.xml

@@ -43,6 +43,11 @@
   </properties>
 
   <dependencies>
+    <dependency>
+      <groupId>com.azure</groupId>
+      <artifactId>azure-json</artifactId>
+      <version>1.3.0</version> <!-- {x-version-update;com.azure:azure-json;dependency} -->
+    </dependency>
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core</artifactId>

sdk/modelsrepository/azure-iot-modelsrepository/src/main/java/com/azure/iot/modelsrepository/implementation/HttpModelFetcher.java

@@ -9,9 +9,9 @@
 import com.azure.iot.modelsrepository.DtmiConventions;
 import com.azure.iot.modelsrepository.implementation.models.FetchMetadataResult;
 import com.azure.iot.modelsrepository.implementation.models.FetchModelResult;
-import com.fasterxml.jackson.core.JsonProcessingException;
 import reactor.core.publisher.Mono;
 
+import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -51,7 +51,7 @@ public Mono<FetchModelResult> fetchModelAsync(String dtmi, URI repositoryUri, bo
 
             return evaluatePath(tryContentPath, context)
                 .onErrorResume(error -> {
-                    if (work.size() != 0) {
+                    if (!work.isEmpty()) {
                         return evaluatePath(work.poll(), context);
                     } else {
                         logger.error(String.format(StatusStrings.ERROR_FETCHING_MODEL_CONTENT, tryContentPath));
@@ -78,7 +78,7 @@ public Mono<FetchMetadataResult> fetchMetadataAsync(URI repositoryUri, Context c
                 .map(s -> {
                     try {
                         return new FetchMetadataResult().setPath(tryContentPath).setDefinition(s);
-                    } catch (JsonProcessingException e) {
+                    } catch (IOException e) {
                         logger.error(String.format(StatusStrings.ERROR_FETCHING_METADATA_CONTENT, tryContentPath));
                         return null;
                     }