diff --git a/eng/emitter-package-lock.json b/eng/emitter-package-lock.json index 224b96beed85..e3ec818d7e92 100644 --- a/eng/emitter-package-lock.json +++ b/eng/emitter-package-lock.json @@ -5,7 +5,7 @@ "packages": { "": { "dependencies": { - "@azure-tools/typespec-java": "0.39.0" + "@azure-tools/typespec-java": "/mnt/vss/_work/1/s/autorest.java/typespec-extension/azure-tools-typespec-java-0.39.1.tgz" }, "devDependencies": { "@azure-tools/openai-typespec": "^1.8.0", @@ -184,9 +184,9 @@ } }, "node_modules/@azure-tools/typespec-java": { - "version": "0.39.0", - "resolved": "https://registry.npmjs.org/@azure-tools/typespec-java/-/typespec-java-0.39.0.tgz", - "integrity": "sha512-mUQ693tZ0XZgc6Z8ZH8RrR+KsyEukpMFAZT+VAXutm2+JrlHQbQpsN8F47M0uMiMOUs+4DJc2ZsCk8740Jqekw==", + "version": "0.39.1", + "resolved": "file:../../autorest.java/typespec-extension/azure-tools-typespec-java-0.39.1.tgz", + "integrity": "sha512-a4PeYZo3WroYtBsVNOKTK0kOkuX/YZd+JDRTtU8yPmsIGuFIYXfMfmfVrZCn+Y0Q1WBiDQDCRY2RyscpWqyCPg==", "license": "MIT", "dependencies": { "@autorest/codemodel": "~4.20.1", diff --git a/eng/emitter-package.json b/eng/emitter-package.json index 4185ba2bc9cb..467c6b0d8d9e 100644 --- a/eng/emitter-package.json +++ b/eng/emitter-package.json @@ -1,7 +1,7 @@ { "main": "dist/src/index.js", "dependencies": { - "@azure-tools/typespec-java": "0.39.0" + "@azure-tools/typespec-java": "/mnt/vss/_work/1/s/autorest.java/typespec-extension/azure-tools-typespec-java-0.39.1.tgz" }, "devDependencies": { "@azure-tools/openai-typespec": "^1.8.0", diff --git a/sdk/ai/azure-ai-projects/src/main/java/com/azure/ai/projects/models/EvaluationResultSample.java b/sdk/ai/azure-ai-projects/src/main/java/com/azure/ai/projects/models/EvaluationResultSample.java index 5a7d637f2395..bb5351aa3213 100644 --- a/sdk/ai/azure-ai-projects/src/main/java/com/azure/ai/projects/models/EvaluationResultSample.java +++ b/sdk/ai/azure-ai-projects/src/main/java/com/azure/ai/projects/models/EvaluationResultSample.java @@ -59,10 +59,20 @@ public EvaluationResult getEvaluationResult() { public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); jsonWriter.writeStringField("id", getId()); - jsonWriter.writeMapField("features", getFeatures(), - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); - jsonWriter.writeMapField("correlationInfo", getCorrelationInfo(), - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); + jsonWriter.writeMapField("features", getFeatures(), (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); + jsonWriter.writeMapField("correlationInfo", getCorrelationInfo(), (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); jsonWriter.writeJsonField("evaluationResult", this.evaluationResult); jsonWriter.writeStringField("type", this.type == null ? null : this.type.toString()); return jsonWriter.writeEndObject(); diff --git a/sdk/ai/azure-ai-projects/src/main/java/com/azure/ai/projects/models/InsightSample.java b/sdk/ai/azure-ai-projects/src/main/java/com/azure/ai/projects/models/InsightSample.java index 1f2095f84ad1..011b010371ec 100644 --- a/sdk/ai/azure-ai-projects/src/main/java/com/azure/ai/projects/models/InsightSample.java +++ b/sdk/ai/azure-ai-projects/src/main/java/com/azure/ai/projects/models/InsightSample.java @@ -105,10 +105,20 @@ public Map getCorrelationInfo() { public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); jsonWriter.writeStringField("id", this.id); - jsonWriter.writeMapField("features", this.features, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); - jsonWriter.writeMapField("correlationInfo", this.correlationInfo, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); + jsonWriter.writeMapField("features", this.features, (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); + jsonWriter.writeMapField("correlationInfo", this.correlationInfo, (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); jsonWriter.writeStringField("type", this.type == null ? null : this.type.toString()); return jsonWriter.writeEndObject(); } diff --git a/sdk/chaos/azure-resourcemanager-chaos/src/main/java/com/azure/resourcemanager/chaos/fluent/models/TargetInner.java b/sdk/chaos/azure-resourcemanager-chaos/src/main/java/com/azure/resourcemanager/chaos/fluent/models/TargetInner.java index 49f31dd8b0fe..0ceda3f50225 100644 --- a/sdk/chaos/azure-resourcemanager-chaos/src/main/java/com/azure/resourcemanager/chaos/fluent/models/TargetInner.java +++ b/sdk/chaos/azure-resourcemanager-chaos/src/main/java/com/azure/resourcemanager/chaos/fluent/models/TargetInner.java @@ -140,8 +140,13 @@ public String id() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeMapField("properties", this.properties, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); + jsonWriter.writeMapField("properties", this.properties, (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); jsonWriter.writeStringField("location", this.location); return jsonWriter.writeEndObject(); } diff --git a/sdk/computefleet/azure-resourcemanager-computefleet/src/main/java/com/azure/resourcemanager/computefleet/models/VirtualMachineScaleSetExtensionProperties.java b/sdk/computefleet/azure-resourcemanager-computefleet/src/main/java/com/azure/resourcemanager/computefleet/models/VirtualMachineScaleSetExtensionProperties.java index 181905f9b220..ced17b7300d3 100644 --- a/sdk/computefleet/azure-resourcemanager-computefleet/src/main/java/com/azure/resourcemanager/computefleet/models/VirtualMachineScaleSetExtensionProperties.java +++ b/sdk/computefleet/azure-resourcemanager-computefleet/src/main/java/com/azure/resourcemanager/computefleet/models/VirtualMachineScaleSetExtensionProperties.java @@ -363,10 +363,20 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStringField("typeHandlerVersion", this.typeHandlerVersion); jsonWriter.writeBooleanField("autoUpgradeMinorVersion", this.autoUpgradeMinorVersion); jsonWriter.writeBooleanField("enableAutomaticUpgrade", this.enableAutomaticUpgrade); - jsonWriter.writeMapField("settings", this.settings, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); - jsonWriter.writeMapField("protectedSettings", this.protectedSettings, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); + jsonWriter.writeMapField("settings", this.settings, (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); + jsonWriter.writeMapField("protectedSettings", this.protectedSettings, (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); jsonWriter.writeArrayField("provisionAfterExtensions", this.provisionAfterExtensions, (writer, element) -> writer.writeString(element)); jsonWriter.writeBooleanField("suppressFailures", this.suppressFailures); diff --git a/sdk/computeschedule/azure-resourcemanager-computeschedule/src/main/java/com/azure/resourcemanager/computeschedule/models/ResourceProvisionPayload.java b/sdk/computeschedule/azure-resourcemanager-computeschedule/src/main/java/com/azure/resourcemanager/computeschedule/models/ResourceProvisionPayload.java index 50dd54ffd590..809c721e4281 100644 --- a/sdk/computeschedule/azure-resourcemanager-computeschedule/src/main/java/com/azure/resourcemanager/computeschedule/models/ResourceProvisionPayload.java +++ b/sdk/computeschedule/azure-resourcemanager-computeschedule/src/main/java/com/azure/resourcemanager/computeschedule/models/ResourceProvisionPayload.java @@ -148,11 +148,21 @@ public ResourceProvisionPayload withResourcePrefix(String resourcePrefix) { public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); jsonWriter.writeIntField("resourceCount", this.resourceCount); - jsonWriter.writeMapField("baseProfile", this.baseProfile, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); - jsonWriter.writeArrayField("resourceOverrides", this.resourceOverrides, (writer, element) -> writer.writeMap( - element, - (writer1, element1) -> writer1.writeUntyped(element1 == null ? null : element1.toObject(Object.class)))); + jsonWriter.writeMapField("baseProfile", this.baseProfile, (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); + jsonWriter.writeArrayField("resourceOverrides", this.resourceOverrides, + (writer, element) -> writer.writeMap(element, (writer1, element1) -> { + if (element1 == null) { + writer1.writeNull(); + } else { + element1.writeTo(writer1); + } + })); jsonWriter.writeStringField("resourcePrefix", this.resourcePrefix); return jsonWriter.writeEndObject(); } diff --git a/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/main/java/com/azure/resourcemanager/deviceregistry/models/AssetProperties.java b/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/main/java/com/azure/resourcemanager/deviceregistry/models/AssetProperties.java index ec303bd0bdfb..998858e0a4e7 100644 --- a/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/main/java/com/azure/resourcemanager/deviceregistry/models/AssetProperties.java +++ b/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/main/java/com/azure/resourcemanager/deviceregistry/models/AssetProperties.java @@ -620,8 +620,13 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStringField("softwareRevision", this.softwareRevision); jsonWriter.writeStringField("documentationUri", this.documentationUri); jsonWriter.writeStringField("serialNumber", this.serialNumber); - jsonWriter.writeMapField("attributes", this.attributes, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); + jsonWriter.writeMapField("attributes", this.attributes, (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); jsonWriter.writeArrayField("discoveredAssetRefs", this.discoveredAssetRefs, (writer, element) -> writer.writeString(element)); jsonWriter.writeStringField("defaultDatasetsConfiguration", this.defaultDatasetsConfiguration); diff --git a/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/main/java/com/azure/resourcemanager/deviceregistry/models/AssetUpdateProperties.java b/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/main/java/com/azure/resourcemanager/deviceregistry/models/AssetUpdateProperties.java index 0430f0370f51..804bc18fb93b 100644 --- a/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/main/java/com/azure/resourcemanager/deviceregistry/models/AssetUpdateProperties.java +++ b/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/main/java/com/azure/resourcemanager/deviceregistry/models/AssetUpdateProperties.java @@ -477,8 +477,13 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStringField("softwareRevision", this.softwareRevision); jsonWriter.writeStringField("documentationUri", this.documentationUri); jsonWriter.writeStringField("serialNumber", this.serialNumber); - jsonWriter.writeMapField("attributes", this.attributes, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); + jsonWriter.writeMapField("attributes", this.attributes, (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); jsonWriter.writeStringField("defaultDatasetsConfiguration", this.defaultDatasetsConfiguration); jsonWriter.writeStringField("defaultEventsConfiguration", this.defaultEventsConfiguration); jsonWriter.writeJsonField("defaultTopic", this.defaultTopic); diff --git a/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/main/java/com/azure/resourcemanager/deviceregistry/models/NamespaceAssetProperties.java b/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/main/java/com/azure/resourcemanager/deviceregistry/models/NamespaceAssetProperties.java index e4ab85521750..e4053478a397 100644 --- a/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/main/java/com/azure/resourcemanager/deviceregistry/models/NamespaceAssetProperties.java +++ b/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/main/java/com/azure/resourcemanager/deviceregistry/models/NamespaceAssetProperties.java @@ -829,8 +829,13 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStringField("softwareRevision", this.softwareRevision); jsonWriter.writeStringField("documentationUri", this.documentationUri); jsonWriter.writeStringField("serialNumber", this.serialNumber); - jsonWriter.writeMapField("attributes", this.attributes, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); + jsonWriter.writeMapField("attributes", this.attributes, (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); jsonWriter.writeArrayField("discoveredAssetRefs", this.discoveredAssetRefs, (writer, element) -> writer.writeString(element)); jsonWriter.writeStringField("defaultDatasetsConfiguration", this.defaultDatasetsConfiguration); diff --git a/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/main/java/com/azure/resourcemanager/deviceregistry/models/NamespaceAssetUpdateProperties.java b/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/main/java/com/azure/resourcemanager/deviceregistry/models/NamespaceAssetUpdateProperties.java index b09adda1fdd7..cb18ed846d3a 100644 --- a/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/main/java/com/azure/resourcemanager/deviceregistry/models/NamespaceAssetUpdateProperties.java +++ b/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/main/java/com/azure/resourcemanager/deviceregistry/models/NamespaceAssetUpdateProperties.java @@ -674,8 +674,13 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStringField("softwareRevision", this.softwareRevision); jsonWriter.writeStringField("documentationUri", this.documentationUri); jsonWriter.writeStringField("serialNumber", this.serialNumber); - jsonWriter.writeMapField("attributes", this.attributes, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); + jsonWriter.writeMapField("attributes", this.attributes, (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); jsonWriter.writeStringField("defaultDatasetsConfiguration", this.defaultDatasetsConfiguration); jsonWriter.writeStringField("defaultEventsConfiguration", this.defaultEventsConfiguration); jsonWriter.writeStringField("defaultStreamsConfiguration", this.defaultStreamsConfiguration); diff --git a/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/main/java/com/azure/resourcemanager/deviceregistry/models/NamespaceDeviceProperties.java b/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/main/java/com/azure/resourcemanager/deviceregistry/models/NamespaceDeviceProperties.java index 1fc07759baa6..233601a026e9 100644 --- a/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/main/java/com/azure/resourcemanager/deviceregistry/models/NamespaceDeviceProperties.java +++ b/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/main/java/com/azure/resourcemanager/deviceregistry/models/NamespaceDeviceProperties.java @@ -363,8 +363,13 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStringField("operatingSystem", this.operatingSystem); jsonWriter.writeStringField("operatingSystemVersion", this.operatingSystemVersion); jsonWriter.writeJsonField("endpoints", this.endpoints); - jsonWriter.writeMapField("attributes", this.attributes, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); + jsonWriter.writeMapField("attributes", this.attributes, (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); jsonWriter.writeJsonField("policy", this.policy); return jsonWriter.writeEndObject(); } diff --git a/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/main/java/com/azure/resourcemanager/deviceregistry/models/NamespaceDeviceUpdateProperties.java b/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/main/java/com/azure/resourcemanager/deviceregistry/models/NamespaceDeviceUpdateProperties.java index a410cc221318..563181e61771 100644 --- a/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/main/java/com/azure/resourcemanager/deviceregistry/models/NamespaceDeviceUpdateProperties.java +++ b/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/main/java/com/azure/resourcemanager/deviceregistry/models/NamespaceDeviceUpdateProperties.java @@ -160,8 +160,13 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); jsonWriter.writeStringField("operatingSystemVersion", this.operatingSystemVersion); jsonWriter.writeJsonField("endpoints", this.endpoints); - jsonWriter.writeMapField("attributes", this.attributes, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); + jsonWriter.writeMapField("attributes", this.attributes, (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); jsonWriter.writeJsonField("policy", this.policy); jsonWriter.writeBooleanField("enabled", this.enabled); return jsonWriter.writeEndObject(); diff --git a/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/main/java/com/azure/resourcemanager/deviceregistry/models/NamespaceDiscoveredAssetProperties.java b/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/main/java/com/azure/resourcemanager/deviceregistry/models/NamespaceDiscoveredAssetProperties.java index 746f402553bb..5c04bda5d5c9 100644 --- a/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/main/java/com/azure/resourcemanager/deviceregistry/models/NamespaceDiscoveredAssetProperties.java +++ b/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/main/java/com/azure/resourcemanager/deviceregistry/models/NamespaceDiscoveredAssetProperties.java @@ -770,8 +770,13 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStringField("softwareRevision", this.softwareRevision); jsonWriter.writeStringField("documentationUri", this.documentationUri); jsonWriter.writeStringField("serialNumber", this.serialNumber); - jsonWriter.writeMapField("attributes", this.attributes, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); + jsonWriter.writeMapField("attributes", this.attributes, (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); jsonWriter.writeStringField("defaultDatasetsConfiguration", this.defaultDatasetsConfiguration); jsonWriter.writeStringField("defaultEventsConfiguration", this.defaultEventsConfiguration); jsonWriter.writeStringField("defaultStreamsConfiguration", this.defaultStreamsConfiguration); diff --git a/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/main/java/com/azure/resourcemanager/deviceregistry/models/NamespaceDiscoveredAssetUpdateProperties.java b/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/main/java/com/azure/resourcemanager/deviceregistry/models/NamespaceDiscoveredAssetUpdateProperties.java index 75177cf841f6..931c7cac6f89 100644 --- a/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/main/java/com/azure/resourcemanager/deviceregistry/models/NamespaceDiscoveredAssetUpdateProperties.java +++ b/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/main/java/com/azure/resourcemanager/deviceregistry/models/NamespaceDiscoveredAssetUpdateProperties.java @@ -733,8 +733,13 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStringField("softwareRevision", this.softwareRevision); jsonWriter.writeStringField("documentationUri", this.documentationUri); jsonWriter.writeStringField("serialNumber", this.serialNumber); - jsonWriter.writeMapField("attributes", this.attributes, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); + jsonWriter.writeMapField("attributes", this.attributes, (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); jsonWriter.writeStringField("defaultDatasetsConfiguration", this.defaultDatasetsConfiguration); jsonWriter.writeStringField("defaultEventsConfiguration", this.defaultEventsConfiguration); jsonWriter.writeStringField("defaultStreamsConfiguration", this.defaultStreamsConfiguration); diff --git a/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/main/java/com/azure/resourcemanager/deviceregistry/models/NamespaceDiscoveredDeviceProperties.java b/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/main/java/com/azure/resourcemanager/deviceregistry/models/NamespaceDiscoveredDeviceProperties.java index 60086a8a6c62..edf094037973 100644 --- a/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/main/java/com/azure/resourcemanager/deviceregistry/models/NamespaceDiscoveredDeviceProperties.java +++ b/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/main/java/com/azure/resourcemanager/deviceregistry/models/NamespaceDiscoveredDeviceProperties.java @@ -280,8 +280,13 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStringField("model", this.model); jsonWriter.writeStringField("operatingSystem", this.operatingSystem); jsonWriter.writeStringField("operatingSystemVersion", this.operatingSystemVersion); - jsonWriter.writeMapField("attributes", this.attributes, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); + jsonWriter.writeMapField("attributes", this.attributes, (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); return jsonWriter.writeEndObject(); } diff --git a/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/main/java/com/azure/resourcemanager/deviceregistry/models/NamespaceDiscoveredDeviceUpdateProperties.java b/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/main/java/com/azure/resourcemanager/deviceregistry/models/NamespaceDiscoveredDeviceUpdateProperties.java index b848674d298f..898096ea1d27 100644 --- a/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/main/java/com/azure/resourcemanager/deviceregistry/models/NamespaceDiscoveredDeviceUpdateProperties.java +++ b/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/main/java/com/azure/resourcemanager/deviceregistry/models/NamespaceDiscoveredDeviceUpdateProperties.java @@ -186,8 +186,13 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStringField("externalDeviceId", this.externalDeviceId); jsonWriter.writeJsonField("endpoints", this.endpoints); jsonWriter.writeStringField("operatingSystemVersion", this.operatingSystemVersion); - jsonWriter.writeMapField("attributes", this.attributes, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); + jsonWriter.writeMapField("attributes", this.attributes, (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); jsonWriter.writeStringField("discoveryId", this.discoveryId); jsonWriter.writeNumberField("version", this.version); return jsonWriter.writeEndObject(); diff --git a/sdk/easm/azure-analytics-defender-easm/src/main/java/com/azure/analytics/defender/easm/models/Task.java b/sdk/easm/azure-analytics-defender-easm/src/main/java/com/azure/analytics/defender/easm/models/Task.java index 6676d5b2e9f9..6c3eb2f96b3f 100644 --- a/sdk/easm/azure-analytics-defender-easm/src/main/java/com/azure/analytics/defender/easm/models/Task.java +++ b/sdk/easm/azure-analytics-defender-easm/src/main/java/com/azure/analytics/defender/easm/models/Task.java @@ -173,8 +173,13 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStringField("state", this.state == null ? null : this.state.toString()); jsonWriter.writeStringField("phase", this.phase == null ? null : this.phase.toString()); jsonWriter.writeStringField("reason", this.reason); - jsonWriter.writeMapField("metadata", this.metadata, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); + jsonWriter.writeMapField("metadata", this.metadata, (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); return jsonWriter.writeEndObject(); } diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsChatThreadCreatedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsChatThreadCreatedEventData.java index 695862c29ec5..169dc475b429 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsChatThreadCreatedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsChatThreadCreatedEventData.java @@ -150,8 +150,13 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStringField("transactionId", getTransactionId()); jsonWriter.writeNumberField("version", getVersion()); jsonWriter.writeJsonField("createdByCommunicationIdentifier", this.createdByCommunicationIdentifier); - jsonWriter.writeMapField("properties", this.properties, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); + jsonWriter.writeMapField("properties", this.properties, (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); return jsonWriter.writeEndObject(); } diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsChatThreadCreatedWithUserEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsChatThreadCreatedWithUserEventData.java index dbbae3eab9df..981579a24e9a 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsChatThreadCreatedWithUserEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsChatThreadCreatedWithUserEventData.java @@ -153,8 +153,13 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStringField("transactionId", getTransactionId()); jsonWriter.writeNumberField("version", getVersion()); jsonWriter.writeJsonField("createdByCommunicationIdentifier", this.createdByCommunicationIdentifier); - jsonWriter.writeMapField("properties", this.properties, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); + jsonWriter.writeMapField("properties", this.properties, (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); return jsonWriter.writeEndObject(); } diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsChatThreadPropertiesUpdatedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsChatThreadPropertiesUpdatedEventData.java index b99e076d875b..45b93d17bd1d 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsChatThreadPropertiesUpdatedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsChatThreadPropertiesUpdatedEventData.java @@ -154,8 +154,13 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeJsonField("editedByCommunicationIdentifier", this.editedByCommunicationIdentifier); jsonWriter.writeStringField("editTime", this.editTime == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.editTime)); - jsonWriter.writeMapField("properties", this.properties, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); + jsonWriter.writeMapField("properties", this.properties, (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); return jsonWriter.writeEndObject(); } diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsChatThreadPropertiesUpdatedPerUserEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsChatThreadPropertiesUpdatedPerUserEventData.java index a6a0b3f4da9f..70bdc7fe2ed2 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsChatThreadPropertiesUpdatedPerUserEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/AcsChatThreadPropertiesUpdatedPerUserEventData.java @@ -158,8 +158,13 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeJsonField("editedByCommunicationIdentifier", this.editedByCommunicationIdentifier); jsonWriter.writeStringField("editTime", this.editTime == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.editTime)); - jsonWriter.writeMapField("properties", this.properties, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); + jsonWriter.writeMapField("properties", this.properties, (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); return jsonWriter.writeEndObject(); } diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/ApiManagementCircuitBreakerProperties.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/ApiManagementCircuitBreakerProperties.java index d27d7d9e37e5..133c36483591 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/ApiManagementCircuitBreakerProperties.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/ApiManagementCircuitBreakerProperties.java @@ -53,8 +53,14 @@ public Map> getRules() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeMapField("rules", this.rules, (writer, element) -> writer.writeMap(element, - (writer1, element1) -> writer1.writeUntyped(element1 == null ? null : element1.toObject(Object.class)))); + jsonWriter.writeMapField("rules", this.rules, + (writer, element) -> writer.writeMap(element, (writer1, element1) -> { + if (element1 == null) { + writer1.writeNull(); + } else { + element1.writeTo(writer1); + } + })); return jsonWriter.writeEndObject(); } diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/DeviceTelemetryEventProperties.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/DeviceTelemetryEventProperties.java index 2cabc95e92fd..ae8f3bcf70c2 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/DeviceTelemetryEventProperties.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/DeviceTelemetryEventProperties.java @@ -110,8 +110,13 @@ DeviceTelemetryEventProperties setSystemProperties(Map systemPro @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeMapField("body", this.body, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); + jsonWriter.writeMapField("body", this.body, (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); return jsonWriter.writeEndObject(); } diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/IotHubDeviceTelemetryEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/IotHubDeviceTelemetryEventData.java index 110fac523573..4314c1621910 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/IotHubDeviceTelemetryEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/IotHubDeviceTelemetryEventData.java @@ -70,8 +70,13 @@ public Map getProperties() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeMapField("body", getBody(), - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); + jsonWriter.writeMapField("body", getBody(), (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); return jsonWriter.writeEndObject(); } diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/MachineLearningServicesModelDeployedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/MachineLearningServicesModelDeployedEventData.java index 80e3bfbdcc0f..050cea7a2ee0 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/MachineLearningServicesModelDeployedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/MachineLearningServicesModelDeployedEventData.java @@ -125,10 +125,20 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStringField("serviceName", this.serviceName); jsonWriter.writeStringField("serviceComputeType", this.serviceComputeType); jsonWriter.writeStringField("modelIds", this.modelIds); - jsonWriter.writeMapField("serviceTags", this.serviceTags, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); - jsonWriter.writeMapField("serviceProperties", this.serviceProperties, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); + jsonWriter.writeMapField("serviceTags", this.serviceTags, (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); + jsonWriter.writeMapField("serviceProperties", this.serviceProperties, (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); return jsonWriter.writeEndObject(); } diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/MachineLearningServicesModelRegisteredEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/MachineLearningServicesModelRegisteredEventData.java index ed8a1bb0e1ac..3a391e7772fa 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/MachineLearningServicesModelRegisteredEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/MachineLearningServicesModelRegisteredEventData.java @@ -105,10 +105,20 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); jsonWriter.writeStringField("modelName", this.modelName); jsonWriter.writeStringField("modelVersion", this.modelVersion); - jsonWriter.writeMapField("modelTags", this.modelTags, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); - jsonWriter.writeMapField("modelProperties", this.modelProperties, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); + jsonWriter.writeMapField("modelTags", this.modelTags, (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); + jsonWriter.writeMapField("modelProperties", this.modelProperties, (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); return jsonWriter.writeEndObject(); } diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/MachineLearningServicesRunCompletedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/MachineLearningServicesRunCompletedEventData.java index 6e1d6015ab49..f57e709fd959 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/MachineLearningServicesRunCompletedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/MachineLearningServicesRunCompletedEventData.java @@ -144,10 +144,20 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStringField("experimentName", this.experimentName); jsonWriter.writeStringField("runId", this.runId); jsonWriter.writeStringField("runType", this.runType); - jsonWriter.writeMapField("runTags", this.runTags, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); - jsonWriter.writeMapField("runProperties", this.runProperties, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); + jsonWriter.writeMapField("runTags", this.runTags, (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); + jsonWriter.writeMapField("runProperties", this.runProperties, (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); return jsonWriter.writeEndObject(); } diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/MachineLearningServicesRunStatusChangedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/MachineLearningServicesRunStatusChangedEventData.java index 73bd64f2325e..9207601d90d4 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/MachineLearningServicesRunStatusChangedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/MachineLearningServicesRunStatusChangedEventData.java @@ -163,10 +163,20 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStringField("runId", this.runId); jsonWriter.writeStringField("runType", this.runType); jsonWriter.writeStringField("runStatus", this.runStatus); - jsonWriter.writeMapField("runTags", this.runTags, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); - jsonWriter.writeMapField("runProperties", this.runProperties, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); + jsonWriter.writeMapField("runTags", this.runTags, (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); + jsonWriter.writeMapField("runProperties", this.runProperties, (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); return jsonWriter.writeEndObject(); } diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/StorageAsyncOperationInitiatedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/StorageAsyncOperationInitiatedEventData.java index aa1df9341bf6..a835fba801ab 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/StorageAsyncOperationInitiatedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/StorageAsyncOperationInitiatedEventData.java @@ -208,8 +208,13 @@ public Map getStorageDiagnostics() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeMapField("storageDiagnostics", this.storageDiagnostics, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); + jsonWriter.writeMapField("storageDiagnostics", this.storageDiagnostics, (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); jsonWriter.writeStringField("api", this.api); jsonWriter.writeStringField("clientRequestId", this.clientRequestId); jsonWriter.writeStringField("requestId", this.requestId); diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/StorageBlobCreatedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/StorageBlobCreatedEventData.java index c3c695f593f9..f9f8d0299d16 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/StorageBlobCreatedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/StorageBlobCreatedEventData.java @@ -258,8 +258,13 @@ public Map getStorageDiagnostics() { public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); jsonWriter.writeStringField("accessTier", this.accessTier == null ? null : this.accessTier.toString()); - jsonWriter.writeMapField("storageDiagnostics", this.storageDiagnostics, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); + jsonWriter.writeMapField("storageDiagnostics", this.storageDiagnostics, (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); jsonWriter.writeStringField("api", this.api); jsonWriter.writeStringField("clientRequestId", this.clientRequestId); jsonWriter.writeStringField("requestId", this.requestId); diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/StorageBlobDeletedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/StorageBlobDeletedEventData.java index 292470e3581a..d698dc5b3199 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/StorageBlobDeletedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/StorageBlobDeletedEventData.java @@ -189,8 +189,13 @@ public Map getStorageDiagnostics() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeMapField("storageDiagnostics", this.storageDiagnostics, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); + jsonWriter.writeMapField("storageDiagnostics", this.storageDiagnostics, (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); jsonWriter.writeStringField("api", this.api); jsonWriter.writeStringField("clientRequestId", this.clientRequestId); jsonWriter.writeStringField("requestId", this.requestId); diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/StorageBlobRenamedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/StorageBlobRenamedEventData.java index 91ef5fc80e43..1b096bb30d0d 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/StorageBlobRenamedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/StorageBlobRenamedEventData.java @@ -171,8 +171,13 @@ public Map getStorageDiagnostics() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeMapField("storageDiagnostics", this.storageDiagnostics, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); + jsonWriter.writeMapField("storageDiagnostics", this.storageDiagnostics, (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); jsonWriter.writeStringField("api", this.api); jsonWriter.writeStringField("clientRequestId", this.clientRequestId); jsonWriter.writeStringField("requestId", this.requestId); diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/StorageBlobTierChangedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/StorageBlobTierChangedEventData.java index eec1f5d0a066..cda4570c42b8 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/StorageBlobTierChangedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/StorageBlobTierChangedEventData.java @@ -246,8 +246,13 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); jsonWriter.writeStringField("accessTier", this.accessTier == null ? null : this.accessTier.toString()); jsonWriter.writeStringField("previousTier", this.previousTier == null ? null : this.previousTier.toString()); - jsonWriter.writeMapField("storageDiagnostics", this.storageDiagnostics, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); + jsonWriter.writeMapField("storageDiagnostics", this.storageDiagnostics, (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); jsonWriter.writeStringField("api", this.api); jsonWriter.writeStringField("clientRequestId", this.clientRequestId); jsonWriter.writeStringField("requestId", this.requestId); diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/StorageDirectoryCreatedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/StorageDirectoryCreatedEventData.java index e1b4a8da1ed0..805f30d3b9c8 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/StorageDirectoryCreatedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/StorageDirectoryCreatedEventData.java @@ -171,8 +171,13 @@ public Map getStorageDiagnostics() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeMapField("storageDiagnostics", this.storageDiagnostics, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); + jsonWriter.writeMapField("storageDiagnostics", this.storageDiagnostics, (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); jsonWriter.writeStringField("api", this.api); jsonWriter.writeStringField("clientRequestId", this.clientRequestId); jsonWriter.writeStringField("requestId", this.requestId); diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/StorageDirectoryDeletedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/StorageDirectoryDeletedEventData.java index 97efb9ac10f3..0cca36f07544 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/StorageDirectoryDeletedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/StorageDirectoryDeletedEventData.java @@ -171,8 +171,13 @@ public Map getStorageDiagnostics() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeMapField("storageDiagnostics", this.storageDiagnostics, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); + jsonWriter.writeMapField("storageDiagnostics", this.storageDiagnostics, (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); jsonWriter.writeStringField("api", this.api); jsonWriter.writeStringField("clientRequestId", this.clientRequestId); jsonWriter.writeStringField("requestId", this.requestId); diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/StorageDirectoryRenamedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/StorageDirectoryRenamedEventData.java index 51d8d3242e3b..7e304b840972 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/StorageDirectoryRenamedEventData.java +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/src/main/java/com/azure/messaging/eventgrid/systemevents/models/StorageDirectoryRenamedEventData.java @@ -171,8 +171,13 @@ public Map getStorageDiagnostics() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeMapField("storageDiagnostics", this.storageDiagnostics, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); + jsonWriter.writeMapField("storageDiagnostics", this.storageDiagnostics, (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); jsonWriter.writeStringField("api", this.api); jsonWriter.writeStringField("clientRequestId", this.clientRequestId); jsonWriter.writeStringField("requestId", this.requestId); diff --git a/sdk/impactreporting/azure-resourcemanager-impactreporting/src/main/java/com/azure/resourcemanager/impactreporting/models/WorkloadImpactProperties.java b/sdk/impactreporting/azure-resourcemanager-impactreporting/src/main/java/com/azure/resourcemanager/impactreporting/models/WorkloadImpactProperties.java index 6e6e37eb10de..188246991617 100644 --- a/sdk/impactreporting/azure-resourcemanager-impactreporting/src/main/java/com/azure/resourcemanager/impactreporting/models/WorkloadImpactProperties.java +++ b/sdk/impactreporting/azure-resourcemanager-impactreporting/src/main/java/com/azure/resourcemanager/impactreporting/models/WorkloadImpactProperties.java @@ -449,8 +449,13 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { (writer, element) -> writer.writeString(element)); jsonWriter.writeArrayField("performance", this.performance, (writer, element) -> writer.writeJson(element)); jsonWriter.writeJsonField("connectivity", this.connectivity); - jsonWriter.writeMapField("additionalProperties", this.additionalProperties, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); + jsonWriter.writeMapField("additionalProperties", this.additionalProperties, (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); jsonWriter.writeJsonField("errorDetails", this.errorDetails); jsonWriter.writeJsonField("workload", this.workload); jsonWriter.writeStringField("impactGroupId", this.impactGroupId); diff --git a/sdk/iotoperations/azure-resourcemanager-iotoperations/src/main/java/com/azure/resourcemanager/iotoperations/models/AkriConnectorTemplateManagedConfigurationSettings.java b/sdk/iotoperations/azure-resourcemanager-iotoperations/src/main/java/com/azure/resourcemanager/iotoperations/models/AkriConnectorTemplateManagedConfigurationSettings.java index cb69e817ea3b..2ff2c68ee817 100644 --- a/sdk/iotoperations/azure-resourcemanager-iotoperations/src/main/java/com/azure/resourcemanager/iotoperations/models/AkriConnectorTemplateManagedConfigurationSettings.java +++ b/sdk/iotoperations/azure-resourcemanager-iotoperations/src/main/java/com/azure/resourcemanager/iotoperations/models/AkriConnectorTemplateManagedConfigurationSettings.java @@ -220,8 +220,13 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeMapField("additionalConfiguration", this.additionalConfiguration, (writer, element) -> writer.writeString(element)); jsonWriter.writeArrayField("persistentVolumeClaimTemplates", this.persistentVolumeClaimTemplates, - (writer, element) -> writer.writeMap(element, (writer1, element1) -> writer1 - .writeUntyped(element1 == null ? null : element1.toObject(Object.class)))); + (writer, element) -> writer.writeMap(element, (writer1, element1) -> { + if (element1 == null) { + writer1.writeNull(); + } else { + element1.writeTo(writer1); + } + })); jsonWriter.writeArrayField("secrets", this.secrets, (writer, element) -> writer.writeJson(element)); jsonWriter.writeJsonField("trustSettings", this.trustSettings); return jsonWriter.writeEndObject(); diff --git a/sdk/iotoperations/azure-resourcemanager-iotoperations/src/main/java/com/azure/resourcemanager/iotoperations/models/AkriConnectorTemplateRuntimeImageConfiguration.java b/sdk/iotoperations/azure-resourcemanager-iotoperations/src/main/java/com/azure/resourcemanager/iotoperations/models/AkriConnectorTemplateRuntimeImageConfiguration.java index cc107172886c..27945731d386 100644 --- a/sdk/iotoperations/azure-resourcemanager-iotoperations/src/main/java/com/azure/resourcemanager/iotoperations/models/AkriConnectorTemplateRuntimeImageConfiguration.java +++ b/sdk/iotoperations/azure-resourcemanager-iotoperations/src/main/java/com/azure/resourcemanager/iotoperations/models/AkriConnectorTemplateRuntimeImageConfiguration.java @@ -137,8 +137,13 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeMapField("additionalConfiguration", additionalConfiguration(), (writer, element) -> writer.writeString(element)); jsonWriter.writeArrayField("persistentVolumeClaimTemplates", persistentVolumeClaimTemplates(), - (writer, element) -> writer.writeMap(element, (writer1, element1) -> writer1 - .writeUntyped(element1 == null ? null : element1.toObject(Object.class)))); + (writer, element) -> writer.writeMap(element, (writer1, element1) -> { + if (element1 == null) { + writer1.writeNull(); + } else { + element1.writeTo(writer1); + } + })); jsonWriter.writeArrayField("secrets", secrets(), (writer, element) -> writer.writeJson(element)); jsonWriter.writeJsonField("trustSettings", trustSettings()); jsonWriter.writeJsonField("imageConfigurationSettings", this.imageConfigurationSettings); diff --git a/sdk/iotoperations/azure-resourcemanager-iotoperations/src/main/java/com/azure/resourcemanager/iotoperations/models/AkriConnectorTemplateRuntimeStatefulSetConfiguration.java b/sdk/iotoperations/azure-resourcemanager-iotoperations/src/main/java/com/azure/resourcemanager/iotoperations/models/AkriConnectorTemplateRuntimeStatefulSetConfiguration.java index 679a4ef521c3..e647e06ea3aa 100644 --- a/sdk/iotoperations/azure-resourcemanager-iotoperations/src/main/java/com/azure/resourcemanager/iotoperations/models/AkriConnectorTemplateRuntimeStatefulSetConfiguration.java +++ b/sdk/iotoperations/azure-resourcemanager-iotoperations/src/main/java/com/azure/resourcemanager/iotoperations/models/AkriConnectorTemplateRuntimeStatefulSetConfiguration.java @@ -146,12 +146,23 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeMapField("additionalConfiguration", additionalConfiguration(), (writer, element) -> writer.writeString(element)); jsonWriter.writeArrayField("persistentVolumeClaimTemplates", persistentVolumeClaimTemplates(), - (writer, element) -> writer.writeMap(element, (writer1, element1) -> writer1 - .writeUntyped(element1 == null ? null : element1.toObject(Object.class)))); + (writer, element) -> writer.writeMap(element, (writer1, element1) -> { + if (element1 == null) { + writer1.writeNull(); + } else { + element1.writeTo(writer1); + } + })); jsonWriter.writeArrayField("secrets", secrets(), (writer, element) -> writer.writeJson(element)); jsonWriter.writeJsonField("trustSettings", trustSettings()); jsonWriter.writeMapField("statefulSetConfigurationSettings", this.statefulSetConfigurationSettings, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); + (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); jsonWriter.writeStringField("managedConfigurationType", this.managedConfigurationType == null ? null : this.managedConfigurationType.toString()); return jsonWriter.writeEndObject(); diff --git a/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/MessageAttachment.java b/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/MessageAttachment.java index 2573e70c1f64..bb68727c3130 100644 --- a/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/MessageAttachment.java +++ b/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/models/MessageAttachment.java @@ -71,8 +71,13 @@ public List getTools() { public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); jsonWriter.writeStringField("file_id", this.fileId); - jsonWriter.writeArrayField("tools", this.tools, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); + jsonWriter.writeArrayField("tools", this.tools, (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); return jsonWriter.writeEndObject(); } diff --git a/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/models/AtlasClassification.java b/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/models/AtlasClassification.java index 5adae4bdefd5..ddb1136d8759 100644 --- a/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/models/AtlasClassification.java +++ b/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/models/AtlasClassification.java @@ -234,8 +234,13 @@ public AtlasClassification setValidityPeriods(List validityPeriods @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeMapField("attributes", this.attributes, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); + jsonWriter.writeMapField("attributes", this.attributes, (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); jsonWriter.writeStringField("typeName", this.typeName); jsonWriter.writeStringField("lastModifiedTS", this.lastModifiedTS); jsonWriter.writeStringField("entityGuid", this.entityGuid); diff --git a/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/models/AtlasClassifications.java b/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/models/AtlasClassifications.java index 5160ac5a4fb6..0e6075853baa 100644 --- a/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/models/AtlasClassifications.java +++ b/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/models/AtlasClassifications.java @@ -129,8 +129,13 @@ public Integer getTotalCount() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeArrayField("list", this.list, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); + jsonWriter.writeArrayField("list", this.list, (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); jsonWriter.writeNumberField("pageSize", this.pageSize); jsonWriter.writeStringField("sortBy", this.sortBy); jsonWriter.writeStringField("sortType", this.sortType == null ? null : this.sortType.toString()); diff --git a/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/models/AtlasConstraintDef.java b/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/models/AtlasConstraintDef.java index ed1660095af2..a71409006aa6 100644 --- a/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/models/AtlasConstraintDef.java +++ b/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/models/AtlasConstraintDef.java @@ -89,8 +89,13 @@ public AtlasConstraintDef setType(String type) { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeMapField("params", this.params, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); + jsonWriter.writeMapField("params", this.params, (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); jsonWriter.writeStringField("type", this.type); return jsonWriter.writeEndObject(); } diff --git a/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/models/AtlasEntity.java b/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/models/AtlasEntity.java index 8ad0725be750..527ca34d2d69 100644 --- a/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/models/AtlasEntity.java +++ b/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/models/AtlasEntity.java @@ -641,12 +641,22 @@ public AtlasEntity setContacts(Map> contacts) { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeMapField("attributes", this.attributes, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); + jsonWriter.writeMapField("attributes", this.attributes, (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); jsonWriter.writeStringField("typeName", this.typeName); jsonWriter.writeStringField("lastModifiedTS", this.lastModifiedTS); - jsonWriter.writeMapField("businessAttributes", this.businessAttributes, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); + jsonWriter.writeMapField("businessAttributes", this.businessAttributes, (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); jsonWriter.writeArrayField("classifications", this.classifications, (writer, element) -> writer.writeJson(element)); jsonWriter.writeNumberField("createTime", this.createTime); @@ -660,8 +670,13 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeArrayField("meanings", this.meanings, (writer, element) -> writer.writeJson(element)); jsonWriter.writeNumberField("provenanceType", this.provenanceType); jsonWriter.writeBooleanField("proxy", this.proxy); - jsonWriter.writeMapField("relationshipAttributes", this.relationshipAttributes, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); + jsonWriter.writeMapField("relationshipAttributes", this.relationshipAttributes, (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); jsonWriter.writeStringField("status", this.status == null ? null : this.status.toString()); jsonWriter.writeNumberField("updateTime", this.updateTime); jsonWriter.writeStringField("updatedBy", this.updatedBy); diff --git a/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/models/AtlasEntityHeader.java b/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/models/AtlasEntityHeader.java index f37d787a3eda..7cc1acb8f6a0 100644 --- a/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/models/AtlasEntityHeader.java +++ b/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/models/AtlasEntityHeader.java @@ -373,8 +373,13 @@ public AtlasEntityHeader setStatus(EntityStatus status) { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeMapField("attributes", this.attributes, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); + jsonWriter.writeMapField("attributes", this.attributes, (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); jsonWriter.writeStringField("typeName", this.typeName); jsonWriter.writeStringField("lastModifiedTS", this.lastModifiedTS); jsonWriter.writeArrayField("classificationNames", this.classificationNames, diff --git a/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/models/AtlasGlossaryTerm.java b/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/models/AtlasGlossaryTerm.java index 611dc4a3c96e..4e758dfb567b 100644 --- a/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/models/AtlasGlossaryTerm.java +++ b/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/models/AtlasGlossaryTerm.java @@ -1091,8 +1091,13 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeNumberField("updateTime", this.updateTime); jsonWriter.writeStringField("updatedBy", this.updatedBy); jsonWriter.writeStringField("abbreviation", this.abbreviation); - jsonWriter.writeArrayField("templateName", this.templateName, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); + jsonWriter.writeArrayField("templateName", this.templateName, (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); jsonWriter.writeJsonField("anchor", this.anchor); jsonWriter.writeArrayField("antonyms", this.antonyms, (writer, element) -> writer.writeJson(element)); jsonWriter.writeStringField("status", this.status == null ? null : this.status.toString()); @@ -1101,8 +1106,14 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeArrayField("resources", this.resources, (writer, element) -> writer.writeJson(element)); jsonWriter.writeMapField("contacts", this.contacts, (writer, element) -> writer.writeArray(element, (writer1, element1) -> writer1.writeJson(element1))); - jsonWriter.writeMapField("attributes", this.attributes, (writer, element) -> writer.writeMap(element, - (writer1, element1) -> writer1.writeUntyped(element1 == null ? null : element1.toObject(Object.class)))); + jsonWriter.writeMapField("attributes", this.attributes, + (writer, element) -> writer.writeMap(element, (writer1, element1) -> { + if (element1 == null) { + writer1.writeNull(); + } else { + element1.writeTo(writer1); + } + })); jsonWriter.writeArrayField("assignedEntities", this.assignedEntities, (writer, element) -> writer.writeJson(element)); jsonWriter.writeArrayField("categories", this.categories, (writer, element) -> writer.writeJson(element)); diff --git a/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/models/AtlasLineageInfo.java b/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/models/AtlasLineageInfo.java index 5ff7182f00da..3b5edc85e7f7 100644 --- a/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/models/AtlasLineageInfo.java +++ b/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/models/AtlasLineageInfo.java @@ -180,8 +180,14 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); jsonWriter.writeStringField("baseEntityGuid", this.baseEntityGuid); jsonWriter.writeMapField("guidEntityMap", this.guidEntityMap, (writer, element) -> writer.writeJson(element)); - jsonWriter.writeMapField("widthCounts", this.widthCounts, (writer, element) -> writer.writeMap(element, - (writer1, element1) -> writer1.writeUntyped(element1 == null ? null : element1.toObject(Object.class)))); + jsonWriter.writeMapField("widthCounts", this.widthCounts, + (writer, element) -> writer.writeMap(element, (writer1, element1) -> { + if (element1 == null) { + writer1.writeNull(); + } else { + element1.writeTo(writer1); + } + })); jsonWriter.writeNumberField("lineageDepth", this.lineageDepth); jsonWriter.writeNumberField("lineageWidth", this.lineageWidth); jsonWriter.writeNumberField("childrenCount", this.childrenCount); diff --git a/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/models/AtlasObjectId.java b/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/models/AtlasObjectId.java index 2a866d443d03..db6dbb4427e3 100644 --- a/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/models/AtlasObjectId.java +++ b/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/models/AtlasObjectId.java @@ -119,8 +119,13 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); jsonWriter.writeStringField("guid", this.guid); jsonWriter.writeStringField("typeName", this.typeName); - jsonWriter.writeMapField("uniqueAttributes", this.uniqueAttributes, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); + jsonWriter.writeMapField("uniqueAttributes", this.uniqueAttributes, (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); return jsonWriter.writeEndObject(); } diff --git a/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/models/AtlasRelatedObjectId.java b/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/models/AtlasRelatedObjectId.java index 2196d5ab7b66..5a74381ee13e 100644 --- a/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/models/AtlasRelatedObjectId.java +++ b/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/models/AtlasRelatedObjectId.java @@ -296,8 +296,13 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); jsonWriter.writeStringField("guid", this.guid); jsonWriter.writeStringField("typeName", this.typeName); - jsonWriter.writeMapField("uniqueAttributes", this.uniqueAttributes, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); + jsonWriter.writeMapField("uniqueAttributes", this.uniqueAttributes, (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); jsonWriter.writeStringField("displayText", this.displayText); jsonWriter.writeStringField("entityStatus", this.entityStatus == null ? null : this.entityStatus.toString()); jsonWriter.writeStringField("relationshipType", this.relationshipType); diff --git a/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/models/AtlasRelationship.java b/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/models/AtlasRelationship.java index afc936163aae..e820181cf08a 100644 --- a/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/models/AtlasRelationship.java +++ b/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/models/AtlasRelationship.java @@ -453,8 +453,13 @@ public AtlasRelationship setVersion(Long version) { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeMapField("attributes", this.attributes, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); + jsonWriter.writeMapField("attributes", this.attributes, (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); jsonWriter.writeStringField("typeName", this.typeName); jsonWriter.writeStringField("lastModifiedTS", this.lastModifiedTS); jsonWriter.writeNumberField("createTime", this.createTime); diff --git a/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/models/AtlasStruct.java b/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/models/AtlasStruct.java index 959876bea773..b4f8f9811bdd 100644 --- a/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/models/AtlasStruct.java +++ b/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/models/AtlasStruct.java @@ -118,8 +118,13 @@ public AtlasStruct setLastModifiedTS(String lastModifiedTS) { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeMapField("attributes", this.attributes, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); + jsonWriter.writeMapField("attributes", this.attributes, (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); jsonWriter.writeStringField("typeName", this.typeName); jsonWriter.writeStringField("lastModifiedTS", this.lastModifiedTS); return jsonWriter.writeEndObject(); diff --git a/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/models/PurviewObjectId.java b/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/models/PurviewObjectId.java index a49b6506f826..1d8f05a035f5 100644 --- a/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/models/PurviewObjectId.java +++ b/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/models/PurviewObjectId.java @@ -259,14 +259,24 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); jsonWriter.writeStringField("guid", this.guid); jsonWriter.writeStringField("typeName", this.typeName); - jsonWriter.writeMapField("uniqueAttributes", this.uniqueAttributes, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); + jsonWriter.writeMapField("uniqueAttributes", this.uniqueAttributes, (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); jsonWriter.writeStringField("name", this.name); jsonWriter.writeStringField("displayText", this.displayText); jsonWriter.writeStringField("itemPath", this.itemPath); jsonWriter.writeStringField("resourceId", this.resourceId); - jsonWriter.writeMapField("properties", this.properties, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); + jsonWriter.writeMapField("properties", this.properties, (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); return jsonWriter.writeEndObject(); } diff --git a/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/models/QueryOptions.java b/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/models/QueryOptions.java index be603fad133f..0d560e8d1b7e 100644 --- a/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/models/QueryOptions.java +++ b/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/models/QueryOptions.java @@ -238,8 +238,13 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStringField("keywords", this.keywords); jsonWriter.writeNumberField("limit", this.limit); jsonWriter.writeStringField("continuationToken", this.continuationToken); - jsonWriter.writeArrayField("orderby", this.orderby, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); + jsonWriter.writeArrayField("orderby", this.orderby, (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); if (this.filter != null) { jsonWriter.writeFieldName("filter"); this.filter.writeTo(jsonWriter); diff --git a/sdk/workloadorchestration/azure-resourcemanager-workloadorchestration/src/main/java/com/azure/resourcemanager/workloadorchestration/models/ExecutionProperties.java b/sdk/workloadorchestration/azure-resourcemanager-workloadorchestration/src/main/java/com/azure/resourcemanager/workloadorchestration/models/ExecutionProperties.java index bd311c86ea16..a2621ed88d45 100644 --- a/sdk/workloadorchestration/azure-resourcemanager-workloadorchestration/src/main/java/com/azure/resourcemanager/workloadorchestration/models/ExecutionProperties.java +++ b/sdk/workloadorchestration/azure-resourcemanager-workloadorchestration/src/main/java/com/azure/resourcemanager/workloadorchestration/models/ExecutionProperties.java @@ -109,8 +109,13 @@ public ProvisioningState provisioningState() { public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); jsonWriter.writeStringField("workflowVersionId", this.workflowVersionId); - jsonWriter.writeMapField("specification", this.specification, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); + jsonWriter.writeMapField("specification", this.specification, (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); return jsonWriter.writeEndObject(); } diff --git a/sdk/workloadorchestration/azure-resourcemanager-workloadorchestration/src/main/java/com/azure/resourcemanager/workloadorchestration/models/SolutionTemplateVersionProperties.java b/sdk/workloadorchestration/azure-resourcemanager-workloadorchestration/src/main/java/com/azure/resourcemanager/workloadorchestration/models/SolutionTemplateVersionProperties.java index e0814c066b4b..7831aba02f6a 100644 --- a/sdk/workloadorchestration/azure-resourcemanager-workloadorchestration/src/main/java/com/azure/resourcemanager/workloadorchestration/models/SolutionTemplateVersionProperties.java +++ b/sdk/workloadorchestration/azure-resourcemanager-workloadorchestration/src/main/java/com/azure/resourcemanager/workloadorchestration/models/SolutionTemplateVersionProperties.java @@ -120,8 +120,13 @@ public ProvisioningState provisioningState() { public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); jsonWriter.writeStringField("configurations", this.configurations); - jsonWriter.writeMapField("specification", this.specification, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); + jsonWriter.writeMapField("specification", this.specification, (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); jsonWriter.writeStringField("orchestratorType", this.orchestratorType == null ? null : this.orchestratorType.toString()); return jsonWriter.writeEndObject(); diff --git a/sdk/workloadorchestration/azure-resourcemanager-workloadorchestration/src/main/java/com/azure/resourcemanager/workloadorchestration/models/SolutionVersionProperties.java b/sdk/workloadorchestration/azure-resourcemanager-workloadorchestration/src/main/java/com/azure/resourcemanager/workloadorchestration/models/SolutionVersionProperties.java index 72f2a76f21f1..0a17e22c6cdf 100644 --- a/sdk/workloadorchestration/azure-resourcemanager-workloadorchestration/src/main/java/com/azure/resourcemanager/workloadorchestration/models/SolutionVersionProperties.java +++ b/sdk/workloadorchestration/azure-resourcemanager-workloadorchestration/src/main/java/com/azure/resourcemanager/workloadorchestration/models/SolutionVersionProperties.java @@ -254,8 +254,13 @@ public ProvisioningState provisioningState() { @Override public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); - jsonWriter.writeMapField("specification", this.specification, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); + jsonWriter.writeMapField("specification", this.specification, (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); return jsonWriter.writeEndObject(); } diff --git a/sdk/workloadorchestration/azure-resourcemanager-workloadorchestration/src/main/java/com/azure/resourcemanager/workloadorchestration/models/SolutionVersionSnapshot.java b/sdk/workloadorchestration/azure-resourcemanager-workloadorchestration/src/main/java/com/azure/resourcemanager/workloadorchestration/models/SolutionVersionSnapshot.java index 69030f0f821b..1a1cd44d142b 100644 --- a/sdk/workloadorchestration/azure-resourcemanager-workloadorchestration/src/main/java/com/azure/resourcemanager/workloadorchestration/models/SolutionVersionSnapshot.java +++ b/sdk/workloadorchestration/azure-resourcemanager-workloadorchestration/src/main/java/com/azure/resourcemanager/workloadorchestration/models/SolutionVersionSnapshot.java @@ -59,8 +59,13 @@ public Map specification() { public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); jsonWriter.writeStringField("solutionVersionId", this.solutionVersionId); - jsonWriter.writeMapField("specification", this.specification, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); + jsonWriter.writeMapField("specification", this.specification, (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); return jsonWriter.writeEndObject(); } diff --git a/sdk/workloadorchestration/azure-resourcemanager-workloadorchestration/src/main/java/com/azure/resourcemanager/workloadorchestration/models/StageSpec.java b/sdk/workloadorchestration/azure-resourcemanager-workloadorchestration/src/main/java/com/azure/resourcemanager/workloadorchestration/models/StageSpec.java index a02ef7fc3356..e6d1405ba23b 100644 --- a/sdk/workloadorchestration/azure-resourcemanager-workloadorchestration/src/main/java/com/azure/resourcemanager/workloadorchestration/models/StageSpec.java +++ b/sdk/workloadorchestration/azure-resourcemanager-workloadorchestration/src/main/java/com/azure/resourcemanager/workloadorchestration/models/StageSpec.java @@ -132,8 +132,13 @@ public StageSpec withTaskOption(TaskOption taskOption) { public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); jsonWriter.writeStringField("name", this.name); - jsonWriter.writeMapField("specification", this.specification, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); + jsonWriter.writeMapField("specification", this.specification, (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); jsonWriter.writeArrayField("tasks", this.tasks, (writer, element) -> writer.writeJson(element)); jsonWriter.writeJsonField("taskOption", this.taskOption); return jsonWriter.writeEndObject(); diff --git a/sdk/workloadorchestration/azure-resourcemanager-workloadorchestration/src/main/java/com/azure/resourcemanager/workloadorchestration/models/StageStatus.java b/sdk/workloadorchestration/azure-resourcemanager-workloadorchestration/src/main/java/com/azure/resourcemanager/workloadorchestration/models/StageStatus.java index 4124d52be212..d3cda22de32d 100644 --- a/sdk/workloadorchestration/azure-resourcemanager-workloadorchestration/src/main/java/com/azure/resourcemanager/workloadorchestration/models/StageStatus.java +++ b/sdk/workloadorchestration/azure-resourcemanager-workloadorchestration/src/main/java/com/azure/resourcemanager/workloadorchestration/models/StageStatus.java @@ -149,10 +149,20 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStringField("nextstage", this.nextstage); jsonWriter.writeStringField("errorMessage", this.errorMessage); jsonWriter.writeStringField("isActive", this.isActive == null ? null : this.isActive.toString()); - jsonWriter.writeMapField("inputs", this.inputs, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); - jsonWriter.writeMapField("outputs", this.outputs, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); + jsonWriter.writeMapField("inputs", this.inputs, (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); + jsonWriter.writeMapField("outputs", this.outputs, (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); return jsonWriter.writeEndObject(); } diff --git a/sdk/workloadorchestration/azure-resourcemanager-workloadorchestration/src/main/java/com/azure/resourcemanager/workloadorchestration/models/TargetProperties.java b/sdk/workloadorchestration/azure-resourcemanager-workloadorchestration/src/main/java/com/azure/resourcemanager/workloadorchestration/models/TargetProperties.java index 7f5b48fbec83..dcbea1a28529 100644 --- a/sdk/workloadorchestration/azure-resourcemanager-workloadorchestration/src/main/java/com/azure/resourcemanager/workloadorchestration/models/TargetProperties.java +++ b/sdk/workloadorchestration/azure-resourcemanager-workloadorchestration/src/main/java/com/azure/resourcemanager/workloadorchestration/models/TargetProperties.java @@ -262,8 +262,13 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStringField("description", this.description); jsonWriter.writeStringField("displayName", this.displayName); jsonWriter.writeStringField("contextId", this.contextId); - jsonWriter.writeMapField("targetSpecification", this.targetSpecification, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); + jsonWriter.writeMapField("targetSpecification", this.targetSpecification, (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); jsonWriter.writeArrayField("capabilities", this.capabilities, (writer, element) -> writer.writeString(element)); jsonWriter.writeStringField("hierarchyLevel", this.hierarchyLevel); jsonWriter.writeStringField("solutionScope", this.solutionScope); diff --git a/sdk/workloadorchestration/azure-resourcemanager-workloadorchestration/src/main/java/com/azure/resourcemanager/workloadorchestration/models/TargetSnapshot.java b/sdk/workloadorchestration/azure-resourcemanager-workloadorchestration/src/main/java/com/azure/resourcemanager/workloadorchestration/models/TargetSnapshot.java index c2c471cc732f..2de7a8d18d9a 100644 --- a/sdk/workloadorchestration/azure-resourcemanager-workloadorchestration/src/main/java/com/azure/resourcemanager/workloadorchestration/models/TargetSnapshot.java +++ b/sdk/workloadorchestration/azure-resourcemanager-workloadorchestration/src/main/java/com/azure/resourcemanager/workloadorchestration/models/TargetSnapshot.java @@ -73,8 +73,13 @@ public String solutionScope() { public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); jsonWriter.writeStringField("targetId", this.targetId); - jsonWriter.writeMapField("targetSpecification", this.targetSpecification, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); + jsonWriter.writeMapField("targetSpecification", this.targetSpecification, (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); jsonWriter.writeStringField("solutionScope", this.solutionScope); return jsonWriter.writeEndObject(); } diff --git a/sdk/workloadorchestration/azure-resourcemanager-workloadorchestration/src/main/java/com/azure/resourcemanager/workloadorchestration/models/TargetUpdateProperties.java b/sdk/workloadorchestration/azure-resourcemanager-workloadorchestration/src/main/java/com/azure/resourcemanager/workloadorchestration/models/TargetUpdateProperties.java index 49509aee4799..7b4cea91e862 100644 --- a/sdk/workloadorchestration/azure-resourcemanager-workloadorchestration/src/main/java/com/azure/resourcemanager/workloadorchestration/models/TargetUpdateProperties.java +++ b/sdk/workloadorchestration/azure-resourcemanager-workloadorchestration/src/main/java/com/azure/resourcemanager/workloadorchestration/models/TargetUpdateProperties.java @@ -234,8 +234,13 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStringField("description", this.description); jsonWriter.writeStringField("displayName", this.displayName); jsonWriter.writeStringField("contextId", this.contextId); - jsonWriter.writeMapField("targetSpecification", this.targetSpecification, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); + jsonWriter.writeMapField("targetSpecification", this.targetSpecification, (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); jsonWriter.writeArrayField("capabilities", this.capabilities, (writer, element) -> writer.writeString(element)); jsonWriter.writeStringField("hierarchyLevel", this.hierarchyLevel); jsonWriter.writeStringField("solutionScope", this.solutionScope); diff --git a/sdk/workloadorchestration/azure-resourcemanager-workloadorchestration/src/main/java/com/azure/resourcemanager/workloadorchestration/models/TaskSpec.java b/sdk/workloadorchestration/azure-resourcemanager-workloadorchestration/src/main/java/com/azure/resourcemanager/workloadorchestration/models/TaskSpec.java index 5ffeea084673..0624aa1b532d 100644 --- a/sdk/workloadorchestration/azure-resourcemanager-workloadorchestration/src/main/java/com/azure/resourcemanager/workloadorchestration/models/TaskSpec.java +++ b/sdk/workloadorchestration/azure-resourcemanager-workloadorchestration/src/main/java/com/azure/resourcemanager/workloadorchestration/models/TaskSpec.java @@ -106,8 +106,13 @@ public TaskSpec withSpecification(Map specification) { public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); jsonWriter.writeStringField("name", this.name); - jsonWriter.writeMapField("specification", this.specification, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); + jsonWriter.writeMapField("specification", this.specification, (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); jsonWriter.writeStringField("targetId", this.targetId); return jsonWriter.writeEndObject(); } diff --git a/sdk/workloadorchestration/azure-resourcemanager-workloadorchestration/src/main/java/com/azure/resourcemanager/workloadorchestration/models/WorkflowVersionProperties.java b/sdk/workloadorchestration/azure-resourcemanager-workloadorchestration/src/main/java/com/azure/resourcemanager/workloadorchestration/models/WorkflowVersionProperties.java index 66e7c57236cb..b71cadcd5ed8 100644 --- a/sdk/workloadorchestration/azure-resourcemanager-workloadorchestration/src/main/java/com/azure/resourcemanager/workloadorchestration/models/WorkflowVersionProperties.java +++ b/sdk/workloadorchestration/azure-resourcemanager-workloadorchestration/src/main/java/com/azure/resourcemanager/workloadorchestration/models/WorkflowVersionProperties.java @@ -152,8 +152,13 @@ public ProvisioningState provisioningState() { public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { jsonWriter.writeStartObject(); jsonWriter.writeArrayField("stageSpec", this.stageSpec, (writer, element) -> writer.writeJson(element)); - jsonWriter.writeMapField("specification", this.specification, - (writer, element) -> writer.writeUntyped(element == null ? null : element.toObject(Object.class))); + jsonWriter.writeMapField("specification", this.specification, (writer, element) -> { + if (element == null) { + writer.writeNull(); + } else { + element.writeTo(writer); + } + }); return jsonWriter.writeEndObject(); }